diff options
Diffstat (limited to 'asdctool/src/main')
13 files changed, 36 insertions, 36 deletions
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ArtifactToolBL.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ArtifactToolBL.java index 75fde3de1e..d53cadf362 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ArtifactToolBL.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ArtifactToolBL.java @@ -20,7 +20,7 @@ package org.openecomp.sdc.asdctool.impl.validator; -import org.openecomp.sdc.asdctool.impl.validator.executers.IArtifactValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.IArtifactValidatorExecutor; import org.openecomp.sdc.common.log.wrappers.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBL.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBL.java index 2fac030188..e9121f184c 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBL.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBL.java @@ -20,7 +20,7 @@ package org.openecomp.sdc.asdctool.impl.validator; -import org.openecomp.sdc.asdctool.impl.validator.executers.ValidatorExecuter; +import org.openecomp.sdc.asdctool.impl.validator.executor.ValidatorExecutor; import org.openecomp.sdc.asdctool.impl.validator.report.Report; import org.openecomp.sdc.asdctool.impl.validator.report.ReportFile; import org.openecomp.sdc.common.log.wrappers.Logger; @@ -34,18 +34,18 @@ public class ValidationToolBL { private static final Logger log = Logger.getLogger(ValidationToolBL.class); - protected List<ValidatorExecuter> validators; + protected List<ValidatorExecutor> validators; private boolean allValid = true; @Autowired public ValidationToolBL( - List<ValidatorExecuter> validators) { + List<ValidatorExecutor> validators) { this.validators = validators; } public boolean validateAll(Report report, ReportFile.TXTFile textFile) { - for (ValidatorExecuter validatorExec: validators) { + for (ValidatorExecutor validatorExec: validators) { log.debug("ValidatorExecuter "+validatorExec.getName()+" started"); if (!validatorExec.executeValidations(report, textFile)) { allValid = false; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java index 81051a62b9..1c02ac685a 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java @@ -23,13 +23,13 @@ package org.openecomp.sdc.asdctool.impl.validator.config; import org.openecomp.sdc.asdctool.impl.VrfObjectFixHandler; import org.openecomp.sdc.asdctool.impl.validator.ArtifactToolBL; import org.openecomp.sdc.asdctool.impl.validator.ValidationToolBL; -import org.openecomp.sdc.asdctool.impl.validator.executers.IArtifactValidatorExecutor; -import org.openecomp.sdc.asdctool.impl.validator.executers.NodeToscaArtifactsValidatorExecutor; -import org.openecomp.sdc.asdctool.impl.validator.executers.ServiceToscaArtifactsValidatorExecutor; -import org.openecomp.sdc.asdctool.impl.validator.executers.ServiceValidatorExecuter; -import org.openecomp.sdc.asdctool.impl.validator.executers.VFToscaArtifactValidatorExecutor; -import org.openecomp.sdc.asdctool.impl.validator.executers.ValidatorExecuter; -import org.openecomp.sdc.asdctool.impl.validator.executers.VfValidatorExecuter; +import org.openecomp.sdc.asdctool.impl.validator.executor.IArtifactValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.NodeToscaArtifactsValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.ServiceToscaArtifactsValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.ServiceValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.VFToscaArtifactValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.ValidatorExecutor; +import org.openecomp.sdc.asdctool.impl.validator.executor.VfValidatorExecutor; import org.openecomp.sdc.asdctool.impl.validator.tasks.VfValidationTask; import org.openecomp.sdc.asdctool.impl.validator.tasks.artifacts.ArtifactValidationUtils; import org.openecomp.sdc.asdctool.impl.validator.tasks.artifacts.ServiceArtifactValidationTask; @@ -78,8 +78,8 @@ import java.util.List; public class ValidationToolConfiguration { @Bean - public ServiceValidatorExecuter basicServiceValidator(JanusGraphDao janusGraphDao) { - return new ServiceValidatorExecuter(janusGraphDao); + public ServiceValidatorExecutor basicServiceValidator(JanusGraphDao janusGraphDao) { + return new ServiceValidatorExecutor(janusGraphDao); } @Bean @@ -116,7 +116,7 @@ public class ValidationToolConfiguration { } @Bean - public ValidationToolBL validationToolBL(List<ValidatorExecuter> validators) { + public ValidationToolBL validationToolBL(List<ValidatorExecutor> validators) { return new ValidationToolBL(validators); } @@ -126,8 +126,8 @@ public class ValidationToolConfiguration { } @Bean - public VfValidatorExecuter basicVfValidator(List<VfValidationTask> tasks, JanusGraphDao janusGraphDao) { - return new VfValidatorExecuter(tasks, janusGraphDao); + public VfValidatorExecutor basicVfValidator(List<VfValidationTask> tasks, JanusGraphDao janusGraphDao) { + return new VfValidatorExecutor(tasks, janusGraphDao); } @Bean(name = "artifact-cassandra-dao") diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ArtifactValidatorExecutor.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/ArtifactValidatorExecutor.java index 1a19f5d882..29f808fcbb 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ArtifactValidatorExecutor.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/ArtifactValidatorExecutor.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/IArtifactValidatorExecutor.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/IArtifactValidatorExecutor.java index 19f7bf88c5..fb905fe314 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/IArtifactValidatorExecutor.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/IArtifactValidatorExecutor.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; // TODO: Merge this interface with ArtifactValidatorExecutor public interface IArtifactValidatorExecutor { diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/NodeToscaArtifactsValidatorExecutor.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/NodeToscaArtifactsValidatorExecutor.java index 41f2c5516b..791bafb00d 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/NodeToscaArtifactsValidatorExecutor.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/NodeToscaArtifactsValidatorExecutor.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceToscaArtifactsValidatorExecutor.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/ServiceToscaArtifactsValidatorExecutor.java index e633aa0204..c09bda508b 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceToscaArtifactsValidatorExecutor.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/ServiceToscaArtifactsValidatorExecutor.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceValidatorExecuter.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/ServiceValidatorExecutor.java index 5d209807b6..ff27b667d5 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceValidatorExecuter.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/ServiceValidatorExecutor.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import org.openecomp.sdc.asdctool.impl.validator.report.Report; import org.openecomp.sdc.asdctool.impl.validator.report.ReportFile.TXTFile; @@ -33,12 +33,12 @@ import java.util.ArrayList; import java.util.List; @Component -public class ServiceValidatorExecuter extends TopologyTemplateValidatorExecuter implements ValidatorExecuter { +public class ServiceValidatorExecutor extends TopologyTemplateValidatorExecutor implements ValidatorExecutor { List<ServiceValidationTask> tasks = new ArrayList<>(); @Autowired(required = false) - public ServiceValidatorExecuter(JanusGraphDao janusGraphDao) { + public ServiceValidatorExecutor(JanusGraphDao janusGraphDao) { super(janusGraphDao); setName("SERVICE_VALIDATOR"); } diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/TopologyTemplateValidatorExecutor.java index ddf9e7bce5..9ba2f5ab46 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/TopologyTemplateValidatorExecutor.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import fj.data.Either; import java.util.ArrayList; @@ -41,16 +41,16 @@ import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; import org.openecomp.sdc.common.log.wrappers.Logger; import org.springframework.beans.factory.annotation.Autowired; -public class TopologyTemplateValidatorExecuter { +public class TopologyTemplateValidatorExecutor { - private static final Logger log = Logger.getLogger(VfValidatorExecuter.class); + private static final Logger log = Logger.getLogger(VfValidatorExecutor.class); protected JanusGraphDao janusGraphDao; protected String name; @Autowired - public TopologyTemplateValidatorExecuter(JanusGraphDao janusGraphDao) { + public TopologyTemplateValidatorExecutor(JanusGraphDao janusGraphDao) { this.janusGraphDao = janusGraphDao; } diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutor.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/VFToscaArtifactValidatorExecutor.java index ba05994984..237507a486 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutor.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/VFToscaArtifactValidatorExecutor.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ValidatorExecuter.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/ValidatorExecutor.java index 87449886d8..b01af0b353 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ValidatorExecuter.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/ValidatorExecutor.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import org.openecomp.sdc.asdctool.impl.validator.report.Report; import org.openecomp.sdc.asdctool.impl.validator.report.ReportFile.TXTFile; -public interface ValidatorExecuter { +public interface ValidatorExecutor { boolean executeValidations(Report report, TXTFile textFile); String getName(); diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/VfValidatorExecuter.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/VfValidatorExecutor.java index 40aa601224..4729e63c16 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/VfValidatorExecuter.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executor/VfValidatorExecutor.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.asdctool.impl.validator.executers; +package org.openecomp.sdc.asdctool.impl.validator.executor; import org.openecomp.sdc.asdctool.impl.validator.report.Report; import org.openecomp.sdc.asdctool.impl.validator.report.ReportFile.TXTFile; @@ -30,12 +30,12 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; -public class VfValidatorExecuter extends TopologyTemplateValidatorExecuter implements ValidatorExecuter { +public class VfValidatorExecutor extends TopologyTemplateValidatorExecutor implements ValidatorExecutor { private final List<VfValidationTask> tasks; @Autowired(required = false) - public VfValidatorExecuter(List<VfValidationTask> tasks, JanusGraphDao janusGraphDao) { + public VfValidatorExecutor(List<VfValidationTask> tasks, JanusGraphDao janusGraphDao) { super(janusGraphDao); this.tasks = tasks; setName("BASIC_VF_VALIDATOR"); diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ElementTypeEnum.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ElementTypeEnum.java index 19dda6ad6a..3424641491 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ElementTypeEnum.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ElementTypeEnum.java @@ -20,7 +20,7 @@ package org.openecomp.sdc.asdctool.impl.validator.utils; -import org.openecomp.sdc.asdctool.impl.validator.executers.VfValidatorExecuter; +import org.openecomp.sdc.asdctool.impl.validator.executor.VfValidatorExecutor; import java.util.ArrayList; import java.util.List; @@ -30,7 +30,7 @@ import java.util.List; */ public enum ElementTypeEnum { - VF ("vf", VfValidatorExecuter.class); + VF ("vf", VfValidatorExecutor.class); //SERVICE("service", ServiceValidatorExecuter.class) private String elementType; |