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 20888ab..18f4671 100644 --- a/src/main/java/com/olympus/apollo/controllers/FeApi/KSGitController.java +++ b/src/main/java/com/olympus/apollo/controllers/FeApi/KSGitController.java @@ -100,7 +100,7 @@ public class KSGitController { //Return an immediate response ResultDTO response = new ResultDTO(); - response.setMessage("Ingestion process initiated for repo: " + gitCloneInput.getRepoName() + " branch: " + gitCloneInput.getBranch()); + response.setMessage("clone process initiated for repo: " + gitCloneInput.getRepoName() + " branch: " + gitCloneInput.getBranch()); response.setSuccess(true); return ResponseEntity.ok(response); } diff --git a/src/main/java/com/olympus/apollo/dto/GitCloneInput.java b/src/main/java/com/olympus/apollo/dto/GitCloneInput.java index f3a06da..9ea460b 100644 --- a/src/main/java/com/olympus/apollo/dto/GitCloneInput.java +++ b/src/main/java/com/olympus/apollo/dto/GitCloneInput.java @@ -1,9 +1,13 @@ package com.olympus.apollo.dto; +import com.olympus.apollo.models.CodeTypes; +import com.olympus.apollo.models.ParseStatuses; +import com.olympus.apollo.models.RevEngineeringStatuses; import lombok.Getter; import lombok.Setter; -import java.util.HashMap; +import java.util.ArrayList; +import java.util.List; @Setter @Getter @@ -22,7 +26,11 @@ public class GitCloneInput { private int defaultChunkSize; private boolean codeParsingToBeDone; - private String parseStatus; - private String reverseEngineeringStatus; - private String codeType; + //private String parseStatus; + //private String reverseEngineeringStatus; + //private String codeType; + + private List codeTypes= new ArrayList<>(); + private List parseStatuses= new ArrayList<>(); + private List revEngineeringStatuses= new ArrayList<>(); } diff --git a/src/main/java/com/olympus/apollo/models/CodeTypes.java b/src/main/java/com/olympus/apollo/models/CodeTypes.java new file mode 100644 index 0000000..dbfb2fb --- /dev/null +++ b/src/main/java/com/olympus/apollo/models/CodeTypes.java @@ -0,0 +1,11 @@ +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/KSGitInfo.java b/src/main/java/com/olympus/apollo/models/KSGitInfo.java index 3b4a8f1..2ec0fec 100644 --- a/src/main/java/com/olympus/apollo/models/KSGitInfo.java +++ b/src/main/java/com/olympus/apollo/models/KSGitInfo.java @@ -2,6 +2,7 @@ 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; @@ -27,8 +28,11 @@ public class KSGitInfo { private String ingestionDateFormat; private boolean codeParsingToBeDone; - private String parseStatus; - private String reverseEngineeringStatus; - private String codeType; - private String parseId; + //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/ParseStatuses.java b/src/main/java/com/olympus/apollo/models/ParseStatuses.java new file mode 100644 index 0000000..0c14021 --- /dev/null +++ b/src/main/java/com/olympus/apollo/models/ParseStatuses.java @@ -0,0 +1,11 @@ +package com.olympus.apollo.models; + +import lombok.Getter; +import lombok.Setter; + +@Getter @Setter +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 new file mode 100644 index 0000000..9aa8310 --- /dev/null +++ b/src/main/java/com/olympus/apollo/models/RevEngineeringStatuses.java @@ -0,0 +1,11 @@ +package com.olympus.apollo.models; + +import lombok.Getter; +import lombok.Setter; + +@Getter @Setter +public class RevEngineeringStatuses { + private String type; + private String status; + private String revProcessId; +} diff --git a/src/main/java/com/olympus/apollo/utils/GitUtils.java b/src/main/java/com/olympus/apollo/utils/GitUtils.java index 994842d..4ea2ca3 100644 --- a/src/main/java/com/olympus/apollo/utils/GitUtils.java +++ b/src/main/java/com/olympus/apollo/utils/GitUtils.java @@ -1,6 +1,7 @@ package com.olympus.apollo.utils; import com.olympus.apollo.dto.GitCloneInput; +import com.olympus.apollo.models.CodeTypes; import com.olympus.apollo.models.KSGitInfo; import com.olympus.apollo.models.KSGitIngestionInfo; import org.eclipse.jgit.lib.Ref; @@ -32,9 +33,10 @@ public class GitUtils { info.setIngestionDateFormat(new SimpleDateFormat("MM/dd/yy").format(new Date())); info.setCodeParsingToBeDone(gitCloneInput.isCodeParsingToBeDone()); - info.setCodeType(gitCloneInput.getCodeType()); - info.setParseStatus("NEW"); - info.setReverseEngineeringStatus("NEW"); + + info.setCodeTypes(gitCloneInput.getCodeTypes()); + info.setParseStatuses(gitCloneInput.getParseStatuses()); + info.setRevEngineeringStatuses(gitCloneInput.getRevEngineeringStatuses()); logger.info("KSGitInfo Created: {}, {}",info.getRepoName(),info.getBranch()); return info;