summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--onboarding/pom.xml2
-rw-r--r--openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java5
2 files changed, 4 insertions, 3 deletions
diff --git a/onboarding/pom.xml b/onboarding/pom.xml
index 7c9b6267fd..19a74656cb 100644
--- a/onboarding/pom.xml
+++ b/onboarding/pom.xml
@@ -38,7 +38,7 @@
<openecomp.sdc.common.version>${project.version}</openecomp.sdc.common.version>
<!-- Onboarding 3rd party versions -->
- <jtosca.version>1.1.10-SNAPSHOT</jtosca.version>
+ <jtosca.version>1.1.1-SNAPSHOT</jtosca.version>
<aspectj.version>1.8.9</aspectj.version>
<bsh.version>2.0b5</bsh.version>
<cassandra.version>2.1.9</cassandra.version>
diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java
index 69fa33aae7..f38d7f2b06 100644
--- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java
+++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java
@@ -345,7 +345,7 @@ public class ToscaConverterImpl implements ToscaConverter {
return CsarFileTypes.globalServiceTemplate;
} else if (isDefinitions(fileName)) {
return CsarFileTypes.definitionsFile;
- } else if (isMetadataFile(metadataFile)) {
+ } else if (isMetadataFile(fileName)) {
return CsarFileTypes.toscaMetadata;
}
return CsarFileTypes.externalFile;
@@ -409,7 +409,8 @@ public class ToscaConverterImpl implements ToscaConverter {
//todo - return error to user?
throw new CoreException(new ErrorCode.ErrorCodeBuilder()
.withCategory(ErrorCategory.APPLICATION)
- .withMessage("Can't create Node Type from " + nodeTypeId).build());
+ .withMessage("Can't create " + classToCreate.getSimpleName() + " from " +
+ nodeTypeId).build());
}
}