Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / java / org / onap / vid / asdc / beans / tosca / ToscaMeta.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/ToscaMeta.java b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/ToscaMeta.java
index a7a6c62..ad88340 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/ToscaMeta.java
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/ToscaMeta.java
@@ -20,6 +20,8 @@
 
 package org.onap.vid.asdc.beans.tosca;
 
+import org.onap.vid.asdc.AsdcCatalogException;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,8 +29,6 @@ import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.onap.vid.asdc.AsdcCatalogException;
-
 /**
  * The Class ToscaMeta.
  */
@@ -45,7 +45,7 @@ public class ToscaMeta {
         * @throws AsdcCatalogException the asdc catalog exception
         */
        private ToscaMeta(Builder builder) throws IOException, AsdcCatalogException {
-               metadata = new HashMap<String, String> ();
+               metadata = new HashMap<> ();
                
                read(builder.inputStream);
        }
@@ -113,10 +113,7 @@ public class ToscaMeta {
                                        metadata.put(entry[0], entry[1].substring(1));
                                }
                        }
-               } catch (IOException e) {
-                       metadata.clear();
-                       throw e;
-               } catch (AsdcCatalogException e) {
+               } catch (IOException | AsdcCatalogException e) {
                        metadata.clear();
                        throw e;
                }