Fix styles

Author: Yauhenikapl

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

@@ -133,10 +133,7 @@ public AspectModel load( final File file ) {
     * @return the Aspect Model
     */
    public AspectModel load( final Collection<File> files ) {
-      final List<AspectModelFile> migratedFiles = files.stream()
-            .map( AspectModelFileLoader::load )
-            .map( this::migrate )
-            .toList();
+      final List<AspectModelFile> migratedFiles = files.stream().map( AspectModelFileLoader::load ).map( this::migrate ).toList();
       final LoaderContext loaderContext = new LoaderContext();
       resolve( migratedFiles, loaderContext );
       return buildAspectModel( loaderContext.loadedFiles() );
@@ -230,8 +227,8 @@ private AspectModel loadNamespacePackageFromStream( final InputStream inputStrea
 
          while ( (entry = zis.getNextEntry()) != null ) {
             boolean isRelevantEntry =
-                  (hasAspectModelsFolder && entry.getName().startsWith( ASPECT_MODELS_FOLDER ) && entry.getName().endsWith( ".ttl" )) ||
-                        (!hasAspectModelsFolder && entry.getName().endsWith( ".ttl" ));
+                  (hasAspectModelsFolder && entry.getName().startsWith( ASPECT_MODELS_FOLDER ) && entry.getName().endsWith( ".ttl" )) || (
+                        !hasAspectModelsFolder && entry.getName().endsWith( ".ttl" ));
 
             if ( isRelevantEntry ) {
                AspectModelFile aspectModelFile = migrate( AspectModelFileLoader.load( zis ) );
@@ -268,31 +265,25 @@ private AspectModelFile migrate( final AspectModelFile file ) {
       return MetaModelVersionMigrator.INSTANCE.apply( file );
    }
 
-   private record LoaderContext(
-         Set<String> resolvedUrns,
-         Set<AspectModelFile> loadedFiles,
-         Deque<String> unresolvedUrns,
-         Deque<AspectModelFile> unresolvedFiles
-   ) {
+   private record LoaderContext( Set<String> resolvedUrns, Set<AspectModelFile> loadedFiles, Deque<String> unresolvedUrns,
+         Deque<AspectModelFile> unresolvedFiles ) {
       private LoaderContext() {
          this( new HashSet<>(), new HashSet<>(), new ArrayDeque<>(), new ArrayDeque<>() );
       }
    }
 
    private Set<String> getAllUrnsInModel( final Model model ) {
       return Streams.stream( model.listStatements().mapWith( statement -> {
-         final Stream<String> subjectUri = statement.getSubject().isURIResource()
-               ? Stream.of( statement.getSubject().getURI() )
-               : Stream.empty();
+         final Stream<String> subjectUri = statement.getSubject().isURIResource() ?
+               Stream.of( statement.getSubject().getURI() ) :
+               Stream.empty();
          final Stream<String> propertyUri = Stream.of( statement.getPredicate().getURI() );
-         final Stream<String> objectUri = statement.getObject().isURIResource()
-               ? Stream.of( statement.getObject().asResource().getURI() )
-               : Stream.empty();
-
-         return Stream.of( subjectUri, propertyUri, objectUri )
-               .flatMap( Function.identity() )
-               .flatMap( urn -> AspectModelUrn.from( urn ).toJavaOptional().stream() )
-               .map( AspectModelUrn::toString );
+         final Stream<String> objectUri = statement.getObject().isURIResource() ?
+               Stream.of( statement.getObject().asResource().getURI() ) :
+               Stream.empty();
+
+         return Stream.of( subjectUri, propertyUri, objectUri ).flatMap( Function.identity() )
+               .flatMap( urn -> AspectModelUrn.from( urn ).toJavaOptional().stream() ).map( AspectModelUrn::toString );
       } ) ).flatMap( Function.identity() ).collect( toSet() );
    }
 
@@ -351,21 +342,14 @@ private Optional<AspectModelFile> applyResolutionStrategy( final String urn ) {
    }
 
    private void urnsFromModelNeedResolution( final AspectModelFile modelFile, final LoaderContext context ) {
-      Streams.stream( modelFile.sourceModel().listStatements( null, RDF.type, (RDFNode) null ) )
-            .map( Statement::getSubject )
-            .filter( Resource::isURIResource )
-            .map( Resource::getURI )
-            .filter( uri -> uri.startsWith( "urn:samm:" ) )
+      Streams.stream( modelFile.sourceModel().listStatements( null, RDF.type, (RDFNode) null ) ).map( Statement::getSubject )
+            .filter( Resource::isURIResource ).map( Resource::getURI ).filter( uri -> uri.startsWith( "urn:samm:" ) )
             .forEach( urn -> context.resolvedUrns().add( urn ) );
 
-      getAllUrnsInModel( modelFile.sourceModel() ).stream()
-            .filter( urn -> !context.resolvedUrns().contains( urn ) )
-            .filter( urn -> !urn.startsWith( XSD.NS ) )
-            .filter( urn -> !urn.startsWith( RDF.uri ) )
-            .filter( urn -> !urn.startsWith( SammNs.SAMM.getNamespace() ) )
-            .filter( urn -> !urn.startsWith( SammNs.SAMMC.getNamespace() ) )
-            .filter( urn -> !urn.startsWith( SammNs.SAMME.getNamespace() ) )
-            .filter( urn -> !urn.startsWith( SammNs.UNIT.getNamespace() ) )
+      getAllUrnsInModel( modelFile.sourceModel() ).stream().filter( urn -> !context.resolvedUrns().contains( urn ) )
+            .filter( urn -> !urn.startsWith( XSD.NS ) ).filter( urn -> !urn.startsWith( RDF.uri ) )
+            .filter( urn -> !urn.startsWith( SammNs.SAMM.getNamespace() ) ).filter( urn -> !urn.startsWith( SammNs.SAMMC.getNamespace() ) )
+            .filter( urn -> !urn.startsWith( SammNs.SAMME.getNamespace() ) ).filter( urn -> !urn.startsWith( SammNs.UNIT.getNamespace() ) )
             .forEach( urn -> context.unresolvedUrns().add( urn ) );
    }
 
@@ -391,8 +375,7 @@ private void resolve( final List<AspectModelFile> inputFiles, final LoaderContex
          }
 
          while ( !context.unresolvedUrns().isEmpty() ) {
-            applyResolutionStrategy( context.unresolvedUrns().pop() )
-                  .map( this::migrate )
+            applyResolutionStrategy( context.unresolvedUrns().pop() ).map( this::migrate )
                   .ifPresent( resolvedFile -> markModelFileAsLoaded( resolvedFile, context ) );
          }
       }
@@ -412,11 +395,9 @@ private AspectModel buildAspectModel( final Collection<AspectModelFile> inputFil
          final Model model = file.sourceModel();
          final ModelElementFactory modelElementFactory = new ModelElementFactory( mergedModel, Map.of(), element -> aspectModelFile );
          final List<ModelElement> fileElements = model.listStatements( null, RDF.type, (RDFNode) null ).toList().stream()
-               .map( Statement::getSubject )
-               .filter( RDFNode::isURIResource )
+               .map( Statement::getSubject ).filter( RDFNode::isURIResource )
                .map( resource -> mergedModel.createResource( resource.getURI() ) )
-               .map( resource -> modelElementFactory.create( ModelElement.class, resource ) )
-               .toList();
+               .map( resource -> modelElementFactory.create( ModelElement.class, resource ) ).toList();
          aspectModelFile.setElements( fileElements );
          elements.addAll( fileElements );
       }