Refactor TestController to use ApolloParseRequestDTO instead of ParseRequest
This commit is contained in:
@@ -6,7 +6,7 @@ import com.olympus.dto.ResultDTO;
|
||||
import com.olympus.apollo.feign.services.ParserModuleService;
|
||||
import com.olympus.apollo.services.GitService;
|
||||
import com.olympus.dto.CommonParseRequest;
|
||||
import com.olympus.dto.ParseRequest;
|
||||
import com.olympus.dto.ApolloParseRequestDTO;
|
||||
import com.olympus.feign.JavaParserModule;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -112,8 +112,8 @@ public class TestController {
|
||||
}
|
||||
|
||||
@PostMapping("/parse")
|
||||
public ResponseEntity<String> ParseApplication(@RequestBody ParseRequest parseRequest){
|
||||
parserModuleService.callParserModules(parseRequest);
|
||||
public ResponseEntity<String> ParseApplication(@RequestBody ApolloParseRequestDTO apolloParseRequestDTO){
|
||||
parserModuleService.callParserModules(apolloParseRequestDTO);
|
||||
return ResponseEntity.accepted().body("Request to parse the java application is being processed");
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.olympus.apollo.feign.services;
|
||||
import com.olympus.dto.CommonParseRequest;
|
||||
import com.olympus.model.apollo.KSGitInfo;
|
||||
import com.olympus.apollo.repository.KSGitInfoRepository;
|
||||
import com.olympus.dto.ParseRequest;
|
||||
import com.olympus.dto.ApolloParseRequestDTO;
|
||||
import com.olympus.feign.JavaParserModule;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@@ -29,17 +29,17 @@ public class ParserModuleService {
|
||||
return javaParserModule.getParseStatus(parseProcessId);
|
||||
}
|
||||
|
||||
public void callParserModules(ParseRequest parseRequest) {
|
||||
Optional<KSGitInfo> ksGitInfoOptional = ksGitInfoRepository.findById(parseRequest.getId());
|
||||
public void callParserModules(ApolloParseRequestDTO apolloParseRequestDTO) {
|
||||
Optional<KSGitInfo> ksGitInfoOptional = ksGitInfoRepository.findById(apolloParseRequestDTO.getId());
|
||||
if(ksGitInfoOptional.isPresent()) {
|
||||
KSGitInfo gitInfo = ksGitInfoOptional.get();
|
||||
CommonParseRequest commonParseRequest = new CommonParseRequest();
|
||||
commonParseRequest.setRepositoryEntityId(parseRequest.getId());
|
||||
commonParseRequest.setRepositoryEntityId(apolloParseRequestDTO.getId());
|
||||
commonParseRequest.setApplicationName(gitInfo.getRepoName());
|
||||
commonParseRequest.setApplicationVersion(gitInfo.getApplicationVersion());
|
||||
commonParseRequest.setApplicationProjectName(gitInfo.getProjectName());
|
||||
commonParseRequest.setApplicationCommitSha(gitInfo.getCommitId());
|
||||
commonParseRequest.setDeleteExistingData(parseRequest.isDeleteExistingData());
|
||||
commonParseRequest.setDeleteExistingData(apolloParseRequestDTO.isDeleteExistingData());
|
||||
gitInfo.getCodeTypes().forEach(codeType -> {
|
||||
if(codeType.getType().equalsIgnoreCase("java")){
|
||||
CompletableFuture.completedFuture(javaParserModule.getJavaParsedDetails(commonParseRequest));
|
||||
|
||||
Reference in New Issue
Block a user