Skip to content

Fixes Bug in HierarchicalSubmodelElementParser #694

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
aaronzi merged 10 commits into from
Apr 9, 2025
Merged

Fixes Bug in HierarchicalSubmodelElementParser #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0b5799b
Adds Submodel Service docker release step
aaronzi Apr 8, 2025
305b4b7
Fixes Bug in HierarchicalSubmodelElementParser
FriedJannik Apr 8, 2025
d6be3ea
Merge remote-tracking branch 'origin/main'
FriedJannik Apr 8, 2025
5ba1524
Merge remote-tracking branch 'upstream/main'
aaronzi Apr 8, 2025
be08890
Merge remote-tracking branch 'origin/main' into FriedJannik/main
aaronzi Apr 8, 2025
968b738
Merge remote-tracking branch 'origin/main' into FriedJannik/main
aaronzi Apr 8, 2025
b867d20
Merge remote-tracking branch 'upstream/main'
aaronzi Apr 8, 2025
82693d2
Merge remote-tracking branch 'upstream/main' into FriedJannik/main
aaronzi Apr 8, 2025
eeec680
Merge branch 'main' of https://github.com/friedjannik/basyx-java-serv…
aaronzi Apr 9, 2025
c586f12
Removes unrelated change
aaronzi Apr 9, 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
6 changes: 6 additions & 0 deletions ...ipse/digitaltwin/basyx/submodelservice/pathparsing/HierarchicalSubmodelElementParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ public SubmodelElement getSubmodelElementFromIdShortPath(String idShortPath) thr
*/
public String getIdShortPathOfParentElement(String idShortPath) {

boolean isLastElementABracket = idShortPath.endsWith("]");
if (isLastElementABracket){
int lastElementBracketIndex = idShortPath.lastIndexOf("[");
return idShortPath.substring(0, lastElementBracketIndex);
}

int lastElementIdShortIndex = idShortPath.lastIndexOf(".");

if (lastElementIdShortIndex == -1)
Expand Down
24 changes: 24 additions & 0 deletions ...a/org/eclipse/digitaltwin/basyx/submodelservice/SubmodelElementIdShortPathParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.Stack;

import org.eclipse.digitaltwin.basyx.core.exceptions.ElementDoesNotExistException;
import org.eclipse.digitaltwin.basyx.submodelservice.pathparsing.HierarchicalSubmodelElementParser;
import org.eclipse.digitaltwin.basyx.submodelservice.pathparsing.PathToken;
import org.eclipse.digitaltwin.basyx.submodelservice.pathparsing.SubmodelElementIdShortPathParser;
import org.junit.Test;
Expand Down Expand Up @@ -78,4 +79,27 @@ public void idShortWithSpecialCharactersDoesNotThrowError() {
Stack<PathToken> tokenStack = pathParser.parsePathTokens(ID_SHORT_WITH_SPECIAL_CHARACTERS);
assertEquals(ID_SHORT_WITH_SPECIAL_CHARACTERS, tokenStack.pop().getToken());
}

@Test
public void parentPathIsExtractedCorrectly() {
String[][] testCases = {
// input expected output
{ "a", "a" },
{ "a.b", "a" },
{ "a.b[0]", "a.b" },
{ "a.b[0].c", "a.b[0]" },
{ "a.b[0].c.d", "a.b[0].c" },
{ "sensor[3].value[1]", "sensor[3].value" },
{ "root.list[12][3]", "root.list[12]" },
{ "deep.nest[4].elem[2].data", "deep.nest[4].elem[2]" },
};

for (String[] testCase : testCases) {
String input = testCase[0];
String expected = testCase[1];
HierarchicalSubmodelElementParser hierarchicalSubmodelElementParser = new HierarchicalSubmodelElementParser(null);
String actual = hierarchicalSubmodelElementParser.getIdShortPathOfParentElement(input);
assertEquals("Failed for input: " + input, expected, actual);
}
}
}
17 changes: 17 additions & 0 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 @@ -464,6 +464,23 @@ public void updateFileSMEWithFileSME() throws FileNotFoundException, IOException
assertStoredFileContentEquals(submodelService, idShortPathPropertyInSmeCol, DUMMY_JSON_2);
}

@Test
public void updateSMEInSubmodelElementList(){
Submodel operationDataSubmodel = DummySubmodelFactory.createOperationalDataSubmodelWithHierarchicalSubmodelElements();
SubmodelService submodelService = getSubmodelService(operationDataSubmodel);

DefaultProperty submodelElement = (DefaultProperty) submodelService.getSubmodelElement(generateIdShortPath());

String expectedValue = "1308";
submodelElement.setValue(expectedValue);

submodelService.updateSubmodelElement(generateIdShortPath(), submodelElement);

DefaultProperty actualElement = (DefaultProperty) submodelService.getSubmodelElement(generateIdShortPath());

assertEquals(expectedValue, actualElement.getValue());
}

@Test
public void deleteNestedSubmodelElementInSubmodelElementCollection() {
Submodel operationDataSubmodel = DummySubmodelFactory.createOperationalDataSubmodelWithHierarchicalSubmodelElements();
Expand Down