diff --git a/src/main/java/com/olympus/apollo/ApolloApplication.java b/src/main/java/com/olympus/apollo/ApolloApplication.java index 5a5c152..e703927 100644 --- a/src/main/java/com/olympus/apollo/ApolloApplication.java +++ b/src/main/java/com/olympus/apollo/ApolloApplication.java @@ -5,16 +5,18 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableAsync; import com.olympus.apollo.properties.StorageProperties; -@SpringBootApplication(scanBasePackages = {"com.olympus.apollo", "com.olympus.feign"}) +@SpringBootApplication @EnableConfigurationProperties(StorageProperties.class) @EnableAsync @Configuration @EnableDiscoveryClient +@ComponentScan(basePackages = {"com.olympus.apollo", "com.olympus.feign", "com.olympus.dto","com.olympus.model"}) @EnableFeignClients(basePackages = "com.olympus.feign") public class ApolloApplication { 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 18f4671..15df234 100644 --- a/src/main/java/com/olympus/apollo/controllers/FeApi/KSGitController.java +++ b/src/main/java/com/olympus/apollo/controllers/FeApi/KSGitController.java @@ -1,31 +1,25 @@ package com.olympus.apollo.controllers.FeApi; -import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; -import java.util.concurrent.CompletableFuture; import com.olympus.apollo.dto.*; import com.olympus.apollo.exception.GitCloneException; import com.olympus.apollo.services.GitService; import com.olympus.apollo.utils.GitUtils; -import org.eclipse.jgit.api.errors.GitAPIException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; -import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.olympus.apollo.models.KSGitInfo; -import com.olympus.apollo.models.KSGitIngestionInfo; +import com.olympus.model.apollo.KSGitInfo; +import com.olympus.model.apollo.KSGitIngestionInfo; import com.olympus.apollo.repository.KSGitInfoRepository; import com.olympus.apollo.repository.KSGitIngestionInfoRepository; -import com.olympus.apollo.services.KSGitInfoService; @RestController @RequestMapping("/fe-api/ks_git_repos") diff --git a/src/main/java/com/olympus/apollo/controllers/FeApi/KsDocumentController.java b/src/main/java/com/olympus/apollo/controllers/FeApi/KsDocumentController.java index 953e20a..b26ed49 100644 --- a/src/main/java/com/olympus/apollo/controllers/FeApi/KsDocumentController.java +++ b/src/main/java/com/olympus/apollo/controllers/FeApi/KsDocumentController.java @@ -1,12 +1,11 @@ package com.olympus.apollo.controllers.FeApi; import java.util.List; -import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.olympus.apollo.models.KSDocument; +import com.olympus.model.apollo.KSDocument; import com.olympus.apollo.repository.KSDocumentRepository; @RestController 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 183a0b0..0dd8d7f 100644 --- a/src/main/java/com/olympus/apollo/controllers/FeApi/VectorStoreController.java +++ b/src/main/java/com/olympus/apollo/controllers/FeApi/VectorStoreController.java @@ -3,7 +3,7 @@ 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.apollo.models.VectorStore; +import com.olympus.model.apollo.VectorStore; import com.olympus.apollo.repository.VectorStoreRepository; import com.olympus.apollo.services.DeletionService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/olympus/apollo/controllers/KSFileController.java b/src/main/java/com/olympus/apollo/controllers/KSFileController.java index c6f0475..4f29983 100644 --- a/src/main/java/com/olympus/apollo/controllers/KSFileController.java +++ b/src/main/java/com/olympus/apollo/controllers/KSFileController.java @@ -6,11 +6,8 @@ import java.text.SimpleDateFormat; import java.util.List; import java.util.Optional; -import com.olympus.apollo.dto.DeletionRequest; import com.olympus.apollo.dto.ExternalFileIngestionDTO; -import com.olympus.apollo.dto.IngestionOutput; -import com.olympus.apollo.models.KSGitInfo; -import com.olympus.apollo.models.KSTexts; +import com.olympus.model.apollo.KSTexts; import com.olympus.apollo.repository.KSTextsRepository; import com.olympus.apollo.services.DeletionService; import com.olympus.apollo.services.KSIngestor; @@ -19,16 +16,14 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import com.olympus.apollo.models.KSDocument; -import com.olympus.apollo.models.KSIngestionInfo; +import com.olympus.model.apollo.KSDocument; +import com.olympus.model.apollo.KSIngestionInfo; 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 javax.swing.text.html.Option; - @RestController public class KSFileController { @Autowired diff --git a/src/main/java/com/olympus/apollo/controllers/TestController.java b/src/main/java/com/olympus/apollo/controllers/TestController.java index b1c9d7b..fd716d5 100644 --- a/src/main/java/com/olympus/apollo/controllers/TestController.java +++ b/src/main/java/com/olympus/apollo/controllers/TestController.java @@ -4,7 +4,6 @@ import java.util.List; import com.olympus.apollo.dto.ResultDTO; import com.olympus.apollo.feign.services.ParserModuleService; -import com.olympus.apollo.models.ParseProcess; import com.olympus.apollo.services.GitService; import com.olympus.dto.JavaParseRequest; import com.olympus.dto.ParseRequest; diff --git a/src/main/java/com/olympus/apollo/dto/GitCloneInput.java b/src/main/java/com/olympus/apollo/dto/GitCloneInput.java index 65f8196..c0bf06a 100644 --- a/src/main/java/com/olympus/apollo/dto/GitCloneInput.java +++ b/src/main/java/com/olympus/apollo/dto/GitCloneInput.java @@ -1,8 +1,6 @@ package com.olympus.apollo.dto; -import com.olympus.apollo.models.CodeTypes; -import com.olympus.apollo.models.ParseStatuses; -import com.olympus.apollo.models.RevEngineeringStatuses; +import com.olympus.model.apollo.CodeTypes; import lombok.Getter; import lombok.Setter; 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 ea9a5e2..e9cbc7a 100644 --- a/src/main/java/com/olympus/apollo/feign/services/ParserModuleService.java +++ b/src/main/java/com/olympus/apollo/feign/services/ParserModuleService.java @@ -1,6 +1,6 @@ package com.olympus.apollo.feign.services; -import com.olympus.apollo.models.KSGitInfo; +import com.olympus.model.apollo.KSGitInfo; import com.olympus.apollo.repository.KSGitInfoRepository; import com.olympus.dto.ParseRequest; import com.olympus.feign.JavaParserModule; diff --git a/src/main/java/com/olympus/apollo/models/CodeTypes.java b/src/main/java/com/olympus/apollo/models/CodeTypes.java deleted file mode 100644 index dbfb2fb..0000000 --- a/src/main/java/com/olympus/apollo/models/CodeTypes.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.olympus.apollo.models; - -import lombok.Getter; -import lombok.Setter; - -@Getter @Setter -public class CodeTypes { - private String type; - private String re_scenario; - private String[] base_source; -} diff --git a/src/main/java/com/olympus/apollo/models/KSDocument.java b/src/main/java/com/olympus/apollo/models/KSDocument.java deleted file mode 100644 index 6f16fa4..0000000 --- a/src/main/java/com/olympus/apollo/models/KSDocument.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.olympus.apollo.models; - -import org.springframework.data.mongodb.core.mapping.Document; - -import java.util.Date; - -import org.springframework.data.annotation.Id; -import lombok.Getter; -import lombok.Setter; - -@Document(collection = "ksdocuments") -@Getter @Setter -public class KSDocument { - - - private @Id String id; - - private String name; - private String description; - - private String filePath; - private String fileName; - - - private String ingestionStatus; - //private String ingestionMessage; - private Date ingestionDate; - private String ingestionDateFormat; - - private KSIngestionInfo ingestionInfo; - - - -} diff --git a/src/main/java/com/olympus/apollo/models/KSGitInfo.java b/src/main/java/com/olympus/apollo/models/KSGitInfo.java deleted file mode 100644 index 2d51cbe..0000000 --- a/src/main/java/com/olympus/apollo/models/KSGitInfo.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.olympus.apollo.models; - -import java.util.Date; -import java.util.HashMap; -import java.util.List; - -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -import lombok.Getter; -import lombok.Setter; - -@Document(collection = "ksgit_info") -@Getter -@Setter -public class KSGitInfo { - @Id - private String id; - - private String repoName; - private String branch; - private String commitId; - private String repoPath; - private KSGitIngestionInfo ksGitIngestionInfo; - private HashMap gitModifiedFiles; - private String cloneStatus; - private String ingestionStatus; - private Date ingestionDate; - private String ingestionDateFormat; - - private boolean codeParsingToBeDone; - //private String parseStatus; - //private String reverseEngineeringStatus; - //private String codeType; - //private String parseId; - private List codeTypes; - private List parseStatuses; - private List revEngineeringStatuses; -} diff --git a/src/main/java/com/olympus/apollo/models/KSGitIngestionInfo.java b/src/main/java/com/olympus/apollo/models/KSGitIngestionInfo.java deleted file mode 100644 index 0a1dfee..0000000 --- a/src/main/java/com/olympus/apollo/models/KSGitIngestionInfo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.olympus.apollo.models; - -import java.util.HashMap; -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; -import lombok.Getter; -import lombok.Setter; - -@Document(collection = "ksgit_ingestioninfo") -@Getter @Setter -public class KSGitIngestionInfo { - @Id - private String id; - - private String type; - private HashMap metadata; - private int minChunkSizeToEmbed; - private int maxNumberOfChunks; - private int minChunkSize; - private int defaultChunkSize; -} diff --git a/src/main/java/com/olympus/apollo/models/KSIngestionInfo.java b/src/main/java/com/olympus/apollo/models/KSIngestionInfo.java deleted file mode 100644 index c985534..0000000 --- a/src/main/java/com/olympus/apollo/models/KSIngestionInfo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.olympus.apollo.models; - - -import java.util.HashMap; - -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - - -import lombok.Getter; -import lombok.Setter; - -@Document(collection = "ksingestioninfo") -@Getter @Setter -public class KSIngestionInfo { - - private @Id String id; - - - private String type; - - private HashMap metadata; - - private int minChunkSizeToEmbed; - private int maxNumberOfChunks; - private int minChunkSize; - private int defaultChunkSize; - - -} diff --git a/src/main/java/com/olympus/apollo/models/KSTexts.java b/src/main/java/com/olympus/apollo/models/KSTexts.java deleted file mode 100644 index 0e0813a..0000000 --- a/src/main/java/com/olympus/apollo/models/KSTexts.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.olympus.apollo.models; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -import java.util.Date; -import java.util.HashMap; - -@Document(collection = "ksinternal") -@Getter @Setter -public class KSTexts { - private @Id String id; - private String textToEmbed; - private String name; - private String description; - - private String ingestionStatus; - //private String ingestionMessage; - private Date ingestionDate; - private String ingestionDateFormat; - - //private KSIngestionInfo ingestionInfo; - private String type; - private HashMap IngestionInfo; - private HashMap metadata; - - private int minChunkSizeToEmbed; - private int maxNumberOfChunks; - private int minChunkSize; - private int defaultChunkSize; - private HashMap additionalMetadata; -} diff --git a/src/main/java/com/olympus/apollo/models/ParseProcess.java b/src/main/java/com/olympus/apollo/models/ParseProcess.java deleted file mode 100644 index 4b2a7ec..0000000 --- a/src/main/java/com/olympus/apollo/models/ParseProcess.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.olympus.apollo.models; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -import java.util.Date; - -@Document(collection = "parse_process") -@Getter -@Setter -public class ParseProcess { - - public ParseProcess(String applicationName) { - this.applicationName = applicationName; - this.status = "IN_PROGRESS"; - this.parsedFiles = 0; - this.startDate = new Date(); - } - - @Id - private String id; - - private String repositoryId; - - private String applicationName; - - private Integer totalFiles; - - private Integer parsedFiles; - - private String currentFile; - - private Date startDate; - - private Date endDate; - - private String status; - - -} diff --git a/src/main/java/com/olympus/apollo/models/ParseStatuses.java b/src/main/java/com/olympus/apollo/models/ParseStatuses.java deleted file mode 100644 index ccb72cc..0000000 --- a/src/main/java/com/olympus/apollo/models/ParseStatuses.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.olympus.apollo.models; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Getter @Setter -@AllArgsConstructor -public class ParseStatuses { - private String type; - private String Status; - private String parseProcessId; -} diff --git a/src/main/java/com/olympus/apollo/models/RevEngineeringStatuses.java b/src/main/java/com/olympus/apollo/models/RevEngineeringStatuses.java deleted file mode 100644 index 24b0d81..0000000 --- a/src/main/java/com/olympus/apollo/models/RevEngineeringStatuses.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.olympus.apollo.models; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Getter @Setter -@AllArgsConstructor -public class RevEngineeringStatuses { - private String type; - private String status; - private String revProcessId; -} diff --git a/src/main/java/com/olympus/apollo/models/VectorStore.java b/src/main/java/com/olympus/apollo/models/VectorStore.java deleted file mode 100644 index 2f00870..0000000 --- a/src/main/java/com/olympus/apollo/models/VectorStore.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.olympus.apollo.models; - -import lombok.Getter; -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -import java.util.HashMap; - -@Document(collection = "vector_store") -@Getter -public class VectorStore { - private @Id String id; - - private HashMap metadata; - private String content; - private String media; - private String embedding; - private HashMap contentFormatter; - -} diff --git a/src/main/java/com/olympus/apollo/repository/KSDocumentRepository.java b/src/main/java/com/olympus/apollo/repository/KSDocumentRepository.java index 898e187..3e07b81 100644 --- a/src/main/java/com/olympus/apollo/repository/KSDocumentRepository.java +++ b/src/main/java/com/olympus/apollo/repository/KSDocumentRepository.java @@ -6,7 +6,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.web.bind.annotation.CrossOrigin; -import com.olympus.apollo.models.KSDocument; +import com.olympus.model.apollo.KSDocument; @RepositoryRestResource(collectionResourceRel = "ksdocuments", path = "ksdocuments") @CrossOrigin diff --git a/src/main/java/com/olympus/apollo/repository/KSGitInfoRepository.java b/src/main/java/com/olympus/apollo/repository/KSGitInfoRepository.java index ffabb51..5e5a6c2 100644 --- a/src/main/java/com/olympus/apollo/repository/KSGitInfoRepository.java +++ b/src/main/java/com/olympus/apollo/repository/KSGitInfoRepository.java @@ -1,16 +1,12 @@ package com.olympus.apollo.repository; -import java.util.List; import java.util.Optional; -import com.olympus.apollo.models.VectorStore; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; -import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.stereotype.Repository; -import org.springframework.web.bind.annotation.CrossOrigin; -import com.olympus.apollo.models.KSGitInfo; +import com.olympus.model.apollo.KSGitInfo; @Repository public interface KSGitInfoRepository extends MongoRepository { diff --git a/src/main/java/com/olympus/apollo/repository/KSGitIngestionInfoRepository.java b/src/main/java/com/olympus/apollo/repository/KSGitIngestionInfoRepository.java index 705242d..fb71796 100644 --- a/src/main/java/com/olympus/apollo/repository/KSGitIngestionInfoRepository.java +++ b/src/main/java/com/olympus/apollo/repository/KSGitIngestionInfoRepository.java @@ -3,7 +3,7 @@ package com.olympus.apollo.repository; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.stereotype.Repository; -import com.olympus.apollo.models.KSGitIngestionInfo; +import com.olympus.model.apollo.KSGitIngestionInfo; @Repository public interface KSGitIngestionInfoRepository extends MongoRepository { diff --git a/src/main/java/com/olympus/apollo/repository/KSIngestionInfoRepository.java b/src/main/java/com/olympus/apollo/repository/KSIngestionInfoRepository.java index ae6c8a4..dde7ca8 100644 --- a/src/main/java/com/olympus/apollo/repository/KSIngestionInfoRepository.java +++ b/src/main/java/com/olympus/apollo/repository/KSIngestionInfoRepository.java @@ -3,10 +3,9 @@ package com.olympus.apollo.repository; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import com.olympus.apollo.models.KSIngestionInfo; +import com.olympus.model.apollo.KSIngestionInfo; import org.springframework.web.bind.annotation.CrossOrigin; -@CrossOrigin @Repository public interface KSIngestionInfoRepository extends CrudRepository { diff --git a/src/main/java/com/olympus/apollo/repository/KSTextsRepository.java b/src/main/java/com/olympus/apollo/repository/KSTextsRepository.java index 907675d..3c4b8b8 100644 --- a/src/main/java/com/olympus/apollo/repository/KSTextsRepository.java +++ b/src/main/java/com/olympus/apollo/repository/KSTextsRepository.java @@ -1,18 +1,14 @@ package com.olympus.apollo.repository; -import com.olympus.apollo.models.KSDocument; -import com.olympus.apollo.models.KSGitInfo; -import com.olympus.apollo.models.KSTexts; +import com.olympus.model.apollo.KSTexts; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; import org.springframework.data.rest.core.annotation.RepositoryRestResource; -import org.springframework.web.bind.annotation.CrossOrigin; import java.util.Optional; @RepositoryRestResource(collectionResourceRel = "ksinternal", path = "ksinternal") -@CrossOrigin public interface KSTextsRepository extends MongoRepository { @Query("{'name': ?0}") diff --git a/src/main/java/com/olympus/apollo/repository/VectorStoreRepository.java b/src/main/java/com/olympus/apollo/repository/VectorStoreRepository.java index 47c34ee..6f413e6 100644 --- a/src/main/java/com/olympus/apollo/repository/VectorStoreRepository.java +++ b/src/main/java/com/olympus/apollo/repository/VectorStoreRepository.java @@ -1,7 +1,8 @@ package com.olympus.apollo.repository; + import com.olympus.apollo.dto.VectorStoreDetails; -import com.olympus.apollo.models.VectorStore; +import com.olympus.model.apollo.VectorStore; import org.springframework.data.mongodb.repository.Aggregation; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; diff --git a/src/main/java/com/olympus/apollo/services/DeletionService.java b/src/main/java/com/olympus/apollo/services/DeletionService.java index a47e904..863e8a3 100644 --- a/src/main/java/com/olympus/apollo/services/DeletionService.java +++ b/src/main/java/com/olympus/apollo/services/DeletionService.java @@ -3,23 +3,18 @@ package com.olympus.apollo.services; import com.olympus.apollo.dto.DeleteGitRepoDetailsRequest; import com.olympus.apollo.dto.ResultDTO; import com.olympus.apollo.exception.vectorStoreMetaDetailsEmptyException; -import com.olympus.apollo.models.KSGitInfo; -import com.olympus.apollo.models.KSGitIngestionInfo; -import com.olympus.apollo.models.KSIngestionInfo; 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.apollo.dto.VectorStoreMetadataDetails; -import com.olympus.apollo.models.VectorStore; +import com.olympus.model.apollo.VectorStore; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/com/olympus/apollo/services/GitRepositoryIngestor.java b/src/main/java/com/olympus/apollo/services/GitRepositoryIngestor.java index fcf7fb9..1539070 100644 --- a/src/main/java/com/olympus/apollo/services/GitRepositoryIngestor.java +++ b/src/main/java/com/olympus/apollo/services/GitRepositoryIngestor.java @@ -13,10 +13,8 @@ import java.util.concurrent.CompletableFuture; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.olympus.apollo.dto.GitCloneOutput; import com.olympus.apollo.dto.ResultDTO; import com.olympus.apollo.exception.BranchCheckoutException; -import com.olympus.apollo.exception.GitCloneException; import com.olympus.apollo.repository.VectorStoreRepository; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; @@ -30,14 +28,13 @@ import org.springframework.ai.transformer.splitter.TokenTextSplitter; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.ResponseEntity; 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.apollo.models.KSGitInfo; -import com.olympus.apollo.models.KSGitIngestionInfo; +import com.olympus.model.apollo.KSGitInfo; +import com.olympus.model.apollo.KSGitIngestionInfo; import com.olympus.apollo.repository.KSGitInfoRepository; @Service @@ -246,7 +243,7 @@ public class GitRepositoryIngestor { break; } for (String fileToDelete : filePathsToDelete) { - Optional optionalDocument = vectorStoreRepository.findByKsapplicationNameKsBranchFilePath(repoName,branchName,fileToDelete); + Optional optionalDocument = vectorStoreRepository.findByKsapplicationNameKsBranchFilePath(repoName,branchName,fileToDelete); if (optionalDocument.isPresent()) { String vectorStoreId = optionalDocument.get().getId(); vectorStoreRepository.deleteById(vectorStoreId); diff --git a/src/main/java/com/olympus/apollo/services/GitService.java b/src/main/java/com/olympus/apollo/services/GitService.java index 89bf3b1..4d88225 100644 --- a/src/main/java/com/olympus/apollo/services/GitService.java +++ b/src/main/java/com/olympus/apollo/services/GitService.java @@ -1,11 +1,10 @@ package com.olympus.apollo.services; -import com.olympus.apollo.dto.GitCloneOutput; import com.olympus.apollo.dto.GitPullOutput; import com.olympus.apollo.dto.ResultDTO; import com.olympus.apollo.exception.BranchCheckoutException; import com.olympus.apollo.exception.GitCloneException; -import com.olympus.apollo.models.KSGitInfo; +import com.olympus.model.apollo.KSGitInfo; import com.olympus.apollo.repository.KSGitInfoRepository; import com.olympus.apollo.utils.GitUrlUtils; import com.olympus.apollo.utils.GitUtils; diff --git a/src/main/java/com/olympus/apollo/services/KSIngestor.java b/src/main/java/com/olympus/apollo/services/KSIngestor.java index 6cb8c5f..bb071d3 100644 --- a/src/main/java/com/olympus/apollo/services/KSIngestor.java +++ b/src/main/java/com/olympus/apollo/services/KSIngestor.java @@ -4,10 +4,9 @@ import java.util.*; import java.text.SimpleDateFormat; import com.olympus.apollo.dto.IngestionOutput; -import com.olympus.apollo.models.KSDocument; -import com.olympus.apollo.models.KSTexts; +import com.olympus.model.apollo.KSDocument; +import com.olympus.model.apollo.KSTexts; import com.olympus.apollo.repository.KSTextsRepository; -import org.codelibs.jhighlight.fastutil.Hash; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.ai.document.Document; @@ -19,7 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; -import com.olympus.apollo.models.KSIngestionInfo; +import com.olympus.model.apollo.KSIngestionInfo; import com.olympus.apollo.repository.KSDocumentRepository; import com.olympus.apollo.repository.KSIngestionInfoRepository; diff --git a/src/main/java/com/olympus/apollo/utils/GitUtils.java b/src/main/java/com/olympus/apollo/utils/GitUtils.java index 5ae11c9..2fbf66a 100644 --- a/src/main/java/com/olympus/apollo/utils/GitUtils.java +++ b/src/main/java/com/olympus/apollo/utils/GitUtils.java @@ -1,7 +1,11 @@ package com.olympus.apollo.utils; + import com.olympus.apollo.dto.GitCloneInput; -import com.olympus.apollo.models.*; +import com.olympus.model.apollo.KSGitInfo; +import com.olympus.model.apollo.KSGitIngestionInfo; +import com.olympus.model.apollo.ParseStatuses; +import com.olympus.model.apollo.RevEngineeringStatuses; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.slf4j.Logger; @@ -19,7 +23,7 @@ public class GitUtils { private static final Logger logger = LoggerFactory.getLogger(GitUtils.class); - public static KSGitInfo createKSGitInfo(GitCloneInput gitCloneInput,String basePath){ + public static KSGitInfo createKSGitInfo(GitCloneInput gitCloneInput, String basePath){ logger.debug("Creating KSGitInfo with repoName: {}, branch: {}",gitCloneInput.getRepoName(),gitCloneInput.getBranch()); KSGitInfo info = new KSGitInfo();