Update Spring Boot to 3.5.0 and fix SubmodelElement event path computation (#770)

* Remove deprecated includeLayerTools from spring-boot-maven-plugin and correct SubmodelElement path computation

- Updated spring-boot-maven-plugin to 3.5.0 and removed includeLayerTools configuration as it was removed in this version. It's active by default
- Fixed SubmodelElement path in event handling: now computes full path, including list index if parent is a SubmodelElementList.

* Fix testcases

* Also remove includeLayerTool tag from submodel registry

* Increase spring version to 3.5.0

Author: geso02

basyx.aasregistry/pom.xml

@@ -295,7 +295,6 @@
 						<configuration>
 							<layers>
 								<enabled>true</enabled>
-								<includeLayerTools>true</includeLayerTools>
 							</layers>
 						</configuration>
 						<executions>

basyx.submodelregistry/pom.xml

@@ -276,7 +276,6 @@
 						<configuration>
 							<layers>
 								<enabled>true</enabled>
-								<includeLayerTools>true</includeLayerTools>
 							</layers>
 						</configuration>
 						<executions>

basyx.submodelrepository/basyx.submodelrepository-feature-kafka/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/kafka/KafkaSubmodelRepository.java

@@ -31,6 +31,7 @@
 import org.eclipse.digitaltwin.aas4j.v3.model.OperationVariable;
 import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;
 import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement;
+import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElementList;
 import org.eclipse.digitaltwin.basyx.core.exceptions.CollidingIdentifierException;
 import org.eclipse.digitaltwin.basyx.core.exceptions.ElementDoesNotExistException;
 import org.eclipse.digitaltwin.basyx.core.pagination.CursorResult;
@@ -114,10 +115,24 @@ public void createSubmodelElement(String submodelId, SubmodelElement submodelEle
 	}
 
 	@Override
-	public void createSubmodelElement(String submodelId, String idShortPath, SubmodelElement submodelElement)
+	public void createSubmodelElement(String submodelId, String parentPath, SubmodelElement submodelElement)
 			throws ElementDoesNotExistException {
-		decorated.createSubmodelElement(submodelId, idShortPath, submodelElement);
-		eventHandler.onSubmodelElementCreated(submodelElement, submodelId, idShortPath);
+		decorated.createSubmodelElement(submodelId, parentPath, submodelElement);
+		String path = computePath(submodelId, parentPath, submodelElement.getIdShort());
+		eventHandler.onSubmodelElementCreated(submodelElement, submodelId, path);
+	}
+
+	private String computePath(String submodelId, String parentPath, String smeIdShort) {
+		SubmodelElement parent = getSubmodelElement(submodelId, parentPath);
+			if (parent instanceof SubmodelElementList) {
+				SubmodelElementList parentList = (SubmodelElementList) parent;
+				int listSize = parentList.getValue().size();
+				int pos = listSize -1; // already added starting with zero
+				// new element is appended
+				return parentPath + "[" + pos + "]";
+			} else {
+				return parentPath + "." + smeIdShort;
+			}
 	}
 
 	@Override

basyx.submodelrepository/basyx.submodelrepository-feature-kafka/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/kafka/KafkaEventsInMemoryStorageIntegrationTest.java

@@ -238,7 +238,27 @@ public void testSubmodelElementAddedUnderPath() {
 		evt = adapter.next();
 		Assert.assertEquals(SubmodelEventType.SME_CREATED, evt.getType());
 		Assert.assertEquals(ID_SM1, evt.getId());
-		Assert.assertEquals(TestSubmodels.IDSHORT_COLL, evt.getSmElementPath());
+		Assert.assertEquals(TestSubmodels.IDSHORT_COLL + "." + TestSubmodels.IDSHORT_PROP_1, evt.getSmElementPath());
+		Assert.assertNull(evt.getSubmodel());
+		Assert.assertEquals(elem, evt.getSmElement());
+	}
+	
+	@Test
+	public void testSubmodelElementAddedUnderListPath() {
+		Submodel sm = TestSubmodels.createSubmodel(ID_SM1, TestSubmodels.IDSHORT_PROP_0, "7");
+		sm.getSubmodelElements().add(new DefaultSubmodelElementList.Builder().idShort("List")
+				.value(new DefaultProperty.Builder().idShort("P77").value("77").build())
+				.build());
+		repo.createSubmodel(sm);
+		SubmodelEvent evt = adapter.next();
+		Assert.assertEquals(SubmodelEventType.SM_CREATED, evt.getType());
+
+		SubmodelElement elem = TestSubmodels.submodelElement(TestSubmodels.IDSHORT_PROP_1, "88");
+		repo.createSubmodelElement(ID_SM1, "List", elem);
+		evt = adapter.next();
+		Assert.assertEquals(SubmodelEventType.SME_CREATED, evt.getType());
+		Assert.assertEquals(ID_SM1, evt.getId());
+		Assert.assertEquals("List[1]", evt.getSmElementPath());
 		Assert.assertNull(evt.getSubmodel());
 		Assert.assertEquals(elem, evt.getSmElement());
 	}
@@ -259,7 +279,7 @@ public void testSubmodelElementAddedAndBlobValueNotPartOfTheEvent() {
 		SubmodelElementList expected = new DefaultSubmodelElementList.Builder().idShort(IDSHORT_LIST0).value(new DefaultBlob.Builder().idShort(IDSHORT_BLOB).build()).build();
 
 		Assert.assertEquals(TestSubmodels.ID_SM, evtCreated.getId());
-		Assert.assertEquals(TestSubmodels.IDSHORT_COLL, evtCreated.getSmElementPath());
+		Assert.assertEquals(TestSubmodels.IDSHORT_COLL + "." + IDSHORT_LIST0, evtCreated.getSmElementPath());
 		Assert.assertEquals(expected, evtCreated.getSmElement());
 		Assert.assertNull(evtCreated.getSubmodel());
 	}

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.5</version>
+		<version>3.5.0</version>
 		<relativePath />
 	</parent>
 	<groupId>org.eclipse.digitaltwin.basyx</groupId>