From 301b1d7db800b31246788bae1a0915197642c2e5 Mon Sep 17 00:00:00 2001 From: "DIR\\maria.del.valle" Date: Thu, 28 Nov 2024 12:43:37 +0100 Subject: [PATCH 1/3] added jsp and generic parser --- .../feign/services/ParserModuleService.java | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) 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 8a56477..ebce153 100644 --- a/src/main/java/com/olympus/apollo/feign/services/ParserModuleService.java +++ b/src/main/java/com/olympus/apollo/feign/services/ParserModuleService.java @@ -1,22 +1,32 @@ 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.ApolloParseRequestDTO; -import com.olympus.feign.JavaParserModule; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; - import java.util.Optional; import java.util.concurrent.CompletableFuture; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + +import com.olympus.apollo.repository.KSGitInfoRepository; +import com.olympus.dto.ApolloParseRequestDTO; +import com.olympus.dto.CommonParseRequest; +import com.olympus.feign.GenericParserModule; +import com.olympus.feign.JavaParserModule; +import com.olympus.feign.JspParserModule; +import com.olympus.model.apollo.KSGitInfo; + @Service public class ParserModuleService { + @Autowired private JavaParserModule javaParserModule; + @Autowired + private JspParserModule jspParserModule; + + @Autowired + private GenericParserModule genericParserModule; + @Autowired KSGitInfoRepository ksGitInfoRepository; @@ -45,7 +55,10 @@ public class ParserModuleService { CompletableFuture.completedFuture(javaParserModule.getJavaParsedDetails(commonParseRequest)); } if(codeType.getType().equalsIgnoreCase("jsp")) { - System.out.println("JSP Parser Module"); + CompletableFuture.completedFuture(jspParserModule.getJspParsedDetails(commonParseRequest)); + } + if(codeType.getType().equalsIgnoreCase("generic")) { + CompletableFuture.completedFuture(genericParserModule.getGenericParsedDetails(commonParseRequest)); } }); }; From 2c35b5ca9af5d2b21ccc6093590db4e18afa45db Mon Sep 17 00:00:00 2001 From: Maria del Valle Date: Thu, 28 Nov 2024 14:31:40 +0000 Subject: [PATCH 2/3] Updated application.yml --- src/main/resources/application.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index be51639..2cdf55f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,6 +6,10 @@ apollo: url: "http://localhost:5173" java-parser-module: url: "http://localhost:8084" +jsp-parser-module: + url: "http://localhost:8089" +generic-file-parser-module: + url: "http://localhost:8085" spring: application: name: apollo From 4f0b4368331a4d2a1312b2f7c83c5c90fc96ba8b Mon Sep 17 00:00:00 2001 From: "DIR\\maria.del.valle" Date: Mon, 2 Dec 2024 16:47:58 +0100 Subject: [PATCH 3/3] added codeType for re module --- .../apollo/feign/services/REModuleService.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/olympus/apollo/feign/services/REModuleService.java b/src/main/java/com/olympus/apollo/feign/services/REModuleService.java index 28074f8..49cd8d6 100644 --- a/src/main/java/com/olympus/apollo/feign/services/REModuleService.java +++ b/src/main/java/com/olympus/apollo/feign/services/REModuleService.java @@ -1,15 +1,16 @@ package com.olympus.apollo.feign.services; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + import com.olympus.apollo.repository.KSGitInfoRepository; import com.olympus.dto.ApolloParseRequestDTO; import com.olympus.dto.CommonReverseEngRequest; import com.olympus.feign.JavaREModule; import com.olympus.model.apollo.KSGitInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; - -import java.util.Optional; @Service public class REModuleService { @@ -33,13 +34,15 @@ public class REModuleService { commonReverseEngRequest.setCommitSha(gitInfo.getCommitId()); gitInfo.getCodeTypes().forEach(codeType -> { - if(codeType.getType().equalsIgnoreCase("java")){ + /*if(codeType.getType().equalsIgnoreCase("java")){ commonReverseEngRequest.setApplicationType(codeType.getType()); System.out.println("value is :"+javaREModule.revApplication(commonReverseEngRequest)); } if(codeType.getType().equalsIgnoreCase("jsp")) { System.out.println("JSP Parser Module"); - } + }*/ + commonReverseEngRequest.setApplicationType(codeType.getType()); + javaREModule.revApplication(commonReverseEngRequest); }); }