Skip to content

Adds BaSyx Profile to all Components #952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FriedJannik merged 9 commits into from
Jan 12, 2026
Merged

Adds BaSyx Profile to all Components #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb843d9
Adds BaSyx SSP001 Profile to all Components
FriedJannik Jan 12, 2026
2c6a41c
Update basyx.aasregistry/basyx.aasregistry-service/src/main/java/org/…
FriedJannik Jan 12, 2026
57d4efb
Update basyx.aasregistry/basyx.aasregistry-service/src/main/java/org/…
FriedJannik Jan 12, 2026
5ba866f
Update basyx.common/basyx.http/src/main/java/org/eclipse/digitaltwin/…
FriedJannik Jan 12, 2026
105342c
Update basyx.submodelregistry/basyx.submodelregistry-service/src/main…
FriedJannik Jan 12, 2026
19e87e8
Adapts Tests
FriedJannik Jan 12, 2026
a14d2d5
Merge remote-tracking branch 'refs/remotes/origin/profiles' into prof…
FriedJannik Jan 12, 2026
ccce9ac
Adapts Tests
FriedJannik Jan 12, 2026
871a0c7
Adapts Tests
FriedJannik Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...gitaltwin/basyx/aasdiscoveryservice/http/AasDiscoveryServiceDescriptionConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
public class AasDiscoveryServiceDescriptionConfiguration {
@Bean
public ProfileDeclaration aasDiscoveryProfiles() {
return () -> new TreeSet<>(List.of(Profile.DISCOVERYSERVICESPECIFICATION_SSP_001));
return () -> new TreeSet<>(List.of(Profile.DISCOVERYSERVICESPECIFICATION_SSP_001, Profile.BASYXSERVICESPECIFICATION_SSP_001));
}
}
4 changes: 2 additions & 2 deletions .../eclipse/digitaltwin/basyx/aasregistry/service/tests/integration/BaseIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ public void whenGetDescription_thenDescriptionIsReturned() throws ApiException {
ApiResponse<ServiceDescription> entity = api.getDescriptionWithHttpInfo();
assertThat(entity.getStatusCode()).isEqualTo(OK);
List<ProfilesEnum> profiles = entity.getData().getProfiles();
assertThat(profiles).asList().hasSize(1);
assertThat(profiles).asList().containsExactlyInAnyOrder(ProfilesEnum.ASSETADMINISTRATIONSHELLREGISTRYSERVICESPECIFICATION_SSP_001);
assertThat(profiles).asList().hasSize(2);
assertThat(profiles).asList().containsExactlyInAnyOrder(ProfilesEnum.ASSETADMINISTRATIONSHELLREGISTRYSERVICESPECIFICATION_SSP_001, ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001);
}

@Test
Expand Down
3 changes: 3 additions & 0 deletions ...va/org/eclipse/digitaltwin/basyx/aasregistry/service/api/BasyxDescriptionApiDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ public void setValues(@Value("${description.profiles}") String[] profiles) {
ProfilesEnum value = getProfile(eachProfile);
profilesList.add(value);
}
if (!profilesList.contains(ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001)) {
profilesList.add(ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001);
}
description.setProfiles(profilesList);
}

