refactor: change setter to constructor injection style

ProgrammeVitam · Jan 24, 2024 · 28a8d23 · 28a8d23
1 parent 941a0c1
commit 28a8d23
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 58 deletions.
diff --git a/...vitamui/archives/search/common/dto/converter/JsonPatchDtoToUpdateMultiQueryConverter.java b/...vitamui/archives/search/common/dto/converter/JsonPatchDtoToUpdateMultiQueryConverter.java
@@ -46,8 +46,15 @@
 public class JsonPatchDtoToUpdateMultiQueryConverter implements Converter<JsonPatchDto, UpdateMultiQuery> {
     private static final VitamUILogger log =
         VitamUILoggerFactory.getInstance(JsonPatchDtoToUpdateMultiQueryConverter.class);
-    private JsonPatchToSetActionConverter jsonPatchToSetActionConverter;
-    private JsonPatchToUnsetActionConverter jsonPatchToUnsetActionConverter;
+    private final JsonPatchToSetActionConverter jsonPatchToSetActionConverter;
+    private final JsonPatchToUnsetActionConverter jsonPatchToUnsetActionConverter;
+
+    @Autowired
+    public JsonPatchDtoToUpdateMultiQueryConverter(final JsonPatchToSetActionConverter jsonPatchToSetActionConverter,
+        JsonPatchToUnsetActionConverter jsonPatchToUnsetActionConverter) {
+        this.jsonPatchToSetActionConverter = jsonPatchToSetActionConverter;
+        this.jsonPatchToUnsetActionConverter = jsonPatchToUnsetActionConverter;
+    }
 
     @Override
     public UpdateMultiQuery convert(JsonPatchDto source) {
@@ -71,15 +78,4 @@ public UpdateMultiQuery convert(JsonPatchDto source) {
         }
         return null;
     }
-
-    @Autowired
-    public void setJsonPatchToUnsetActionConverter(
-        final JsonPatchToUnsetActionConverter jsonPatchToUnsetActionConverter) {
-        this.jsonPatchToUnsetActionConverter = jsonPatchToUnsetActionConverter;
-    }
-
-    @Autowired
-    public void setJsonPatchToSetActionConverter(final JsonPatchToSetActionConverter jsonPatchToSetActionConverter) {
-        this.jsonPatchToSetActionConverter = jsonPatchToSetActionConverter;
-    }
 }
