Skip to content
Snippets Groups Projects
Commit c0cbfd01 authored by tranoris's avatar tranoris
Browse files

fix for #61

parent edb211d4
No related branches found
No related tags found
2 merge requests!59MR for Release 2024Q4,!53MR to resolve #61
Pipeline #10767 failed
Stage: build
Hide whitespace changes
Inline Side-by-side
src/main/java/org/etsi/osl/tmf/ri639/reposervices/ResourceRepoService.java
+ 0
− 1
View file @ c0cbfd01
...@@ -449,7 +449,6 @@ public class ResourceRepoService { ...@@ -449,7 +449,6 @@ public class ResourceRepoService {
resource = this.resourceRepo.save(resource); resource = this.resourceRepo.save(resource);
this.serviceRepoService.updateServicesHavingThisSupportingResource(resource);
if (resourceCharacteristicChanged) { if (resourceCharacteristicChanged) {
raiseResourceAttributeValueChangeEventNotification(resource); raiseResourceAttributeValueChangeEventNotification(resource);
......
src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiRouteBuilder.java
+ 13
− 13
View file @ c0cbfd01
...@@ -224,19 +224,19 @@ public class ServiceApiRouteBuilder extends RouteBuilder { ...@@ -224,19 +224,19 @@ public class ServiceApiRouteBuilder extends RouteBuilder {
// from( EVENT_RESOURCE_ATTRIBUTE_VALUE_CHANGED ) from( EVENT_RESOURCE_ATTRIBUTE_VALUE_CHANGED )
// .errorHandler(deadLetterChannel("direct:retriesDeadLetters") .errorHandler(deadLetterChannel("direct:retriesDeadLetters")
// .maximumRedeliveries(5) .maximumRedeliveries(5)
// .redeliveryDelay(1000).useOriginalMessage() .redeliveryDelay(1000).useOriginalMessage()
// .logExhausted(true) .logExhausted(true)
// .logHandled(true) .logHandled(true)
// .retriesExhaustedLogLevel(LoggingLevel.ERROR) .retriesExhaustedLogLevel(LoggingLevel.ERROR)
// .retryAttemptedLogLevel(LoggingLevel.ERROR)) .retryAttemptedLogLevel(LoggingLevel.ERROR))
//
// .log(LoggingLevel.INFO, log, EVENT_RESOURCE_ATTRIBUTE_VALUE_CHANGED + " message received and will be processed for service inventory!") .log(LoggingLevel.DEBUG, log, EVENT_RESOURCE_ATTRIBUTE_VALUE_CHANGED + " message received and will be processed for service inventory!")
// .to("log:DEBUG?showBody=true&showHeaders=true") .to("log:DEBUG?showBody=true&showHeaders=true")
// .unmarshal().json( JsonLibrary.Jackson, ResourceAttributeValueChangeNotification.class, true) .unmarshal().json( JsonLibrary.Jackson, ResourceAttributeValueChangeNotification.class, true)
// .bean( serviceRepoService, "resourceAttrChangedEvent(${body})"); .bean( serviceRepoService, "resourceAttrChangedEvent(${body})");
......
src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
+ 18
− 114
View file @ c0cbfd01
...@@ -340,26 +340,6 @@ public class ServiceRepoService { ...@@ -340,26 +340,6 @@ public class ServiceRepoService {
noteItem.setDate(OffsetDateTime.now(ZoneOffset.UTC) ); noteItem.setDate(OffsetDateTime.now(ZoneOffset.UTC) );
s.addNoteItem(noteItem); s.addNoteItem(noteItem);
// double characteristic investigation
//
//
// int cnt = 0;
// if ( service.getServiceCharacteristic()!=null)
// for (Characteristic ch : service.getServiceCharacteristic()) {
// if ( ch.getName().equals( "org.etsi.osl.prefixName" ) ) {
// cnt++;
// }
// if ( ch.getName().equals( "AdditionPropertiesAsJson" ) ) {
// logger.debug("=============================================> FOUND CHARACTERISTIC addService AdditionPropertiesAsJson IN addService" );
// logger.debug("=============================================> AdditionPropertiesAsJson charlength=" + ch.getValue().getValue().length() );
// }
// }
// if ( cnt>1) {
// logger.debug("=============================================> FOUND CHARACTERISTIC TWICE AFTER service addService" );
// }
s = this.serviceRepo.save( s ); s = this.serviceRepo.save( s );
raiseServiceCreateNotification(s); raiseServiceCreateNotification(s);
...@@ -385,23 +365,15 @@ public class ServiceRepoService { ...@@ -385,23 +365,15 @@ public class ServiceRepoService {
*/ */
@Transactional @Transactional
public Service updateService(String id, @Valid ServiceUpdate servUpd, boolean triggerServiceActionQueue, Service updatedFromParentService, Service updatedFromChildService ) { public Service updateService(String id, @Valid ServiceUpdate servUpd, boolean triggerServiceActionQueue, Service updatedFromParentService, Service updatedFromChildService ) {
logger.debug("================> Will updateService = " + id );
//Service service = this.findByUuid(id);
Service service = this.getServiceEager(id); Service service = this.getServiceEager(id);
if ( service == null ) { if ( service == null ) {
logger.error("Service cannot be found in registry, UUID: " + id ); logger.error("Service cannot be found in registry, UUID: " + id );
return null; return null;
} }
logger.info("Will update service: " + service.getName() ); logger.info("Will update service: " + service.getName() );
//logger.info("Will update service details: " + s.toString() );
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String originaServiceAsJson = null; String originaServiceAsJson = null;
...@@ -412,43 +384,6 @@ public class ServiceRepoService { ...@@ -412,43 +384,6 @@ public class ServiceRepoService {
e.printStackTrace(); e.printStackTrace();
} }
// double characteristic investigation
//
//
// int cnt = 0;
// if ( servUpd.getServiceCharacteristic() != null ) {
// for (Characteristic ch1 : servUpd.getServiceCharacteristic()) {
// if ( ch1.getName().equals( "org.etsi.osl.prefixName" ) ) {
// cnt++;
// }
// if ( ch1.getName().equals( "AdditionPropertiesAsJson" ) ) {
// logger.debug("=============================================> FOUND CHARACTERISTIC AdditionPropertiesAsJson IN servUpd" );
// logger.debug("=============================================> AdditionPropertiesAsJson charlength=" + ch1.getValue().getValue().length() );
// }
// }
// if ( cnt>1) {
// logger.debug("=============================================> FOUND CHARACTERISTIC TWICE servUpd updateService servUpd" );
// }
// }
// cnt = 0;
// for (Characteristic ch : service.getServiceCharacteristic()) {
// if ( ch.getName().equals( "org.etsi.osl.prefixName" ) ) {
// cnt++;
// }
// if ( ch.getName().equals( "AdditionPropertiesAsJson" ) ) {
// logger.debug("=============================================> FOUND CHARACTERISTIC AdditionPropertiesAsJson IN service" );
// logger.debug("=============================================> AdditionPropertiesAsJson charlength=" + ch.getValue().getValue().length() );
// }
// }
// if ( cnt>1) {
// logger.debug("=============================================> FOUND CHARACTERISTIC TWICE service updateService service" );
// }
if (servUpd.getType()!=null) { if (servUpd.getType()!=null) {
service.setType(servUpd.getType()); service.setType(servUpd.getType());
...@@ -497,8 +432,12 @@ public class ServiceRepoService { ...@@ -497,8 +432,12 @@ public class ServiceRepoService {
boolean stateChanged = false; boolean stateChanged = false;
ServiceStateType previousState = service.getState(); ServiceStateType previousState = service.getState();
if (servUpd.getState() != null ) { if (servUpd.getState() != null ) {
logger.debug("=============SERVICE STATE == previousState => " + service.getState() +", " + servUpd.getName());
logger.debug("=============SERVICE STATE == newState ======> " + servUpd.getState() +", " + service.getName());
stateChanged = service.getState() != servUpd.getState(); stateChanged = service.getState() != servUpd.getState();
service.setState(servUpd.getState()); service.setState(servUpd.getState());
} }
if (servUpd.getServiceSpecificationRef() != null ) { if (servUpd.getServiceSpecificationRef() != null ) {
...@@ -539,10 +478,6 @@ public class ServiceRepoService { ...@@ -539,10 +478,6 @@ public class ServiceRepoService {
boolean serviceCharacteristicChangedContainsNSLCM; boolean serviceCharacteristicChangedContainsNSLCM;
String charChangedForNotes = ""; String charChangedForNotes = "";
//List<Characteristic> childCharacteristicsChanged = new ArrayList<>();
//logger.info("==> Will update serviceToString: " + service.toString() );
if ( servUpd.getServiceCharacteristic()!=null ) { if ( servUpd.getServiceCharacteristic()!=null ) {
...@@ -590,20 +525,7 @@ public class ServiceRepoService { ...@@ -590,20 +525,7 @@ public class ServiceRepoService {
} else { } else {
service.addServiceCharacteristicItem(n); service.addServiceCharacteristicItem(n);
// double characteristic investigation
//
//
// if ( n.getName().equals( "AdditionPropertiesAsJson" ) ) {
// logger.debug("=============================================> ADDING AdditionPropertiesAsJson to service" );
// if ( n.getValue()!=null ) {
// logger.debug("=============================================> ADDING AdditionPropertiesAsJson charlength=" + n.getValue().getValue().length() );
// } else {
// logger.debug("=============================================> ADDING AdditionPropertiesAsJson charlength=NULL" );
// }
// }
if ( !n.getName().contains("::") ) { //it is not a child characteristic if ( !n.getName().contains("::") ) { //it is not a child characteristic
serviceCharacteristicChanged = true; serviceCharacteristicChanged = true;
charChangedForNotes += n.getName() + ", "; charChangedForNotes += n.getName() + ", ";
...@@ -651,7 +573,6 @@ public class ServiceRepoService { ...@@ -651,7 +573,6 @@ public class ServiceRepoService {
noteItem.setAuthor("SIM-638"); noteItem.setAuthor("SIM-638");
noteItem.setDate(OffsetDateTime.now(ZoneOffset.UTC) ); noteItem.setDate(OffsetDateTime.now(ZoneOffset.UTC) );
service.addNoteItem(noteItem); service.addNoteItem(noteItem);
logger.debug("=============SERVICE STATE ================================> " + service.getState() );
} }
...@@ -702,24 +623,7 @@ public class ServiceRepoService { ...@@ -702,24 +623,7 @@ public class ServiceRepoService {
service = this.serviceRepo.save( service ); service = this.serviceRepo.save( service );
// double characteristic investigation
//
//
// cnt = 0;
// for (Characteristic ch : service.getServiceCharacteristic()) {
// if ( ch.getName().equals( "org.etsi.osl.prefixName" ) ) {
// cnt++;
// }
// if ( ch.getName().equals( "AdditionPropertiesAsJson" ) ) {
// logger.debug("=============================================> FOUND CHARACTERISTIC AFTER AdditionPropertiesAsJson IN service" );
// logger.debug("=============================================> AdditionPropertiesAsJson charlength=" + ch.getValue().getValue().length() );
// }
// }
// if ( cnt>1) {
// logger.debug("=============================================> FOUND CHARACTERISTIC TWICE AFTER service updateService service" );
// }
String requestedServiceAsJson = null; String requestedServiceAsJson = null;
try { try {
...@@ -958,17 +862,6 @@ public class ServiceRepoService { ...@@ -958,17 +862,6 @@ public class ServiceRepoService {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new Hibernate5JakartaModule()); mapper.registerModule(new Hibernate5JakartaModule());
String res = mapper.writeValueAsString(s); String res = mapper.writeValueAsString(s);
// Characteristic schart = s.getServiceCharacteristicByName("long_string");
// if ( schart!= null ) {
// String teest = schart.getValue().getValue();
// logger.debug("schart size = " + teest.length() );
// logger.debug("schart " + teest );
// logger.debug("======================================================================================================");
// }
return res; return res;
} }
...@@ -1313,7 +1206,7 @@ public class ServiceRepoService { ...@@ -1313,7 +1206,7 @@ public class ServiceRepoService {
if (! servChar.getValue().getValue().equals( rChar.getValue().getValue() ) ) { if (! servChar.getValue().getValue().equals( rChar.getValue().getValue() ) ) {
characteristicFoundDifferent = true; characteristicFoundDifferent = true;
supd.getServiceCharacteristicByName( characteristicname ) .value(new Any( rChar.getValue() )); supd.getServiceCharacteristicByName( characteristicname ) .value(new Any( rChar.getValue() ));
logger.debug("====================> add characteristic: " + characteristicname +", value: "+ rChar.getValue().getValue()); logger.debug("====================> update characteristic: " + characteristicname +", value: "+ rChar.getValue().getValue());
} }
} else { } else {
...@@ -1385,7 +1278,18 @@ public class ServiceRepoService { ...@@ -1385,7 +1278,18 @@ public class ServiceRepoService {
}catch (Exception e) { }catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
}
@Transactional
public void resourceAttrChangedEvent(@Valid ResourceAttributeValueChangeNotification resNotif) {
try {
Resource res = resNotif.getEvent().getEvent().getResource();
logger.debug("resourceAttrChangedEvent for: " + res.getName());
updateServiceFromresourceChange(res);
}catch (Exception e) {
e.printStackTrace();
}
} }
@Transactional @Transactional
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment