Skip to content

Commit 75a2865

Browse files
IvanBorislavovDimitrovIvanBorislavovDimitrov
committed
Fix comments
1 parent 94ce1e5 commit 75a2865

4 files changed

Lines changed: 86 additions & 63 deletions

File tree

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import org.cloudfoundry.multiapps.controller.api.model.ImmutableFileMetadata;
1313
import org.cloudfoundry.multiapps.controller.api.model.UserCredentials;
1414
import org.cloudfoundry.multiapps.controller.core.auditlogging.FilesApiServiceAuditLog;
15-
import org.cloudfoundry.multiapps.controller.core.helpers.DescriptorParserFacadeFactory;
16-
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
1715
import org.cloudfoundry.multiapps.controller.core.util.UriUtil;
1816
import org.cloudfoundry.multiapps.controller.persistence.model.AsyncUploadJobEntry;
1917
import org.cloudfoundry.multiapps.controller.persistence.model.AsyncUploadJobEntry.State;
@@ -62,25 +60,28 @@ public class FilesApiServiceImpl implements FilesApiService {
6260
System.setProperty(Constants.RETRY_LIMIT_PROPERTY, "0");
6361
}
6462

63+
private final FileService fileService;
64+
private final AsyncUploadJobService uploadJobService;
65+
private final FilesApiServiceAuditLog filesApiServiceAuditLog;
66+
private final AsyncUploadJobOrchestrator asyncUploadJobOrchestrator;
67+
private final ApiUsageLogger apiUsageLogger;
68+
private final ExecutorService fileStorageThreadPool;
69+
private final HttpServletRequest httpServletRequest;
70+
6571
@Inject
66-
@Named("fileService")
67-
private FileService fileService;
68-
@Inject
69-
private DescriptorParserFacadeFactory descriptorParserFactory;
70-
@Inject
71-
private ApplicationConfiguration configuration;
72-
@Inject
73-
private AsyncUploadJobService uploadJobService;
74-
@Inject
75-
private FilesApiServiceAuditLog filesApiServiceAuditLog;
76-
@Inject
77-
private AsyncUploadJobOrchestrator asyncUploadJobOrchestrator;
78-
@Inject
79-
private ApiUsageLogger apiUsageLogger;
80-
@Inject
81-
private ExecutorService fileStorageThreadPool;
82-
@Inject
83-
private HttpServletRequest httpServletRequest;
72+
public FilesApiServiceImpl(@Named("fileService") FileService fileService,
73+
AsyncUploadJobService uploadJobService,
74+
FilesApiServiceAuditLog filesApiServiceAuditLog,
75+
AsyncUploadJobOrchestrator asyncUploadJobOrchestrator, ApiUsageLogger apiUsageLogger,
76+
ExecutorService fileStorageThreadPool, HttpServletRequest httpServletRequest) {
77+
this.fileService = fileService;
78+
this.uploadJobService = uploadJobService;
79+
this.filesApiServiceAuditLog = filesApiServiceAuditLog;
80+
this.asyncUploadJobOrchestrator = asyncUploadJobOrchestrator;
81+
this.apiUsageLogger = apiUsageLogger;
82+
this.fileStorageThreadPool = fileStorageThreadPool;
83+
this.httpServletRequest = httpServletRequest;
84+
}
8485

