Remove unused code files and update dependencies

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;

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.dto.DeleteGitRepoDetailsRequest;
-import com.olympus.apollo.dto.DeletionRequest;
+import com.olympus.dto.DeletionRequest;
-import com.olympus.apollo.dto.VectorStoreDetails;
+import com.olympus.dto.VectorStoreDetails;
 import com.olympus.model.apollo.VectorStore;
 import com.olympus.apollo.repository.VectorStoreRepository;
 import com.olympus.apollo.services.DeletionService;

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 {

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<String> fetchParsedJava(@RequestBody JavaParseRequest javaParseRequest){
+	public ResponseEntity<String> fetchParsedJava(@RequestBody CommonParseRequest javaParseRequest){
 		javaParserModule.getJavaParsedDetails(javaParseRequest);
 		return ResponseEntity.accepted().body("Request to parse the java application is being processed");
 	}

src/main/java/com/olympus/apollo/dto/DeleteGitRepoDetailsRequest.java

@@ -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;
-}

src/main/java/com/olympus/apollo/dto/DeletionRequest.java

@@ -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;
-}
-

src/main/java/com/olympus/apollo/dto/ExternalFileIngestionDTO.java

@@ -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;
-}

src/main/java/com/olympus/apollo/dto/FileUploadDTO.java

@@ -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;
-}

src/main/java/com/olympus/apollo/dto/GitCloneInput.java

@@ -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> codeTypes= new ArrayList<>();
-}

src/main/java/com/olympus/apollo/dto/GitCloneOutput.java

@@ -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;
-}

src/main/java/com/olympus/apollo/dto/GitPullOutput.java

@@ -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<String,String > changes;
-    private String repoName;
-    private String message;
-}

src/main/java/com/olympus/apollo/dto/IngestionOutput.java

@@ -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<String> ingestedDocumentId;
-
-    public IngestionOutput(){
-        ingestedDocumentId=new ArrayList<String>();
-    }
-}

src/main/java/com/olympus/apollo/dto/KSGitInfoDTO.java

@@ -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;
-        
-    }
-}

src/main/java/com/olympus/apollo/dto/KSGitUploadDTO.java

@@ -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<String, String> metadata;
-    private int minChunkSizeToEmbed;
-    private int maxNumberOfChunks;
-    private int minChunkSize;
-    private int defaultChunkSize;
-}

src/main/java/com/olympus/apollo/dto/ResultDTO.java

@@ -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;
-}

src/main/java/com/olympus/apollo/dto/VectorStoreDetails.java

@@ -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;
-}

src/main/java/com/olympus/apollo/dto/VectorStoreMetadataDetails.java

@@ -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;
-}
-

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;

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> ksGitInfo = ksGitInfoRepository.findById(parseRequest.getId());
+        Optional<KSGitInfo> ksGitInfoOptional = ksGitInfoRepository.findById(parseRequest.getId());
-        if(ksGitInfo.isPresent()){
+        if(ksGitInfoOptional.isPresent()) {
-            KSGitInfo gitInfo = ksGitInfo.get();
+            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();
+                    CompletableFuture.completedFuture(javaParserModule.getJavaParsedDetails(commonParseRequest));
-                    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));
                 }
                 if(codeType.getType().equalsIgnoreCase("jsp")) {
                     System.out.println("JSP Parser Module");
                 }
             });
-        }
+        };
     }
 }

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;

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.dto.DeleteGitRepoDetailsRequest;
-import com.olympus.apollo.dto.ResultDTO;
+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;

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;

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.dto.GitPullOutput;
-import com.olympus.apollo.dto.ResultDTO;
+import com.olympus.dto.ResultDTO;
 import com.olympus.apollo.exception.BranchCheckoutException;
 import com.olympus.apollo.exception.GitCloneException;
 import com.olympus.model.apollo.KSGitInfo;

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

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;

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> parseStatuses = new ArrayList<>();
         List<RevEngineeringStatuses> revEngineeringStatuses = new ArrayList<>();