Merge branch 'main' into 2.0.x

Author: atextor

core/sds-aspect-model-java-generator/src/main/java/io/openmanufacturing/sds/aspectmodel/java/ImportTracker.java

@@ -27,7 +27,8 @@
  */
 public class ImportTracker {
    private static final String GENERICS_START = "<";
-
+   private static final String EMPTY_STRING = "";
+   private static final String COMMA_STRING = ",";
    private static final String TYPE_BRACKETS_AND_WHITESPACE = "[<>\\s]";
 
    private final Set<String> usedImports = new HashSet<>();
@@ -46,14 +47,10 @@ public String getRawContainerType( final String parameterizedContainerType ) {
 
    public void trackPotentiallyParameterizedType( final String potentiallyParameterizedType ) {
       if ( potentiallyParameterizedType.contains( GENERICS_START ) ) {
-         final String rawContainerType = potentiallyParameterizedType.substring( 0,
-               potentiallyParameterizedType.indexOf( GENERICS_START ) );
-         final List<String> typeParameters = Arrays.asList( potentiallyParameterizedType
-               .substring( potentiallyParameterizedType.indexOf( GENERICS_START ) + 1 )
-               .replaceAll( TYPE_BRACKETS_AND_WHITESPACE, "" )
-               .split( "," ) );
-         usedImports.add( rawContainerType );
-         usedImports.addAll( typeParameters );
+         final List<String> types = Arrays.stream( potentiallyParameterizedType.split( GENERICS_START ) )
+               .flatMap( substring -> Arrays.stream( substring.split( COMMA_STRING ) ) )
+               .map( substring -> substring.replaceAll( TYPE_BRACKETS_AND_WHITESPACE, EMPTY_STRING ) ).collect( Collectors.toList() );
+         usedImports.addAll( types );
       } else {
          usedImports.add( potentiallyParameterizedType );
       }

core/sds-aspect-model-java-generator/src/test/java/io/openmanufacturing/sds/aspectmodel/java/ImportTrackerTest.java

@@ -0,0 +1,40 @@
+package io.openmanufacturing.sds.aspectmodel.java;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class ImportTrackerTest {
+   @Test
+   void testType() {
+      var importTracker = new ImportTracker();
+      var type = "java.lang.Long";
+      importTracker.trackPotentiallyParameterizedType( type );
+      assertThat( importTracker.getUsedImports() ).containsExactlyInAnyOrder( "java.lang.Long" );
+   }
+
+   @Test
+   void testGenericType() {
+      var importTracker = new ImportTracker();
+      var type = "java.util.LinkedHashSet<java.lang.Long>>";
+      importTracker.trackPotentiallyParameterizedType( type );
+      assertThat( importTracker.getUsedImports() ).containsExactlyInAnyOrder( "java.lang.Long", "java.util.LinkedHashSet" );
+   }
+
+   @Test
+   void testOptionalGenericType() {
+      var importTracker = new ImportTracker();
+      var type = "java.util.Optional<java.util.LinkedHashSet<java.lang.Long>>";
+      importTracker.trackPotentiallyParameterizedType( type );
+      assertThat( importTracker.getUsedImports() ).containsExactlyInAnyOrder( "java.util.Optional", "java.util.LinkedHashSet", "java.lang.Long" );
+   }
+
+   @Test
+   void testDoubleGenericType() {
+      var importTracker = new ImportTracker();
+      var type = "test.importTracker.StaticContainerProperty<test.importTracker.TestEntity,java.util.Optional<test.importTracker.TestEntity>>";
+      importTracker.trackPotentiallyParameterizedType( type );
+      assertThat( importTracker.getUsedImports() ).containsExactlyInAnyOrder( "test.importTracker.StaticContainerProperty", "test.importTracker.TestEntity",
+            "java.util.Optional" );
+   }
+}