diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core')
2 files changed, 47 insertions, 59 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerFactoryImpl.java index abbb577075..cd991241ee 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerFactoryImpl.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerFactoryImpl.java @@ -7,9 +7,9 @@ * 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. @@ -17,18 +17,15 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.sdc.enrichment.impl; - import org.openecomp.core.enrichment.api.EnrichmentManager; import org.openecomp.core.enrichment.factory.EnrichmentManagerFactory; - public class EnrichmentManagerFactoryImpl extends EnrichmentManagerFactory { - @Override - public EnrichmentManager createInterface() { - return new EnrichmentManagerImpl(); - } + @Override + public EnrichmentManager createInterface() { + return new EnrichmentManagerImpl(); + } } diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImpl.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImpl.java index 40bd3964cb..9854bc0a74 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImpl.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImpl.java @@ -7,9 +7,9 @@ * 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. @@ -17,9 +17,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.sdc.enrichment.impl; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.openecomp.core.enrichment.api.EnrichmentManager; import org.openecomp.core.enrichment.types.EntityInfo; import org.openecomp.sdc.datatypes.error.ErrorLevel; @@ -32,60 +35,48 @@ import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; import org.openecomp.sdc.versioning.dao.types.Version; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public class EnrichmentManagerImpl implements EnrichmentManager<ToscaServiceModel> { - private static Logger logger = (Logger) LoggerFactory.getLogger(EnrichmentManagerImpl.class); + private static Logger logger = (Logger) LoggerFactory.getLogger(EnrichmentManagerImpl.class); + private EnrichmentInfo data = null; + private ToscaServiceModel model; - private EnrichmentInfo data = null; - private ToscaServiceModel model; - - - @Override - public Map<String, List<ErrorMessage>> enrich() { - Map<String, List<ErrorMessage>> enrichErrors = new HashMap<>(); - List<Enricher> enricherList = - EnricherHandlerFactory.getInstance().createInterface().getEnrichers(); - for (Enricher enricher : enricherList) { - enricher.setData(data); - enricher.setModel(model); - try { - enrichErrors.putAll(enricher.enrich()); - } catch (Exception exception) { - enrichErrors.put("Enrich", Arrays.asList(new ErrorMessage(ErrorLevel.ERROR, exception - .getMessage()))); - logger.error("Exception occurred during enrichment", exception); + @Override + public Map<String, List<ErrorMessage>> enrich() { + Map<String, List<ErrorMessage>> enrichErrors = new HashMap<>(); + List<Enricher> enricherList = EnricherHandlerFactory.getInstance().createInterface().getEnrichers(); + for (Enricher enricher : enricherList) { + enricher.setData(data); + enricher.setModel(model); + try { + enrichErrors.putAll(enricher.enrich()); + } catch (Exception exception) { + enrichErrors.put("Enrich", Arrays.asList(new ErrorMessage(ErrorLevel.ERROR, exception.getMessage()))); + logger.error("Exception occurred during enrichment", exception); + } } + return enrichErrors; } - return enrichErrors; - } - - @Override - public void addEntityInfo(String entityKey, EntityInfo entityInfo) { - this.data.addEntityInfo(entityKey, entityInfo); - } - - - @Override - public void init(String key, Version version) { - data = new EnrichmentInfo(); - data.setKey(key); - data.setVersion(version); - } - @Override - public ToscaServiceModel getModel() { - return this.model; - } + @Override + public void addEntityInfo(String entityKey, EntityInfo entityInfo) { + this.data.addEntityInfo(entityKey, entityInfo); + } - @Override - public void setModel(ToscaServiceModel model) { - this.model = model; - } + @Override + public void init(String key, Version version) { + data = new EnrichmentInfo(); + data.setKey(key); + data.setVersion(version); + } + @Override + public ToscaServiceModel getModel() { + return this.model; + } + @Override + public void setModel(ToscaServiceModel model) { + this.model = model; + } } |