Skip to content

Commit a14d2d5

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/profiles' into profiles
2 parents 19e87e8 + 105342c commit a14d2d5

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

  • basyx.aasregistry/basyx.aasregistry-service/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/api
  • basyx.common/basyx.http/src/main/java/org/eclipse/digitaltwin/basyx/http/description
  • basyx.submodelregistry/basyx.submodelregistry-service/src/main/java/org/eclipse/digitaltwin/basyx/submodelregistry/service/api

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
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;
3332
import org.springframework.beans.factory.annotation.Autowired;
3433
import org.springframework.beans.factory.annotation.Value;
3534
import org.springframework.http.HttpStatus;
@@ -49,7 +48,9 @@ public void setValues(@Value("${description.profiles}") String[] profiles) {
4948
ProfilesEnum value = getProfile(eachProfile);
5049
profilesList.add(value);
5150
}
52-
profilesList.add(ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001);
51+
if (!profilesList.contains(ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001)) {
52+
profilesList.add(ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001);
53+
}
5354
description.setProfiles(profilesList);
5455
}
5556

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public enum Profile implements StandardizedLiteralEnum {
5959
"https://admin-shell.io/aas/API/3/0/ConceptDescriptionServiceSpecification/SSP-001"),
6060

6161
BASYXSERVICESPECIFICATION_SSP_001(
62-
"https://basyx.org/aas/API/3/0/BaSyxServiceSpecification/SSP-001"
62+
"https://basyx.org/aas/API/3/0/BaSyxServiceSpecification/SSP-001"
6363
);
6464

6565
private String value;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ 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);
51+
if (!profilesList.contains(ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001)) {
52+
profilesList.add(ProfilesEnum.BASYXSERVICESPECIFICATION_SSP_001);
53+
}
5254
description.setProfiles(profilesList);
5355
}
5456

0 commit comments

Comments
 (0)