Replace or remove references to SDS and OMP

Author: atextor

.github/workflows/release-workflow.yml

@@ -1,4 +1,4 @@
-name: Release SDS SDK
+name: Release ESMF SDK
 on:
   workflow_dispatch:
     inputs:
@@ -74,9 +74,9 @@ jobs:
       - name: Create GitHub release
         if: ${{ !contains( github.event.inputs.release_version, '-M' ) }}
         uses: softprops/action-gh-release@v1
-        id: sds_sdk_release
+        id: esmf_sdk_release
         with: 
-          body: "Release of the BAMM SDK in version v${{ github.event.inputs.release_version  }}."
+          body: "Release of ESMF SDK in version v${{ github.event.inputs.release_version  }}."
           tag_name: v${{ github.event.inputs.release_version }}
           target_commitish: ${{ env.release_branch_name }}
           draft: false
@@ -87,7 +87,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
       - name: Publish to OSSRH
         if: ${{ !contains( github.event.inputs.release_version, '-M' ) }}
-        run: mvn -B clean -pl '!sds-sdk-test-report,!documentation,!tools/samm-cli' deploy -DskipTests -Prelease-build,sign
+        run: mvn -B clean -pl '!esmf-sdk-test-report,!documentation,!tools/samm-cli' deploy -DskipTests -Prelease-build,sign
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
@@ -100,9 +100,9 @@ jobs:
       - name: Create GitHub release
         if: contains( github.event.inputs.release_version, '-M' )
         uses: softprops/action-gh-release@v1
-        id: sds_sdk_milestone_release
+        id: esmf_sdk_milestone_release
         with:
-          body: "Release of the BAMM SDK in version v${{ github.event.inputs.release_version  }}."
+          body: "Release of ESMF SDK in version v${{ github.event.inputs.release_version  }}."
           tag_name: v${{ github.event.inputs.release_version }}
           target_commitish: ${{ env.release_branch_name }}
           draft: false
@@ -142,7 +142,7 @@ jobs:
           write-mode: overwrite
       - name: Publish to Github
         if: contains( github.event.inputs.release_version, '-M' )
-        run: mvn -s ./settings.xml -B clean -pl '!sds-sdk-test-report,!documentation,!tools/samm-cli' deploy -DskipTests -Pmilestone-build,sign
+        run: mvn -s ./settings.xml -B clean -pl '!esmf-sdk-test-report,!documentation,!tools/samm-cli' deploy -DskipTests -Pmilestone-build,sign
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}

.gitignore

@@ -145,8 +145,8 @@ build
 /core/sds-aspect-meta-model-legacy*/target
 
 # Directories where classes are generated during unit tests
-core/sds-aspect-model-java-generator/src/test/java/io/openmanufacturing/test
-core/sds-aspect-model-jackson/src/main/java/io/openmanufacturing/test
+core/esmf-aspect-model-java-generator/src/test/java/org/eclipse/esmf/test
+core/esmf-aspect-model-jackson/src/main/java/org/eclipse/esmf/test
 
 # jqwik
 .jqwik-database

CONVENTIONS.md

@@ -1,21 +1,22 @@
-# SDS SDK Code Conventions
-The following document contains a compilation of conventions and guidelines to format, structure and write code for the
-SDS SDK.
+# ESMF Code Conventions
+The following document contains a compilation of conventions and guidelines to format, structure and
+write code for the ESMF SDK.
 
 ## General Conventions