8586
@Override
8687
public ResponseEntity<List<FileMetadata>> getFiles(String spaceGuid, String namespace) {

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

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -71,30 +71,42 @@
7171
public class OperationsApiServiceImpl implements OperationsApiService {
7272

7373
private static final Logger LOGGER = LoggerFactory.getLogger(OperationsApiServiceImpl.class);
74+
75+
private final CloudControllerClientFactory clientFactory;
76+
private final TokenService tokenService;
77+
private final OperationService operationService;
78+
private final ProcessTypeToOperationMetadataMapper operationMetadataMapper;
79+
private final ProcessLogsPersistenceService logsService;
80+
private final FlowableFacade flowableFacade;
81+
private final OperationsHelper operationsHelper;
82+
private final ProgressMessageService progressMessageService;
83+
private final ProcessActionRegistry processActionRegistry;
84+
private final OperationsApiServiceAuditLog operationsApiServiceAuditLog;
85+
private final ApiUsageLogger apiUsageLogger;
86+
private final HttpServletRequest httpServletRequest;
87+
7488
@Inject
75-
private CloudControllerClientFactory clientFactory;
76-
@Inject
77-
private TokenService tokenService;
78-
@Inject
79-
private OperationService operationService;
80-
@Inject
81-
private ProcessTypeToOperationMetadataMapper operationMetadataMapper;
82-
@Inject
83-
private ProcessLogsPersistenceService logsService;
84-
@Inject
85-
private FlowableFacade flowableFacade;
86-
@Inject
87-
private OperationsHelper operationsHelper;
88-
@Inject
89-
private ProgressMessageService progressMessageService;
90-
@Inject
91-
private ProcessActionRegistry processActionRegistry;
92-
@Inject
93-
private OperationsApiServiceAuditLog operationsApiServiceAuditLog;
94-
@Inject
95-
private ApiUsageLogger apiUsageLogger;
96-
@Inject
97-
private HttpServletRequest httpServletRequest;
89+
public OperationsApiServiceImpl(CloudControllerClientFactory clientFactory, TokenService tokenService,
90+
OperationService operationService,
91+
ProcessTypeToOperationMetadataMapper operationMetadataMapper,
92+
ProcessLogsPersistenceService logsService, FlowableFacade flowableFacade,
93+
OperationsHelper operationsHelper, ProgressMessageService progressMessageService,
94+
ProcessActionRegistry processActionRegistry,
95+
OperationsApiServiceAuditLog operationsApiServiceAuditLog,
96+
ApiUsageLogger apiUsageLogger, HttpServletRequest httpServletRequest) {
97+
this.clientFactory = clientFactory;
98+
this.tokenService = tokenService;
99+
this.operationService = operationService;
100+
this.operationMetadataMapper = operationMetadataMapper;
101+
this.logsService = logsService;
102+
this.flowableFacade = flowableFacade;
103+
this.operationsHelper = operationsHelper;
104+
this.progressMessageService = progressMessageService;
105+
this.processActionRegistry = processActionRegistry;
106+
this.operationsApiServiceAuditLog = operationsApiServiceAuditLog;
107+
this.apiUsageLogger = apiUsageLogger;
108+
this.httpServletRequest = httpServletRequest;
109+
}
98110

99111
@Override
100112
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‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
package org.cloudfoundry.multiapps.controller.web.api.impl;
22

3-
import java.io.InputStream;
4-
import java.math.BigInteger;
5-
import java.nio.charset.StandardCharsets;
6-
import java.time.LocalDateTime;
7-
import java.util.Base64;
8-
import java.util.Collections;
9-
import java.util.List;
10-
import java.util.Map;
11-
import java.util.Random;
12-
import java.util.UUID;
13-
import java.util.concurrent.Callable;
14-
import java.util.concurrent.ExecutorService;
15-
import java.util.concurrent.FutureTask;
3+
import jakarta.servlet.http.HttpServletRequest;
164
import org.apache.commons.lang3.RandomStringUtils;
175
import org.cloudfoundry.multiapps.common.SLException;
186
import org.cloudfoundry.multiapps.controller.api.model.AsyncUploadResult;
@@ -36,7 +24,6 @@
3624
import org.junit.jupiter.api.AfterEach;
3725
import org.junit.jupiter.api.BeforeEach;
3826
import org.junit.jupiter.api.Test;
39-
import org.mockito.InjectMocks;
4027
import org.mockito.Mock;
4128
import org.mockito.Mockito;
4229
import org.mockito.MockitoAnnotations;
@@ -47,6 +34,21 @@
4734
import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
4835
import org.springframework.web.multipart.MultipartFile;
4936
import org.springframework.web.multipart.MultipartHttpServletRequest;
37+
38+
import java.io.InputStream;
39+
import java.math.BigInteger;
40+
import java.nio.charset.StandardCharsets;
41+
import java.time.LocalDateTime;
42+
import java.util.Base64;
43+
import java.util.Collections;
44+
import java.util.List;
45+
import java.util.Map;
46+
import java.util.Random;
47+
import java.util.UUID;
48+
import java.util.concurrent.Callable;
49+
import java.util.concurrent.ExecutorService;
50+
import java.util.concurrent.FutureTask;
51+
5052
import static org.junit.jupiter.api.Assertions.assertEquals;
5153
import static org.junit.jupiter.api.Assertions.assertThrows;
5254
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -73,23 +75,27 @@ class FilesApiServiceImplTest {
7375
private MultipartHttpServletRequest request;
7476
@Mock
7577
private MultipartFile file;
76-
@InjectMocks
77-
private final FilesApiServiceImpl testedClass = new FilesApiServiceImpl();
7878
@Mock
7979
private FilesApiServiceAuditLog filesApiServiceAuditLog;
8080
@Mock
8181
private ApiUsageLogger apiUsageLogger;
82-
@Mock(name = "fileStorageThreadPool")
82+
@Mock
8383
private ExecutorService fileStorageThreadPool;
8484
@Mock
8585
private AsyncUploadJobOrchestrator asyncUploadJobOrchestrator;
8686
@Mock
8787
private AsyncUploadJobService uploadJobService;
88+
@Mock
89+
private HttpServletRequest httpServletRequest;
90+
91+
private FilesApiServiceImpl testedClass;
8892

8993
@BeforeEach
9094
public void initialize() throws Exception {
9195
MockitoAnnotations.openMocks(this)
9296
.close();
97+
testedClass = new FilesApiServiceImpl(fileService, uploadJobService, filesApiServiceAuditLog, asyncUploadJobOrchestrator,
98+
apiUsageLogger, fileStorageThreadPool, httpServletRequest);
9399
SecurityContextHolder.clearContext();
94100
var user = new UserInfo("user1", "user1", null);
95101
var token = new DefaultOAuth2User(Collections.emptyList(), Map.of("user_info", user), "user_info");

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.junit.jupiter.api.Test;
4545
import org.mockito.Answers;
4646
import org.mockito.ArgumentMatchers;
47-
import org.mockito.InjectMocks;
4847
import org.mockito.Mock;
4948
import org.mockito.Mockito;
5049
import org.mockito.MockitoAnnotations;
@@ -88,9 +87,10 @@ class OperationsApiServiceImplTest {
8887
private OperationsApiServiceAuditLog operationsApiServiceAuditLog;
8988
@Mock
9089
private ApiUsageLogger apiUsageLogger;
90+
@Mock
91+
private HttpServletRequest httpServletRequest;
9192

92-
@InjectMocks
93-
private OperationsApiServiceImpl operationsApiService = new OperationsApiServiceImpl();
93+
private OperationsApiServiceImpl operationsApiService;
9494

9595
private static final String SPACE_GUID = "896e6be9-8217-4a1c-b938-09b30966157a";
9696
private static final String ORG_GUID = "0a42c085-b772-4b1e-bf4d-75c463aab5f6";
@@ -115,6 +115,10 @@ class OperationsApiServiceImplTest {
115115
public void initialize() throws Exception {
116116
MockitoAnnotations.openMocks(this)
117117
.close();
118+
operationsApiService = new OperationsApiServiceImpl(clientFactory, tokenService, operationService, operationMetadataMapper,
119+
logsService, flowableFacade, operationsHelper, progressMessageService,
120+
processActionRegistry, operationsApiServiceAuditLog, apiUsageLogger,
121+
httpServletRequest);
118122
operations = new LinkedList<>();
119123
operations.add(createOperation(FINISHED_PROCESS, Operation.State.FINISHED, Collections.emptyMap()));
120124
operations.add(createOperation(RUNNING_PROCESS, Operation.State.RUNNING, Collections.emptyMap()));

0 commit comments

Comments
 (0)