JNG-5368 fix review items

BlackBeltTechnology · Jan 3, 2024 · acde141 · acde141
1 parent 680bd5d
commit acde141
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/...src/main/java/hu/blackbelt/judo/ui/generator/typescript/rest/service/UiServiceHelper.java b/...src/main/java/hu/blackbelt/judo/ui/generator/typescript/rest/service/UiServiceHelper.java
@@ -51,19 +51,17 @@ public static List<RelationType> getAccessRelationsTypes(Application application
     }
 
     public static String accessJoinedImportTokens(Application application) {
-        HashSet<String> tokens = new HashSet<>();
+        HashSet<String> tokens = new LinkedHashSet<>();
         if (application.getPrincipal() != null) {
             tokens.add(classDataName(application.getPrincipal(), "Stored"));
         }
-        List<RelationType> relations = getAccessRelationsTypes(application);
-        relations.forEach(relation -> {
-            tokens.add(classDataName(relation.getTarget(), "Stored"));
-        });
+        getAccessRelationsTypes(application)
+                .forEach(relation -> tokens.add(classDataName(relation.getTarget(), "Stored")));
         return String.join(", ", tokens);
     }
 
     public static String joinedTokensForApiImport(RelationType relation){
-        HashSet<String> tokens = new HashSet<>();
+        HashSet<String> tokens = new LinkedHashSet<>();
 
         if (!relation.isIsAccess()) {
             tokens.add(classDataName((ClassType) relation.getOwner(), ""));
@@ -105,7 +103,7 @@ private static void fillImportTokens(HashSet<String> tokens, RelationType target
     }
 
     public static String joinedTokensForApiImportForAccessRelationServiceImpl(RelationType relation){
-        HashSet<String> tokens = new HashSet<>();
+        HashSet<String> tokens = new LinkedHashSet<>();
 
         if (!relation.isIsAccess()) {
             tokens.add(classDataName((ClassType) relation.getOwner(), ""));
@@ -124,7 +122,7 @@ public static String joinedTokensForApiImportForAccessRelationServiceImpl(Relati
     }
 
     public static String joinedTokensForApiImportClassService(ClassType classType){
-        HashSet<String> tokens = new HashSet<>();
+        HashSet<String> tokens = new LinkedHashSet<>();
 
         tokens.add(classDataName(classType, ""));
         tokens.add(classDataName(classType, "Stored"));