Skip to content

Commit fb843d9

Browse files
FriedJannikFriedJannik
committed
Adds BaSyx SSP001 Profile to all Components
1 parent 2b17672 commit fb843d9

10 files changed

Lines changed: 64 additions & 7 deletions

File tree

‎basyx.aasdiscoveryservice/basyx.aasdiscoveryservice-http/src/main/java/org/eclipse/digitaltwin/basyx/aasdiscoveryservice/http/AasDiscoveryServiceDescriptionConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
public class AasDiscoveryServiceDescriptionConfiguration {
1313
@Bean
1414
public ProfileDeclaration aasDiscoveryProfiles() {
15-
return () -> new TreeSet<>(List.of(Profile.DISCOVERYSERVICESPECIFICATION_SSP_001));
15+
return () -> new TreeSet<>(List.of(Profile.DISCOVERYSERVICESPECIFICATION_SSP_001, Profile.BASYXSERVICESPECIFICATION_SSP_001));
1616
}
1717
}

‎basyx.aasregistry/basyx.aasregistry-service/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/api/BasyxDescriptionApiDelegate.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
import org.eclipse.digitaltwin.basyx.aasregistry.model.ServiceDescription;
3131
import org.eclipse.digitaltwin.basyx.aasregistry.model.ServiceDescription.ProfilesEnum;
32+
import org.eclipse.digitaltwin.basyx.http.description.Profile;
3233
import org.springframework.beans.factory.annotation.Autowired;
3334
import org.springframework.beans.factory.annotation.Value;
3435
import org.springframework.http.HttpStatus;
@@ -48,6 +49,7 @@ public void setValues(@Value("${description.profiles}") String[] profiles) {
4849
ProfilesEnum value = getProfile(eachProfile);
4950
profilesList.add(value);
5051
}
52+
profilesList.add(ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001);
5153
description.setProfiles(profilesList);
5254
}
5355

‎basyx.aasregistry/open-api/patch-base-extensions.yaml‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,32 @@
188188
value: date-time
189189
## alter ServiceDescription
190190
- op: remove
191-
path: /components/schemas/ServiceDescription/example
191+
path: /components/schemas/ServiceDescription/example
192+
- op: add
193+
path: /components/schemas/ServiceDescription/properties/profiles/items/enum/-
194+
value: https://basyx.org/aas/API/3/0/BaSyxServiceSpecification/SSP-001
195+
- op: add
196+
path: /components/schemas/ServiceDescription/properties/profiles/items/x-enum-varnames
197+
value:
198+
- ASSETADMINISTRATIONSHELLSERVICESPECIFICATION_SSP_001
199+
- ASSETADMINISTRATIONSHELLSERVICESPECIFICATION_SSP_002
200+
- SUBMODELSERVICESPECIFICATION_SSP_001
201+
- SUBMODELSERVICESPECIFICATION_SSP_002
202+
- SUBMODELSERVICESPECIFICATION_SSP_003
203+
- AASXFILESERVERSERVICESPECIFICATION_SSP_001
204+
- ASSETADMINISTRATIONSHELLREGISTRYSERVICESPECIFICATION_SSP_001
205+
- ASSETADMINISTRATIONSHELLREGISTRYSERVICESPECIFICATION_SSP_002
206+
- SUBMODELREGISTRYSERVICESPECIFICATION_SSP_001
207+
- SUBMODELREGISTRYSERVICESPECIFICATION_SSP_002
208+
- DISCOVERYSERVICESPECIFICATION_SSP_001
209+
- ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_001
210+
- ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_002
211+
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_001
212+
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_002
213+
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_003
214+
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_004
215+
- CONCEPTDESCRIPTIONSERVICESPECIFICATION_SSP_001
216+
- BASYXSERVICESPECIFICATION_SSP_001
192217
## PagedResult_paging_metadata
193218
- op: remove
194219
path: /components/schemas/PagedResult_paging_metadata/properties/cursor/example

‎basyx.aasrepository/basyx.aasrepository-http/src/main/java/org/eclipse/digitaltwin/basyx/aasrepository/http/AasRepositoryServiceDescriptionConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ public class AasRepositoryServiceDescriptionConfiguration {
1313
@Bean
1414
public ProfileDeclaration aasRepositoryProfiles() {
1515
return () -> new TreeSet<>(List.of(Profile.ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_001,
16-
Profile.ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_002));
16+
Profile.ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_002, Profile.BASYXSERVICESPECIFICATION_SSP_001));
1717
}
1818
}

