diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl')
2 files changed, 3 insertions, 11 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java index 150e9629a8..49ba6148c0 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java @@ -25,8 +25,6 @@ import org.openecomp.core.utilities.json.JsonUtil; import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.enrichment.inter.Enricher; import org.openecomp.sdc.enrichment.inter.ExternalArtifactEnricherInterface; -import org.openecomp.sdc.logging.api.Logger; -import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; import java.lang.reflect.Constructor; @@ -40,7 +38,6 @@ public class ExternalArtifactEnricher extends Enricher { + ".json"; private static Collection<String> implementingClasses = getExternalArtifactEnrichedImplClassesList(); - private static Logger logger = LoggerFactory.getLogger(ExternalArtifactEnricher.class); private static Collection<String> getExternalArtifactEnrichedImplClassesList() { @SuppressWarnings("unchecked") @@ -51,18 +48,13 @@ public class ExternalArtifactEnricher extends Enricher { } @Override - public Map<String, List<ErrorMessage>> enrich() { + public Map<String, List<ErrorMessage>> enrich() throws Exception{ Map<String, List<ErrorMessage>> errors = new HashMap<>(); - try { for (String implementingClassName : implementingClasses) { ExternalArtifactEnricherInterface externalArtifactEnricherInstance = getExternalArtifactEnricherInstance(implementingClassName); - externalArtifactEnricherInstance.enrich(this.data, (ToscaServiceModel) this.model); + errors.putAll(externalArtifactEnricherInstance.enrich(this.data, (ToscaServiceModel) this.model)); } - } catch (Exception e) { - logger.debug("",e); - logger.error(e.getMessage()); - } return errors; } diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/inter/Enricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/inter/Enricher.java index ed606f8746..8e66887c1e 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/inter/Enricher.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/inter/Enricher.java @@ -42,5 +42,5 @@ public abstract class Enricher { this.model = model; } - public abstract Map<String, List<ErrorMessage>> enrich(); + public abstract Map<String, List<ErrorMessage>> enrich() throws Exception; } |