fix comments from ivan

Author: Yavor16

multiapps-controller-core/src/main/java/module-info.java

@@ -37,6 +37,7 @@
     exports org.cloudfoundry.multiapps.controller.core.validators.parameters;
     exports org.cloudfoundry.multiapps.controller.core.validators.parameters.v2;
     exports org.cloudfoundry.multiapps.controller.core.validators.parameters.v3;
+    exports org.cloudfoundry.multiapps.controller.core.auditlogging.model;
 
     requires transitive com.sap.cloudfoundry.client.facade;
     requires transitive java.persistence;

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

@@ -1,5 +1,6 @@
 package org.cloudfoundry.multiapps.controller.core.auditlogging.model;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -12,11 +13,11 @@
 
 public class AuditLogConfiguration implements AuditableConfiguration {
 
-    private static String PERFORMED_ACTION_IDENTIFIER_KEY_NAME = "performed_action";
-    private static String TIME_IDENTIFIER_KEY_NAME = "time";
-    private static String SPACE_ID_IDENTIFIER_KEY_NAME = "spaceId";
-    private String userId;
-    private String spaceId;
+    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 final String userId;
+    private final String spaceId;
     private String performedAction;
     private String configuration;
     private Map<String, String> parameters;
@@ -62,7 +63,7 @@ public String getUserId() {
     }
 
     public String getTimeOfPerformedAction() {
-        return new Date().toString();
+        return LocalDateTime.now().toString();
     }
 
     @Override

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

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

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

@@ -76,7 +76,9 @@ public class FilesApiServiceImpl implements FilesApiService {
     private static final int INPUT_STREAM_BUFFER_SIZE = 16 * 1024;
     private static final Duration HTTP_CONNECT_TIMEOUT = Duration.ofMinutes(10);
     private static final String RETRY_AFTER_SECONDS = "30";
-
+    private final CachedMap<String, AtomicLong> jobCounters = new CachedMap<>(Duration.ofHours(1));
+    private final CachedMap<String, Future<?>> runningTasks = new CachedMap<>(Duration.ofHours(1));
+    private final ResilientOperationExecutor resilientOperationExecutor = getResilientOperationExecutor();
     @Inject
     @Named("fileService")
     private FileService fileService;
@@ -87,16 +89,14 @@ public class FilesApiServiceImpl implements FilesApiService {
     @Inject
     private AsyncUploadJobService uploadJobService;
     @Inject
-    private FilesApiServiceAuditLog filesApiServiceAuditLog;
-    @Inject
     @Named("asyncFileUploadExecutor")
     private ExecutorService deployFromUrlExecutor;
+    private FilesApiServiceAuditLog filesApiServiceAuditLog;
 
-    private final CachedMap<String, AtomicLong> jobCounters = new CachedMap<>(Duration.ofHours(1));
-
-    private final CachedMap<String, Future<?>> runningTasks = new CachedMap<>(Duration.ofHours(1));
-
-    private final ResilientOperationExecutor resilientOperationExecutor = getResilientOperationExecutor();
+    @Inject
+    public FilesApiServiceImpl(FilesApiServiceAuditLog filesApiServiceAuditLog) {
+        this.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,9 +13,13 @@
 @Named
 public class InfoApiServiceImpl implements InfoApiService {
 
-    @Inject
     private InfoApiServiceAuditLog infoApiServiceAuditLog;
 
+    @Inject
+    public InfoApiServiceImpl(InfoApiServiceAuditLog infoApiServiceAuditLog) {
+        this.infoApiServiceAuditLog = infoApiServiceAuditLog;
+    }
+
     @Override
     public ResponseEntity<Info> getInfo() {
         infoApiServiceAuditLog.logGetInfo(SecurityContextUtil.getUsername());

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

@@ -39,14 +39,18 @@ public class MtasApiServiceImpl implements MtasApiService {
 
     @Inject
     private CloudControllerClientProvider clientProvider;
-    
-    @Inject
-    private MtasApiServiceAuditLog mtasApiServiceAuditLog;
 
     @Inject
     @Qualifier("deployedMtaRequiredDataOnlyDetector")
     private DeployedMtaDetector deployedMtaDetector;
 
+    private MtasApiServiceAuditLog mtasApiServiceAuditLog;
+
+    @Inject
+    public MtasApiServiceImpl(MtasApiServiceAuditLog mtasApiServiceAuditLog) {
+        this.mtasApiServiceAuditLog = mtasApiServiceAuditLog;
+    }
+
     @Override
     public ResponseEntity<List<Mta>> getMtas(String spaceGuid) {
         mtasApiServiceAuditLog.logGetMtas(SecurityContextUtil.getUsername(), spaceGuid);
@@ -91,8 +95,7 @@ public ResponseEntity<List<Mta>> getMtas(String spaceGuid, String namespace, Str
         }
 
         CloudControllerClient client = getCloudFoundryClient(spaceGuid);
-        Optional<DeployedMta> optionalDeployedMta = deployedMtaDetector.detectDeployedMtaByNameAndNamespace(name, namespace,
-                                                                                                            client);
+        Optional<DeployedMta> optionalDeployedMta = deployedMtaDetector.detectDeployedMtaByNameAndNamespace(name, namespace, client);
         DeployedMta deployedMta = optionalDeployedMta.orElseThrow(() -> new NotFoundException(Messages.SPECIFIC_MTA_NOT_FOUND,
                                                                                               name,
                                                                                               namespace));

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

@@ -69,6 +69,7 @@
 @Named
 public class OperationsApiServiceImpl implements OperationsApiService {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(OperationsApiServiceImpl.class);
     @Inject
     private CloudControllerClientFactory clientFactory;
     @Inject
@@ -87,10 +88,13 @@ public class OperationsApiServiceImpl implements OperationsApiService {
     private ProgressMessageService progressMessageService;
     @Inject
     private ProcessActionRegistry processActionRegistry;
-    @Inject
+
     private OperationsApiServiceAuditLog operationsApiServiceAuditLog;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OperationsApiServiceImpl.class);
+    @Inject
+    public OperationsApiServiceImpl(OperationsApiServiceAuditLog operationsApiServiceAuditLog) {
+        this.operationsApiServiceAuditLog = operationsApiServiceAuditLog;
+    }
 
     @Override
     public ResponseEntity<List<Operation>> getOperations(String spaceGuid, String mtaId, List<String> stateStrings, Integer last) {

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

@@ -92,7 +92,7 @@ class FilesApiServiceImplTest {
                                                  .encodeToString("https://host.domain/test.mtar?query=true".getBytes(StandardCharsets.UTF_8));
 
     @InjectMocks
-    private final FilesApiServiceImpl testedClass = new FilesApiServiceImpl() {
+    private final FilesApiServiceImpl testedClass = new FilesApiServiceImpl(filesApiServiceAuditLog) {
         @Override
         protected HttpClient buildHttpClient(String url) {
             return httpClient;

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

@@ -58,11 +58,12 @@ class MtasApiServiceImplTest {
     @Mock
     private DeployedMtaRequiredDataOnlyDetector deployedMtaDetector;
 
-    @InjectMocks
-    private MtasApiServiceImpl testedClass;
     @Mock
     private MtasApiServiceAuditLog mtasApiServiceAuditLog;
 
+    @InjectMocks
+    private MtasApiServiceImpl testedClass = new MtasApiServiceImpl(mtasApiServiceAuditLog);
+
     private List<Mta> mtas;
 
     private static final String USER_NAME = "someUser";

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

@@ -87,7 +87,7 @@ class OperationsApiServiceImplTest {
     private OperationsApiServiceAuditLog operationsApiServiceAuditLog;
 
     @InjectMocks
-    private OperationsApiServiceImpl operationsApiService;
+    private OperationsApiServiceImpl operationsApiService = new OperationsApiServiceImpl(operationsApiServiceAuditLog);
 
     private static final String SPACE_GUID = "896e6be9-8217-4a1c-b938-09b30966157a";
     private static final String ORG_GUID = "0a42c085-b772-4b1e-bf4d-75c463aab5f6";