Skip to content

Updates AAS4J to 2.0.0-Snapshot #867

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Updates AAS4J to 2.0.0-Snapshot #867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
677ab67
Updates AAS4J to Snapshot
FriedJannik Sep 24, 2025
5f2235b
Fixes problems with order relevant in SMLs
aaronzi Sep 25, 2025
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
4 changes: 2 additions & 2 deletions ...rc/main/java/org/eclipse/digitaltwin/basyx/aasxfileserver/backend/CrudAASXFileServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private String fullyDeletePackage(Package pkg) {
}

private boolean containsShellId(PackageDescription packageDesc, String shellId) {
return packageDesc.getItems().stream().anyMatch(aasId -> aasId.equals(shellId));
return packageDesc.getAasIds().stream().anyMatch(aasId -> aasId.equals(shellId));
}

private Stream<Package> getPackages() {
Expand All @@ -167,7 +167,7 @@ private Stream<Package> getPackages() {
private static PackageDescription createPackageDescription(List<String> shellIds, String newPackageId) {
PackageDescription packageDescription = new DefaultPackageDescription();
packageDescription.setPackageId(newPackageId);
packageDescription.setItems(shellIds);
packageDescription.setAasIds(shellIds);

return packageDescription;
}
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/org/eclipse/digitaltwin/basyx/aasxfileserver/core/AASXFileServerSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void updateExistingAASXByPackageId() throws IOException {

PackageDescription expectedPackageDescription = new DefaultPackageDescription();
expectedPackageDescription.setPackageId(initialPackageDescription.getPackageId());
expectedPackageDescription.setItems(DummyAASXFileServerFactory.SECOND_SHELL_IDS);
expectedPackageDescription.setAasIds(DummyAASXFileServerFactory.SECOND_SHELL_IDS);

CursorResult<List<PackageDescription>> pagedPackageDescriptions = server.getAllAASXPackageIds("", PaginationInfo.NO_LIMIT);
List<PackageDescription> actualPackageDescription = pagedPackageDescriptions.getResult();
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/org/eclipse/digitaltwin/basyx/aasxfileserver/core/DummyAASXFileServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static List<PackageDescription> createMultipleDummyAASXPackagesOnServer(A
public static PackageDescription createDummyPackageDescription(String packageId, List<String> shellIds) {
PackageDescription expectedDescription1 = new DefaultPackageDescription();
expectedDescription1.setPackageId(packageId);
expectedDescription1.setItems(shellIds);
expectedDescription1.setAasIds(shellIds);

return expectedDescription1;
}
Expand Down
11 changes: 5 additions & 6 deletions ...ore/src/test/java/org/eclipse/digitaltwin/basyx/submodelservice/DummySubmodelFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,13 @@ private static List<SubmodelElement> getOperationalDataSubmodelElements() {
}

private static List<SubmodelElement> createOperationalDataSubmodelElements() {
ArrayList<SubmodelElement> list = new ArrayList<>();

List<SubmodelElement> list = new ArrayList<>();
SubmodelElement sme1 = createProperty(SUBMODEL_OPERATIONAL_DATA_PROPERTY_ID_SHORT);
SubmodelElement sme2 = createProperty(SUBMODEL_ELEMENT_FIRST_ID_SHORT);
SubmodelElement sme3 = createProperty(SUBMODEL_ELEMENT_SECOND_ID_SHORT);

SubmodelElementCollection submodelElementCollection = new DefaultSubmodelElementCollection();
SubmodelElementList submodelElementList = new DefaultSubmodelElementList();
SubmodelElementList submodelElementList = new DefaultSubmodelElementList.Builder().orderRelevant(true).build();

List<SubmodelElement> submodelElementsCollection = new ArrayList<>();
List<SubmodelElement> submodelElementsList = new ArrayList<>();
Expand Down Expand Up @@ -231,8 +230,8 @@ private static void setValuesOfSubmodelElements(SubmodelElement sme2, SubmodelEl

private static SubmodelElementCollection createNestedElementCollection(SubmodelElement sme2) {
SubmodelElementCollection topLevelElementCollection = new DefaultSubmodelElementCollection();
SubmodelElementList submodelElementListInElementCollection = new DefaultSubmodelElementList();
SubmodelElementList submodelElementListInElementList = new DefaultSubmodelElementList();
SubmodelElementList submodelElementListInElementCollection = new DefaultSubmodelElementList.Builder().orderRelevant(true).build();
SubmodelElementList submodelElementListInElementList = new DefaultSubmodelElementList.Builder().orderRelevant(true).build();
SubmodelElementCollection submodelElementCollectionInElementList = new DefaultSubmodelElementCollection();
List<SubmodelElement> submodelElementCollectionInElementListCollection = new ArrayList<>();
List<SubmodelElement> listForSubmodelElementListInElementList = new ArrayList<>();
Expand Down Expand Up @@ -272,7 +271,7 @@ private static List<SubmodelElement> createSimpleSubmodelElements() {
smeCollection.setIdShort(SUBMODEL_ELEMENT_COLLECTION_SIMPLE);
smeCollectionValue.add(createProperty(SUBMODEL_ELEMENT_FIRST_ID_SHORT));

SubmodelElementList smeList = new DefaultSubmodelElementList();
SubmodelElementList smeList = new DefaultSubmodelElementList.Builder().orderRelevant(true).build();
smeList.setIdShort(SUBMODEL_ELEMENT_LIST_SIMPLE);
smeListValue.add(createProperty(SUBMODEL_ELEMENT_SECOND_ID_SHORT));

Expand Down
1 change: 1 addition & 0 deletions ...re/src/test/java/org/eclipse/digitaltwin/basyx/submodelservice/SubmodelServiceHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ public static SubmodelElementList createSubmodelElementList() {
.build())
.idShort(SUBMODEL_TECHNICAL_DATA_SUBMODEL_ELEMENT_LIST_ID_SHORT)
.category(SUBMODEL_TECHNICAL_DATA_SUBMODEL_ELEMENT_LIST_CATEGORY)
.orderRelevant(true)
.value(Lists.newArrayList(createRangeSubmodelElement(), createPropertySubmodelElement()))
.build();
}
Expand Down
4 changes: 2 additions & 2 deletions ...ore/src/test/java/org/eclipse/digitaltwin/basyx/submodelservice/SubmodelServiceSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public void getHierarchicalSubmodelElementWhenFirstElementIsList() {

List<SubmodelElement> submodelElementsList = new ArrayList<>();

SubmodelElementList submodelElementList = new DefaultSubmodelElementList();
SubmodelElementList submodelElementList = new DefaultSubmodelElementList.Builder().orderRelevant(true).build();
submodelElementList.setIdShort("testList");
List<SubmodelElement> listElements = new ArrayList<>();
Property testProperty = new DefaultProperty.Builder().idShort("propIdShort").category("cat1").value("123").valueType(DataTypeDefXsd.INTEGER).build();
Expand Down Expand Up @@ -734,7 +734,7 @@ private String generateNestedIdShortPath() {
}

private DefaultSubmodelElementList createDummySubmodelElementList(String idShort) {
return new DefaultSubmodelElementList.Builder().idShort(idShort).build();
return new DefaultSubmodelElementList.Builder().idShort(idShort).orderRelevant(true).build();
}

private SubmodelElementCollection createDummySubmodelElementCollection(String idShort) {
Expand Down
16 changes: 14 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<docker.target.platforms>linux/amd64, linux/arm64, linux/arm/v7</docker.target.platforms>
<docker.host.port>8081</docker.host.port>
<docker.container.port>8081</docker.container.port>
<aas4j-version>1.0.5</aas4j-version>
<aas4j-version>2.0.0-SNAPSHOT</aas4j-version>
<querydsl-version>5.1.0</querydsl-version>
<jakarta-version>3.2.0</jakarta-version>
</properties>
Expand All @@ -82,7 +82,19 @@
</snapshots>
</pluginRepository>
</pluginRepositories>

<repositories>
<repository>
<name>Central Portal Snapshots</name>
<id>central-portal-snapshots</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<build>
<plugins>
<plugin>
Expand Down