Refactors package structure to better reflect public API (#246)

* Refactors package structure to better reflect public API * Fixes wrong names in ReflectionHelper --------- Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
eclipse-aas4j · Feb 9, 2024 · 4c56bbe · 4c56bbe
1 parent 2abf04b
commit 4c56bbe
Show file tree

Hide file tree

Showing 113 changed files with 231 additions and 198 deletions.
diff --git a/...aasx/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/AASXDeserializer.java b/...aasx/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/AASXDeserializer.java
@@ -31,8 +31,8 @@
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
 import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.DeserializationException;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.internal.AASXUtils;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.DeserializationException;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlDeserializer;
 import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
 import org.eclipse.digitaltwin.aas4j.v3.model.File;

diff --git a/...t-aasx/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/AASXSerializer.java b/...t-aasx/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/AASXSerializer.java
@@ -31,8 +31,8 @@
 import org.apache.poi.openxml4j.opc.RelationshipSource;
 import org.apache.poi.openxml4j.opc.TargetMode;
 import org.apache.poi.openxml4j.opc.internal.MemoryPackagePart;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.internal.AASXUtils;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.SerializationException;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlSerializer;
 import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
 import org.eclipse.digitaltwin.aas4j.v3.model.File;

diff --git a/...rg/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/deserialization/AASXDeserializerTest.java b/...rg/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/deserialization/AASXDeserializerTest.java
@@ -31,12 +31,12 @@
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.DeserializationException;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXDeserializer;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXSerializer;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.InMemoryFile;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.AASSimple;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.DeserializationException;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.SerializationException;
 import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
 import org.eclipse.digitaltwin.aas4j.v3.model.File;
 import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;

diff --git a/...java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/deserialization/ValidationTest.java b/...java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/deserialization/ValidationTest.java
@@ -16,12 +16,12 @@
 package org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.deserialization;
 
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.DeserializationException;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXSerializer;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXValidator;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.InMemoryFile;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.AASSimple;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.DeserializationException;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.SerializationException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;

diff --git a/...va/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/serialization/AASXSerializerTest.java b/...va/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/serialization/AASXSerializerTest.java
@@ -16,10 +16,10 @@
 package org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.serialization;
 
 
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXSerializer;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.InMemoryFile;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.AASSimple;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.SerializationException;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/.../dataformat/DeserializationException.java → ...format/core/DeserializationException.java b/.../dataformat/DeserializationException.java → ...format/core/DeserializationException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.core;
 
 @SuppressWarnings("serial")
 public class DeserializationException extends Exception {

diff --git a/.../aas4j/v3/dataformat/SchemaValidator.java → ...j/v3/dataformat/core/SchemaValidator.java b/.../aas4j/v3/dataformat/SchemaValidator.java → ...j/v3/dataformat/core/SchemaValidator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.core;
 
 import java.util.Set;
 

diff --git a/...v3/dataformat/SerializationException.java → ...taformat/core/SerializationException.java b/...v3/dataformat/SerializationException.java → ...taformat/core/SerializationException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.core;
 
 @SuppressWarnings("serial")
 public class SerializationException extends Exception {

diff --git a/...ore/deserialization/EnumDeserializer.java → ...nal/deserialization/EnumDeserializer.java b/...ore/deserialization/EnumDeserializer.java → ...nal/deserialization/EnumDeserializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.core.deserialization;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.deserialization;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;

diff --git a/...at/core/serialization/EnumSerializer.java → ...nternal/serialization/EnumSerializer.java b/...at/core/serialization/EnumSerializer.java → ...nternal/serialization/EnumSerializer.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.core.serialization;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.serialization;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.util.ReflectionHelper;
+
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.ReflectionHelper;
 import org.eclipse.digitaltwin.aas4j.v3.model.DataTypeDefXsd;
 import org.eclipse.digitaltwin.aas4j.v3.model.DataTypeIec61360;
 import org.eclipse.digitaltwin.aas4j.v3.model.Direction;

diff --git a/...ataformat/core/util/ReflectionHelper.java → .../core/internal/util/ReflectionHelper.java b/...ataformat/core/util/ReflectionHelper.java → .../core/internal/util/ReflectionHelper.java
@@ -13,19 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.core.util;
-
-import com.google.common.reflect.TypeToken;
-import io.github.classgraph.ClassGraph;
-import io.github.classgraph.ClassInfo;
-import io.github.classgraph.ClassInfoList;
-import io.github.classgraph.ScanResult;
-import org.apache.commons.lang3.ClassUtils;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.MostSpecificTypeTokenComparator;
-import org.eclipse.digitaltwin.aas4j.v3.model.DataSpecificationContent;
-import org.eclipse.digitaltwin.aas4j.v3.model.Referable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -37,6 +25,19 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.ClassUtils;
+import org.eclipse.digitaltwin.aas4j.v3.model.DataSpecificationContent;
+import org.eclipse.digitaltwin.aas4j.v3.model.Referable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.reflect.TypeToken;
+
+import io.github.classgraph.ClassGraph;
+import io.github.classgraph.ClassInfo;
+import io.github.classgraph.ClassInfoList;
+import io.github.classgraph.ScanResult;
+
 /**
  * Helper class to collect relevant data needed for
  * ReflectionAnnotationIntrospector via reflection.
@@ -58,12 +59,12 @@ public class ReflectionHelper {
      * Name of package where the json mixins are defined. These mixins are
      * automatically added to JsonSerializer and JsonDeserializer.
      */
-    public static final String JSON_MIXINS_PACKAGE_NAME = ROOT_PACKAGE_NAME + ".dataformat.json.mixins";
+	public static final String JSON_MIXINS_PACKAGE_NAME = ROOT_PACKAGE_NAME + ".dataformat.json.internal.mixins";
     /**
      * Name of package where the xml mixins are defined. These mixins are
      * automatically added to XmlSerializer and XmlDeserializer.
      */
-    public static final String XML_MIXINS_PACKAGE_NAME = ROOT_PACKAGE_NAME + ".dataformat.xml.mixins";
+	public static final String XML_MIXINS_PACKAGE_NAME = ROOT_PACKAGE_NAME + ".dataformat.xml.internal.mixins";
     /**
      * Suffix that identifies a class as a mixin.
      */

diff --git a/...at-core/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/core/util/AasUtils.java b/...at-core/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/core/util/AasUtils.java
@@ -23,30 +23,31 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.deserialization.EnumDeserializer;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.deserialization.EnumDeserializer;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.serialization.EnumSerializer;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.GetChildrenVisitor;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.GetIdentifierVisitor;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.MostSpecificTypeTokenComparator;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.serialization.EnumSerializer;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.ReflectionHelper;
 import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
 import org.eclipse.digitaltwin.aas4j.v3.model.Identifiable;
 import org.eclipse.digitaltwin.aas4j.v3.model.Key;
 import org.eclipse.digitaltwin.aas4j.v3.model.KeyTypes;
 import org.eclipse.digitaltwin.aas4j.v3.model.Referable;
 import org.eclipse.digitaltwin.aas4j.v3.model.Reference;
 import org.eclipse.digitaltwin.aas4j.v3.model.ReferenceTypes;
+import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement;
+import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElementList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.reflect.TypeToken;
-import java.util.Map;
-import java.util.Objects;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.GetChildrenVisitor;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.GetIdentifierVisitor;
-import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement;
-import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElementList;
 
 /**
  * Provides utility functions related to AAS
@@ -55,8 +56,6 @@ public class AasUtils {
 
     private static final Logger log = LoggerFactory.getLogger(AasUtils.class);
 
-    private static final String REFERENCE_ELEMENT_DELIMITER = ", ";
-
     private static final Map<ReferenceTypes, String> REFERENCE_TYPE_REPRESENTATION = Map.of(
             ReferenceTypes.EXTERNAL_REFERENCE, "ExternalRef",
             ReferenceTypes.MODEL_REFERENCE, "ModelRef");

diff --git a/.../src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/core/EnumDeserializerTest.java b/.../src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/core/EnumDeserializerTest.java
@@ -18,7 +18,8 @@
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.deserialization.EnumDeserializer;
+
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.deserialization.EnumDeserializer;
 import org.eclipse.digitaltwin.aas4j.v3.model.DataTypeIec61360;
 import org.eclipse.digitaltwin.aas4j.v3.model.Direction;
 import org.eclipse.digitaltwin.aas4j.v3.model.StateOfEvent;

diff --git a/...re/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/core/EnumSerializerTest.java b/...re/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/core/EnumSerializerTest.java
@@ -18,7 +18,8 @@
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.serialization.EnumSerializer;
+
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.serialization.EnumSerializer;
 import org.eclipse.digitaltwin.aas4j.v3.model.DataTypeIec61360;
 import org.eclipse.digitaltwin.aas4j.v3.model.Direction;
 import org.eclipse.digitaltwin.aas4j.v3.model.ModellingKind;

diff --git a/...json/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonDeserializer.java b/...json/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonDeserializer.java
@@ -23,7 +23,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.DeserializationException;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.DeserializationException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;

diff --git a/...son/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonMapperFactory.java b/...son/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonMapperFactory.java
@@ -19,9 +19,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.deserialization.EnumDeserializer;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.serialization.EnumSerializer;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.util.ReflectionHelper;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.deserialization.EnumDeserializer;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.serialization.EnumSerializer;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.ReflectionHelper;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.json.internal.ReflectionAnnotationIntrospector;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/...n/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSchemaValidator.java b/...n/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSchemaValidator.java
@@ -22,7 +22,6 @@
 import com.networknt.schema.JsonSchemaFactory;
 import com.networknt.schema.SpecVersionDetector;
 import com.networknt.schema.ValidationMessage;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.SchemaValidator;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -31,6 +30,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.SchemaValidator;
+
 /**
  * Class for validating a serialized instance of AssetAdministrationShellEnvironment against a json-schema.
  */

diff --git a/...t-json/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSerializer.java b/...t-json/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSerializer.java
@@ -24,7 +24,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.SerializationException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;

diff --git a/...a/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/SimpleAbstractTypeResolverFactory.java b/...a/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/SimpleAbstractTypeResolverFactory.java
@@ -16,7 +16,7 @@
 
 package org.eclipse.digitaltwin.aas4j.v3.dataformat.json;
 
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.util.ReflectionHelper;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.ReflectionHelper;
 
 import com.fasterxml.jackson.databind.module.SimpleAbstractTypeResolver;
 

diff --git a/...lipse/digitaltwin/aas4j/v3/dataformat/json/internal/ReflectionAnnotationIntrospector.java b/...lipse/digitaltwin/aas4j/v3/dataformat/json/internal/ReflectionAnnotationIntrospector.java
@@ -25,12 +25,13 @@
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.util.ReflectionHelper;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.ReflectionHelper;
+
 /**
  * This class helps to dynamically decide how to de-/serialize classes and
  * properties defined in the AAS model library.

diff --git a/...mixins/AssetAdministrationShellMixin.java → ...mixins/AssetAdministrationShellMixin.java b/...mixins/AssetAdministrationShellMixin.java → ...mixins/AssetAdministrationShellMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.mixins;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.internal.mixins;
 
 import org.eclipse.digitaltwin.aas4j.v3.model.AssetInformation;
 

diff --git a/...at/json/mixins/AssetInformationMixin.java → ...nternal/mixins/AssetInformationMixin.java b/...at/json/mixins/AssetInformationMixin.java → ...nternal/mixins/AssetInformationMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.mixins;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.internal.mixins;
 
 import org.eclipse.digitaltwin.aas4j.v3.model.AssetKind;
 

diff --git a/.../v3/dataformat/json/mixins/BlobMixin.java → ...ormat/json/internal/mixins/BlobMixin.java b/.../v3/dataformat/json/mixins/BlobMixin.java → ...ormat/json/internal/mixins/BlobMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.mixins;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.internal.mixins;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

diff --git a/...ixins/DataSpecificationIec61360Mixin.java → ...ixins/DataSpecificationIec61360Mixin.java b/...ixins/DataSpecificationIec61360Mixin.java → ...ixins/DataSpecificationIec61360Mixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.mixins;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.internal.mixins;
 
 import java.util.List;
 

diff --git a/...dataformat/json/mixins/EndpointMixin.java → ...t/json/internal/mixins/EndpointMixin.java b/...dataformat/json/mixins/EndpointMixin.java → ...t/json/internal/mixins/EndpointMixin.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.mixins;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.internal.mixins;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...3/dataformat/json/mixins/EntityMixin.java → ...mat/json/internal/mixins/EntityMixin.java b/...3/dataformat/json/mixins/EntityMixin.java → ...mat/json/internal/mixins/EntityMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.mixins;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.internal.mixins;
 
 import org.eclipse.digitaltwin.aas4j.v3.model.EntityType;
 

diff --git a/...aformat/json/mixins/EnvironmentMixin.java → ...son/internal/mixins/EnvironmentMixin.java b/...aformat/json/mixins/EnvironmentMixin.java → ...son/internal/mixins/EnvironmentMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.mixins;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.internal.mixins;
 
 import java.util.List;
 import java.util.Set;

diff --git a/...ataformat/json/mixins/ExtensionMixin.java → .../json/internal/mixins/ExtensionMixin.java b/...ataformat/json/mixins/ExtensionMixin.java → .../json/internal/mixins/ExtensionMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.mixins;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.internal.mixins;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

diff --git a/.../v3/dataformat/json/mixins/FileMixin.java → ...ormat/json/internal/mixins/FileMixin.java b/.../v3/dataformat/json/mixins/FileMixin.java → ...ormat/json/internal/mixins/FileMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.mixins;
+package org.eclipse.digitaltwin.aas4j.v3.dataformat.json.internal.mixins;
 
 import com.fasterxml.jackson.annotation.JsonInclude;