style : add deprecated since

Author: alicela

src/main/java/fr/insee/genesis/domain/model/surveyunit/SurveyUnitModel.java

@@ -27,7 +27,7 @@ public class SurveyUnitModel {
 	/**
 	 * @deprecated We will not receive this identifier anymore
 	 */
-	@Deprecated(forRemoval = true)
+	@Deprecated(forRemoval = true, since = "2026-01-01")
 	private String campaignId;
 	private String interrogationId;
 	// New name of idUE

src/main/java/fr/insee/genesis/domain/service/rawdata/RawResponseService.java

@@ -36,6 +36,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -179,7 +180,6 @@ public List<SurveyUnitModel> convertRawResponse(List<RawResponse> rawResponses,
             }
         }
         return surveyUnitModels;
-        //return List.of();
     }
 
     @Override
@@ -195,13 +195,10 @@ public void updateProcessDates(List<SurveyUnitModel> surveyUnitModels) {
         }
 
         for (String collectionInstrumentId : collectionInstrumentIds) {
-            Set<String> interrogationIds = new HashSet<>();
-            for (SurveyUnitModel surveyUnitModel :
-                    surveyUnitModels.stream().filter(
-                            surveyUnitModel -> surveyUnitModel.getCollectionInstrumentId().equals(collectionInstrumentId)
-                    ).toList()) {
-                interrogationIds.add(surveyUnitModel.getInterrogationId());
-            }
+            Set<String> interrogationIds = surveyUnitModels.stream()
+                    .filter(su -> su.getCollectionInstrumentId().equals(collectionInstrumentId))
+                    .map(SurveyUnitModel::getInterrogationId)
+                    .collect(Collectors.toSet());
             rawResponsePersistencePort.updateProcessDates(collectionInstrumentId, interrogationIds);
         }
     }
@@ -218,11 +215,12 @@ private Map<String, Set<String>> getProcessedIdsMap(List<SurveyUnitModel> survey
 
     private void sendProcessedIdsToQualityTool(List<SurveyUnitModel> surveyUnitModels) {
         try {
+            Map<String, Set<String>> processedIdsMap = getProcessedIdsMap(surveyUnitModels);
             ResponseEntity<Object> response =
-                    surveyUnitQualityToolPort.sendProcessedIds(getProcessedIdsMap(surveyUnitModels));
+                    surveyUnitQualityToolPort.sendProcessedIds(processedIdsMap);
 
             if (response.getStatusCode().is2xxSuccessful()) {
-                log.info("Successfully sent {} ids to quality tool", getProcessedIdsMap(surveyUnitModels).size());
+                log.info("Successfully sent {} ids to quality tool", processedIdsMap.size());
             }else{
                 log.warn("Survey unit quality tool responded non-2xx code {} and body {}",
                         response.getStatusCode(), response.getBody());
@@ -237,7 +235,7 @@ private static Boolean getIsCapturedIndirectly(RawResponse rawResponse) {
             return rawResponse.payload().get("isCapturedIndirectly") == null ? null :
                     Boolean.parseBoolean(rawResponse.payload().get("isCapturedIndirectly").toString());
         }catch(Exception e){
-            log.warn("Exception when parsing isCapturedIndirectly : {}}",e.toString());
+            log.warn("Exception when parsing isCapturedIndirectly : {}",e.toString());
             return Boolean.FALSE;
         }
     }
@@ -247,7 +245,7 @@ private static LocalDateTime getValidationDate(RawResponse rawResponse) {
             return rawResponse.payload().get("validationDate") == null ? null :
                     LocalDateTime.parse(rawResponse.payload().get("validationDate").toString());
         }catch(Exception e){
-            log.warn("Exception when parsing validation date : {}}",e.toString());
+            log.warn("Exception when parsing validation date : {}",e.toString());
             return null;
         }
     }
@@ -340,7 +338,7 @@ private static void convertOneVar(Map.Entry<String, Object> externalVariableEntr
 
     private static String getIdLoop(VariablesMap variablesMap, String variableName) {
         if (variablesMap.getVariable(variableName) == null) {
-            log.warn("Variable {} not present in metadatas, assigning to {}", variableName, Constants.ROOT_GROUP_NAME);
+            log.warn("Variable {} not present in metadata, assigning to {}", variableName, Constants.ROOT_GROUP_NAME);
             return Constants.ROOT_GROUP_NAME;
         }
         return variablesMap.getVariable(variableName).getGroupName();

src/main/java/fr/insee/genesis/infrastructure/document/contextualexternal/ContextualExternalVariableDocument.java

@@ -22,7 +22,7 @@ public class ContextualExternalVariableDocument {
     /**
      * @deprecated it will be replaced by collectionInstrumentId
      */
-    @Deprecated(forRemoval = true)
+    @Deprecated(forRemoval = true, since = "2026-01-01")
     @Indexed
     String questionnaireId;
     @Indexed

src/main/java/fr/insee/genesis/infrastructure/document/contextualprevious/ContextualPreviousVariableDocument.java

@@ -21,7 +21,7 @@ public class ContextualPreviousVariableDocument {
     /**
      * @deprecated it will be replaced by collectionInstrumentId
      */
-    @Deprecated(forRemoval = true)
+    @Deprecated(forRemoval = true, since = "2026-01-01")
     @Indexed
     String questionnaireId;
     @Indexed

src/main/java/fr/insee/genesis/infrastructure/document/lunaticmodel/LunaticModelDocument.java

@@ -16,8 +16,7 @@ I choose to keep the record here (this choice can be challenged)*/
 @Builder
 @Document(collection = "lunaticmodels")
 public record LunaticModelDocument (
-
-    @Deprecated
+    @Deprecated (since = "2026-01-01", forRemoval = true)
     @Indexed
     String questionnaireId,
     @Indexed

src/main/java/fr/insee/genesis/infrastructure/document/metadata/QuestionnaireMetadataDocument.java

@@ -17,7 +17,7 @@ I choose to keep the record here (this choice can be challenged)*/
 @Document(collection = "questionnaireMetadatas")
 public record QuestionnaireMetadataDocument(
 
-        @Deprecated
+        @Deprecated (since = "2026-01-01", forRemoval = true)
         @Indexed
         String questionnaireId,
         @Indexed

src/main/java/fr/insee/genesis/infrastructure/document/surveyunit/SurveyUnitDocument.java

@@ -24,23 +24,23 @@ public class SurveyUnitDocument {
 	/**
 	 * @deprecated This piece of information will not be available anymore in the raw responses
 	 */
-	@Deprecated(forRemoval = true)
+	@Deprecated(forRemoval = true, since ="2026-01-01")
 	private String campaignId;
 	@Indexed
 	private String interrogationId;
 
 	/**
 	 * @deprecated It will be replaced by usualSurveyUnitId
 	 */
-	@Deprecated(forRemoval = true)
+	@Deprecated(forRemoval = true, since ="2026-01-01")
 	private String idUE;
 
 	private String usualSurveyUnitId;
 
 	/**
 	 * @deprecated It will be replaced by collectionInstrumentId
 	 */
-	@Deprecated(forRemoval = true)
+	@Deprecated(forRemoval = true, since ="2026-01-01")
 	private String questionnaireId;
 
 	private String collectionInstrumentId;