‎basyx.aasxfileserver/basyx.aasxfileserver-http/src/main/java/org/eclipse/digitaltwin/basyx/aasxfileserver/http/AASXFileServerDescriptionConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
public class AASXFileServerDescriptionConfiguration {
1313
@Bean
1414
public ProfileDeclaration aasxFileServerProfiles() {
15-
return () -> new TreeSet<>(List.of(Profile.AASXFILESERVERSERVICESPECIFICATION_SSP_001));
15+
return () -> new TreeSet<>(List.of(Profile.AASXFILESERVERSERVICESPECIFICATION_SSP_001, Profile.BASYXSERVICESPECIFICATION_SSP_001));
1616
}
1717
}

‎basyx.common/basyx.http/src/main/java/org/eclipse/digitaltwin/basyx/http/description/Profile.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ public enum Profile implements StandardizedLiteralEnum {
5656
"https://admin-shell.io/aas/API/3/0/SubmodelRepositoryServiceSpecification/SSP-004"),
5757

5858
CONCEPTDESCRIPTIONSERVICESPECIFICATION_SSP_001(
59-
"https://admin-shell.io/aas/API/3/0/ConceptDescriptionServiceSpecification/SSP-001");
59+
"https://admin-shell.io/aas/API/3/0/ConceptDescriptionServiceSpecification/SSP-001"),
60+
61+
BASYXSERVICESPECIFICATION_SSP_001(
62+
"https://basyx.org/aas/API/3/0/BaSyxServiceSpecification/SSP-001"
63+
);
6064

6165
private String value;
6266

‎basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-http/src/main/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/http/ConceptDescriptionRepositoryServiceDescriptionConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
public class ConceptDescriptionRepositoryServiceDescriptionConfiguration {
1313
@Bean
1414
public ProfileDeclaration cdRepositoryProfiles() {
15-
return () -> new TreeSet<>(List.of(Profile.CONCEPTDESCRIPTIONSERVICESPECIFICATION_SSP_001));
15+
return () -> new TreeSet<>(List.of(Profile.CONCEPTDESCRIPTIONSERVICESPECIFICATION_SSP_001, Profile.BASYXSERVICESPECIFICATION_SSP_001));
1616
}
1717
}

‎basyx.submodelregistry/basyx.submodelregistry-service/src/main/java/org/eclipse/digitaltwin/basyx/submodelregistry/service/api/BasyxDescriptionApiDelegate.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public void setValues(@Value("${description.profiles}") String[] profiles) {
4848
ProfilesEnum value = getProfile(eachProfile);
4949
profilesList.add(value);
5050
}
51+
profilesList.add(ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001);
5152
description.setProfiles(profilesList);
5253
}
5354

‎basyx.submodelregistry/open-api/patch-base-extensions.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,28 @@
243243
path: /paths/~1description/get/tags
244244
value:
245245
- Submodel Registry
246+
- op: add
247+
path: /components/schemas/ServiceDescription/properties/profiles/items/enum/-
248+
value: https://basyx.org/aas/API/3/0/BaSyxServiceSpecification/SSP-001
249+
- op: add
250+
path: /components/schemas/ServiceDescription/properties/profiles/items/x-enum-varnames
251+
value:
252+
- ASSETADMINISTRATIONSHELLSERVICESPECIFICATION_SSP_001
253+
- ASSETADMINISTRATIONSHELLSERVICESPECIFICATION_SSP_002
254+
- SUBMODELSERVICESPECIFICATION_SSP_001
255+
- SUBMODELSERVICESPECIFICATION_SSP_002
256+
- SUBMODELSERVICESPECIFICATION_SSP_003
257+
- AASXFILESERVERSERVICESPECIFICATION_SSP_001
258+
- ASSETADMINISTRATIONSHELLREGISTRYSERVICESPECIFICATION_SSP_001
259+
- ASSETADMINISTRATIONSHELLREGISTRYSERVICESPECIFICATION_SSP_002
260+
- SUBMODELREGISTRYSERVICESPECIFICATION_SSP_001
261+
- SUBMODELREGISTRYSERVICESPECIFICATION_SSP_002
262+
- DISCOVERYSERVICESPECIFICATION_SSP_001
263+
- ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_001
264+
- ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_002
265+
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_001
266+
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_002
267+
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_003
268+
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_004
269+
- CONCEPTDESCRIPTIONSERVICESPECIFICATION_SSP_001
270+
- BASYXSERVICESPECIFICATION_SSP_001

‎basyx.submodelrepository/basyx.submodelrepository-http/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/http/SubmodelRepositoryServiceDescriptionConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ public class SubmodelRepositoryServiceDescriptionConfiguration {
1414
public ProfileDeclaration smRepositoryProfiles() {
1515
return () -> new TreeSet<>(List.of(Profile.SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_001,
1616
Profile.SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_002, Profile.SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_003,
17-
Profile.SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_004));
17+
Profile.SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_004, Profile.BASYXSERVICESPECIFICATION_SSP_001));
1818
}
1919
}

0 commit comments

Comments
 (0)