Merge pull request #184 from pwgit-create/codexFix

Fixed so the codebase generations with codegeex4 ai model will work b…

Author: pwgit-create

cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/util/StringUtil.java

@@ -5,9 +5,7 @@
 import org.slf4j.LoggerFactory;
 import pn.cg.datastorage.constant.CommonStringConstants;
 
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 
 import static pn.cg.util.CodeGeneratorUtil.ValidateResponseOnSuperAppGetAllClassesQuestion;
 
@@ -262,6 +260,7 @@ public static String RemoveCommonAdditionStringsFromAiModels(String input) {
      * @return List<String>
      */
     public static List<String> GetListOfClassNamesInSuperAppGeneration(String input) {
+        final String MAIN_CLASS_NAME = "Main";
         try {
             String[] classNamesArr = input.split("\n");
             List<String> tmpClassNames = new LinkedList<>();
@@ -288,7 +287,15 @@ public static List<String> GetListOfClassNamesInSuperAppGeneration(String input)
                 }
             }
 
-            return tmpClassNames.stream().filter(line -> !(line.contains(" "))).toList();
+            tmpClassNames =  tmpClassNames.stream().filter(line -> !(line.contains(" "))).toList();
+
+            if(!tmpClassNames.isEmpty() && tmpClassNames.get(0).equalsIgnoreCase(MAIN_CLASS_NAME)){
+                List<String> mutableList = new ArrayList<>(tmpClassNames);
+                Collections.reverse(mutableList);
+                return mutableList;
+            }
+
+            return tmpClassNames;
 
         } catch (Exception e) {
 

cg/CodeGenerator/CodeGenerator/src/test/java/pn/cg/util/StringUtilTest.java

@@ -347,6 +347,19 @@ public void GetListOfClassNamesInSuperAppGenerationTest2() {
         final String PERFECT_RESPONSE_FROM_AI_MODEL = "PackageScanner\nSecurityAnalyzer\nVulnerabilityChecker\nReportGenerator\nUserInterface\nApplicationManager\nMain";
 
 
+        final List<String> EXPECTED = Arrays.stream(PERFECT_RESPONSE_FROM_AI_MODEL.split("\n")).toList();
+        final List<String> ACTUAL = StringUtil.GetListOfClassNamesInSuperAppGeneration(TEST_INPUT);
+
+        Assertions.assertEquals(EXPECTED, ACTUAL);
+    }
+
+    @Test
+    public void ReverseListOfClassNamesInSuperAppGenerationIfFirstClassIsNamedMain() {
+
+        final String TEST_INPUT = "1. Main\n2. PackageScanner";
+        final String PERFECT_RESPONSE_FROM_AI_MODEL = "PackageScanner\nMain";
+
+
         final List<String> EXPECTED = Arrays.stream(PERFECT_RESPONSE_FROM_AI_MODEL.split("\n")).toList();
         final List<String> ACTUAL = StringUtil.GetListOfClassNamesInSuperAppGeneration(TEST_INPUT);