Adjust formatting

Adds comment about how the URL of a jar is handled

Author: DvSmi

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/impl/BaseImpl.java

@@ -125,7 +125,7 @@ public int hashCode() {
 
    @Override
    public int compareTo( BaseImpl o ) {
-      if(this.urn.isPresent() && o.urn.isPresent())
+      if ( this.urn.isPresent() && o.urn.isPresent() )
          return this.urn.get().compareTo( o.urn.get() );
       return Comparator
             .comparing( BaseImpl::getMetaModelVersion )

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

@@ -235,7 +235,6 @@ ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "M
    }
 
    @ParameterizedTest
-   //   @MethodSource( value = "allVersions" )
    @MethodSource( value = "latestVersion" )
    public void testGenerateStaticMetaModelWithConstraints( final KnownVersion metaModelVersion ) throws IOException {
       final TestAspect aspect = TestAspect.ASPECT_WITH_CONSTRAINTS;

core/sds-aspect-model-resolver/src/main/java/io/openmanufacturing/sds/aspectmodel/resolver/ClasspathStrategy.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
  *
  * See the AUTHORS file(s) distributed with this work for additional
- * information regarding authorship. 
+ * information regarding authorship.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -97,8 +97,8 @@ protected URL resourceUrl( final String directory, final String filename ) {
 
    protected Stream<String> filesInDirectory( final String directory ) {
       try {
-         final Optional<File> file = getDirectoryFile(directory);
-         if(file.isPresent() && file.get().isFile()) {
+         final Optional<File> file = getDirectoryFile( directory );
+         if ( file.isPresent() && file.get().isFile() ) {
             return getFilesFromJar( directory, file.get() );
          } else {
             return getFilesFromResources( directory );
@@ -110,15 +110,16 @@ protected Stream<String> filesInDirectory( final String directory ) {
    }
 
    private Optional<File> getDirectoryFile( String directory ) {
+      // The incoming URL will look like this:  jar:file:/pathToJar/o.jar/packageName/className
+      // In case we run the code from a jar. Because of that we need to deconstruct the path to get the path to the jar only and remove the unwanted part of the URL.
       final URL url = getClass().getClassLoader().getResource( directory );
-      if(url == null)
-      {
+      if ( url == null ) {
          return Optional.empty();
       }
       final String urlString = url.toString();
       final int jarIndex = urlString.indexOf( ".jar" );
-      final String path = jarIndex > 0 ? urlString.substring( 0, jarIndex +4 ).replace( "jar:file:", "" ) : urlString;
-      return Optional.of(new File(path));
+      final String path = jarIndex > 0 ? urlString.substring( 0, jarIndex + 4 ).replace( "jar:file:", "" ) : urlString;
+      return Optional.of( new File( path ) );
    }
 
    private Stream<String> getFilesFromResources( String directory ) throws IOException {
@@ -135,13 +136,11 @@ private Stream<String> getFilesFromJar( String directory, File jarFile ) throws
       final JarFile jar = new JarFile( jarFile );
       final Enumeration<JarEntry> entries = jar.entries();
       final String dir = directory.endsWith( "/" ) ? directory : directory + "/";
-      while(entries.hasMoreElements()) {
+      while ( entries.hasMoreElements() ) {
          final String name = entries.nextElement().getName();
-         if(name.startsWith( dir ))
-         {
+         if ( name.startsWith( dir ) ) {
             final String fileName = name.replace( dir, "" );
-            if(StringUtils.isNotEmpty( fileName ))
-            {
+            if ( StringUtils.isNotEmpty( fileName ) ) {
                fileList.add( fileName );
             }
          }

core/sds-test-aspect-models/src/main/resources/valid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/AspectWithExtendedEntity.ttl

@@ -16,8 +16,7 @@
 @prefix unit:   <urn:bamm:io.openmanufacturing:unit:2.0.0#> .
 @prefix xsd:    <http://www.w3.org/2001/XMLSchema#> .
 
-:AspectWithExtendedEntity
-    a               bamm:Aspect ;
+:AspectWithExtendedEntity a bamm:Aspect ;
     bamm:properties ( :testProperty ) ;
     bamm:operations ( ) .
 
@@ -29,29 +28,23 @@
               bamm:characteristic [ a             bamm-c:SortedSet ;
                                     bamm:dataType :TestEntity ] .
 
-:TestEntity
-    a               bamm:Entity ;
-    bamm:extends    :ParentTestEntity ;
+:TestEntity a bamm:Entity ;
+    bamm:extends :ParentTestEntity ;
     bamm:properties ( ) .
 
-:ParentTestEntity
-    a               bamm:AbstractEntity ;
-    bamm:extends    :ParentOfParentEntity ;
+:ParentTestEntity a bamm:AbstractEntity ;
+    bamm:extends  :ParentOfParentEntity ;
     bamm:properties ( :parentString ) .
 
-:ParentOfParentEntity
-    a               bamm:AbstractEntity ;
+:ParentOfParentEntity a bamm:AbstractEntity ;
     bamm:properties ( :parentOfParentString ) .
 
-:StringCode
-    a             bamm-c:Code ;
+:StringCode a bamm-c:Code ;
     bamm:dataType xsd:string .
 
-:parentString
-    a                   bamm:Property ;
+:parentString a bamm:Property ;
     bamm:characteristic :StringCode .
 
-:parentOfParentString
-    a                   bamm:Property ;
+:parentOfParentString a bamm:Property ;
     bamm:characteristic :StringCode .