diff --git a/.../java/fr/gouv/vitamui/archives/search/external/server/service/ArchiveUnitServiceImpl.java b/.../java/fr/gouv/vitamui/archives/search/external/server/service/ArchiveUnitServiceImpl.java
@@ -46,8 +46,15 @@
 
 @Service
 public class ArchiveUnitServiceImpl implements ArchiveUnitService {
-    private ExternalSecurityService externalSecurityService;
-    private ArchiveUnitClient client;
+    private final ExternalSecurityService externalSecurityService;
+    private final ArchiveUnitClient client;
+
+    @Autowired
+    public ArchiveUnitServiceImpl(final ExternalSecurityService externalSecurityService,
+        final ArchiveUnitClient client) {
+        this.externalSecurityService = externalSecurityService;
+        this.client = client;
+    }
 
     @Override
     public OperationIdDto update(Set<UpdateArchiveUnitDto> updateArchiveUnitDtoSet) {
@@ -64,16 +71,6 @@ public OperationIdDto update(MultiJsonPatchDto multiJsonPatchDto) {
         return client.update(getContext(), multiJsonPatchDto);
     }
 
-    @Autowired
-    public void setExternalSecurityService(ExternalSecurityService externalSecurityService) {
-        this.externalSecurityService = externalSecurityService;
-    }
-
-    @Autowired
-    public void setClient(ArchiveUnitClient client) {
-        this.client = client;
-    }
-
     private InternalHttpContext toInternalHttpContext(final ExternalHttpContext externalHttpContext) {
         final AuthUserDto user = externalSecurityService.getUser();
         final String userLevel = user.getLevel();

diff --git a/...src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveUnitServiceImpl.java b/...src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveUnitServiceImpl.java
@@ -60,11 +60,24 @@
 @Service
 public class ArchiveUnitServiceImpl implements ArchiveUnitService {
     private static final VitamUILogger log = VitamUILoggerFactory.getInstance(ArchiveUnitServiceImpl.class);
-    private AccessExternalClient accessExternalClient;
-    private UpdateArchiveUnitDtoToUpdateMultiQueryConverter updateArchiveUnitDtoToUpdateMultiQueryConverter;
-    private ExternalParametersService externalParametersService;
-    private JsonPatchDtoToUpdateMultiQueryConverter jsonPatchDtoToUpdateMultiQueryConverter;
-    private UpdateMultiQueriesToBulkCommandDto updateMultiQueriesToBulkCommandDto;
+    private final AccessExternalClient accessExternalClient;
+    private final UpdateArchiveUnitDtoToUpdateMultiQueryConverter updateArchiveUnitDtoToUpdateMultiQueryConverter;
+    private final ExternalParametersService externalParametersService;
+    private final JsonPatchDtoToUpdateMultiQueryConverter jsonPatchDtoToUpdateMultiQueryConverter;
+    private final UpdateMultiQueriesToBulkCommandDto updateMultiQueriesToBulkCommandDto;
+
+    @Autowired
+    public ArchiveUnitServiceImpl(final AccessExternalClient accessExternalClient,
+        final UpdateArchiveUnitDtoToUpdateMultiQueryConverter updateArchiveUnitDtoToUpdateMultiQueryConverter,
+        final ExternalParametersService externalParametersService,
+        final JsonPatchDtoToUpdateMultiQueryConverter jsonPatchDtoToUpdateMultiQueryConverter,
+        final UpdateMultiQueriesToBulkCommandDto updateMultiQueriesToBulkCommandDto) {
+        this.accessExternalClient = accessExternalClient;
+        this.updateArchiveUnitDtoToUpdateMultiQueryConverter = updateArchiveUnitDtoToUpdateMultiQueryConverter;
+        this.externalParametersService = externalParametersService;
+        this.jsonPatchDtoToUpdateMultiQueryConverter = jsonPatchDtoToUpdateMultiQueryConverter;
+        this.updateMultiQueriesToBulkCommandDto = updateMultiQueriesToBulkCommandDto;
+    }
 
     @Override
     public OperationIdDto update(Set<UpdateArchiveUnitDto> updateArchiveUnitDtoSet) {
@@ -117,32 +130,4 @@ private OperationIdDto send(Set<UpdateMultiQuery> updateMultiQueries) {
             throw new ArchiveUnitUpdateException(e);
         }
     }
-
-    @Autowired
-    public void setAccessExternalClient(final AccessExternalClient accessExternalClient) {
-        this.accessExternalClient = accessExternalClient;
-    }
-
-    @Autowired
-    public void setUpdateArchiveUnitDtoToUpdateMultiQueryConverter(
-        final UpdateArchiveUnitDtoToUpdateMultiQueryConverter updateArchiveUnitDtoToUpdateMultiQueryConverter) {
-        this.updateArchiveUnitDtoToUpdateMultiQueryConverter = updateArchiveUnitDtoToUpdateMultiQueryConverter;
-    }
-
-    @Autowired
-    public void setExternalParametersService(ExternalParametersService externalParametersService) {
-        this.externalParametersService = externalParametersService;
-    }
-
-    @Autowired
-    public void setJsonPatchDtoToUpdateMultiQueryConverter(
-        final JsonPatchDtoToUpdateMultiQueryConverter jsonPatchDtoToUpdateMultiQueryConverter) {
-        this.jsonPatchDtoToUpdateMultiQueryConverter = jsonPatchDtoToUpdateMultiQueryConverter;
-    }
-
-    @Autowired
-    public void setUpdateMultiQueriesToBulkCommandDto(
-        final UpdateMultiQueriesToBulkCommandDto updateMultiQueriesToBulkCommandDto) {
-        this.updateMultiQueriesToBulkCommandDto = updateMultiQueriesToBulkCommandDto;
-    }
 }