1 files changed, 33 insertions, 42 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java
index 26c1be9938..ee459afa0d 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.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,57 +17,48 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.enrichment.impl.tosca;
 
-import org.openecomp.sdc.datatypes.error.ErrorLevel;
-import org.openecomp.sdc.datatypes.error.ErrorMessage;
-import org.openecomp.sdc.enrichment.inter.Enricher;
-import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.datatypes.error.ErrorMessage;
+import org.openecomp.sdc.enrichment.inter.Enricher;
+import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
 
 public class ToscaEnricher extends Enricher {
-  @Override
-  public Map<String, List<ErrorMessage>> enrich() {
-    Map<String, List<ErrorMessage>> errors = new HashMap<>();
-    errors.putAll(enrichAbstractSubstitute());
-    errors.putAll(enrichPortMirroring());
-
-    return errors;
-  }
 
-  private Map<String, List<ErrorMessage>> enrichAbstractSubstitute() {
-    Map<String, List<ErrorMessage>> enrichErrors = new HashMap<>();
-
-    ToscaServiceModel toscaModel = (ToscaServiceModel) model;
-    AbstractSubstituteToscaEnricher abstractSubstituteToscaEnricher =
-        new AbstractSubstituteToscaEnricher();
-
-    try {
-      enrichErrors = abstractSubstituteToscaEnricher.enrich(toscaModel, data.getKey(),
-          data.getVersion());
-    }catch (Exception e){
-      enrichErrors.put("Tosca Enrich", Arrays.asList(new ErrorMessage(ErrorLevel.ERROR, e
-          .getMessage())));
+    @Override
+    public Map<String, List<ErrorMessage>> enrich() {
+        Map<String, List<ErrorMessage>> errors = new HashMap<>();
+        errors.putAll(enrichAbstractSubstitute());
+        errors.putAll(enrichPortMirroring());
+        return errors;
     }
-    return enrichErrors;
-  }
 
-  private Map<String, List<ErrorMessage>> enrichPortMirroring() {
-    Map<String, List<ErrorMessage>> enrichErrors = new HashMap<>();
-    ToscaServiceModel toscaModel = (ToscaServiceModel) model;
-    PortMirroringEnricher portMirroringEnricher = new PortMirroringEnricher();
+    private Map<String, List<ErrorMessage>> enrichAbstractSubstitute() {
+        Map<String, List<ErrorMessage>> enrichErrors = new HashMap<>();
+        ToscaServiceModel toscaModel = (ToscaServiceModel) model;
+        AbstractSubstituteToscaEnricher abstractSubstituteToscaEnricher = new AbstractSubstituteToscaEnricher();
+        try {
+            enrichErrors = abstractSubstituteToscaEnricher.enrich(toscaModel, data.getKey(), data.getVersion());
+        } catch (Exception e) {
+            enrichErrors.put("Tosca Enrich", Arrays.asList(new ErrorMessage(ErrorLevel.ERROR, e.getMessage())));
+        }
+        return enrichErrors;
+    }
 
-    try {
-      enrichErrors = portMirroringEnricher.enrich(toscaModel);
-    }catch (Exception e){
-      enrichErrors.put("Tosca Enrich", Arrays.asList(new ErrorMessage(ErrorLevel.ERROR, e
-          .getMessage())));
+    private Map<String, List<ErrorMessage>> enrichPortMirroring() {
+        Map<String, List<ErrorMessage>> enrichErrors = new HashMap<>();
+        ToscaServiceModel toscaModel = (ToscaServiceModel) model;
+        PortMirroringEnricher portMirroringEnricher = new PortMirroringEnricher();
+        try {
+            enrichErrors = portMirroringEnricher.enrich(toscaModel);
+        } catch (Exception e) {
+            enrichErrors.put("Tosca Enrich", Arrays.asList(new ErrorMessage(ErrorLevel.ERROR, e.getMessage())));
+        }
+        return enrichErrors;
     }
-    return enrichErrors;
-  }
 }