Skip to content
Snippets Groups Projects
Commit 36cea0de authored by tranoris's avatar tranoris Committed by trantzas
Browse files

fix for #40 

(cherry picked from commit 888ca64b)
parent 78d32db8
No related branches found
No related tags found
3 merge requests!36Merging 2024Q2_RC into main, creating 2024Q2 Release,!35Merging 2024Q2_RC into develop,!31fix for #40
Pipeline #7015 failed
Hide whitespace changes
Inline Side-by-side
src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java
+ 42
− 42
View file @ 36cea0de
...@@ -622,7 +622,7 @@ public class ServiceSpecificationRepoService { ...@@ -622,7 +622,7 @@ public class ServiceSpecificationRepoService {
* Also, * Also,
* we will add by default all the characteristics of this rSpec to the related bundle parent service * we will add by default all the characteristics of this rSpec to the related bundle parent service
*/ */
//serviceSpec = copyCharacteristicsOfResourceSpecId( ar.getId(), serviceSpec); serviceSpec = copyCharacteristicsOfResourceSpecId( ar.getId(), serviceSpec);
} }
} }
...@@ -699,24 +699,24 @@ public class ServiceSpecificationRepoService { ...@@ -699,24 +699,24 @@ public class ServiceSpecificationRepoService {
return targetServiceSpec; return targetServiceSpec;
} }
// private ServiceSpecification copyCharacteristicsOfResourceSpecId(String sourceResourceSpecid, ServiceSpecification targetServiceSpec) { private ServiceSpecification copyCharacteristicsOfResourceSpecId(String sourceResourceSpecid, ServiceSpecification targetServiceSpec) {
//
// ResourceSpecification rSpec = resourceSpecRepoService.findByUuid( sourceResourceSpecid ); ResourceSpecification rSpec = resourceSpecRepoService.findByUuid( sourceResourceSpecid );
//
// if ( rSpec != null ) { if ( rSpec != null ) {
// for (ResourceSpecificationCharacteristic sourceChar : rSpec.getResourceSpecCharacteristic()) { for (ResourceSpecificationCharacteristic sourceChar : rSpec.getResourceSpecCharacteristic()) {
// ServiceSpecCharacteristic serviceSpecCharacteristicItem = copyResourceCharacteristic( sourceChar ); ServiceSpecCharacteristic serviceSpecCharacteristicItem = copyResourceCharacteristic( sourceChar );
// //serviceSpecCharacteristicItem.setName( rSpec.getName() + "::" +sourceChar.getName() ); //serviceSpecCharacteristicItem.setName( rSpec.getName() + "::" +sourceChar.getName() );
// serviceSpecCharacteristicItem.setName( sourceChar.getName() ); serviceSpecCharacteristicItem.setName( sourceChar.getName() );
//
// if ( targetServiceSpec.findSpecCharacteristicByName( serviceSpecCharacteristicItem.getName() ) == null ) { if ( targetServiceSpec.findSpecCharacteristicByName( serviceSpecCharacteristicItem.getName() ) == null ) {
// targetServiceSpec.getServiceSpecCharacteristic().add( serviceSpecCharacteristicItem ); targetServiceSpec.getServiceSpecCharacteristic().add( serviceSpecCharacteristicItem );
// } }
// } }
// } }
//
// return targetServiceSpec; return targetServiceSpec;
// } }
public ServiceSpecification cloneServiceSpecification(String uuid) { public ServiceSpecification cloneServiceSpecification(String uuid) {
ServiceSpecification source = this.findByUuid(uuid); ServiceSpecification source = this.findByUuid(uuid);
...@@ -1422,11 +1422,11 @@ public class ServiceSpecificationRepoService { ...@@ -1422,11 +1422,11 @@ public class ServiceSpecificationRepoService {
// for (ResourceSpecificationCharacteristic sourceChar : rSpec.getResourceSpecCharacteristic()) { for (ResourceSpecificationCharacteristic sourceChar : rSpec.getResourceSpecCharacteristic()) {
// ServiceSpecCharacteristic serviceSpecCharacteristicItem = copyResourceCharacteristic( sourceChar ); ServiceSpecCharacteristic serviceSpecCharacteristicItem = copyResourceCharacteristic( sourceChar );
// serviceSpecCharacteristicItem.setName( rSpec.getName() + "::" +sourceChar.getName() ); // serviceSpecCharacteristicItem.setName( rSpec.getName() + "::" +sourceChar.getName() );
// serviceSpec.addServiceSpecCharacteristicItem(serviceSpecCharacteristicItem ); serviceSpec.addServiceSpecCharacteristicItem(serviceSpecCharacteristicItem );
// } }
ResourceSpecificationRef resourceSpecRef = new ResourceSpecificationRef(); ResourceSpecificationRef resourceSpecRef = new ResourceSpecificationRef();
...@@ -1439,25 +1439,25 @@ public class ServiceSpecificationRepoService { ...@@ -1439,25 +1439,25 @@ public class ServiceSpecificationRepoService {
return serviceSpec; return serviceSpec;
} }
// private ServiceSpecCharacteristic copyResourceCharacteristic( ResourceSpecificationCharacteristic sourceChar ) { private ServiceSpecCharacteristic copyResourceCharacteristic( ResourceSpecificationCharacteristic sourceChar ) {
//
// ServiceSpecCharacteristic serviceSpecCharacteristicItem = new ServiceSpecCharacteristic(); ServiceSpecCharacteristic serviceSpecCharacteristicItem = new ServiceSpecCharacteristic();
// serviceSpecCharacteristicItem.setDescription( sourceChar.getDescription()); serviceSpecCharacteristicItem.setDescription( sourceChar.getDescription());
// serviceSpecCharacteristicItem.valueType( sourceChar.getValueType() ); serviceSpecCharacteristicItem.valueType( sourceChar.getValueType() );
// serviceSpecCharacteristicItem.configurable(sourceChar.isConfigurable()); serviceSpecCharacteristicItem.configurable(sourceChar.isConfigurable());
// serviceSpecCharacteristicItem.setMinCardinality( sourceChar.getMinCardinality() ); serviceSpecCharacteristicItem.setMinCardinality( sourceChar.getMinCardinality() );
// serviceSpecCharacteristicItem.setMaxCardinality( sourceChar.getMaxCardinality() ); serviceSpecCharacteristicItem.setMaxCardinality( sourceChar.getMaxCardinality() );
// serviceSpecCharacteristicItem.setValidFor( sourceChar.getValidFor() ); serviceSpecCharacteristicItem.setValidFor( sourceChar.getValidFor() );
// for (ResourceSpecificationCharacteristicValue cv : sourceChar.getResourceSpecCharacteristicValue()) { for (ResourceSpecificationCharacteristicValue cv : sourceChar.getResourceSpecCharacteristicValue()) {
// ServiceSpecCharacteristicValue serviceSpecCharacteristicValueItem = new ServiceSpecCharacteristicValue(); ServiceSpecCharacteristicValue serviceSpecCharacteristicValueItem = new ServiceSpecCharacteristicValue();
// serviceSpecCharacteristicValueItem.setValue( new Any( cv.getValue().getValue(), cv.getValue().getAlias())); serviceSpecCharacteristicValueItem.setValue( new Any( cv.getValue().getValue(), cv.getValue().getAlias()));
// serviceSpecCharacteristicValueItem.isDefault( cv.isIsDefault() ); serviceSpecCharacteristicValueItem.isDefault( cv.isIsDefault() );
// serviceSpecCharacteristicValueItem.setUnitOfMeasure( cv.getUnitOfMeasure() ); serviceSpecCharacteristicValueItem.setUnitOfMeasure( cv.getUnitOfMeasure() );
// serviceSpecCharacteristicItem.addServiceSpecCharacteristicValueItem(serviceSpecCharacteristicValueItem ); serviceSpecCharacteristicItem.addServiceSpecCharacteristicValueItem(serviceSpecCharacteristicValueItem );
// } }
// return serviceSpecCharacteristicItem; return serviceSpecCharacteristicItem;
// } }
//
......
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