Fix TOSCA Analyzer - null point exception

In case there is import to not exist TOSCA file,
exception with relevant error message should be thrown
In getRequirementAssignment, when there is no Requirement,
Optional.Empty is returned

Change-Id: I8aabde177815dec2f69307f6be3c5114c5c8efa3
Issue-ID: SDC-1281
Signed-off-by: shiria <shiri.amichai@amdocs.com>

3 files changed, 57 insertions, 0 deletions

diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/errors/ToscaFileNotFoundErrorBuilder.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/errors/ToscaFileNotFoundErrorBuilder.java
new file mode 100644
index 0000000000..b06cd1f625
--- /dev/null
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/errors/ToscaFileNotFoundErrorBuilder.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openecomp.sdc.tosca.errors;
+
+import org.openecomp.sdc.common.errors.ErrorCategory;
+import org.openecomp.sdc.common.errors.ErrorCode;
+
+/**
+ * The Tosca file not found error builder.
+ */
+public class ToscaFileNotFoundErrorBuilder {
+  private static final String ENTRY_NOT_FOUND_MSG =
+      "Tosca file '%s' was not found in tosca service model";
+  private final ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
+
+  /**
+   * Instantiates a new Tosca file not found error builder.
+   *
+   * @param fileName the file name
+   */
+  public ToscaFileNotFoundErrorBuilder(String fileName) {
+    builder.withId(ToscaErrorCodes.TOSCA_ENTRY_NOT_FOUND);
+    builder.withCategory(ErrorCategory.APPLICATION);
+    builder.withMessage(String.format(ENTRY_NOT_FOUND_MSG, fileName));
+  }
+
+  /**
+   * Build error code.
+   *
+   * @return the error code
+   */
+  public ErrorCode build() {
+    return builder.build();
+  }
+}
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java
index ff04196a11..d18a2f214e 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java
@@ -820,6 +820,9 @@ public class DataModelUtil {
         matchRequirementAssignmentList.add(requirementAssignment);
       }
     }
+    if(CollectionUtils.isEmpty(matchRequirementAssignmentList)){
+      return Optional.empty();
+    }
     return Optional.of(matchRequirementAssignmentList);
   }
 
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java
index 4428fc6301..46d9b902ca 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java
@@ -39,6 +39,7 @@ import org.onap.sdc.tosca.datatypes.model.RequirementAssignment;
 import org.onap.sdc.tosca.datatypes.model.RequirementDefinition;
 import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
 import org.openecomp.sdc.tosca.errors.ToscaElementTypeNotFoundErrorBuilder;
+import org.openecomp.sdc.tosca.errors.ToscaFileNotFoundErrorBuilder;
 import org.openecomp.sdc.tosca.errors.ToscaInvalidEntryNotFoundErrorBuilder;
 import org.openecomp.sdc.tosca.errors.ToscaInvalidSubstituteNodeTemplatePropertiesErrorBuilder;
 import org.openecomp.sdc.tosca.errors.ToscaInvalidSubstitutionServiceTemplateErrorBuilder;
@@ -604,6 +605,10 @@ public class ToscaAnalyzerServiceImpl implements ToscaAnalyzerService {
         filesScanned.add(fileName);
       }
       ServiceTemplate template = toscaModel.getServiceTemplates().get(fileName);
+      if (Objects.isNull(template)) {
+        throw new CoreException(
+            new ToscaFileNotFoundErrorBuilder(fileName).build());
+      }
       found = scanAnFlatEntity(elementType, typeId, entity, template, toscaModel,
           filesScanned, filesScanned.size());
     }