Loading Dockerfile +2 −2 Changes for Dockerfile: 2 added lines, 2 removed lines. Original line number Diff line number Diff line FROM ibm-semeru-runtimes:open-17.0.7_7-jdk # RUN mkdir /opt/shareclasses RUN mkdir -p /opt/openslice/lib/ COPY target/org.etsi.osl.tmf.api-1.4.0-SNAPSHOT-exec.jar /opt/openslice/lib/ CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.tmf.api-1.4.0-SNAPSHOT-exec.jar"] COPY target/org.etsi.osl.tmf.api-2.0.0-SNAPSHOT-exec.jar /opt/openslice/lib/ CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.tmf.api-2.0.0-SNAPSHOT-exec.jar"] EXPOSE 13082 No newline at end of file pom.xml +1 −1 Changes for pom.xml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ <parent> <groupId>org.etsi.osl</groupId> <artifactId>org.etsi.osl.main</artifactId> <version>2026Q2-SNAPSHOT</version> <version>2026Q4-SNAPSHOT</version> <relativePath>../org.etsi.osl.main</relativePath> </parent> Loading src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java +15 −4 Changes for src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java: 15 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -1243,6 +1243,10 @@ public class ServiceRepoService { } private String normalizeValueType(String valueType) { return (valueType == null || valueType.isBlank()) ? "" : valueType.trim(); } private CharCopyResult copyCharacteristicsFromResource( @Valid Service aService, @Valid ServiceUpdate supd, @Valid Resource res) { Boolean characteristicFoundDifferent = false; Loading Loading @@ -1285,20 +1289,27 @@ public class ServiceRepoService { String characteristicname = kind + resourcename + rChar.getName(); Characteristic servChar = supd.getServiceCharacteristicByName( characteristicname ); if ( servChar != null && servChar.getValue() != null) { if (! servChar.getValue().getValue().equals( rChar.getValue().getValue() ) ) { boolean valueChanged = ! servChar.getValue().getValue().equals( rChar.getValue().getValue() ); boolean typeChanged = ! normalizeValueType( servChar.getValueType() ).equals( normalizeValueType( rChar.getValueType() ) ); if ( valueChanged || typeChanged ) { characteristicFoundDifferent = true; supd.getServiceCharacteristicByName( characteristicname ) .value(new Any( rChar.getValue() )); logger.debug("====================> update characteristic: " + characteristicname +", value: "+ rChar.getValue().getValue()); servChar.value( new Any( rChar.getValue() ) ); servChar.setValueType( rChar.getValueType() ); logger.debug("====================> update characteristic: " + characteristicname + ", value: " + rChar.getValue().getValue() + ", valueType: " + rChar.getValueType()); } } else { Characteristic cNew = new Characteristic(); cNew.setName( characteristicname ); cNew.value( new Any( rChar.getValue() )); cNew.setValueType( rChar.getValueType()); supd.addServiceCharacteristicItem( cNew ); characteristicFoundDifferent = true; logger.debug("====================> add New characteristic: " + characteristicname +", value: "+ rChar.getValue().getValue()); logger.debug("====================> add New characteristic: " + characteristicname +", value: " + rChar.getValue().getValue() + ", valueType: " + rChar.getValueType()); } Loading src/test/java/org/etsi/osl/services/api/ResourceOrderIntegrationTest.java +3 −1 Changes for src/test/java/org/etsi/osl/services/api/ResourceOrderIntegrationTest.java: 3 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -114,7 +114,9 @@ public class ResourceOrderIntegrationTest extends BaseIT { relationships.add(erel ); ResourceRefOrValue resrc = new ResourceRefOrValue(); // Resource's @JsonTypeInfo (model.tmf #35) requires "@type" to be present on the wire; // an absent property throws MissingTypeIdException before the custom resolver even runs. resrc.setType("LogicalResource"); resrc .addResourceCharacteristicItem(charitem) Loading src/test/java/org/etsi/osl/services/api/scm633/ServiceSpecificationApiControllerTest.java +1 −2 Changes for src/test/java/org/etsi/osl/services/api/scm633/ServiceSpecificationApiControllerTest.java: 1 added line, 2 removed lines. Original line number Diff line number Diff line Loading @@ -16,7 +16,6 @@ import org.apache.commons.io.IOUtils; import org.etsi.osl.services.api.BaseIT; import org.etsi.osl.tmf.JsonUtils; import org.etsi.osl.tmf.common.model.Attachment; import org.etsi.osl.tmf.rcm634.model.PhysicalResourceSpecification; import org.etsi.osl.tmf.rcm634.model.ResourceSpecification; import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate; import org.etsi.osl.tmf.rcm634.reposervices.ResourceSpecificationRepoService; Loading Loading @@ -366,7 +365,7 @@ public class ServiceSpecificationApiControllerTest extends BaseIT { .andReturn().getResponse().getContentAsString(); assertThat( resourceSpecificationRepoService.findAll().size() ).isEqualTo( originalSize + 1 ); ResourceSpecification responsesSpec1 = JsonUtils.toJsonObj(responseSpec, PhysicalResourceSpecification.class); ResourceSpecification responsesSpec1 = JsonUtils.toJsonObj(responseSpec, ResourceSpecification.class); assertThat(responsesSpec1.getName()).isEqualTo("Test Resource Spec"); String rSpecId = responsesSpec1.getId(); assertThat( specRepoService.findAll().size() ).isEqualTo( 7); Loading Loading
Dockerfile +2 −2 Changes for Dockerfile: 2 added lines, 2 removed lines. Original line number Diff line number Diff line FROM ibm-semeru-runtimes:open-17.0.7_7-jdk # RUN mkdir /opt/shareclasses RUN mkdir -p /opt/openslice/lib/ COPY target/org.etsi.osl.tmf.api-1.4.0-SNAPSHOT-exec.jar /opt/openslice/lib/ CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.tmf.api-1.4.0-SNAPSHOT-exec.jar"] COPY target/org.etsi.osl.tmf.api-2.0.0-SNAPSHOT-exec.jar /opt/openslice/lib/ CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.tmf.api-2.0.0-SNAPSHOT-exec.jar"] EXPOSE 13082 No newline at end of file
pom.xml +1 −1 Changes for pom.xml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ <parent> <groupId>org.etsi.osl</groupId> <artifactId>org.etsi.osl.main</artifactId> <version>2026Q2-SNAPSHOT</version> <version>2026Q4-SNAPSHOT</version> <relativePath>../org.etsi.osl.main</relativePath> </parent> Loading
src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java +15 −4 Changes for src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java: 15 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -1243,6 +1243,10 @@ public class ServiceRepoService { } private String normalizeValueType(String valueType) { return (valueType == null || valueType.isBlank()) ? "" : valueType.trim(); } private CharCopyResult copyCharacteristicsFromResource( @Valid Service aService, @Valid ServiceUpdate supd, @Valid Resource res) { Boolean characteristicFoundDifferent = false; Loading Loading @@ -1285,20 +1289,27 @@ public class ServiceRepoService { String characteristicname = kind + resourcename + rChar.getName(); Characteristic servChar = supd.getServiceCharacteristicByName( characteristicname ); if ( servChar != null && servChar.getValue() != null) { if (! servChar.getValue().getValue().equals( rChar.getValue().getValue() ) ) { boolean valueChanged = ! servChar.getValue().getValue().equals( rChar.getValue().getValue() ); boolean typeChanged = ! normalizeValueType( servChar.getValueType() ).equals( normalizeValueType( rChar.getValueType() ) ); if ( valueChanged || typeChanged ) { characteristicFoundDifferent = true; supd.getServiceCharacteristicByName( characteristicname ) .value(new Any( rChar.getValue() )); logger.debug("====================> update characteristic: " + characteristicname +", value: "+ rChar.getValue().getValue()); servChar.value( new Any( rChar.getValue() ) ); servChar.setValueType( rChar.getValueType() ); logger.debug("====================> update characteristic: " + characteristicname + ", value: " + rChar.getValue().getValue() + ", valueType: " + rChar.getValueType()); } } else { Characteristic cNew = new Characteristic(); cNew.setName( characteristicname ); cNew.value( new Any( rChar.getValue() )); cNew.setValueType( rChar.getValueType()); supd.addServiceCharacteristicItem( cNew ); characteristicFoundDifferent = true; logger.debug("====================> add New characteristic: " + characteristicname +", value: "+ rChar.getValue().getValue()); logger.debug("====================> add New characteristic: " + characteristicname +", value: " + rChar.getValue().getValue() + ", valueType: " + rChar.getValueType()); } Loading
src/test/java/org/etsi/osl/services/api/ResourceOrderIntegrationTest.java +3 −1 Changes for src/test/java/org/etsi/osl/services/api/ResourceOrderIntegrationTest.java: 3 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -114,7 +114,9 @@ public class ResourceOrderIntegrationTest extends BaseIT { relationships.add(erel ); ResourceRefOrValue resrc = new ResourceRefOrValue(); // Resource's @JsonTypeInfo (model.tmf #35) requires "@type" to be present on the wire; // an absent property throws MissingTypeIdException before the custom resolver even runs. resrc.setType("LogicalResource"); resrc .addResourceCharacteristicItem(charitem) Loading
src/test/java/org/etsi/osl/services/api/scm633/ServiceSpecificationApiControllerTest.java +1 −2 Changes for src/test/java/org/etsi/osl/services/api/scm633/ServiceSpecificationApiControllerTest.java: 1 added line, 2 removed lines. Original line number Diff line number Diff line Loading @@ -16,7 +16,6 @@ import org.apache.commons.io.IOUtils; import org.etsi.osl.services.api.BaseIT; import org.etsi.osl.tmf.JsonUtils; import org.etsi.osl.tmf.common.model.Attachment; import org.etsi.osl.tmf.rcm634.model.PhysicalResourceSpecification; import org.etsi.osl.tmf.rcm634.model.ResourceSpecification; import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate; import org.etsi.osl.tmf.rcm634.reposervices.ResourceSpecificationRepoService; Loading Loading @@ -366,7 +365,7 @@ public class ServiceSpecificationApiControllerTest extends BaseIT { .andReturn().getResponse().getContentAsString(); assertThat( resourceSpecificationRepoService.findAll().size() ).isEqualTo( originalSize + 1 ); ResourceSpecification responsesSpec1 = JsonUtils.toJsonObj(responseSpec, PhysicalResourceSpecification.class); ResourceSpecification responsesSpec1 = JsonUtils.toJsonObj(responseSpec, ResourceSpecification.class); assertThat(responsesSpec1.getName()).isEqualTo("Test Resource Spec"); String rSpecId = responsesSpec1.getId(); assertThat( specRepoService.findAll().size() ).isEqualTo( 7); Loading