Refactor Before in TestMongoDBAggregator.java to clean up

Signed-off-by: Zai Müller-Zhang <[email protected]>
eclipse-basyx · Sep 8, 2023 · 4e6e634 · 4e6e634
1 parent b881e15
commit 4e6e634
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/...ASServer/src/main/java/org/eclipse/basyx/components/aas/mongodb/MongoDBAASAPIFactory.java b/...ASServer/src/main/java/org/eclipse/basyx/components/aas/mongodb/MongoDBAASAPIFactory.java
@@ -67,8 +67,7 @@ public IAASAPI getAASApi(AssetAdministrationShell shell) {
 
 	@Override
 	public IAASAPI create(IIdentifier aasId) {
-		MongoDBAASAPI api = new MongoDBAASAPI(storageAPI, aasId.getId());
-		return api;
+		return new MongoDBAASAPI(storageAPI, aasId.getId());
 	}
 
 }
diff --git a/...ASServer/src/main/java/org/eclipse/basyx/components/aas/mongodb/MongoDBAASAggregator.java b/...ASServer/src/main/java/org/eclipse/basyx/components/aas/mongodb/MongoDBAASAggregator.java
@@ -437,7 +437,7 @@ private void addSubmodelsFromDB(MultiSubmodelProvider provider, AssetAdministrat
 		List<String> submodelIdShorts = getSubmodelIdShortsFromSubmodelReferences(submodelRefs);
 		submodelIdentificationIds = completeSubmodelIdentificationsIdsByIdShorts(submodelIdentificationIds, submodelIdShorts);
 
-			createProviderForSubmodels(provider, submodelIdentificationIds);
+		createProviderForSubmodels(provider, submodelIdentificationIds);
 
 	}
 

diff --git a/...r/src/test/java/org/eclipse/basyx/regression/AASServer/mongodb/TestMongoDBAggregator.java b/...r/src/test/java/org/eclipse/basyx/regression/AASServer/mongodb/TestMongoDBAggregator.java
@@ -109,7 +109,11 @@ public static void setUpClass() throws ParserConfigurationException, SAXExceptio
 
 		component.setRegistry(registry);
 		component.startComponent();
+	}
 
+	@Override
+	public void setup() {
+		super.setup();
 		createAssetAdministrationShell(AAS_ID);
 		createSubmodel(SM_IDSHORT, SM_IDENTIFICATION, AAS_ID);
 	}
@@ -203,8 +207,6 @@ protected IAASAggregator getAggregator() {
 	@SuppressWarnings("deprecation")
 	@Test
 	public void checkInitialSetupAfterCreatingAndRegisteringAasAndSubmodel() {
-		createAssetAdministrationShell(AAS_ID);
-		createSubmodel(SM_IDSHORT, SM_IDENTIFICATION, AAS_ID);
 		MongoDBAASAggregator aggregator = new MongoDBAASAggregator(mongoDBConfig, registry);
 
 		ISubmodel persistentSubmodel = getSubmodelFromAggregator(aggregator, AAS_ID, SM_IDSHORT);
@@ -247,9 +249,6 @@ private void assertSubmodelsAreResolvedCorrectly(ISubmodel persistentSubmodel, I
 	}
 
 	private void createAASWithSubmodelWithCollidingIdShort() {
-		createAssetAdministrationShell(AAS_ID);
-		createSubmodel(SM_IDSHORT, SM_IDENTIFICATION, AAS_ID);
-
 		createAssetAdministrationShell(AAS_ID_2);
 		createSubmodel(SM_IDSHORT, SM_IDENTIFICATION_2, AAS_ID_2);
 	}
@@ -272,9 +271,7 @@ public void checkNoExceptionIsObservedAfterPassingRegistry() {
 		restartAasServer();
 
 		MongoDBAASAggregator aggregator = new MongoDBAASAggregator(mongoDBConfig, registry);
-		// Create two AASs
-		createAssetAdministrationShell(AAS_ID);
-		createSubmodel(SM_IDSHORT, SM_IDENTIFICATION, AAS_ID);
+
 		MultiSubmodelProvider aasProvider = (MultiSubmodelProvider) getAssetAdministrationShellProviderFromMongoDBAggregator(aggregator, AAS_ID, SM_IDSHORT);
 
 		Map<String, Object> submodelObject = (Map<String, Object>) aasProvider.getValue(PREFIX_SUBMODEL_PATH + SM_IDSHORT + SUFFIX_SUBMODEL_PATH);

diff --git a/.../basyx.components.docker/basyx.components.registry/src/main/resources/registry.properties b/.../basyx.components.docker/basyx.components.registry/src/main/resources/registry.properties
@@ -44,5 +44,5 @@ registry.authorization=Disabled
 # ###########################
 # TaggedDirectory
 # ###########################
-#registry.taggedDirectory=Enabled
+# registry.taggedDirectory=Enabled
 registry.taggedDirectory=Disabled