Merge branch 'main' into 2.1.x

Author: atextor

core/sds-aspect-meta-model-interface/src/main/java/io/openmanufacturing/sds/aspectmodel/UnsupportedVersionException.java

@@ -21,10 +21,10 @@ public UnsupportedVersionException() {
    }
 
    public UnsupportedVersionException( final VersionNumber versionNumber ) {
-      super( "Cannot find version " + versionNumber );
+      super( "Meta model version " + versionNumber + " is not supported");
    }
 
    public UnsupportedVersionException( final String versionNumber ) {
-      super( "Cannot find version " + versionNumber );
+      super( "Meta model version " + versionNumber + " is not supported");
    }
 }

core/sds-aspect-meta-model-interface/src/main/java/io/openmanufacturing/sds/aspectmodel/resolver/services/VersionedModel.java

@@ -46,7 +46,7 @@ public Model getModel() {
       return model;
    }
 
-   public VersionNumber getVersion() {
+   public VersionNumber getMetaModelVersion() {
       return version;
    }
 

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/Code.java renamed to core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/characteristic/Code.java

@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
+ * Copyright (c) 2022 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
@@ -11,7 +11,9 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-package io.openmanufacturing.sds.metamodel;
+package io.openmanufacturing.sds.characteristic;
+
+import io.openmanufacturing.sds.metamodel.Characteristic;
 
 /**
  * Describes a Property which contains any kind of code.

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/Collection.java renamed to core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/characteristic/Collection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
+ * Copyright (c) 2022 Robert Bosch Manufacturing Solutions GmbH
  *
  * See the AUTHORS file(s) distributed with this work for additional
  * information regarding authorship.
@@ -11,19 +11,19 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-package io.openmanufacturing.sds.metamodel;
+package io.openmanufacturing.sds.characteristic;
 
 import java.util.Optional;
 
+import io.openmanufacturing.sds.metamodel.Characteristic;
+import io.openmanufacturing.sds.metamodel.CollectionValue;
+
 /**
  * A group of values which may be either of a simple or complex type. The values may be duplicated and are not ordered.
  *
  * @since BAMM 1.0.0
  */
 public interface Collection extends Characteristic {
-   enum CollectionType {
-      COLLECTION, SET, SORTEDSET, LIST
-   }
 
    /**
     * @return a {@link boolean} which determines whether the elements in the collection are ordered.
@@ -44,5 +44,5 @@ default Optional<Characteristic> getElementCharacteristic() {
       return Optional.empty();
    }
 
-   CollectionType getCollectionType();
+   CollectionValue.CollectionType getCollectionType();
 }

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/Duration.java renamed to core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/characteristic/Duration.java

@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
+ * Copyright (c) 2022 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
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-package io.openmanufacturing.sds.metamodel;
+package io.openmanufacturing.sds.characteristic;
 
 /**
  * A time duration according to ISO 8601.

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/Either.java renamed to core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/characteristic/Either.java

@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
+ * Copyright (c) 2022 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
@@ -11,7 +11,9 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-package io.openmanufacturing.sds.metamodel;
+package io.openmanufacturing.sds.characteristic;
+
+import io.openmanufacturing.sds.metamodel.Characteristic;
 
 /**
  * Describes a Property whose value can have one of two possible types (a disjoint union).

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/Enumeration.java renamed to core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/characteristic/Enumeration.java

@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
+ * Copyright (c) 2022 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
@@ -11,10 +11,14 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-package io.openmanufacturing.sds.metamodel;
+package io.openmanufacturing.sds.characteristic;
 
 import java.util.List;
 
+import io.openmanufacturing.sds.metamodel.Characteristic;
+import io.openmanufacturing.sds.metamodel.Type;
+import io.openmanufacturing.sds.metamodel.Value;
+
 /**
  * A list of possible values.
  *

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/List.java renamed to core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/characteristic/List.java

@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
+ * Copyright (c) 2022 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
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-package io.openmanufacturing.sds.metamodel;
+package io.openmanufacturing.sds.characteristic;
 
 /**
  * A collection which may contain duplicates and is ordered.

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/Measurement.java renamed to core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/characteristic/Measurement.java

@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
+ * Copyright (c) 2022 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
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-package io.openmanufacturing.sds.metamodel;
+package io.openmanufacturing.sds.characteristic;
 
 /**
  * A value which can be measured and has a unit.

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/Quantifiable.java renamed to core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/characteristic/Quantifiable.java

@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
+ * Copyright (c) 2022 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
@@ -11,10 +11,13 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-package io.openmanufacturing.sds.metamodel;
+package io.openmanufacturing.sds.characteristic;
 
 import java.util.Optional;
 
+import io.openmanufacturing.sds.metamodel.Characteristic;
+import io.openmanufacturing.sds.metamodel.Unit;
+
 /**
  * A value which can be quantified and may have a unit.
  *