diff --git a/src/main/java/com/olympus/apollo/controllers/FeApi/KSGitController.java b/src/main/java/com/olympus/apollo/controllers/FeApi/KSGitController.java index 15df234..fb9d113 100644 --- a/src/main/java/com/olympus/apollo/controllers/FeApi/KSGitController.java +++ b/src/main/java/com/olympus/apollo/controllers/FeApi/KSGitController.java @@ -5,10 +5,13 @@ import java.util.Date; import java.util.HashMap; import java.util.List; -import com.olympus.apollo.dto.*; import com.olympus.apollo.exception.GitCloneException; import com.olympus.apollo.services.GitService; import com.olympus.apollo.utils.GitUtils; +import com.olympus.dto.GitCloneInput; +import com.olympus.dto.GitPullOutput; +import com.olympus.dto.KSGitUploadDTO; +import com.olympus.dto.ResultDTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/olympus/apollo/controllers/FeApi/VectorStoreController.java b/src/main/java/com/olympus/apollo/controllers/FeApi/VectorStoreController.java index 0dd8d7f..a95ac71 100644 --- a/src/main/java/com/olympus/apollo/controllers/FeApi/VectorStoreController.java +++ b/src/main/java/com/olympus/apollo/controllers/FeApi/VectorStoreController.java @@ -1,8 +1,8 @@ package com.olympus.apollo.controllers.FeApi; -import com.olympus.apollo.dto.DeleteGitRepoDetailsRequest; -import com.olympus.apollo.dto.DeletionRequest; -import com.olympus.apollo.dto.VectorStoreDetails; +import com.olympus.dto.DeleteGitRepoDetailsRequest; +import com.olympus.dto.DeletionRequest; +import com.olympus.dto.VectorStoreDetails; import com.olympus.model.apollo.VectorStore; import com.olympus.apollo.repository.VectorStoreRepository; import com.olympus.apollo.services.DeletionService; diff --git a/src/main/java/com/olympus/apollo/controllers/KSFileController.java b/src/main/java/com/olympus/apollo/controllers/KSFileController.java index 4f29983..5d0ffb8 100644 --- a/src/main/java/com/olympus/apollo/controllers/KSFileController.java +++ b/src/main/java/com/olympus/apollo/controllers/KSFileController.java @@ -6,7 +6,7 @@ import java.text.SimpleDateFormat; import java.util.List; import java.util.Optional; -import com.olympus.apollo.dto.ExternalFileIngestionDTO; +import com.olympus.dto.ExternalFileIngestionDTO; import com.olympus.model.apollo.KSTexts; import com.olympus.apollo.repository.KSTextsRepository; import com.olympus.apollo.services.DeletionService; @@ -22,7 +22,7 @@ import com.olympus.apollo.repository.KSDocumentRepository; import com.olympus.apollo.repository.KSIngestionInfoRepository; import com.olympus.apollo.exception.StorageFileNotFoundException; import com.olympus.apollo.services.StorageService; -import com.olympus.apollo.dto.FileUploadDTO; +import com.olympus.dto.FileUploadDTO; @RestController public class KSFileController { diff --git a/src/main/java/com/olympus/apollo/controllers/TestController.java b/src/main/java/com/olympus/apollo/controllers/TestController.java index fd716d5..441ff41 100644 --- a/src/main/java/com/olympus/apollo/controllers/TestController.java +++ b/src/main/java/com/olympus/apollo/controllers/TestController.java @@ -2,10 +2,10 @@ package com.olympus.apollo.controllers; import java.util.List; -import com.olympus.apollo.dto.ResultDTO; +import com.olympus.dto.ResultDTO; import com.olympus.apollo.feign.services.ParserModuleService; import com.olympus.apollo.services.GitService; -import com.olympus.dto.JavaParseRequest; +import com.olympus.dto.CommonParseRequest; import com.olympus.dto.ParseRequest; import com.olympus.feign.JavaParserModule; import org.slf4j.Logger; @@ -15,7 +15,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.olympus.apollo.dto.IngestionOutput; +import com.olympus.dto.IngestionOutput; import com.olympus.apollo.services.GitRepositoryIngestor; import com.olympus.apollo.services.KSIngestor; @@ -106,7 +106,7 @@ public class TestController { } @PostMapping("/parsejava") - public ResponseEntity fetchParsedJava(@RequestBody JavaParseRequest javaParseRequest){ + public ResponseEntity fetchParsedJava(@RequestBody CommonParseRequest javaParseRequest){ javaParserModule.getJavaParsedDetails(javaParseRequest); return ResponseEntity.accepted().body("Request to parse the java application is being processed"); } diff --git a/src/main/java/com/olympus/apollo/dto/DeleteGitRepoDetailsRequest.java b/src/main/java/com/olympus/apollo/dto/DeleteGitRepoDetailsRequest.java deleted file mode 100644 index bcf9c72..0000000 --- a/src/main/java/com/olympus/apollo/dto/DeleteGitRepoDetailsRequest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.olympus.apollo.dto; - -import lombok.Getter; -import lombok.Setter; - -@Getter @Setter -public class DeleteGitRepoDetailsRequest { - private String ksGitInfoId; - private String ksGitIngestionInfoId; - private String ksDoctype; - private String ksDocSource; - private String ksFileSource; - private String ksApplicationName; - private String ksBranch; -} diff --git a/src/main/java/com/olympus/apollo/dto/DeletionRequest.java b/src/main/java/com/olympus/apollo/dto/DeletionRequest.java deleted file mode 100644 index 034d6d5..0000000 --- a/src/main/java/com/olympus/apollo/dto/DeletionRequest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.olympus.apollo.dto; - -import lombok.Getter; -import lombok.Setter; - -@Getter @Setter -public class DeletionRequest { - private String ksDocumentId; - private String ksIngestionInfoId; - private String ksDoctype; - private String ksDocSource; - private String ksFileSource; - private String ksApplicationName; -} - diff --git a/src/main/java/com/olympus/apollo/dto/ExternalFileIngestionDTO.java b/src/main/java/com/olympus/apollo/dto/ExternalFileIngestionDTO.java deleted file mode 100644 index 719ece5..0000000 --- a/src/main/java/com/olympus/apollo/dto/ExternalFileIngestionDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.olympus.apollo.dto; - -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; -import java.util.HashMap; - -@Getter @Setter -public class ExternalFileIngestionDTO { - private String textToEmbed; - private String name; - private String description; - private String type; - private String ksApplicationName; - private String ksDocType; - private String ksDocSource; - private int defaultChunkSize; - private int minChunkSize; - private int maxNumberOfChunks; - private int minChunkSizeToEmbed; - private HashMap additionalMetaData; - private String ksExternalDocUniqueId; -} diff --git a/src/main/java/com/olympus/apollo/dto/FileUploadDTO.java b/src/main/java/com/olympus/apollo/dto/FileUploadDTO.java deleted file mode 100644 index 38161b4..0000000 --- a/src/main/java/com/olympus/apollo/dto/FileUploadDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.olympus.apollo.dto; - -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; - -@Getter @Setter -public class FileUploadDTO { - private String description; - private String ingestionStatus; - private String type; - private String ksApplicationName; - private String ksDocType; - private String ksDocSource; - private int defaultChunkSize; - private int minChunkSize; - private int maxNumberOfChunks; - private int minChunkSizeToEmbed; - private Date ingestionDate; -} diff --git a/src/main/java/com/olympus/apollo/dto/GitCloneInput.java b/src/main/java/com/olympus/apollo/dto/GitCloneInput.java deleted file mode 100644 index c0bf06a..0000000 --- a/src/main/java/com/olympus/apollo/dto/GitCloneInput.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.olympus.apollo.dto; - -import com.olympus.model.apollo.CodeTypes; -import lombok.Getter; -import lombok.Setter; - -import java.util.ArrayList; -import java.util.List; - -@Setter -@Getter -public class GitCloneInput { - private String source; - private String repoName; - private String group; - private String tokenType; - - private String branch; - private String commitId; - private String repoPath; - private int minChunkSizeToEmbed; - private int maxNumberOfChunks; - private int minChunkSize; - private int defaultChunkSize; - - private boolean codeParsingToBeDone; - private List codeTypes= new ArrayList<>(); -} diff --git a/src/main/java/com/olympus/apollo/dto/GitCloneOutput.java b/src/main/java/com/olympus/apollo/dto/GitCloneOutput.java deleted file mode 100644 index 92bf879..0000000 --- a/src/main/java/com/olympus/apollo/dto/GitCloneOutput.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.olympus.apollo.dto; - -import lombok.Getter; -import lombok.Setter; - -@Setter @Getter -public class GitCloneOutput { - private String message; - private String repoName; -} diff --git a/src/main/java/com/olympus/apollo/dto/GitPullOutput.java b/src/main/java/com/olympus/apollo/dto/GitPullOutput.java deleted file mode 100644 index d274957..0000000 --- a/src/main/java/com/olympus/apollo/dto/GitPullOutput.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.olympus.apollo.dto; - -import lombok.Getter; -import lombok.Setter; - -import java.util.Map; - -@Setter @Getter -public class GitPullOutput { - private Map changes; - private String repoName; - private String message; -} diff --git a/src/main/java/com/olympus/apollo/dto/IngestionOutput.java b/src/main/java/com/olympus/apollo/dto/IngestionOutput.java deleted file mode 100644 index ac03133..0000000 --- a/src/main/java/com/olympus/apollo/dto/IngestionOutput.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.olympus.apollo.dto; - -import lombok.Getter; -import lombok.Setter; - -import java.util.ArrayList; -import java.util.List; - -@Getter @Setter -public class IngestionOutput { - private String status; - private String message; - private List ingestedDocumentId; - - public IngestionOutput(){ - ingestedDocumentId=new ArrayList(); - } -} diff --git a/src/main/java/com/olympus/apollo/dto/KSGitInfoDTO.java b/src/main/java/com/olympus/apollo/dto/KSGitInfoDTO.java deleted file mode 100644 index e224f7a..0000000 --- a/src/main/java/com/olympus/apollo/dto/KSGitInfoDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.olympus.apollo.dto; - -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; - -@Getter @Setter -public class KSGitInfoDTO { - private String repoName; - private String branch; - private String ingestionStatus; - private Date ingestionDate; - - public KSGitInfoDTO(String repoName, String branch, String ingestionStatus, Date ingestionDate) { - this.repoName = repoName; - this.branch = branch; - this.ingestionStatus = ingestionStatus; - this.ingestionDate = ingestionDate; - - } -} diff --git a/src/main/java/com/olympus/apollo/dto/KSGitUploadDTO.java b/src/main/java/com/olympus/apollo/dto/KSGitUploadDTO.java deleted file mode 100644 index e02336d..0000000 --- a/src/main/java/com/olympus/apollo/dto/KSGitUploadDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.olympus.apollo.dto; - -import java.util.HashMap; - -import lombok.Getter; -import lombok.Setter; - -@Getter @Setter -public class KSGitUploadDTO { - private String repoName; - private String branch; - private String commitId; - private String repoPath; - private HashMap metadata; - private int minChunkSizeToEmbed; - private int maxNumberOfChunks; - private int minChunkSize; - private int defaultChunkSize; -} diff --git a/src/main/java/com/olympus/apollo/dto/ResultDTO.java b/src/main/java/com/olympus/apollo/dto/ResultDTO.java deleted file mode 100644 index 75864e0..0000000 --- a/src/main/java/com/olympus/apollo/dto/ResultDTO.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.olympus.apollo.dto; - -import lombok.Getter; -import lombok.Setter; - -@Setter @Getter -public class ResultDTO { - private boolean success; - private String message; -} diff --git a/src/main/java/com/olympus/apollo/dto/VectorStoreDetails.java b/src/main/java/com/olympus/apollo/dto/VectorStoreDetails.java deleted file mode 100644 index 8c93cd6..0000000 --- a/src/main/java/com/olympus/apollo/dto/VectorStoreDetails.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.olympus.apollo.dto; - -import lombok.Getter; -import lombok.Setter; - -@Getter @Setter -public class VectorStoreDetails { - private String id; - private VectorStoreMetadataDetails metadata; -} diff --git a/src/main/java/com/olympus/apollo/dto/VectorStoreMetadataDetails.java b/src/main/java/com/olympus/apollo/dto/VectorStoreMetadataDetails.java deleted file mode 100644 index 8a7cd41..0000000 --- a/src/main/java/com/olympus/apollo/dto/VectorStoreMetadataDetails.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.olympus.apollo.dto; - -import lombok.Getter; -import lombok.Setter; - -@Getter @Setter -public class VectorStoreMetadataDetails { - - private String KsApplicationName; - private String KsDoctype; - private String KsDocSource; - private String KsFileSource; -} - diff --git a/src/main/java/com/olympus/apollo/exception/GlobalExceptionHandler.java b/src/main/java/com/olympus/apollo/exception/GlobalExceptionHandler.java index 5c57246..e971d8c 100644 --- a/src/main/java/com/olympus/apollo/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/olympus/apollo/exception/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ package com.olympus.apollo.exception; -import com.olympus.apollo.dto.GitCloneOutput; +import com.olympus.dto.GitCloneOutput; import org.slf4j.LoggerFactory; import org.slf4j.Logger; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/olympus/apollo/feign/services/ParserModuleService.java b/src/main/java/com/olympus/apollo/feign/services/ParserModuleService.java index e9cbc7a..1b5433b 100644 --- a/src/main/java/com/olympus/apollo/feign/services/ParserModuleService.java +++ b/src/main/java/com/olympus/apollo/feign/services/ParserModuleService.java @@ -1,10 +1,10 @@ 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.feign.JavaParserModule; -import com.olympus.dto.JavaParseRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -30,25 +30,24 @@ public class ParserModuleService { } public void callParserModules(ParseRequest parseRequest) { - Optional ksGitInfo = ksGitInfoRepository.findById(parseRequest.getId()); - if(ksGitInfo.isPresent()){ - KSGitInfo gitInfo = ksGitInfo.get(); + Optional ksGitInfoOptional = ksGitInfoRepository.findById(parseRequest.getId()); + if(ksGitInfoOptional.isPresent()) { + KSGitInfo gitInfo = ksGitInfoOptional.get(); + CommonParseRequest commonParseRequest = new CommonParseRequest(); + commonParseRequest.setRepositoryEntityId(parseRequest.getId()); + commonParseRequest.setApplicationName(gitInfo.getRepoName()); + commonParseRequest.setApplicationVersion(gitInfo.getApplicationVersion()); + commonParseRequest.setApplicationProjectName(gitInfo.getProjectName()); + commonParseRequest.setApplicationCommitSha(gitInfo.getCommitId()); + commonParseRequest.setDeleteExistingData(parseRequest.isDeleteExistingData()); gitInfo.getCodeTypes().forEach(codeType -> { if(codeType.getType().equalsIgnoreCase("java")){ - JavaParseRequest javaParseRequest = new JavaParseRequest(); - javaParseRequest.setId(parseRequest.getId()); - javaParseRequest.setRepositoryPath(gitInfo.getRepoPath()); - javaParseRequest.setApplicationName(gitInfo.getKsGitIngestionInfo().getMetadata().get("KsApplicationName")); - javaParseRequest.setApplicationVersion(gitInfo.getCommitId()); - javaParseRequest.setDeleteExistingData(parseRequest.isDeleteExistingData()); - javaParseRequest.setApplicationType(codeType.getType()); - javaParseRequest.setProjectName(gitInfo.getRepoName()); - CompletableFuture.completedFuture(javaParserModule.getJavaParsedDetails(javaParseRequest)); + CompletableFuture.completedFuture(javaParserModule.getJavaParsedDetails(commonParseRequest)); } if(codeType.getType().equalsIgnoreCase("jsp")) { System.out.println("JSP Parser Module"); } }); - } + }; } } diff --git a/src/main/java/com/olympus/apollo/repository/VectorStoreRepository.java b/src/main/java/com/olympus/apollo/repository/VectorStoreRepository.java index 6f413e6..a19ee93 100644 --- a/src/main/java/com/olympus/apollo/repository/VectorStoreRepository.java +++ b/src/main/java/com/olympus/apollo/repository/VectorStoreRepository.java @@ -1,7 +1,7 @@ package com.olympus.apollo.repository; -import com.olympus.apollo.dto.VectorStoreDetails; +import com.olympus.dto.VectorStoreDetails; import com.olympus.model.apollo.VectorStore; import org.springframework.data.mongodb.repository.Aggregation; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/com/olympus/apollo/services/DeletionService.java b/src/main/java/com/olympus/apollo/services/DeletionService.java index 863e8a3..f61ba9b 100644 --- a/src/main/java/com/olympus/apollo/services/DeletionService.java +++ b/src/main/java/com/olympus/apollo/services/DeletionService.java @@ -1,14 +1,14 @@ package com.olympus.apollo.services; -import com.olympus.apollo.dto.DeleteGitRepoDetailsRequest; -import com.olympus.apollo.dto.ResultDTO; +import com.olympus.dto.DeleteGitRepoDetailsRequest; +import com.olympus.dto.ResultDTO; import com.olympus.apollo.exception.vectorStoreMetaDetailsEmptyException; import com.olympus.apollo.repository.*; import com.olympus.model.apollo.KSGitInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.olympus.apollo.dto.DeletionRequest; +import com.olympus.dto.DeletionRequest; import com.olympus.model.apollo.VectorStore; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.simp.SimpMessagingTemplate; diff --git a/src/main/java/com/olympus/apollo/services/GitRepositoryIngestor.java b/src/main/java/com/olympus/apollo/services/GitRepositoryIngestor.java index 1539070..4875d56 100644 --- a/src/main/java/com/olympus/apollo/services/GitRepositoryIngestor.java +++ b/src/main/java/com/olympus/apollo/services/GitRepositoryIngestor.java @@ -13,7 +13,7 @@ import java.util.concurrent.CompletableFuture; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.olympus.apollo.dto.ResultDTO; +import com.olympus.dto.ResultDTO; import com.olympus.apollo.exception.BranchCheckoutException; import com.olympus.apollo.repository.VectorStoreRepository; import org.eclipse.jgit.api.Git; @@ -32,7 +32,7 @@ import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import com.olympus.apollo.dto.IngestionOutput; +import com.olympus.dto.IngestionOutput; import com.olympus.model.apollo.KSGitInfo; import com.olympus.model.apollo.KSGitIngestionInfo; import com.olympus.apollo.repository.KSGitInfoRepository; diff --git a/src/main/java/com/olympus/apollo/services/GitService.java b/src/main/java/com/olympus/apollo/services/GitService.java index 4d88225..28a0b65 100644 --- a/src/main/java/com/olympus/apollo/services/GitService.java +++ b/src/main/java/com/olympus/apollo/services/GitService.java @@ -1,7 +1,7 @@ package com.olympus.apollo.services; -import com.olympus.apollo.dto.GitPullOutput; -import com.olympus.apollo.dto.ResultDTO; +import com.olympus.dto.GitPullOutput; +import com.olympus.dto.ResultDTO; import com.olympus.apollo.exception.BranchCheckoutException; import com.olympus.apollo.exception.GitCloneException; import com.olympus.model.apollo.KSGitInfo; diff --git a/src/main/java/com/olympus/apollo/services/KSGitInfoService.java b/src/main/java/com/olympus/apollo/services/KSGitInfoService.java index 0b35725..fde1ec9 100644 --- a/src/main/java/com/olympus/apollo/services/KSGitInfoService.java +++ b/src/main/java/com/olympus/apollo/services/KSGitInfoService.java @@ -6,7 +6,7 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.olympus.apollo.dto.KSGitInfoDTO; +import com.olympus.dto.KSGitInfoDTO; import com.olympus.apollo.repository.KSGitInfoRepository; @Service diff --git a/src/main/java/com/olympus/apollo/services/KSIngestor.java b/src/main/java/com/olympus/apollo/services/KSIngestor.java index bb071d3..2b27e93 100644 --- a/src/main/java/com/olympus/apollo/services/KSIngestor.java +++ b/src/main/java/com/olympus/apollo/services/KSIngestor.java @@ -3,7 +3,7 @@ package com.olympus.apollo.services; import java.util.*; import java.text.SimpleDateFormat; -import com.olympus.apollo.dto.IngestionOutput; +import com.olympus.dto.IngestionOutput; import com.olympus.model.apollo.KSDocument; import com.olympus.model.apollo.KSTexts; import com.olympus.apollo.repository.KSTextsRepository; diff --git a/src/main/java/com/olympus/apollo/utils/GitUtils.java b/src/main/java/com/olympus/apollo/utils/GitUtils.java index 2fbf66a..0d82a64 100644 --- a/src/main/java/com/olympus/apollo/utils/GitUtils.java +++ b/src/main/java/com/olympus/apollo/utils/GitUtils.java @@ -1,7 +1,7 @@ package com.olympus.apollo.utils; -import com.olympus.apollo.dto.GitCloneInput; +import com.olympus.dto.GitCloneInput; import com.olympus.model.apollo.KSGitInfo; import com.olympus.model.apollo.KSGitIngestionInfo; import com.olympus.model.apollo.ParseStatuses; @@ -39,6 +39,8 @@ public class GitUtils { info.setCodeParsingToBeDone(gitCloneInput.isCodeParsingToBeDone()); info.setCodeTypes(gitCloneInput.getCodeTypes()); + info.setProjectName(gitCloneInput.getProjectName()); + info.setApplicationVersion(gitCloneInput.getApplicationVersion()); List parseStatuses = new ArrayList<>(); List revEngineeringStatuses = new ArrayList<>();