Expand Down
2 changes: 1 addition & 1 deletion ...java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/DescriptionProfilesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
@RunWith(SpringRunner.class)
@WebMvcTest(DescriptionApiController.class)
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
@TestPropertySource(properties = { "description.profiles=https://admin-shell.io/aas/API/3/0/AssetAdministrationShellRegistryServiceSpecification/SSP-001,https://admin-shell.io/aas/API/3/0/SubmodelRegistryServiceSpecification/SSP-001" })
@TestPropertySource(properties = { "description.profiles=https://admin-shell.io/aas/API/3/0/AssetAdministrationShellRegistryServiceSpecification/SSP-001,https://admin-shell.io/aas/API/3/0/SubmodelRegistryServiceSpecification/SSP-001,https://basyx.org/aas/API/3/0/BaSyxServiceSpecification/SSP-001" })
public class DescriptionProfilesTest {

@MockBean
Expand Down
27 changes: 26 additions & 1 deletion basyx.aasregistry/open-api/patch-base-extensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,32 @@
value: date-time
## alter ServiceDescription
- op: remove
path: /components/schemas/ServiceDescription/example
path: /components/schemas/ServiceDescription/example
- op: add
path: /components/schemas/ServiceDescription/properties/profiles/items/enum/-
value: https://basyx.org/aas/API/3/0/BaSyxServiceSpecification/SSP-001
- op: add
path: /components/schemas/ServiceDescription/properties/profiles/items/x-enum-varnames
value:
- ASSETADMINISTRATIONSHELLSERVICESPECIFICATION_SSP_001
- ASSETADMINISTRATIONSHELLSERVICESPECIFICATION_SSP_002
- SUBMODELSERVICESPECIFICATION_SSP_001
- SUBMODELSERVICESPECIFICATION_SSP_002
- SUBMODELSERVICESPECIFICATION_SSP_003
- AASXFILESERVERSERVICESPECIFICATION_SSP_001
- ASSETADMINISTRATIONSHELLREGISTRYSERVICESPECIFICATION_SSP_001
- ASSETADMINISTRATIONSHELLREGISTRYSERVICESPECIFICATION_SSP_002
- SUBMODELREGISTRYSERVICESPECIFICATION_SSP_001
- SUBMODELREGISTRYSERVICESPECIFICATION_SSP_002
- DISCOVERYSERVICESPECIFICATION_SSP_001
- ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_001
- ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_002
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_001
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_002
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_003
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_004
- CONCEPTDESCRIPTIONSERVICESPECIFICATION_SSP_001
- BASYXSERVICESPECIFICATION_SSP_001
## PagedResult_paging_metadata
- op: remove
path: /components/schemas/PagedResult_paging_metadata/properties/cursor/example
Expand Down
2 changes: 1 addition & 1 deletion ...se/digitaltwin/basyx/aasrepository/http/AasRepositoryServiceDescriptionConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ public class AasRepositoryServiceDescriptionConfiguration {
@Bean
public ProfileDeclaration aasRepositoryProfiles() {
return () -> new TreeSet<>(List.of(Profile.ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_001,
Profile.ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_002));
Profile.ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_002, Profile.BASYXSERVICESPECIFICATION_SSP_001));
}
}
2 changes: 1 addition & 1 deletion ...eclipse/digitaltwin/basyx/aasxfileserver/http/AASXFileServerDescriptionConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
public class AASXFileServerDescriptionConfiguration {
@Bean
public ProfileDeclaration aasxFileServerProfiles() {
return () -> new TreeSet<>(List.of(Profile.AASXFILESERVERSERVICESPECIFICATION_SSP_001));
return () -> new TreeSet<>(List.of(Profile.AASXFILESERVERSERVICESPECIFICATION_SSP_001, Profile.BASYXSERVICESPECIFICATION_SSP_001));
}
}
6 changes: 5 additions & 1 deletion ...mmon/basyx.http/src/main/java/org/eclipse/digitaltwin/basyx/http/description/Profile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ public enum Profile implements StandardizedLiteralEnum {
"https://admin-shell.io/aas/API/3/0/SubmodelRepositoryServiceSpecification/SSP-004"),

CONCEPTDESCRIPTIONSERVICESPECIFICATION_SSP_001(
"https://admin-shell.io/aas/API/3/0/ConceptDescriptionServiceSpecification/SSP-001");
"https://admin-shell.io/aas/API/3/0/ConceptDescriptionServiceSpecification/SSP-001"),

BASYXSERVICESPECIFICATION_SSP_001(
"https://basyx.org/aas/API/3/0/BaSyxServiceSpecification/SSP-001"
);

private String value;

Expand Down
2 changes: 1 addition & 1 deletion ...scriptionrepository/http/ConceptDescriptionRepositoryServiceDescriptionConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
public class ConceptDescriptionRepositoryServiceDescriptionConfiguration {
@Bean
public ProfileDeclaration cdRepositoryProfiles() {
return () -> new TreeSet<>(List.of(Profile.CONCEPTDESCRIPTIONSERVICESPECIFICATION_SSP_001));
return () -> new TreeSet<>(List.of(Profile.CONCEPTDESCRIPTIONSERVICESPECIFICATION_SSP_001, Profile.BASYXSERVICESPECIFICATION_SSP_001));
}
}
4 changes: 2 additions & 2 deletions ...pse/digitaltwin/basyx/submodelregistry/service/tests/integration/BaseIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ public void whenGetDescription_thenDescriptionIsReturned() throws ApiException {
ApiResponse<ServiceDescription> entity = api.getDescriptionWithHttpInfo();
assertThat(entity.getStatusCode()).isEqualTo(OK);
List<ProfilesEnum> profiles = entity.getData().getProfiles();
assertThat(profiles).asList().hasSize(1);
assertThat(profiles).asList().containsExactlyInAnyOrder(ProfilesEnum.SUBMODELREGISTRYSERVICESPECIFICATION_SSP_001);
assertThat(profiles).asList().hasSize(2);
assertThat(profiles).asList().containsExactlyInAnyOrder(ProfilesEnum.SUBMODELREGISTRYSERVICESPECIFICATION_SSP_001, ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001);
}

