diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd')
14 files changed, 22 insertions, 52 deletions
diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/PnfdTransformationEngine.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/PnfdTransformationEngine.java index 12949f2dcc..fa1487f444 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/PnfdTransformationEngine.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/PnfdTransformationEngine.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd; /** @@ -26,5 +25,4 @@ package org.openecomp.core.converter.pnfd; public interface PnfdTransformationEngine { void transform(); - } diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/exception/QueryOperationNotSupportedException.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/exception/QueryOperationNotSupportedException.java index a3f4b83812..e070c449ad 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/exception/QueryOperationNotSupportedException.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/exception/QueryOperationNotSupportedException.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.exception; public class QueryOperationNotSupportedException extends RuntimeException { @@ -24,5 +23,4 @@ public class QueryOperationNotSupportedException extends RuntimeException { public QueryOperationNotSupportedException(final String s) { super(s); } - } diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionDefinition.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionDefinition.java index fa06ab800e..7ef99f2562 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionDefinition.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionDefinition.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.model; import lombok.AllArgsConstructor; @@ -32,8 +31,7 @@ public class ConversionDefinition { private PnfdConversionStrategy pnfdConversionStrategy; private String toGetInput; - public ConversionDefinition(ConversionQuery conversionQuery, String toAttributeName, - PnfdConversionStrategy pnfdConversionStrategy) { + public ConversionDefinition(ConversionQuery conversionQuery, String toAttributeName, PnfdConversionStrategy pnfdConversionStrategy) { this.conversionQuery = conversionQuery; this.toAttributeName = toAttributeName; this.pnfdConversionStrategy = pnfdConversionStrategy; diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionQuery.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionQuery.java index fc1ef75f05..ced653d8d8 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionQuery.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionQuery.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.model; import java.util.Map; @@ -25,8 +24,8 @@ import lombok.EqualsAndHashCode; import lombok.Getter; /** - * Stores a YAML query. The query is a YAML Object that should have the same structure or part of the original YAML that - * is desired to find in a TOSCA Yaml block. + * Stores a YAML query. The query is a YAML Object that should have the same structure or part of the original YAML that is desired to find in a TOSCA + * Yaml block. */ @Getter @EqualsAndHashCode diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionStrategyType.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionStrategyType.java index b5c1f7c411..b58834b1fa 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionStrategyType.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/ConversionStrategyType.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.model; import java.util.Optional; @@ -25,25 +24,18 @@ import java.util.Optional; * Represents a type of a conversion strategy */ public enum ConversionStrategyType { - COPY("copy"), - REPLACE("replace"), - REPLACE_IN_LIST("replaceInList"); - + COPY("copy"), REPLACE("replace"), REPLACE_IN_LIST("replaceInList"); private final String type; ConversionStrategyType(final String type) { this.type = type; } - public String getType() { - return type; - } - /** * Parse a String to the related {@link ConversionStrategyType}. - * @param type the {@link ConversionStrategyType} type - * @return - * The {@link ConversionStrategyType} representing the given type. + * + * @param type the {@link ConversionStrategyType} type + * @return The {@link ConversionStrategyType} representing the given type. */ public static Optional<ConversionStrategyType> parse(final String type) { for (final ConversionStrategyType conversionStrategyType : values()) { @@ -51,7 +43,10 @@ public enum ConversionStrategyType { return Optional.of(conversionStrategyType); } } - return Optional.empty(); } + + public String getType() { + return type; + } } diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/PnfTransformationToken.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/PnfTransformationToken.java index 886614799f..4a0433aeef 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/PnfTransformationToken.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/PnfTransformationToken.java @@ -16,13 +16,13 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.model; /** * Represents a token from the transformation descriptor */ public enum PnfTransformationToken { + // @formatter:off CONVERSIONS("conversions"), FROM("from"), LIST("list"), @@ -38,6 +38,7 @@ public enum PnfTransformationToken { TO_GET_INPUT("to-get-input"), PROPERTIES("properties"), NODE_TYPE("node_types"); + // @formatter:on private final String name; diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/Transformation.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/Transformation.java index ff3e19bd1b..313ac2c158 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/Transformation.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/Transformation.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.model; import java.util.List; @@ -38,7 +37,6 @@ import org.openecomp.sdc.logging.api.LoggerFactory; public class Transformation { private static final Logger LOGGER = LoggerFactory.getLogger(Transformation.class); - private String name; private String description; private TransformationBlock block; @@ -69,12 +67,10 @@ public class Transformation { final Transformation that = (Transformation) o; //if there is no query, compares by block and name. if (conversionQuery == null && that.conversionQuery == null) { - return block == that.block && - Objects.equals(name, that.name); + return block == that.block && Objects.equals(name, that.name); } //transformations with the same block and query will override themselves. - return block == that.block && - Objects.equals(conversionQuery, that.conversionQuery); + return block == that.block && Objects.equals(conversionQuery, that.conversionQuery); } @Override @@ -86,10 +82,8 @@ public class Transformation { if (CollectionUtils.isEmpty(propertySet)) { return Optional.empty(); } - final Optional<TransformationProperty> transformationProperty = propertySet.stream() - .filter(transformationProperty1 -> transformationProperty1.getType() == type) - .findFirst(); + .filter(transformationProperty1 -> transformationProperty1.getType() == type).findFirst(); if (transformationProperty.isPresent()) { try { T value = clazz.cast(transformationProperty.get().getValue()); @@ -99,7 +93,6 @@ public class Transformation { return Optional.empty(); } } - return Optional.empty(); } } diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationBlock.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationBlock.java index f8a5aee407..d29a8ca91f 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationBlock.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationBlock.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.model; import java.util.Optional; @@ -29,19 +28,21 @@ import lombok.Getter; @AllArgsConstructor @Getter public enum TransformationBlock { + // @formatter:off INPUT("input"), GET_INPUT_FUNCTION("getInputFunction"), NODE_TEMPLATE("nodeTemplate"), CUSTOM_NODE_TYPE("customNodeType"), NODE_TYPE("nodeType"); + // @formatter:of private final String name; /** * Parse a String to the related {@link TransformationBlock}. - * @param name the {@link TransformationBlock} name - * @return - * The {@link TransformationBlock} representing the given name. + * + * @param name the {@link TransformationBlock} name + * @return The {@link TransformationBlock} representing the given name. */ public static Optional<TransformationBlock> parse(final String name) { for (final TransformationBlock transformationBlock : values()) { @@ -49,7 +50,6 @@ public enum TransformationBlock { return Optional.of(transformationBlock); } } - return Optional.empty(); } } diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationDescription.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationDescription.java index f21a719f8d..6aebc36d11 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationDescription.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationDescription.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.model; import java.util.Set; @@ -28,5 +27,4 @@ import lombok.Getter; public class TransformationDescription { private final Set<Transformation> transformationSet; - } diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationProperty.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationProperty.java index c42917d95d..7616ec0f14 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationProperty.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationProperty.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.model; import lombok.AllArgsConstructor; @@ -34,7 +33,6 @@ import lombok.Getter; public class TransformationProperty<T> { private TransformationPropertyType type; - @EqualsAndHashCode.Exclude private T value; } diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationPropertyType.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationPropertyType.java index eed251944f..4cf33085ca 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationPropertyType.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/model/TransformationPropertyType.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.model; import java.util.Arrays; @@ -31,12 +30,9 @@ import lombok.Getter; @AllArgsConstructor public enum TransformationPropertyType { NODE_NAME_PREFIX("nodeNamePrefix"); - private final String type; public static Optional<TransformationPropertyType> parse(final String type) { - return Arrays.stream(values()) - .filter(transformationPropertyType -> transformationPropertyType.getType().equals(type)) - .findFirst(); + return Arrays.stream(values()).filter(transformationPropertyType -> transformationPropertyType.getType().equals(type)).findFirst(); } } diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/parser/PnfdBlockParser.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/parser/PnfdBlockParser.java index dd66f502ea..417a640abf 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/parser/PnfdBlockParser.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/parser/PnfdBlockParser.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.parser; import java.util.Map; diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/strategy/AbstractPnfdConversionStrategy.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/strategy/AbstractPnfdConversionStrategy.java index ffd2e6fb34..31a87ea9e2 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/strategy/AbstractPnfdConversionStrategy.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/strategy/AbstractPnfdConversionStrategy.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.strategy; import java.util.Map; @@ -35,5 +34,4 @@ public abstract class AbstractPnfdConversionStrategy<T, U> implements PnfdConver public ConversionStrategyType getStrategyType() { return strategyType; } - } diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/strategy/PnfdConversionStrategy.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/strategy/PnfdConversionStrategy.java index 724f20550f..0e2888e887 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/strategy/PnfdConversionStrategy.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/src/main/java/org/openecomp/core/converter/pnfd/strategy/PnfdConversionStrategy.java @@ -16,7 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ - package org.openecomp.core.converter.pnfd.strategy; import java.util.Optional; |