remote constructor injection

Author: Yavor16

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/model/AuditLogConfiguration.java

@@ -16,6 +16,7 @@ public class AuditLogConfiguration implements AuditableConfiguration {
     private static final String PERFORMED_ACTION_IDENTIFIER_KEY_NAME = "performed_action";
     private static final String TIME_IDENTIFIER_KEY_NAME = "time";
     private static final String SPACE_ID_IDENTIFIER_KEY_NAME = "spaceId";
+    private static final String USER_ID_IDENTIFIER_KEY_NAME = "userId";
     private final String userId;
     private final String spaceId;
     private final String performedAction;
@@ -68,6 +69,7 @@ public List<ConfigurationIdentifier> getConfigurationIdentifiers() {
         configurationIdentifiers.add(new ConfigurationIdentifier(PERFORMED_ACTION_IDENTIFIER_KEY_NAME, getPerformedAction()));
         configurationIdentifiers.add(new ConfigurationIdentifier(TIME_IDENTIFIER_KEY_NAME, getTimeOfPerformedAction()));
         configurationIdentifiers.add(new ConfigurationIdentifier(SPACE_ID_IDENTIFIER_KEY_NAME, getSpaceId()));
+        configurationIdentifiers.add(new ConfigurationIdentifier(USER_ID_IDENTIFIER_KEY_NAME, getUserId()));
         for (var parameter : parameters.entrySet()) {
             if (parameter.getValue() != null) {
                 configurationIdentifiers.add(new ConfigurationIdentifier(parameter.getKey(), parameter.getValue()));

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/security/data/termination/DataTerminationService.java

@@ -56,12 +56,8 @@ public class DataTerminationService {
     private ApplicationConfiguration configuration;
     @Inject
     private WebClientFactory webClientFactory;
-    private MtaConfigurationPurgerAuditLog mtaConfigurationPurgerAuditLog;
-
     @Inject
-    public DataTerminationService(MtaConfigurationPurgerAuditLog mtaConfigurationPurgerAuditLog) {
-        this.mtaConfigurationPurgerAuditLog = mtaConfigurationPurgerAuditLog;
-    }
+    private MtaConfigurationPurgerAuditLog mtaConfigurationPurgerAuditLog;
 
     private static void log(Exception e) {
         LOGGER.error(format(Messages.ERROR_DURING_DATA_TERMINATION_0, e.getMessage()), e);

multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/security/data/termination/DataTerminationServiceTest.java

@@ -81,7 +81,7 @@ void setUp() throws Exception {
     }
 
     private DataTerminationService createDataTerminationService() {
-        return new DataTerminationService(mtaConfigurationPurgerAuditLog) {
+        return new DataTerminationService() {
 
             @Override
             protected CFOptimizedEventGetter getCfOptimizedEventGetter() {

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/api/impl/CsrfTokenApiServiceImpl.java

@@ -11,12 +11,8 @@
 @Named
 public class CsrfTokenApiServiceImpl implements CsrfTokenApiService {
 
-    private CsrfTokenApiServiceAuditLog csrfTokenApiServiceAuditLog;
-
     @Inject
-    public CsrfTokenApiServiceImpl(CsrfTokenApiServiceAuditLog csrfTokenApiServiceAuditLog) {
-        this.csrfTokenApiServiceAuditLog = csrfTokenApiServiceAuditLog;
-    }
+    private CsrfTokenApiServiceAuditLog csrfTokenApiServiceAuditLog;
 
     @Override
     public ResponseEntity<Void> getCsrfToken() {

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/api/impl/FilesApiServiceImpl.java

@@ -93,13 +93,8 @@ public class FilesApiServiceImpl implements FilesApiService {
     @Inject
     @Named("asyncFileUploadExecutor")
     private ExecutorService deployFromUrlExecutor;
-
-    private FilesApiServiceAuditLog filesApiServiceAuditLog;
-
     @Inject
-    public FilesApiServiceImpl(FilesApiServiceAuditLog filesApiServiceAuditLog) {
-        this.filesApiServiceAuditLog = filesApiServiceAuditLog;
-    }
+    private FilesApiServiceAuditLog filesApiServiceAuditLog;
 
     @Override
     public ResponseEntity<List<FileMetadata>> getFiles(String spaceGuid, String namespace) {

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/api/impl/InfoApiServiceImpl.java

@@ -13,12 +13,8 @@
 @Named
 public class InfoApiServiceImpl implements InfoApiService {
 
-    private InfoApiServiceAuditLog infoApiServiceAuditLog;
-
     @Inject
-    public InfoApiServiceImpl(InfoApiServiceAuditLog infoApiServiceAuditLog) {
-        this.infoApiServiceAuditLog = infoApiServiceAuditLog;
-    }
+    private InfoApiServiceAuditLog infoApiServiceAuditLog;
 
     @Override
     public ResponseEntity<Info> getInfo() {

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/api/impl/MtasApiServiceImpl.java

@@ -43,13 +43,8 @@ public class MtasApiServiceImpl implements MtasApiService {
     @Inject
     @Qualifier("deployedMtaRequiredDataOnlyDetector")
     private DeployedMtaDetector deployedMtaDetector;
-
-    private MtasApiServiceAuditLog mtasApiServiceAuditLog;
-
     @Inject
-    public MtasApiServiceImpl(MtasApiServiceAuditLog mtasApiServiceAuditLog) {
-        this.mtasApiServiceAuditLog = mtasApiServiceAuditLog;
-    }
+    private MtasApiServiceAuditLog mtasApiServiceAuditLog;
 
     @Override
     public ResponseEntity<List<Mta>> getMtas(String spaceGuid) {

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/api/impl/OperationsApiServiceImpl.java

@@ -89,13 +89,8 @@ public class OperationsApiServiceImpl implements OperationsApiService {
     private ProgressMessageService progressMessageService;
     @Inject
     private ProcessActionRegistry processActionRegistry;
-
-    private OperationsApiServiceAuditLog operationsApiServiceAuditLog;
-
     @Inject
-    public OperationsApiServiceImpl(OperationsApiServiceAuditLog operationsApiServiceAuditLog) {
-        this.operationsApiServiceAuditLog = operationsApiServiceAuditLog;
-    }
+    private OperationsApiServiceAuditLog operationsApiServiceAuditLog;
 
     @Override
     public ResponseEntity<List<Operation>> getOperations(String spaceGuid, String mtaId, List<String> stateStrings, Integer last) {

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/resources/ConfigurationEntriesResource.java

@@ -43,12 +43,8 @@ public class ConfigurationEntriesResource {
     private MtaMetadataParser mtaMetadataParser;
     @Inject
     private TokenService tokenService;
-    private MtaConfigurationPurgerAuditLog mtaConfigurationPurgerAuditLog;
-
     @Inject
-    public ConfigurationEntriesResource(MtaConfigurationPurgerAuditLog mtaConfigurationPurgerAuditLog) {
-        this.mtaConfigurationPurgerAuditLog = mtaConfigurationPurgerAuditLog;
-    }
+    private MtaConfigurationPurgerAuditLog mtaConfigurationPurgerAuditLog;
 
     @PostMapping("/purge")
     public ResponseEntity<Void> purgeConfigurationRegistry(@RequestParam(REQUEST_PARAM_ORGANIZATION) String organization,

multiapps-controller-web/src/test/java/org/cloudfoundry/multiapps/controller/web/api/impl/FilesApiServiceImplTest.java

@@ -83,7 +83,7 @@ class FilesApiServiceImplTest {
     @Mock
     private FilesApiServiceAuditLog filesApiServiceAuditLog;
     @InjectMocks
-    private final FilesApiServiceImpl testedClass = new FilesApiServiceImpl(filesApiServiceAuditLog) {
+    private final FilesApiServiceImpl testedClass = new FilesApiServiceImpl() {
         @Override
         protected HttpClient buildHttpClient(String url) {
             return httpClient;