Fix race condition in type setup

Author: atextor

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/AspectModelLoader.java

@@ -51,6 +51,7 @@
 import org.eclipse.esmf.aspectmodel.resolver.modelfile.DefaultAspectModelFile;
 import org.eclipse.esmf.aspectmodel.resolver.modelfile.MetaModelFile;
 import org.eclipse.esmf.aspectmodel.resolver.modelfile.RawAspectModelFile;
+import org.eclipse.esmf.aspectmodel.resolver.services.TurtleLoader;
 import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 import org.eclipse.esmf.aspectmodel.urn.ElementType;
 import org.eclipse.esmf.aspectmodel.urn.UrnSyntaxException;
@@ -113,6 +114,7 @@ public AspectModelLoader( final ResolutionStrategy resolutionStrategy ) {
     * @param resolutionStrategies the strategies
     */
    public AspectModelLoader( final List<ResolutionStrategy> resolutionStrategies ) {
+      TurtleLoader.init();
       if ( resolutionStrategies.size() == 1 ) {
          resolutionStrategy = resolutionStrategies.get( 0 );
       } else if ( resolutionStrategies.isEmpty() ) {

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/resolver/services/TurtleLoader.java

@@ -21,6 +21,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.stream.Collectors;
+
 import javax.annotation.Nullable;
 
 import org.eclipse.esmf.aspectmodel.resolver.exceptions.ParserException;
@@ -45,6 +46,11 @@ public final class TurtleLoader {
    private TurtleLoader() {
    }
 
+   public static void init() {
+      SammXsdType.setupTypeMapping();
+      registerTurtle();
+   }
+
    /**
     * Loads a Turtle model from an input stream
     *
@@ -85,8 +91,7 @@ public static Try<Model> loadTurtle( final URL url ) {
     */
    public static Try<Model> loadTurtle( @Nullable final String modelContent ) {
       Objects.requireNonNull( modelContent, "Model content must not be null." );
-      SammXsdType.setupTypeMapping();
-      registerTurtle();
+      init();
       try ( final InputStream turtleInputStream = new ByteArrayInputStream( modelContent.getBytes( StandardCharsets.UTF_8 ) ) ) {
          final Model streamModel = RDFParser.create()
                // Make sure to NOT use FactoryRDFCaching because it will return the same objects for nodes appearing