Skip to content

Commit 65dbbd3

Browse files
authored
Merge pull request #8 from FriedJannik/feat/noExtSubj
Adapts things
2 parents 68c03b7 + 5581a10 commit 65dbbd3

2 files changed

Lines changed: 3 additions & 32 deletions

File tree

.github/workflows/docker-snapshot-release.yml

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,9 @@ jobs:
2929
strategy:
3030
matrix:
3131
include:
32-
- name: aas-environment
33-
path: basyx.aasenvironment/basyx.aasenvironment.component
34-
- name: aas-repository
35-
path: basyx.aasrepository/basyx.aasrepository.component
36-
- name: submodel-repository
37-
path: basyx.submodelrepository/basyx.submodelrepository.component
38-
- name: submodel-service
39-
path: basyx.submodelservice/basyx.submodelservice.component
40-
- name: conceptdescription-repository
41-
path: basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component
42-
- name: aas-discovery
43-
path: basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component
44-
- name: aasxfileserver
45-
path: basyx.aasxfileserver/basyx.aasxfileserver.component
46-
- name: aas-registry-kafka-mem
47-
path: basyx.aasregistry/basyx.aasregistry-service-release-kafka-mem/src/main/docker
48-
- name: aas-registry-kafka-mongodb
49-
path: basyx.aasregistry/basyx.aasregistry-service-release-kafka-mongodb/src/main/docker
50-
- name: aas-registry-log-mem
51-
path: basyx.aasregistry/basyx.aasregistry-service-release-log-mem/src/main/docker
5232
- name: aas-registry-log-mongodb
5333
path: basyx.aasregistry/basyx.aasregistry-service-release-log-mongodb/src/main/docker
54-
- name: submodel-registry-kafka-mem
55-
path: basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mem/src/main/docker
56-
- name: submodel-registry-kafka-mongodb
57-
path: basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mongodb/src/main/docker
58-
- name: submodel-registry-log-mem
59-
path: basyx.submodelregistry/basyx.submodelregistry-service-release-log-mem/src/main/docker
60-
- name: submodel-registry-log-mongodb
61-
path: basyx.submodelregistry/basyx.submodelregistry-service-release-log-mongodb/src/main/docker
62-
- name: digitaltwinregistry
63-
path: basyx.aasdigitaltwinregistry/basyx.digitaltwinregistry.component
34+
6435

6536
steps:
6637
- name: Checkout Code

basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/mongodb/MongoDbAasRegistryStorage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public CursorResult<List<AssetAdministrationShellDescriptor>> getAllAasDescripto
9292
String cursor = resolveCursor(pRequest, foundDescriptors, AssetAdministrationShellDescriptor::getId);
9393
foundDescriptors.forEach(desc -> {
9494
List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
95-
if (!desc.getSpecificAssetIds().isEmpty()) {
95+
if (desc.getSpecificAssetIds() != null || !desc.getSpecificAssetIds().isEmpty()) {
9696
desc.getSpecificAssetIds().forEach(sId -> {
9797
SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
9898
if (!sId.getSupplementalSemanticIds().isEmpty()){
@@ -165,7 +165,7 @@ public AssetAdministrationShellDescriptor getAasDescriptor(@NonNull String aasDe
165165
throw new AasDescriptorNotFoundException(aasDescriptorId);
166166
}
167167
List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
168-
if (!descriptor.getSpecificAssetIds().isEmpty()) {
168+
if (descriptor.getSpecificAssetIds() != null || !descriptor.getSpecificAssetIds().isEmpty()) {
169169
descriptor.getSpecificAssetIds().forEach(sId -> {
170170
SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
171171
if (!sId.getSupplementalSemanticIds().isEmpty()) {

0 commit comments

Comments
 (0)