Skip to content

Commit 24ebc70

Browse files
MateusMolinaMateusMolina
authored
fix: Incorrect package name for ConceptDescriptionRepository-Backend (eclipse-basyx#611)
1 parent aed6553 commit 24ebc70

File tree

14 files changed

+80
-83
lines changed

14 files changed

+80
-83
lines changed

‎basyx.aasenvironment/basyx.aasenvironment-core/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/AasEnvironmentLoaderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
import org.eclipse.digitaltwin.basyx.aasenvironment.environmentloader.CompleteEnvironment;
3636
import org.eclipse.digitaltwin.basyx.aasrepository.AasRepository;
3737
import org.eclipse.digitaltwin.basyx.aasrepository.backend.CrudAasRepository;
38-
import org.eclipse.digitaltwin.basyx.aasrepository.backend.CrudConceptDescriptionRepository;
3938
import org.eclipse.digitaltwin.basyx.aasrepository.backend.inmemory.InMemoryAasRepositoryBackend;
40-
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.ConceptDescriptionInMemoryBackendProvider;
4139
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.ConceptDescriptionRepository;
40+
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend.ConceptDescriptionInMemoryBackendProvider;
41+
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend.CrudConceptDescriptionRepository;
4242
import org.eclipse.digitaltwin.basyx.core.exceptions.CollidingIdentifierException;
4343
import org.eclipse.digitaltwin.basyx.core.filerepository.InMemoryFileRepository;
4444
import org.eclipse.digitaltwin.basyx.core.pagination.PaginationInfo;

‎basyx.aasenvironment/basyx.aasenvironment-core/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/TestAASEnvironmentSerialization.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
import org.eclipse.digitaltwin.basyx.aasenvironment.base.DefaultAASEnvironment;
5656
import org.eclipse.digitaltwin.basyx.aasrepository.AasRepository;
5757
import org.eclipse.digitaltwin.basyx.aasrepository.backend.CrudAasRepositoryFactory;
58-
import org.eclipse.digitaltwin.basyx.aasrepository.backend.SimpleConceptDescriptionRepositoryFactory;
5958
import org.eclipse.digitaltwin.basyx.aasrepository.backend.inmemory.InMemoryAasRepositoryBackend;
60-
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.ConceptDescriptionInMemoryBackendProvider;
6159
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.ConceptDescriptionRepository;
60+
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend.ConceptDescriptionInMemoryBackendProvider;
61+
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend.SimpleConceptDescriptionRepositoryFactory;
6262
import org.eclipse.digitaltwin.basyx.core.filerepository.InMemoryFileRepository;
6363
import org.eclipse.digitaltwin.basyx.core.pagination.PaginationInfo;
6464
import org.eclipse.digitaltwin.basyx.submodelrepository.SubmodelInMemoryBackendProvider;

basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-inmemory/src/main/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/ConceptDescriptionInMemoryBackendProvider.java renamed to basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-inmemory/src/main/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/backend/ConceptDescriptionInMemoryBackendProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
* SPDX-License-Identifier: MIT
2424
******************************************************************************/
2525

26-
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository;
26+
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend;
2727

2828
import org.eclipse.digitaltwin.aas4j.v3.model.ConceptDescription;
29-
import org.eclipse.digitaltwin.basyx.aasrepository.backend.ConceptDescriptionBackendProvider;
3029
import org.eclipse.digitaltwin.basyx.common.backend.inmemory.core.InMemoryCrudRepository;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
3231
import org.springframework.data.repository.CrudRepository;

basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-inmemory/src/test/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/TestInMemoryConceptDescriptionRepository.java renamed to basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-inmemory/src/test/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/backend/TestInMemoryConceptDescriptionRepository.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,15 @@
2323
* SPDX-License-Identifier: MIT
2424
******************************************************************************/
2525

26+
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend;
2627

27-
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository;
28-
29-
import static org.junit.Assert.assertEquals;
28+
import static org.junit.Assert.*;
3029

3130
import java.util.Arrays;
3231
import java.util.Collection;
3332

3433
import org.eclipse.digitaltwin.aas4j.v3.model.ConceptDescription;
35-
import org.eclipse.digitaltwin.basyx.aasrepository.backend.ConceptDescriptionBackendProvider;
36-
import org.eclipse.digitaltwin.basyx.aasrepository.backend.CrudConceptDescriptionRepository;
37-
import org.eclipse.digitaltwin.basyx.aasrepository.backend.SimpleConceptDescriptionRepositoryFactory;
34+
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.ConceptDescriptionRepository;
3835
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.core.ConceptDescriptionRepositorySuite;
3936
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.core.DummyConceptDescriptionFactory;
4037
import org.eclipse.digitaltwin.basyx.core.exceptions.CollidingIdentifierException;
@@ -47,9 +44,9 @@
4744
*
4845
*/
4946
public class TestInMemoryConceptDescriptionRepository extends ConceptDescriptionRepositorySuite {
50-
47+
5148
private static final String CONFIGURED_CD_REPO_NAME = "configured-cd-repo-name";
52-
49+
5350
private ConceptDescriptionBackendProvider backendProvider = new ConceptDescriptionInMemoryBackendProvider();
5451

5552
@Override
@@ -61,18 +58,18 @@ protected ConceptDescriptionRepository getConceptDescriptionRepository() {
6158
protected ConceptDescriptionRepository getConceptDescriptionRepository(Collection<ConceptDescription> conceptDescriptions) {
6259
return new SimpleConceptDescriptionRepositoryFactory(backendProvider, conceptDescriptions).create();
6360
}
64-
61+
6562
@Test
66-
public void getConfiguredInMemoryConceptDescriptionRepositoryName() {
63+
public void getConfiguredInMemoryConceptDescriptionRepositoryName() {
6764
ConceptDescriptionRepository repo = new CrudConceptDescriptionRepository(backendProvider, CONFIGURED_CD_REPO_NAME);
68-
65+
6966
assertEquals(CONFIGURED_CD_REPO_NAME, repo.getName());
7067
}
7168

7269
@Test(expected = CollidingIdentifierException.class)
7370
public void idCollisionDuringConstruction() {
7471
Collection<ConceptDescription> conceptDescriptionsWithCollidingIds = createConceptDescriptionCollectionWithCollidingIds();
75-
72+
7673
new CrudConceptDescriptionRepository(backendProvider, conceptDescriptionsWithCollidingIds);
7774
}
7875

basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-mongodb/src/main/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/ConceptDescriptionMongoDBBackendProvider.java renamed to basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-mongodb/src/main/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/backend/ConceptDescriptionMongoDBBackendProvider.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
* SPDX-License-Identifier: MIT
2424
******************************************************************************/
2525

26-
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository;
26+
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend;
2727

2828
import org.eclipse.digitaltwin.aas4j.v3.model.ConceptDescription;
29-
import org.eclipse.digitaltwin.basyx.aasrepository.backend.ConceptDescriptionBackendProvider;
3029
import org.eclipse.digitaltwin.basyx.common.mongocore.BasyxMongoMappingContext;
3130
import org.springframework.beans.factory.annotation.Autowired;
3231
import org.springframework.beans.factory.annotation.Value;
@@ -47,24 +46,24 @@
4746
@ConditionalOnExpression("'${basyx.backend}'.equals('MongoDB')")
4847
@Component
4948
public class ConceptDescriptionMongoDBBackendProvider implements ConceptDescriptionBackendProvider {
50-
49+
5150
private BasyxMongoMappingContext mappingContext;
5251
private MongoTemplate template;
53-
52+
5453
@Autowired
5554
public ConceptDescriptionMongoDBBackendProvider(BasyxMongoMappingContext mappingContext, @Value("${basyx.cdrepository.mongodb.collectionName:cd-repo}") String collectionName, MongoTemplate template) {
5655
super();
5756
this.mappingContext = mappingContext;
5857
this.template = template;
59-
58+
6059
mappingContext.addEntityMapping(ConceptDescription.class, collectionName);
6160
}
6261

6362
@Override
6463
public CrudRepository<ConceptDescription, String> getCrudRepository() {
6564
@SuppressWarnings("unchecked")
6665
MongoPersistentEntity<ConceptDescription> entity = (MongoPersistentEntity<ConceptDescription>) mappingContext.getPersistentEntity(ConceptDescription.class);
67-
66+
6867
return new SimpleMongoRepository<>(new MappingMongoEntityInformation<>(entity), template);
6968
}
7069

basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/DummyConceptDescriptionRepositoryComponent.java renamed to basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/backend/DummyConceptDescriptionRepositoryComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* SPDX-License-Identifier: MIT
2424
******************************************************************************/
2525

26-
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository;
26+
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend;
2727

2828
import org.springframework.boot.SpringApplication;
2929
import org.springframework.boot.autoconfigure.SpringBootApplication;

basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/DummyConceptDescriptionRepositoryConfig.java renamed to basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/backend/DummyConceptDescriptionRepositoryConfig.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@
2323
* SPDX-License-Identifier: MIT
2424
******************************************************************************/
2525

26-
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository;
26+
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend;
2727

28-
import com.mongodb.client.MongoClient;
29-
import com.mongodb.client.MongoClients;
30-
import org.eclipse.digitaltwin.basyx.aasrepository.backend.SimpleConceptDescriptionRepositoryFactory;
3128
import org.eclipse.digitaltwin.basyx.common.mongocore.BasyxMongoMappingContext;
29+
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.ConceptDescriptionRepository;
3230
import org.springframework.context.annotation.Bean;
3331
import org.springframework.context.annotation.Configuration;
3432
import org.springframework.data.mongodb.core.MongoTemplate;
3533

34+
import com.mongodb.client.MongoClient;
35+
import com.mongodb.client.MongoClients;
36+
3637
/**
3738
* Configuration for tests
3839
*

basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/TestMongoDBConceptDescriptionRepository.java renamed to basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/backend/TestMongoDBConceptDescriptionRepository.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,24 @@
2323
* SPDX-License-Identifier: MIT
2424
******************************************************************************/
2525

26-
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository;
26+
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend;
2727

28-
import static org.junit.Assert.assertEquals;
28+
import static org.junit.Assert.*;
2929

3030
import java.util.Arrays;
3131
import java.util.Collection;
3232

3333
import org.eclipse.digitaltwin.aas4j.v3.model.ConceptDescription;
3434
import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultConceptDescription;
3535
import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultLangStringTextType;
36-
import org.eclipse.digitaltwin.basyx.aasrepository.backend.ConceptDescriptionBackendProvider;
37-
import org.eclipse.digitaltwin.basyx.aasrepository.backend.CrudConceptDescriptionRepository;
38-
import org.eclipse.digitaltwin.basyx.aasrepository.backend.SimpleConceptDescriptionRepositoryFactory;
3936
import org.eclipse.digitaltwin.basyx.common.mongocore.BasyxMongoMappingContext;
4037
import org.eclipse.digitaltwin.basyx.common.mongocore.MongoDBUtilities;
41-
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.ConceptDescriptionMongoDBBackendProvider;
4238
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.ConceptDescriptionRepository;
4339
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.ConceptDescriptionRepositoryFactory;
4440
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.core.ConceptDescriptionRepositorySuite;
4541
import org.junit.Test;
4642
import org.springframework.data.mongodb.core.MongoTemplate;
43+
4744
import com.mongodb.client.MongoClient;
4845
import com.mongodb.client.MongoClients;
4946

@@ -62,10 +59,10 @@ protected ConceptDescriptionRepository getConceptDescriptionRepository() {
6259
MongoTemplate template = createTemplate();
6360

6461
MongoDBUtilities.clearCollection(template, COLLECTION);
65-
62+
6663
ConceptDescriptionBackendProvider cdBackendProvider = new ConceptDescriptionMongoDBBackendProvider(new BasyxMongoMappingContext(), COLLECTION, template);
6764
ConceptDescriptionRepositoryFactory cdRepositoryFactory = new SimpleConceptDescriptionRepositoryFactory(cdBackendProvider);
68-
65+
6966
return cdRepositoryFactory.create();
7067
}
7168

@@ -74,10 +71,10 @@ protected ConceptDescriptionRepository getConceptDescriptionRepository(Collectio
7471
MongoTemplate template = createTemplate();
7572

7673
MongoDBUtilities.clearCollection(template, COLLECTION);
77-
74+
7875
ConceptDescriptionBackendProvider cdBackendProvider = new ConceptDescriptionMongoDBBackendProvider(new BasyxMongoMappingContext(), COLLECTION, template);
7976
ConceptDescriptionRepositoryFactory cdRepositoryFactory = new SimpleConceptDescriptionRepositoryFactory(cdBackendProvider, conceptDescriptions);
80-
77+
8178
return cdRepositoryFactory.create();
8279
}
8380

basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/TestMongoDBConceptDescriptionRepositoryPersistency.java renamed to basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/backend/TestMongoDBConceptDescriptionRepositoryPersistency.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
* SPDX-License-Identifier: MIT
2424
******************************************************************************/
2525

26-
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository;
26+
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend;
2727

2828
import org.eclipse.digitaltwin.basyx.common.mongocore.MongoDBUtilities;
29+
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.ConceptDescriptionRepository;
2930
import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.core.ConceptDescriptionRepositoryPersistencyTestSuite;
3031
import org.junit.Before;
3132
import org.junit.BeforeClass;
@@ -34,7 +35,8 @@
3435
import org.springframework.data.mongodb.core.MongoTemplate;
3536

3637
/**
37-
* Test persistency for {@link ConceptDescriptionRepository} with MongoDB storage backend
38+
* Test persistency for {@link ConceptDescriptionRepository} with MongoDB
39+
* storage backend
3840
*
3941
* @author mateusmolina, danish
4042
*/

basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend/src/main/java/org/eclipse/digitaltwin/basyx/aasrepository/backend/ConceptDescriptionBackendProvider.java renamed to basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-backend/src/main/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/backend/ConceptDescriptionBackendProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
* SPDX-License-Identifier: MIT
2424
******************************************************************************/
25-
package org.eclipse.digitaltwin.basyx.aasrepository.backend;
25+
package org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.backend;
2626

2727
import org.eclipse.digitaltwin.aas4j.v3.model.ConceptDescription;
2828
import org.springframework.data.repository.CrudRepository;
@@ -33,7 +33,7 @@
3333
* @author mateusmolina, despen, danish
3434
*/
3535
public interface ConceptDescriptionBackendProvider {
36-
36+
3737
public CrudRepository<ConceptDescription, String> getCrudRepository();
38-
38+
3939
}

0 commit comments

Comments
 (0)