admin/apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor TestController to use ApolloParseRequestDTO instead of ParseRequest

Browse Source
This commit is contained in:
sumedh
2024-10-22 17:37:11 +05:30
parent 75ebd2f785
commit a8233a594d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/olympus/apollo/controllers/TestController.java
View File

@@ -6,7 +6,7 @@ import com.olympus.dto.ResultDTO;
import com.olympus.apollo.feign.services.ParserModuleService; import com.olympus.apollo.feign.services.ParserModuleService;
import com.olympus.apollo.services.GitService; import com.olympus.apollo.services.GitService;
import com.olympus.dto.CommonParseRequest; import com.olympus.dto.CommonParseRequest;
import com.olympus.dto.ParseRequest; import com.olympus.dto.ApolloParseRequestDTO;
import com.olympus.feign.JavaParserModule; import com.olympus.feign.JavaParserModule;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -112,8 +112,8 @@ public class TestController {
} }
@PostMapping("/parse") @PostMapping("/parse")
public ResponseEntity<String> ParseApplication(@RequestBody ParseRequest parseRequest){ public ResponseEntity<String> ParseApplication(@RequestBody ApolloParseRequestDTO apolloParseRequestDTO){
parserModuleService.callParserModules(parseRequest); parserModuleService.callParserModules(apolloParseRequestDTO);
return ResponseEntity.accepted().body("Request to parse the java application is being processed"); return ResponseEntity.accepted().body("Request to parse the java application is being processed");
} }

10
src/main/java/com/olympus/apollo/feign/services/ParserModuleService.java
View File

@@ -3,7 +3,7 @@ package com.olympus.apollo.feign.services;
import com.olympus.dto.CommonParseRequest; import com.olympus.dto.CommonParseRequest;
import com.olympus.model.apollo.KSGitInfo; import com.olympus.model.apollo.KSGitInfo;
import com.olympus.apollo.repository.KSGitInfoRepository; import com.olympus.apollo.repository.KSGitInfoRepository;
import com.olympus.dto.ParseRequest; import com.olympus.dto.ApolloParseRequestDTO;
import com.olympus.feign.JavaParserModule; import com.olympus.feign.JavaParserModule;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@@ -29,17 +29,17 @@ public class ParserModuleService {
return javaParserModule.getParseStatus(parseProcessId); return javaParserModule.getParseStatus(parseProcessId);
} }
public void callParserModules(ParseRequest parseRequest) { public void callParserModules(ApolloParseRequestDTO apolloParseRequestDTO) {
Optional<KSGitInfo> ksGitInfoOptional = ksGitInfoRepository.findById(parseRequest.getId()); Optional<KSGitInfo> ksGitInfoOptional = ksGitInfoRepository.findById(apolloParseRequestDTO.getId());
if(ksGitInfoOptional.isPresent()) { if(ksGitInfoOptional.isPresent()) {
KSGitInfo gitInfo = ksGitInfoOptional.get(); KSGitInfo gitInfo = ksGitInfoOptional.get();
CommonParseRequest commonParseRequest = new CommonParseRequest(); CommonParseRequest commonParseRequest = new CommonParseRequest();
commonParseRequest.setRepositoryEntityId(parseRequest.getId()); commonParseRequest.setRepositoryEntityId(apolloParseRequestDTO.getId());
commonParseRequest.setApplicationName(gitInfo.getRepoName()); commonParseRequest.setApplicationName(gitInfo.getRepoName());
commonParseRequest.setApplicationVersion(gitInfo.getApplicationVersion()); commonParseRequest.setApplicationVersion(gitInfo.getApplicationVersion());
commonParseRequest.setApplicationProjectName(gitInfo.getProjectName()); commonParseRequest.setApplicationProjectName(gitInfo.getProjectName());
commonParseRequest.setApplicationCommitSha(gitInfo.getCommitId()); commonParseRequest.setApplicationCommitSha(gitInfo.getCommitId());
commonParseRequest.setDeleteExistingData(parseRequest.isDeleteExistingData()); commonParseRequest.setDeleteExistingData(apolloParseRequestDTO.isDeleteExistingData());
gitInfo.getCodeTypes().forEach(codeType -> { gitInfo.getCodeTypes().forEach(codeType -> {
if(codeType.getType().equalsIgnoreCase("java")){ if(codeType.getType().equalsIgnoreCase("java")){
CompletableFuture.completedFuture(javaParserModule.getJavaParsedDetails(commonParseRequest)); CompletableFuture.completedFuture(javaParserModule.getJavaParsedDetails(commonParseRequest));