Build(deps): Bump openapitools.version from 6.6.0 to 7.23.0 (#981)

dependabot[bot] · aaronzi · web-flow · commit 077e91fa22d2 · 2026-06-27T23:49:40.000+02:00
* Build(deps): Bump openapitools.version from 6.6.0 to 7.23.0 Bumps `openapitools.version` from 6.6.0 to 7.23.0. Updates `org.openapitools:openapi-generator` from 6.6.0 to 7.23.0 - [Release notes](https://github.com/openapitools/openapi-generator/releases) - [Changelog](https://github.com/OpenAPITools/openapi-generator/blob/master/docs/release-summary.md) - [Commits](OpenAPITools/openapi-generator@v6.6.0...v7.23.0) Updates `org.openapitools:openapi-generator-maven-plugin` from 6.6.0 to 7.23.0 --- updated-dependencies: - dependency-name: org.openapitools:openapi-generator dependency-version: 7.20.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.openapitools:openapi-generator-maven-plugin dependency-version: 7.20.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Fixes necessary for the new version * Fixes remaining testfailures --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aaron Zielstorff <aaron.zielstorff@iese.fraunhofer.de>
diff --git a/basyx.aasregistry/basyx.aasregistry-client-native/pom.xml b/basyx.aasregistry/basyx.aasregistry-client-native/pom.xml
@@ -87,9 +87,11 @@
 							<generateSupportingFiles>true</generateSupportingFiles>
 							<templateDirectory>${project.basedir}/templates</templateDirectory>
 							<supportingFilesToGenerate>
-								AbstractOpenApiSchema.java,ServerConfiguration.java,ServerVariable.java,Configuration.java,JSON.java,ApiException.java,ApiResponse.java,ApiClient.java,Pair.java,RFC3339DateFormat.java
+								AbstractOpenApiSchema.java,ServerConfiguration.java,ServerVariable.java,Configuration.java,JSON.java,ApiException.java,ApiResponse.java,ApiClient.java,Pair.java,RFC3339DateFormat.java,RFC3339InstantDeserializer.java,RFC3339JavaTimeModule.java
 							</supportingFilesToGenerate>
 							<configOptions>
+								<enumPropertyNaming>legacy</enumPropertyNaming>
+								<containerDefaultToNull>true</containerDefaultToNull>
 								<java8>true</java8>
 								<dateLibrary>java8</dateLibrary>
 								<sourceFolder>java</sourceFolder>
diff --git a/basyx.aasregistry/basyx.aasregistry-client-native/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/main/client/mapper/AttributeMapperFixture.java b/basyx.aasregistry/basyx.aasregistry-client-native/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/main/client/mapper/AttributeMapperFixture.java
@@ -103,7 +103,7 @@ public class AttributeMapperFixture {
 
 	// Extension AasRegistry
 	private static final org.eclipse.digitaltwin.basyx.aasregistry.client.model.Extension AAS_REG_EXTENSION = new org.eclipse.digitaltwin.basyx.aasregistry.client.model.Extension().semanticId(AAS_REG_DATASPECIFICATION).name("extension")
-			.valueType(DataTypeDefXsd.STRING).value("extensionValue");
+			.valueType(DataTypeDefXsd.XS_STRING).value("extensionValue");
 
 	// ExternalSubjectId AAS4J
 	private static final Reference AAS4J_EXTERNAL_SUBJECT_ID = new DefaultReference.Builder().keys(new DefaultKey.Builder().type(KeyTypes.BLOB).value("BlobValue").build()).type(ReferenceTypes.EXTERNAL_REFERENCE).build();
diff --git a/basyx.aasregistry/basyx.aasregistry-feature-hierarchy/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/feature/hierarchy/LocalhostHierarchicalAasRegistryTest.java b/basyx.aasregistry/basyx.aasregistry-feature-hierarchy/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/feature/hierarchy/LocalhostHierarchicalAasRegistryTest.java
@@ -29,6 +29,7 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.web.server.context.WebServerApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 
 /**
@@ -39,26 +40,39 @@
  */
 public class LocalhostHierarchicalAasRegistryTest extends HierarchicalAasRegistryTestSuite {
 
-	private static final String ROOT_REGISTRY_URL = "http://localhost:8081";
-	private static final String DELEGATED_REGISTRY_URL = "http://localhost:8050";
-
 	private static final String REPO_BASE_URL = "http://localhost:8080";
-	private static final String DELEGATED_AASID = "http://localhost:8050/test/aas";
 
-	private static final RegistryAndDiscoveryInterfaceApi rootRegistryApi = new RegistryAndDiscoveryInterfaceApi(ROOT_REGISTRY_URL);
-	private static final RegistryAndDiscoveryInterfaceApi delegatedRegistryApi = new RegistryAndDiscoveryInterfaceApi(DELEGATED_REGISTRY_URL);
-	private static final DummyDescriptorFactory factory = new DummyDescriptorFactory(REPO_BASE_URL, DELEGATED_AASID);
+	private static RegistryAndDiscoveryInterfaceApi rootRegistryApi;
+	private static RegistryAndDiscoveryInterfaceApi delegatedRegistryApi;
+	private static DummyDescriptorFactory factory;
 
-	private static ConfigurableApplicationContext appContext;
+	private static ConfigurableApplicationContext rootAppContext;
+	private static ConfigurableApplicationContext delegatedAppContext;
 
 	@BeforeClass
-	public static void setupRootRegistry() {
-		appContext = new SpringApplication(DummyAasRegistryComponent.class).run(new String[] {});
+	public static void setupRegistries() {
+		delegatedAppContext = new SpringApplication(DummyAasRegistryComponent.class).run(new String[] { "--server.port=0", "--basyx.feature.hierarchy.enabled=false" });
+		rootAppContext = new SpringApplication(DummyAasRegistryComponent.class).run(new String[] { "--server.port=0" });
+
+		String rootRegistryUrl = localUrl(rootAppContext);
+		String delegatedRegistryUrl = localUrl(delegatedAppContext);
+
+		rootRegistryApi = new RegistryAndDiscoveryInterfaceApi(rootRegistryUrl);
+		delegatedRegistryApi = new RegistryAndDiscoveryInterfaceApi(delegatedRegistryUrl);
+		factory = new DummyDescriptorFactory(REPO_BASE_URL, delegatedRegistryUrl + "/test/aas");
 	}
 
 	@AfterClass
-	public static void tearDownRootRegistry() {
-		appContext.close();
+	public static void tearDownRegistries() {
+		if (rootAppContext != null)
+			rootAppContext.close();
+
+		if (delegatedAppContext != null)
+			delegatedAppContext.close();
+	}
+
+	private static String localUrl(ConfigurableApplicationContext applicationContext) {
+		return "http://localhost:" + ((WebServerApplicationContext) applicationContext).getWebServer().getPort();
 	}
 
 	@Override
diff --git a/basyx.aasregistry/basyx.aasregistry-service-basemodel/pom.xml b/basyx.aasregistry/basyx.aasregistry-service-basemodel/pom.xml
@@ -79,6 +79,8 @@
 							<output>${project.basedir}/${generated.folder}</output>
 
 							<configOptions>
+								<enumPropertyNaming>legacy</enumPropertyNaming>
+								<containerDefaultToNull>true</containerDefaultToNull>
 								<java8>true</java8>
 								<dateLibrary>java8</dateLibrary>
 								<sourceFolder>java</sourceFolder>
diff --git a/basyx.aasregistry/basyx.aasregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/AasRegistryStorageTest.java b/basyx.aasregistry/basyx.aasregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/AasRegistryStorageTest.java
@@ -63,7 +63,7 @@ public void whenRegisterSubmodelDescriptorNullModel_thenNullPointer() {
 	@Test
 	public void whenRegisterSubmodelDescriptorUnknownId_thenThrowNotFound() {
 		List<AssetAdministrationShellDescriptor> initialState = getAllAasDescriptors();
-		SubmodelDescriptor ignored = new SubmodelDescriptor("ignored", List.of());
+		SubmodelDescriptor ignored = submodelDescriptor("ignored");
 		assertThrows(AasDescriptorNotFoundException.class, () -> storage.insertSubmodel(UNKNOWN, ignored));
 		List<AssetAdministrationShellDescriptor> currentState = getAllAasDescriptors();
 		assertThat(currentState).isEqualTo(initialState);
@@ -75,7 +75,7 @@ public void whenRegisterSubmodelDescriptorAndWasAlreadyPresent_thenElementIsOver
 		List<AssetAdministrationShellDescriptor> initialState = getAllAasDescriptors();
 		List<AssetAdministrationShellDescriptor> expected = testResourcesLoader.loadList(AssetAdministrationShellDescriptor.class);
 		assertThat(initialState).isNotEqualTo(expected);
-		SubmodelDescriptor toAdd = new SubmodelDescriptor(IDENTIFICATION_2_2, List.of()).addDescriptionItem(new LangStringTextType("de-DE", "Overridden"));
+		SubmodelDescriptor toAdd = submodelDescriptor(IDENTIFICATION_2_2).addDescriptionItem(new LangStringTextType("de-DE", "Overridden"));
 		storage.replaceSubmodel(IDENTIFICATION_2, toAdd.getId(), toAdd);
 		List<AssetAdministrationShellDescriptor> newState = getAllAasDescriptors();
 		assertThat(newState).asList().isNotEqualTo(initialState).containsExactlyInAnyOrderElementsOf(expected);
@@ -87,7 +87,7 @@ public void whenRegisterSubmodelDescriptorAndWasNotAlreadyPresent_thenElementIsA
 		List<AssetAdministrationShellDescriptor> initialState = getAllAasDescriptors();
 		List<AssetAdministrationShellDescriptor> expected = testResourcesLoader.loadList(AssetAdministrationShellDescriptor.class);
 		assertThat(initialState).isNotEqualTo(expected);
-		SubmodelDescriptor toAdd = new SubmodelDescriptor(IDENTIFICATION_2_3, List.of());
+		SubmodelDescriptor toAdd = submodelDescriptor(IDENTIFICATION_2_3);
 
 		// RegistryTestObjects.addDefaultEndpoint(toAdd);
 		storage.insertSubmodel(IDENTIFICATION_2, toAdd);
@@ -295,7 +295,7 @@ public void whenRegisterAssetAdministrationShellDescriptor_thenStored() throws I
 		List<AssetAdministrationShellDescriptor> expected = testResourcesLoader.loadList(AssetAdministrationShellDescriptor.class);
 		assertThat(initialState).isNotEqualTo(expected);
 		AssetAdministrationShellDescriptor testResource = new AssetAdministrationShellDescriptor(IDENTIFICATION_NEW);
-		SubmodelDescriptor subModel = new SubmodelDescriptor(IDENTIFICATION_NEW_1, List.of());
+		SubmodelDescriptor subModel = submodelDescriptor(IDENTIFICATION_NEW_1);
 		testResource.setSubmodelDescriptors(Collections.singletonList(subModel));
 		storage.insertAasDescriptor(testResource);
 		List<AssetAdministrationShellDescriptor> newState = getAllAasDescriptors();
@@ -402,25 +402,25 @@ public void whenTryToReplaceUnknownDescriptor_thenThrowException() {
 
 	@Test
 	public void whenInsertSubmodelAndAlreadyExists_thenThrowException() {
-		SubmodelDescriptor descr = new SubmodelDescriptor(IDENTIFICATION_2_1, List.of());
+		SubmodelDescriptor descr = submodelDescriptor(IDENTIFICATION_2_1);
 		assertThrows(SubmodelAlreadyExistsException.class, () -> storage.insertSubmodel(IDENTIFICATION_2, descr));
 	}
 
 	@Test
 	public void whenInsertSubmodelAndAasDescriptorNotFound_thenThrowException() {
-		SubmodelDescriptor descr = new SubmodelDescriptor(IDENTIFICATION_2_1, List.of());
+		SubmodelDescriptor descr = submodelDescriptor(IDENTIFICATION_2_1);
 		assertThrows(AasDescriptorNotFoundException.class, () -> storage.insertSubmodel(UNKNOWN, descr));
 	}
 
 	@Test
 	public void whenReplaceSubmodelAndNotAvailable_thenThrowException() {
-		SubmodelDescriptor descr = new SubmodelDescriptor(UNKNOWN, List.of());
+		SubmodelDescriptor descr = submodelDescriptor(UNKNOWN);
 		assertThrows(SubmodelNotFoundException.class, () -> storage.replaceSubmodel(IDENTIFICATION_1, UNKNOWN, descr));
 	}
 
 	@Test
 	public void whenReplaceSubmodelAndDescriptorNotAvailable_thenThrowException() {
-		SubmodelDescriptor descr = new SubmodelDescriptor(UNKNOWN, List.of());
+		SubmodelDescriptor descr = submodelDescriptor(UNKNOWN);
 		assertThrows(DescriptorNotFoundException.class, () -> storage.replaceSubmodel(UNKNOWN, UNKNOWN, descr));
 	}
 
@@ -431,16 +431,20 @@ public void whenInsertAasDescriptorAndDescriptorAlreadyAvailable_thenThrowExcept
 
 	@Test
 	public void whenReplaceSubmodelAndWithDifferentId_thenEventIsSent() throws IOException {
-		SubmodelDescriptor descr = new SubmodelDescriptor(IDENTIFICATION_NEW, List.of());
+		SubmodelDescriptor descr = submodelDescriptor(IDENTIFICATION_NEW);
 		storage.replaceSubmodel(IDENTIFICATION_2, IDENTIFICATION_2_1, descr);
 		verifyEventsSent();
 	}
 
 	@Test
 	public void whenReplaceSubmodelButNotFound_thenThrowNotFound() {
-		SubmodelDescriptor sm = new SubmodelDescriptor(IDENTIFICATION_NEW, List.of());
+		SubmodelDescriptor sm = submodelDescriptor(IDENTIFICATION_NEW);
 		assertThrows(SubmodelNotFoundException.class, () -> storage.replaceSubmodel(IDENTIFICATION_1, IDENTIFICATION_NEW, sm));
 		verifyNoEventSent();
 	}
 
-}
+	private static SubmodelDescriptor submodelDescriptor(String id) {
+		return new SubmodelDescriptor().id(id);
+	}
+
+}
diff --git a/basyx.aasregistry/basyx.aasregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/integration/BaseIntegrationTest.java b/basyx.aasregistry/basyx.aasregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/integration/BaseIntegrationTest.java
@@ -48,7 +48,6 @@
 import org.eclipse.digitaltwin.basyx.aasregistry.client.model.AdministrativeInformation;
 import org.eclipse.digitaltwin.basyx.aasregistry.client.model.AssetAdministrationShellDescriptor;
 import org.eclipse.digitaltwin.basyx.aasregistry.client.model.AssetKind;
-import org.eclipse.digitaltwin.basyx.aasregistry.client.model.DataSpecificationContent;
 import org.eclipse.digitaltwin.basyx.aasregistry.client.model.DataSpecificationIec61360;
 import org.eclipse.digitaltwin.basyx.aasregistry.client.model.DataTypeIec61360;
 import org.eclipse.digitaltwin.basyx.aasregistry.client.model.EmbeddedDataSpecification;
@@ -564,7 +563,7 @@ public void whenSendFullObjectStructure_ItemIsProcessedProperly() throws ApiExce
 		dsContent.addDefinitionItem(new LangStringDefinitionTypeIec61360().language(LANG_DE_DE).text("def")).addPreferredNameItem(new LangStringPreferredNameTypeIec61360().language(LANG_DE_DE).text("prefName"))
 				.addShortNameItem(new LangStringShortNameTypeIec61360().language(LANG_DE_DE).text("sn")).dataType(DataTypeIec61360.FILE).levelType(new LevelType().max(true).min(false).nom(false).typ(true)).sourceOfDefinition("sod")
 				.symbol("$$");
-		EmbeddedDataSpecification edSpec = new EmbeddedDataSpecification().dataSpecification(reference).dataSpecificationContent(new DataSpecificationContent(dsContent));
+		EmbeddedDataSpecification edSpec = new EmbeddedDataSpecification().dataSpecification(reference).dataSpecificationContent(dsContent);
 
 		AdministrativeInformation aInfo = new AdministrativeInformation().addEmbeddedDataSpecificationsItem(edSpec);
 		SubmodelDescriptor sm = new SubmodelDescriptor().id("sm").id("short").addDescriptionItem(dType).addDisplayNameItem(nType).addEndpointsItem(ep).addExtensionsItem(ext).addSupplementalSemanticIdsItem(reference);
@@ -680,4 +679,4 @@ private <O,I> O convert(I in, Class<I> inCls, Class<O> outCls) throws JsonProces
 		return mapper.readerFor(outCls).readValue(data);
 	}
 
-}
+}
diff --git a/basyx.aasregistry/basyx.aasregistry-service-inmemory-storage/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/InMemoryAasRegistyStorageTest.java b/basyx.aasregistry/basyx.aasregistry-service-inmemory-storage/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/InMemoryAasRegistyStorageTest.java
@@ -54,12 +54,12 @@ public AasRegistryStorage createCloningInMemoryStorage() {
 	@Test
 	public void whenInsertDescriptorWithDuplicateSubmodelIds_thenThrowException() throws IOException {
 		AssetAdministrationShellDescriptor descr = new AssetAdministrationShellDescriptor(IDENTIFICATION_NEW);
-		descr.addSubmodelDescriptorsItem(new SubmodelDescriptor(IDENTIFICATION_NEW_1, List.of()));
-		descr.addSubmodelDescriptorsItem(new SubmodelDescriptor(IDENTIFICATION_NEW_1, List.of()));
+		descr.addSubmodelDescriptorsItem(new SubmodelDescriptor().id(IDENTIFICATION_NEW_1));
+		descr.addSubmodelDescriptorsItem(new SubmodelDescriptor().id(IDENTIFICATION_NEW_1));
 		
 		assertThrows(DuplicateSubmodelIds.class, ()->storage.insertAasDescriptor(descr));
 		
 		verifyNoEventSent();
 	}
 
-}
+}
diff --git a/basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/pom.xml b/basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/pom.xml
@@ -100,6 +100,8 @@
 
 							<!-- See https://openapi-generator.tech/docs/generators/spring -->
 							<configOptions>
+								<enumPropertyNaming>legacy</enumPropertyNaming>
+								<containerDefaultToNull>true</containerDefaultToNull>
 								<openApiNullable>false</openApiNullable>
 								<java8>true</java8>
 								<dateLibrary>java8</dateLibrary>
diff --git a/basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/ProjectionTest.java b/basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/ProjectionTest.java
@@ -65,7 +65,7 @@ public void testSegmentBlockCollectorEndpointProtocolVersion() {
 	
 	@Test
 	public void testSegmentBlockCollectorDataSpecificationContentDefinition() {
-		String path = AasRegistryPaths.submodelDescriptors().administration().embeddedDataSpecifications().dataSpecificationContent().asDataSpecificationIec61360().definition().text();
+		String path = AasRegistryPaths.submodelDescriptors().administration().embeddedDataSpecifications().dataSpecificationContent().definition().text();
 		assertSegmentBlocksCreated(path, false, "submodelDescriptors", "administration.embeddedDataSpecifications", "dataSpecificationContent.definition", "text");
 	}
 	
diff --git a/basyx.aasregistry/basyx.aasregistry-service/pom.xml b/basyx.aasregistry/basyx.aasregistry-service/pom.xml
@@ -98,6 +98,8 @@
 							<templateDirectory>${project.basedir}/templates</templateDirectory>
 							<!-- See https://openapi-generator.tech/docs/generators/spring -->
 							<configOptions>
+								<enumPropertyNaming>legacy</enumPropertyNaming>
+								<containerDefaultToNull>true</containerDefaultToNull>
 								<java8>true</java8>
 								<dateLibrary>java8</dateLibrary>
 								<sourceFolder>java</sourceFolder>
diff --git a/basyx.aasregistry/pom.xml b/basyx.aasregistry/pom.xml
@@ -32,7 +32,7 @@
 		<maven-project.version>3.0-alpha-2</maven-project.version>
 		<mustache.compiler.version>0.9.14</mustache.compiler.version>
 		<docker.image.name>${project.artifactId}</docker.image.name>
-		<openapitools.version>6.6.0</openapitools.version>
+		<openapitools.version>7.23.0</openapitools.version>
 		<openapitools.jacksonnullable.version>0.2.9</openapitools.jacksonnullable.version>
 		<jsr305.version>3.0.2</jsr305.version>
 		<jsonpatch.plugin.version>0.5.1</jsonpatch.plugin.version>
@@ -104,7 +104,7 @@
 				</plugin>
 				<plugin>
 					<!-- If you want to override templates you can copy these:
-					https://github.com/OpenAPITools/openapi-generator/tree/v6.6.0/modules/openapi-generator/src/main/resources -->
+					https://github.com/OpenAPITools/openapi-generator/tree/v7.23.0/modules/openapi-generator/src/main/resources -->
 					<groupId>org.openapitools</groupId>
 					<artifactId>openapi-generator-maven-plugin</artifactId>
 					<version>${openapitools.version}</version>
diff --git a/basyx.submodelregistry/basyx.submodelregistry-client-native/pom.xml b/basyx.submodelregistry/basyx.submodelregistry-client-native/pom.xml
@@ -83,9 +83,11 @@
 							<generateSupportingFiles>true</generateSupportingFiles>
 							<templateDirectory>${project.basedir}/templates</templateDirectory>
 							<supportingFilesToGenerate>
-								AbstractOpenApiSchema.java,ServerConfiguration.java,ServerVariable.java,Configuration.java,JSON.java,ApiException.java,ApiResponse.java,ApiClient.java,Pair.java,RFC3339DateFormat.java
+								AbstractOpenApiSchema.java,ServerConfiguration.java,ServerVariable.java,Configuration.java,JSON.java,ApiException.java,ApiResponse.java,ApiClient.java,Pair.java,RFC3339DateFormat.java,RFC3339InstantDeserializer.java,RFC3339JavaTimeModule.java
 							</supportingFilesToGenerate>
 							<configOptions>
+								<enumPropertyNaming>legacy</enumPropertyNaming>
+								<containerDefaultToNull>true</containerDefaultToNull>
 								<java8>true</java8>
 								<dateLibrary>java8</dateLibrary>
 								<sourceFolder>java</sourceFolder>
diff --git a/basyx.submodelregistry/basyx.submodelregistry-client-native/src/test/java/org/eclipse/digitaltwin/basyx/submodelregistry/client/mapper/AttributeMapperFixture.java b/basyx.submodelregistry/basyx.submodelregistry-client-native/src/test/java/org/eclipse/digitaltwin/basyx/submodelregistry/client/mapper/AttributeMapperFixture.java
@@ -94,7 +94,7 @@ public class AttributeMapperFixture {
 
 	// Extension SMRegistry
 	private static final org.eclipse.digitaltwin.basyx.submodelregistry.client.model.Extension SUBMODEL_REG_EXTENSION = new org.eclipse.digitaltwin.basyx.submodelregistry.client.model.Extension().semanticId(SUBMODEL_REG_DATASPECIFICATION)
-			.name("extension").valueType(DataTypeDefXsd.STRING).value("extensionValue");
+			.name("extension").valueType(DataTypeDefXsd.XS_STRING).value("extensionValue");
 
 	public static List<LangStringTextType> getAas4jLangStringTextTypes() {
 		return Arrays.asList(AAS4J_LANG_STRING_TEXT_TYPE_1, AAS4J_LANG_STRING_TEXT_TYPE_2);
diff --git a/basyx.submodelregistry/basyx.submodelregistry-feature-hierarchy/src/test/java/org/eclipse/digitaltwin/basyx/submodelregistry/feature/hierarchy/LocalhostHierarchicalSubmodelRegistryTest.java b/basyx.submodelregistry/basyx.submodelregistry-feature-hierarchy/src/test/java/org/eclipse/digitaltwin/basyx/submodelregistry/feature/hierarchy/LocalhostHierarchicalSubmodelRegistryTest.java
@@ -29,6 +29,7 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.web.server.context.WebServerApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 
 /**
@@ -39,27 +40,39 @@
  */
 public class LocalhostHierarchicalSubmodelRegistryTest extends HierarchicalSubmodelRegistryTestSuite {
 
-	private static final String ROOT_REGISTRY_URL = "http://localhost:8081";
-	private static final String DELEGATED_REGISTRY_URL = "http://localhost:8060";
-
 	private static final String REPO_BASE_URL = "http://localhost:8080";
-	private static final String DELEGATED_SMID = "http://localhost:8060/test/sm";
-
-	private static final SubmodelRegistryApi rootRegistryApi = new SubmodelRegistryApi(ROOT_REGISTRY_URL);
-	private static final SubmodelRegistryApi delegatedRegistryApi = new SubmodelRegistryApi(DELEGATED_REGISTRY_URL);
 
-	private static final DummyDescriptorFactory factory = new DummyDescriptorFactory(REPO_BASE_URL, DELEGATED_SMID);
+	private static SubmodelRegistryApi rootRegistryApi;
+	private static SubmodelRegistryApi delegatedRegistryApi;
+	private static DummyDescriptorFactory factory;
 
-	private static ConfigurableApplicationContext appContext;
+	private static ConfigurableApplicationContext rootAppContext;
+	private static ConfigurableApplicationContext delegatedAppContext;
 
 	@BeforeClass
-	public static void setupRootRegistry() {
-		appContext = new SpringApplication(DummySubmodelRegistryComponent.class).run(new String[] {});
+	public static void setupRegistries() {
+		delegatedAppContext = new SpringApplication(DummySubmodelRegistryComponent.class).run(new String[] { "--server.port=0", "--basyx.feature.hierarchy.enabled=false" });
+		rootAppContext = new SpringApplication(DummySubmodelRegistryComponent.class).run(new String[] { "--server.port=0" });
+
+		String rootRegistryUrl = localUrl(rootAppContext);
+		String delegatedRegistryUrl = localUrl(delegatedAppContext);
+
+		rootRegistryApi = new SubmodelRegistryApi(rootRegistryUrl);
+		delegatedRegistryApi = new SubmodelRegistryApi(delegatedRegistryUrl);
+		factory = new DummyDescriptorFactory(REPO_BASE_URL, delegatedRegistryUrl + "/test/sm");
 	}
 
 	@AfterClass
-	public static void tearDownRootRegistry() {
-		appContext.close();
+	public static void tearDownRegistries() {
+		if (rootAppContext != null)
+			rootAppContext.close();
+
+		if (delegatedAppContext != null)
+			delegatedAppContext.close();
+	}
+
+	private static String localUrl(ConfigurableApplicationContext applicationContext) {
+		return "http://localhost:" + ((WebServerApplicationContext) applicationContext).getWebServer().getPort();
 	}
 
 	@Override
diff --git a/basyx.submodelregistry/basyx.submodelregistry-service-basemodel/pom.xml b/basyx.submodelregistry/basyx.submodelregistry-service-basemodel/pom.xml
@@ -79,6 +79,8 @@
 							<output>${project.basedir}/${generated.folder}</output>
 
 							<configOptions>
+								<enumPropertyNaming>legacy</enumPropertyNaming>
+								<containerDefaultToNull>true</containerDefaultToNull>
 								<java8>true</java8>
 								<dateLibrary>java8</dateLibrary>
 								<sourceFolder>java</sourceFolder>
diff --git a/basyx.submodelregistry/basyx.submodelregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/submodelregistry/service/tests/SubmodelRegistryStorageTest.java b/basyx.submodelregistry/basyx.submodelregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/submodelregistry/service/tests/SubmodelRegistryStorageTest.java
diff --git a/basyx.submodelregistry/basyx.submodelregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/submodelregistry/service/tests/integration/BaseIntegrationTest.java b/basyx.submodelregistry/basyx.submodelregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/submodelregistry/service/tests/integration/BaseIntegrationTest.java
diff --git a/basyx.submodelregistry/basyx.submodelregistry-service-inmemory-storage/src/test/java/org/eclipse/digitaltwin/basyx/submodelregistry/service/tests/api/BasyxRegistryApiDelegateTest.java b/basyx.submodelregistry/basyx.submodelregistry-service-inmemory-storage/src/test/java/org/eclipse/digitaltwin/basyx/submodelregistry/service/tests/api/BasyxRegistryApiDelegateTest.java
diff --git a/basyx.submodelregistry/basyx.submodelregistry-service-mongodb-storage/pom.xml b/basyx.submodelregistry/basyx.submodelregistry-service-mongodb-storage/pom.xml
diff --git a/basyx.submodelregistry/basyx.submodelregistry-service/pom.xml b/basyx.submodelregistry/basyx.submodelregistry-service/pom.xml
diff --git a/basyx.submodelregistry/pom.xml b/basyx.submodelregistry/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public void testSegmentBlockCollectorEndpointProtocolVersion() {`
`65`	`65`
`66`	`66`	`@Test`
`67`	`67`	`public void testSegmentBlockCollectorDataSpecificationContentDefinition() {`
`68`		`- String path = AasRegistryPaths.submodelDescriptors().administration().embeddedDataSpecifications().dataSpecificationContent().asDataSpecificationIec61360().definition().text();`
	`68`	`+ String path = AasRegistryPaths.submodelDescriptors().administration().embeddedDataSpecifications().dataSpecificationContent().definition().text();`
`69`	`69`	`assertSegmentBlocksCreated(path, false, "submodelDescriptors", "administration.embeddedDataSpecifications", "dataSpecificationContent.definition", "text");`
`70`	`70`	`}`
`71`	`71`