diff options
Diffstat (limited to 'common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinition.java')
-rw-r--r-- | common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinition.java | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinition.java index 9bb35d81eb..0936b753c5 100644 --- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinition.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.onap.sdc.tosca.datatypes.model; import java.util.Map; @@ -24,38 +23,30 @@ import org.onap.sdc.tosca.services.CommonUtil; public abstract class InterfaceDefinition extends Interface { - protected static final String CONVERT_INTERFACE_DEFINITION_OBJECT_ERROR = - "Could not create InterfaceDefinition from input object, input object - "; + protected static final String CONVERT_INTERFACE_DEFINITION_OBJECT_ERROR = "Could not create InterfaceDefinition from input object, input object - "; protected InterfaceDefinition convertObjToInterfaceDefinition(Object toscaInterfaceObj) { try { - Optional<? extends InterfaceDefinition> interfaceDefinition = - CommonUtil.createObjectUsingSetters(toscaInterfaceObj, this.getClass()); + Optional<? extends InterfaceDefinition> interfaceDefinition = CommonUtil.createObjectUsingSetters(toscaInterfaceObj, this.getClass()); if (interfaceDefinition.isPresent()) { - updateInterfaceDefinitionOperations(CommonUtil.getObjectAsMap(toscaInterfaceObj), - interfaceDefinition.get()); + updateInterfaceDefinitionOperations(CommonUtil.getObjectAsMap(toscaInterfaceObj), interfaceDefinition.get()); return interfaceDefinition.get(); } else { - throw new ToscaRuntimeException( - CONVERT_INTERFACE_DEFINITION_OBJECT_ERROR + toscaInterfaceObj.toString()); + throw new ToscaRuntimeException(CONVERT_INTERFACE_DEFINITION_OBJECT_ERROR + toscaInterfaceObj.toString()); } } catch (Exception exc) { - throw new ToscaRuntimeException(CONVERT_INTERFACE_DEFINITION_OBJECT_ERROR - + toscaInterfaceObj.toString(), exc); + throw new ToscaRuntimeException(CONVERT_INTERFACE_DEFINITION_OBJECT_ERROR + toscaInterfaceObj.toString(), exc); } - } private <T extends OperationDefinition> void updateInterfaceDefinitionOperations(Map<String, Object> interfaceAsMap, - InterfaceDefinition interfaceDefinition) { + InterfaceDefinition interfaceDefinition) { Set<String> fieldNames = CommonUtil.getClassFieldNames(interfaceDefinition.getClass()); for (Map.Entry<String, Object> entry : interfaceAsMap.entrySet()) { - Optional<Map.Entry<String, ? extends OperationDefinition>> operationDefinition = - createOperation(entry.getKey(), entry.getValue(), fieldNames, - interfaceDefinition instanceof InterfaceDefinitionType ? OperationDefinitionType.class - : OperationDefinitionTemplate.class); - operationDefinition - .ifPresent(operation -> interfaceDefinition.addOperation(operation.getKey(), operation.getValue())); + Optional<Map.Entry<String, ? extends OperationDefinition>> operationDefinition = createOperation(entry.getKey(), entry.getValue(), + fieldNames, + interfaceDefinition instanceof InterfaceDefinitionType ? OperationDefinitionType.class : OperationDefinitionTemplate.class); + operationDefinition.ifPresent(operation -> interfaceDefinition.addOperation(operation.getKey(), operation.getValue())); } } |