-Our code conventions are based on the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html) but
-detailed and adjusted for the needs of the SDS SDK.
+Our code conventions are based on the [Google Java Style
+Guide](https://google.github.io/styleguide/javaguide.html) but detailed and adjusted for the needs
+of the ESMF SDK.
 
 ## Copyright header
 See [CONTRIBUTING](CONTRIBUTING.md)
 
 ## Code Recommendations
 
 ### Utility Classes
-[Utility classes](https://wiki.c2.com/?UtilityClasses) as such should be avoided - domain concepts must be expressed in domain classes. 
-Thus, only for "real", non-domain operations not belonging to any class, utility methods and classes may be used. 
-However, chances are pretty close to 100% that all of everyday utility needs are already covered by high-quality 
-3rd-party libraries.
+[Utility classes](https://wiki.c2.com/?UtilityClasses) as such should be avoided - domain concepts
+must be expressed in domain classes. Thus, only for "real", non-domain operations not belonging to
+any class, utility methods and classes may be used. However, chances are pretty close to 100% that
+all of everyday utility needs are already covered by high-quality 3rd-party libraries.
 
 Usually we apply the following rule to decide on the introduction of new libraries
 1. Check your framework's and its dependency's utility/static constants classes (e.g. Spring or Vert.x)
@@ -24,11 +25,11 @@ Usually we apply the following rule to decide on the introduction of new librari
 4. If really not covered, write your own (highly unlikely)
 
 ### Optional<> usage
-The Optional<> type, common for some time in Guava and in the Java core since Version 8, has found widespread use for 
-return values, however still a lot of discussions emerge concerning a fitting scope of usage.
-You may not return null where an Optional<> is expected
-Whenever an Optional<> is passed, you may safely assume it to be non-null. 
-So the following snippet must never appear anywhere: 
+The Optional<> type, common for some time in Guava and in the Java core since Version 8, has found
+widespread use for return values, however still a lot of discussions emerge concerning a fitting
+scope of usage. You may not return null where an Optional<> is expected Whenever an Optional<> is
+passed, you may safely assume it to be non-null. So the following snippet must never appear
+anywhere:
 ```
 if (someOptional != null && someOptional.isPresent()) ...
 ```
@@ -44,21 +45,20 @@ if (someOptional != null && someOptional.isPresent()) ...
 * You should be using Objects.requireNonNull() for those sort of checks (or Guava's Preconditions if you're having more types of assertions than non-null and aim for a maximum of consistency).
 
 ### Lombok
-We use Lombok in the SDS SDK.
-Project Lombok is a Java library that automatically plugs into your editor and build tools.
-It removes the burden to write getter or equals methods, adds fully featured builders to a class with one annotation, 
-automates logging variables, and much more.
-Consider using its features if you are in the need to do something like that.
+We use Lombok in the ESMF SDK. Project Lombok is a Java library that automatically plugs into your
+editor and build tools. It removes the burden to write getter or equals methods, adds fully featured
+builders to a class with one annotation, automates logging variables, and much more. Consider using
+its features if you are in the need to do something like that.
 
 ## Documentation
 
 ### Source Code Documentation
-Public classes and interfaces should carry appropriate JavaDoc explaining the responsibility of the class.
-All public methods except getters/setters/toString etc. must be documented as well.
-Private methods should be simple enough and well-named such that they don't need documentation. If appropriate they of 
-course may be documented as well. Inline comments, especially those that merely separate logical blocks of code, must be 
-avoided as they are usually an indicator that a private method can be extracted or that bad naming was used that needs 
-explaining.
+Public classes and interfaces should carry appropriate JavaDoc explaining the responsibility of the
+class. All public methods except getters/setters/toString etc. must be documented as well. Private
+methods should be simple enough and well-named such that they don't need documentation. If
+appropriate they of course may be documented as well. Inline comments, especially those that merely
+separate logical blocks of code, must be avoided as they are usually an indicator that a private
+method can be extracted or that bad naming was used that needs explaining.
 
 ### Developer Documentation
 Developer documentation is put into a README.md placed in the project root. This should contain documentation like:
@@ -82,7 +82,3 @@ way more targeted towards writing fully fledged documents and with its multitude
 very good source format.
 Publishing is realized by means of [Github pages](https://docs.antora.org/antora/2.3/publish-to-github-pages/).
 
-### High Level Documentation
-Technical documentation targeted towards components and architecture should be accessible via the developer documentation.
-Corresponding discussions on design etc. can be placed in the project wiki on 
-[Github](https://github.com/OpenManufacturingPlatform/sds-sdk/wiki).

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/loader/Instantiator.java

@@ -220,7 +220,7 @@ private ScalarValue buildScalarValue( final Literal literal ) {
       // 1. A custom parser for rdf:langString values can not be registered with Jena, because it would only receive from Jena during parsing
       //    the lexical representation of the value without the language tag (this is handled specially in Jena).
       // 2. This means that a Literal we receive here which has a type URI of rdf:langString will be of type org.apache.jena.datatypes.xsd.impl.RDFLangString
-      //    but _not_ io.openmanufacturing.sds.metamodel.datatypes.LangString as we would like to.
+      //    but _not_ org.eclipse.esmf.metamodel.datatypes.LangString as we would like to.
       // 3. So we construct an instance of LangString here from the RDFLangString.
       if ( literal.getDatatypeURI().equals( RDF.langString.getURI() ) ) {
          final LangString langString = new LangString( literal.getString(), Locale.forLanguageTag( literal.getLanguage() ) );

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/loader/MetaModelBaseAttributes.java

@@ -33,7 +33,7 @@
 
 import org.eclipse.esmf.aspectmodel.vocabulary.SAMM;
 import org.eclipse.esmf.samm.KnownVersion;
-import org.eclipse.esmf.aspectmodel.resolver.services.SdsAspectMetaModelResourceResolver;
+import org.eclipse.esmf.aspectmodel.resolver.services.SammAspectMetaModelResourceResolver;
 import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 import org.eclipse.esmf.metamodel.datatypes.LangString;
 
@@ -42,7 +42,7 @@
  */
 public class MetaModelBaseAttributes {
 
-   private static final SdsAspectMetaModelResourceResolver metaModelResourceResolver = new SdsAspectMetaModelResourceResolver();
+   private static final SammAspectMetaModelResourceResolver metaModelResourceResolver = new SammAspectMetaModelResourceResolver();
    private final KnownVersion metaModelVersion;
    private final Optional<AspectModelUrn> urn;
    private final String name;

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/metamodel/loader/AspectMetaModelInstantiatorTest.java

@@ -57,7 +57,7 @@ public void testAspectTransformationExpectSuccess( final KnownVersion metaModelV
       final Aspect aspect = loadAspect( TestAspect.ASPECT_WITH_SEE, metaModelVersion );
       final AspectModelUrn expectedAspectModelUrn = TestAspect.ASPECT_WITH_SEE.getUrn();
       assertBaseAttributes( aspect, expectedAspectModelUrn, "AspectWithSee", "Test Aspect With See",
-            "This is a test description", "http://example.com/omp" );
+            "This is a test description", "http://example.com/" );
    }
 
    @ParameterizedTest
@@ -72,7 +72,7 @@ public void testPropertyInstantiationExpectSuccess( final KnownVersion metaModel
       final Property property = aspect.getProperties().get( 0 );
 
       assertBaseAttributes( property, expectedAspectModelUrn, "testProperty", "Test Property",
-            "This is a test property.", "http://example.com/me", "http://example.com/omp" );
+            "This is a test property.", "http://example.com/me", "http://example.com/" );
       assertThat( property.getExampleValue() ).map( value -> value.as( ScalarValue.class ).getValue() ).contains( "Example Value" );
       assertThat( property.isOptional() ).isFalse();
       assertThat( property.getCharacteristic().get().getName() ).isEqualTo( "Text" );
@@ -91,7 +91,7 @@ public void testOptionalPropertyInstantiationExpectSuccess( final KnownVersion m
       final Property property = aspect.getProperties().get( 0 );
 
       assertBaseAttributes( property, expectedAspectModelUrn, "testProperty", "Test Property",
-            "This is a test property.", "http://example.com/me", "http://example.com/omp" );
+            "This is a test property.", "http://example.com/me", "http://example.com/" );
 
       assertThat( property.getExampleValue() ).isEmpty();
       assertThat( property.isOptional() ).isTrue();
@@ -111,7 +111,7 @@ public void testNotInPayloadPropertyInstantiationExpectSuccess( final KnownVersi
       final Property property = entity.getProperties().get( 1 );
 
       assertBaseAttributes( property, expectedAspectModelUrn, "description", "Test Property",
-            "This is a test property.", "http://example.com/me", "http://example.com/omp" );
+            "This is a test property.", "http://example.com/me", "http://example.com/" );
 
       assertThat( property.getExampleValue() ).isEmpty();
       assertThat( property.isOptional() ).isFalse();
@@ -130,7 +130,7 @@ public void testPropertyWithPayloadNameInstantiationExpectSuccess( final KnownVe
       final Property property = aspect.getProperties().get( 0 );
 
       assertBaseAttributes( property, expectedAspectModelUrn, "testProperty", "Test Property",
-            "This is a test property.", "http://example.com/me", "http://example.com/omp" );
+            "This is a test property.", "http://example.com/me", "http://example.com/" );
 
       assertThat( property.getExampleValue() ).isEmpty();
       assertThat( property.isOptional() ).isFalse();
@@ -150,7 +150,7 @@ public void testEitherCharacteristicInstantiationExpectSuccess( final KnownVersi
       final Either either = (Either) aspect.getProperties().get( 0 ).getCharacteristic().get();
 
       assertBaseAttributes( either, expectedAspectModelUrn, "TestEither",
-            "Test Either", "This is a test Either.", "http://example.com/omp" );
+            "Test Either", "This is a test Either.", "http://example.com/" );
 
       Assertions.assertThat( either.getDataType() ).isNotPresent();
       Assertions.assertThat( either.getLeft().getName() ).isEqualTo( "Text" );
@@ -168,7 +168,7 @@ public void testSingleEntityCharacteristicInstantiationExpectSuccess( final Know
       final SingleEntity singleEntity = (SingleEntity) aspect.getProperties().get( 0 ).getCharacteristic().get();
 
       assertBaseAttributes( singleEntity, expectedAspectModelUrn, "EntityCharacteristic",
-            "Test Entity Characteristic", "This is a test Entity Characteristic", "http://example.com/omp" );
+            "Test Entity Characteristic", "This is a test Entity Characteristic", "http://example.com/" );
 
       Assertions.assertThat( singleEntity.getDataType().get() ).isInstanceOf( Entity.class );
    }
@@ -216,7 +216,7 @@ public void testCodeCharacteristicInstantiationExpectSuccess( final KnownVersion
       final Code code = (Code) aspect.getProperties().get( 0 ).getCharacteristic().get();
 
       assertBaseAttributes( code, expectedAspectModelUrn, "TestCode",
-            "Test Code", "This is a test code.", "http://example.com/omp" );
+            "Test Code", "This is a test code.", "http://example.com/" );
 
       final Scalar scalar = (Scalar) code.getDataType().get();
       assertThat( scalar.getUrn() ).isEqualTo( XSD.xint.getURI() );
@@ -230,7 +230,7 @@ public void testCollectionAspectInstantiationExpectSuccess( final KnownVersion m
 
       assertBaseAttributes( aspect, expectedAspectModelUrn, "AspectWithList", "Test Aspect",
             "This is a test description",
-            "http://example.com/omp" );
+            "http://example.com/" );
 
       assertThat( aspect.getProperties() ).hasSize( 1 );
       assertThat( aspect.isCollectionAspect() ).isTrue();
@@ -245,7 +245,7 @@ public void testAspectWithTwoCollectionsInstantiationExpectSuccess( final KnownV
 
       assertBaseAttributes( aspect, expectedAspectModelUrn, "AspectWithTwoLists", "Test Aspect",
             "This is a test description",
-            "http://example.com/omp" );
+            "http://example.com/" );
 
       assertThat( aspect.getProperties() ).hasSize( 2 );
       assertThat( aspect.isCollectionAspect() ).isFalse();
@@ -259,7 +259,7 @@ public void testAspectWithListAndAdditionalPropertyInstantiationExpectSuccess( f
       final AspectModelUrn expectedAspectModelUrn = TestAspect.ASPECT_WITH_LIST_AND_ADDITIONAL_PROPERTY.getUrn();
 
       assertBaseAttributes( aspect, expectedAspectModelUrn, "AspectWithListAndAdditionalProperty",
-            "Test Aspect", "This is a test description", "http://example.com/omp" );
+            "Test Aspect", "This is a test description", "http://example.com/" );
 
       assertThat( aspect.getProperties() ).hasSize( 2 );
       assertThat( aspect.isCollectionAspect() ).isTrue();