Revert styles

Author: Yauhenikapl

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

@@ -133,7 +133,10 @@ 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() );
@@ -287,8 +290,10 @@ private Set<String> getAllUrnsInModel( final Model model ) {
                ? 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 );
+         return Stream.of( subjectUri, propertyUri, objectUri )
+               .flatMap( Function.identity() )
+               .flatMap( urn -> AspectModelUrn.from( urn ).toJavaOptional().stream() )
+               .map( AspectModelUrn::toString );
       } ) ).flatMap( Function.identity() ).collect( toSet() );
    }
 
@@ -372,7 +377,7 @@ private void markModelFileAsLoaded( final AspectModelFile modelFile, final Loade
       }
    }
 
-   private void resolve( List<AspectModelFile> inputFiles, final LoaderContext context ) {
+   private void resolve( final List<AspectModelFile> inputFiles, final LoaderContext context ) {
       for ( final AspectModelFile aspectModelFile : inputFiles ) {
          context.unresolvedFiles().push( aspectModelFile );
       }
@@ -387,7 +392,8 @@ private void resolve( List<AspectModelFile> inputFiles, final LoaderContext cont
          }
 
          while ( !context.unresolvedUrns().isEmpty() ) {
-            applyResolutionStrategy( context.unresolvedUrns().pop() ).map( this::migrate )
+            applyResolutionStrategy( context.unresolvedUrns().pop() )
+                  .map( this::migrate )
                   .ifPresent( resolvedFile -> markModelFileAsLoaded( resolvedFile, context ) );
          }
       }
@@ -407,9 +413,11 @@ 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 );
       }

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/aspectmodel/loader/AspectModelLoaderTest.java

@@ -41,16 +41,18 @@
 class AspectModelLoaderTest {
    @Test
    void testOfAbstractEntityCyclomaticCreation() {
-      final Map<String, ComplexType> entities = TestResources.load( TestAspect.ASPECT_WITH_MULTIPLE_ENTITIES_SAME_EXTEND ).elements()
-            .stream().filter( ComplexType.class::isInstance ).map( ComplexType.class::cast )
-            .collect( Collectors.toMap( ComplexType::getName, Function.identity() ) );
+      final Map<String, ComplexType> entities =
+            TestResources.load( TestAspect.ASPECT_WITH_MULTIPLE_ENTITIES_SAME_EXTEND ).elements().stream()
+                  .filter( ComplexType.class::isInstance )
+                  .map( ComplexType.class::cast )
+                  .collect( Collectors.toMap( ComplexType::getName, Function.identity() ) );
 
       assertThat( entities ).extracting( "AbstractTestEntity" ).isInstanceOf( AbstractEntity.class );
       final AbstractEntity abstractEntity = (AbstractEntity) entities.get( "AbstractTestEntity" );
-      assertThat( entities ).extracting( "testEntityOne" ).isInstanceOfSatisfying( ComplexType.class,
-            type -> assertThat( type ).extracting( ComplexType::getExtends ).extracting( Optional::get ).isSameAs( abstractEntity ) );
-      assertThat( entities ).extracting( "testEntityTwo" ).isInstanceOfSatisfying( ComplexType.class,
-            type -> assertThat( type ).extracting( ComplexType::getExtends ).extracting( Optional::get ).isSameAs( abstractEntity ) );
+      assertThat( entities ).extracting( "testEntityOne" ).isInstanceOfSatisfying( ComplexType.class, type ->
+            assertThat( type ).extracting( ComplexType::getExtends ).extracting( Optional::get ).isSameAs( abstractEntity ) );
+      assertThat( entities ).extracting( "testEntityTwo" ).isInstanceOfSatisfying( ComplexType.class, type ->
+            assertThat( type ).extracting( ComplexType::getExtends ).extracting( Optional::get ).isSameAs( abstractEntity ) );
    }
 
    @Test