* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openecomp.sdc.tosca.datatypes.model;
+import java.util.HashSet;
import java.util.List;
import java.util.Objects;
}
Implementation that = (Implementation) o;
return Objects.equals(primary, that.primary) &&
- Objects.equals(dependencies, that.dependencies);
+ Objects.equals(new HashSet<>(dependencies), new HashSet<>(that.dependencies));
}
@Override
public int hashCode() {
-
return Objects.hash(primary, dependencies);
}
}
*/
package org.openecomp.sdc.tosca.datatypes.model;
+import java.util.Map;
+
public abstract class InterfaceDefinition {
- public abstract void addOperation(String operationName, OperationDefinition operationDefinition);
+ protected Map<String, OperationDefinition> operations;
+
+ public abstract void addOperation(String operationName, OperationDefinition operationDefinition);
}
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
public class InterfaceDefinitionTemplate extends InterfaceDefinition {
return operations;
}
- public void setOperations(
- Map<String, OperationDefinitionTemplate> operations) {
- this.operations = operations;
- }
-
public void addOperation(String operationName, OperationDefinitionTemplate operation) {
if(MapUtils.isEmpty(this.operations)) {
this.operations = new HashMap<>();
if (!(o instanceof InterfaceDefinitionTemplate)) {
return false;
}
-
InterfaceDefinitionTemplate that = (InterfaceDefinitionTemplate) o;
-
- if (getInputs() != null ? !getInputs().equals(that.getInputs()) : that.getInputs() != null) {
- return false;
- }
- return getOperations() != null ? getOperations().equals(that.getOperations())
- : that.getOperations() == null;
+ return Objects.equals(inputs, that.inputs) &&
+ Objects.equals(operations, that.operations);
}
@Override
public int hashCode() {
- int result = getInputs() != null ? getInputs().hashCode() : 0;
- result = 31 * result + (getOperations() != null ? getOperations().hashCode() : 0);
- return result;
+
+ return Objects.hash(inputs, operations);
}
@Override
* limitations under the License.
*/
+
package org.openecomp.sdc.tosca.datatypes.model;
import org.apache.commons.collections4.MapUtils;
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.openecomp.sdc.tosca.datatypes.model;
import java.util.Map;
import java.util.Objects;
-public class OperationDefinitionTemplate extends OperationDefinition{
+public class OperationDefinitionTemplate extends OperationDefinition {
private Implementation implementation;
private Map<String, Object> inputs;
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.openecomp.sdc.tosca.datatypes.model;
import java.util.Map;
import org.openecomp.core.converter.errors.CreateToscaObjectErrorBuilder;
import org.openecomp.sdc.common.errors.CoreException;
import org.openecomp.sdc.common.utils.CommonUtil;
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
import java.util.HashSet;
import java.util.Map;
CommonUtil.createObjectUsingSetters(interfaceObj, interfaceClass);
interfaceDefinition.ifPresent(interfaceDefinitionType1 -> updateInterfaceDefinitionOperations(
CommonUtil.getObjectAsMap(interfaceObj),
- interfaceDefinitionType1));
+ interfaceDefinitionType1, getOperationClass(interfaceClass)));
return interfaceDefinition;
} catch (Exception ex) {
throw new CoreException(
new CreateInterfaceObjectErrorBuilder(InterfaceDefinitionType.class.getName(),
- interfaceId, ex.getMessage()).build());
+ interfaceId,
+ ex.getMessage()).build());
}
}
+ private static <T extends OperationDefinition, V extends InterfaceDefinition> Class<T> getOperationClass(
+ Class<V> interfaceClass) {
+ return interfaceClass.equals(InterfaceDefinitionType.class)
+ ? (Class<T>) OperationDefinitionType.class
+ :
+ (Class<T>) OperationDefinitionTemplate.class;
+ }
+
public static Optional<Object> convertInterfaceDefinitionToObj(
InterfaceDefinitionType interfaceDefinitionType) {
return converInetrfaceToToscaInterfaceObj(interfaceDefinitionType);
return Optional.empty();
}
- private static <T extends OperationDefinition> void updateInterfaceDefinitionOperations(
- Map<String, Object> interfaceAsMap,
- InterfaceDefinition interfaceDefinition) {
+ private static <T extends OperationDefinition> void updateInterfaceDefinitionOperations
+ (Map<String, Object> interfaceAsMap, InterfaceDefinition interfaceDefinition,
+ Class<T> operationClass) {
- Set<String> fieldNames = CommonUtil.getClassFieldNames(InterfaceDefinitionType.class);
- Optional<? extends OperationDefinition> operationDefinition = Optional.empty();
+ Set<String> fieldNames = CommonUtil.getClassFieldNames(interfaceDefinition.getClass());
+ Optional<? extends OperationDefinition> operationDefinition;
for (Map.Entry<String, Object> entry : interfaceAsMap.entrySet()) {
- operationDefinition = createOperation(entry.getKey(), entry.getValue(), fieldNames,
- interfaceDefinition instanceof InterfaceDefinitionType ? OperationDefinitionType.class :
- OperationDefinitionTemplate.class);
-
- operationDefinition
- .ifPresent(operation -> interfaceDefinition.addOperation(entry.getKey(), operation));
-
+ operationDefinition =
+ createOperation(entry.getKey(), entry.getValue(), fieldNames, operationClass);
+ operationDefinition.ifPresent(operation -> addOperationToInterface(interfaceDefinition,
+ entry.getKey(), operation));
+ }
+ }
+
+ private static void addOperationToInterface(InterfaceDefinition interfaceDefinition,
+ String operationName,
+ OperationDefinition operationDefinition) {
+ if (interfaceDefinition instanceof InterfaceDefinitionType) {
+ InterfaceDefinitionType interfaceDefinitionType =
+ (InterfaceDefinitionType) interfaceDefinition;
+ interfaceDefinitionType.addOperation(operationName, (OperationDefinitionType)
+ operationDefinition);
+ }
+ if (interfaceDefinition instanceof InterfaceDefinitionTemplate) {
+ InterfaceDefinitionTemplate interfaceDefinitionTemplate =
+ (InterfaceDefinitionTemplate) interfaceDefinition;
+ interfaceDefinitionTemplate.addOperation(operationName, (OperationDefinitionTemplate)
+ operationDefinition);
}
}
Code Review / sdc.git / commitdiff