[VID-55] Upgrade Tosca Parser (merge)

[vid.git] / vid-app-common / src / main / java / org / openecomp / vid / asdc / memory / InMemoryAsdcClient.java

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/memory/InMemoryAsdcClient.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/memory/InMemoryAsdcClient.java
index c5134bf..123cc57 100755 (executable)
--- a/vid-app-common/src/main/java/org/openecomp/vid/asdc/memory/InMemoryAsdcClient.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/memory/InMemoryAsdcClient.java
@@ -7,7 +7,7 @@
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
- * \r
+ *     \r
  *      http://www.apache.org/licenses/LICENSE-2.0\r
  * \r
  * Unless required by applicable law or agreed to in writing, software\r
@@ -168,7 +168,6 @@ public class InMemoryAsdcClient implements AsdcClient {
        }\r
 \r
        /* (non-Javadoc)\r
-        * @see org.openecomp.vid.asdc.AsdcClient#getResources()\r
         */\r
        public Collection<Resource> getResources() throws AsdcCatalogException {\r
                final Collection<Resource> resources = new LinkedList<Resource> ();\r
@@ -299,7 +298,7 @@ public class InMemoryAsdcClient implements AsdcClient {
        /* (non-Javadoc)\r
         * @see org.openecomp.vid.asdc.AsdcClient#getResourceToscaModel(java.util.UUID)\r
         */\r
-       public ToscaCsar getResourceToscaModel(UUID resourceUuid) throws AsdcCatalogException {\r
+       public Path getResourceToscaModel(UUID resourceUuid) throws AsdcCatalogException {\r
                final String toscaModelURL = getCatalog().getJSONObject("resources")\r
                                .getJSONObject(resourceUuid.toString())\r
                                .getString("toscaModelURL");\r
@@ -309,13 +308,13 @@ public class InMemoryAsdcClient implements AsdcClient {
                \r
                if (toscaModelStream == null) return null;\r
                \r
-               return getToscaModel(toscaModelStream);\r
+               return null;//getToscaModel(toscaModelStream);\r
        }\r
 \r
        /* (non-Javadoc)\r
         * @see org.openecomp.vid.asdc.AsdcClient#getServiceToscaModel(java.util.UUID)\r
         */\r
-       public ToscaCsar getServiceToscaModel(UUID serviceUuid) throws AsdcCatalogException {\r
+       public Path getServiceToscaModel(UUID serviceUuid) throws AsdcCatalogException {\r
                final String toscaModelURL = getCatalog().getJSONObject("services")\r
                                                .getJSONObject(serviceUuid.toString())\r
                                                .getString("toscaModelURL");\r
@@ -324,7 +323,7 @@ public class InMemoryAsdcClient implements AsdcClient {
                \r
                if (toscaModelStream == null) return null;\r
                \r
-               return getToscaModel(toscaModelStream);\r
+               return null;//getToscaModel(toscaModelStream);\r
        }\r
 \r
        /**\r
@@ -369,4 +368,5 @@ public class InMemoryAsdcClient implements AsdcClient {
                        throw new AsdcCatalogException("Caught IOException while processing CSAR", e);\r
                }\r
        }\r
+\r
 }\r