From: Michael Lando <ml636r@att.com>
Date: Thu, 29 Jun 2017 16:30:42 +0000 (+0000)
Subject: Merge "[SDC-43] NFOD getVnfConfig support"
X-Git-Tag: v1.1.32~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f118ea26bcea3a3d9af27faa7d54e895a0202dcf;p=sdc%2Fsdc-tosca.git

Merge "[SDC-43] NFOD getVnfConfig support"
---

f118ea26bcea3a3d9af27faa7d54e895a0202dcf
diff --cc src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
index e3b9937,590abd9..0ed4c97
--- a/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
+++ b/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
@@@ -22,9 -22,12 +22,10 @@@ package org.openecomp.sdc.tosca.parser.
  
  import java.util.*;
  import java.util.Map.Entry;
 -import java.util.regex.Matcher;
  import java.util.regex.Pattern;
  import java.util.stream.Collectors;
+ import java.util.stream.Stream;
  
 -import org.apache.commons.lang3.StringUtils;
  import org.apache.commons.lang3.tuple.ImmutablePair;
  import org.apache.commons.lang3.tuple.Pair;
  //import org.json.JSONObject;