@Test
Expand Down
3 changes: 3 additions & 0 deletions ...g/eclipse/digitaltwin/basyx/submodelregistry/service/api/BasyxDescriptionApiDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ public void setValues(@Value("${description.profiles}") String[] profiles) {
ProfilesEnum value = getProfile(eachProfile);
profilesList.add(value);
}
if (!profilesList.contains(ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001)) {
profilesList.add(ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001);
}
description.setProfiles(profilesList);
}

Expand Down
2 changes: 1 addition & 1 deletion ...org/eclipse/digitaltwin/basyx/submodelregistry/service/tests/DescriptionProfilesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
@RunWith(SpringRunner.class)
@WebMvcTest(DescriptionApiController.class)
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
@TestPropertySource(properties = { "description.profiles=https://admin-shell.io/aas/API/3/0/SubmodelRegistryServiceSpecification/SSP-001,https://admin-shell.io/aas/API/3/0/DiscoveryServiceSpecification/SSP-001" })
@TestPropertySource(properties = { "description.profiles=https://admin-shell.io/aas/API/3/0/SubmodelRegistryServiceSpecification/SSP-001,https://admin-shell.io/aas/API/3/0/DiscoveryServiceSpecification/SSP-001,https://basyx.org/aas/API/3/0/BaSyxServiceSpecification/SSP-001" })
public class DescriptionProfilesTest {

@MockBean
Expand Down
25 changes: 25 additions & 0 deletions basyx.submodelregistry/open-api/patch-base-extensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,3 +243,28 @@
path: /paths/~1description/get/tags
value:
- Submodel Registry
- op: add
path: /components/schemas/ServiceDescription/properties/profiles/items/enum/-
value: https://basyx.org/aas/API/3/0/BaSyxServiceSpecification/SSP-001
- op: add
path: /components/schemas/ServiceDescription/properties/profiles/items/x-enum-varnames
value:
- ASSETADMINISTRATIONSHELLSERVICESPECIFICATION_SSP_001
- ASSETADMINISTRATIONSHELLSERVICESPECIFICATION_SSP_002
- SUBMODELSERVICESPECIFICATION_SSP_001
- SUBMODELSERVICESPECIFICATION_SSP_002
- SUBMODELSERVICESPECIFICATION_SSP_003
- AASXFILESERVERSERVICESPECIFICATION_SSP_001
- ASSETADMINISTRATIONSHELLREGISTRYSERVICESPECIFICATION_SSP_001
- ASSETADMINISTRATIONSHELLREGISTRYSERVICESPECIFICATION_SSP_002
- SUBMODELREGISTRYSERVICESPECIFICATION_SSP_001
- SUBMODELREGISTRYSERVICESPECIFICATION_SSP_002
- DISCOVERYSERVICESPECIFICATION_SSP_001
- ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_001
- ASSETADMINISTRATIONSHELLREPOSITORYSERVICESPECIFICATION_SSP_002
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_001
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_002
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_003
- SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_004
- CONCEPTDESCRIPTIONSERVICESPECIFICATION_SSP_001
- BASYXSERVICESPECIFICATION_SSP_001
2 changes: 1 addition & 1 deletion ...twin/basyx/submodelrepository/http/SubmodelRepositoryServiceDescriptionConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ public class SubmodelRepositoryServiceDescriptionConfiguration {
public ProfileDeclaration smRepositoryProfiles() {
return () -> new TreeSet<>(List.of(Profile.SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_001,
Profile.SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_002, Profile.SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_003,
Profile.SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_004));
Profile.SUBMODELREPOSITORYSERVICESPECIFICATION_SSP_004, Profile.BASYXSERVICESPECIFICATION_SSP_001));
}
}