Jira wdt 400 version file in zip file (#596)

* Fix java.lang.Boolean issues for ActiveDirectoryAuthenticator

* add version file to zip

* Throw exception on duplicate entry

Author: CarolynRountree

core/src/main/java/oracle/weblogic/deploy/json/AbstractJsonTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.json;
@@ -9,6 +9,7 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 
+import oracle.weblogic.deploy.exception.ExceptionHelper;
 import oracle.weblogic.deploy.logging.PlatformLogger;
 import oracle.weblogic.deploy.util.PyOrderedDict;
 import oracle.weblogic.deploy.util.StringUtils;
@@ -17,6 +18,7 @@
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.atn.PredictionMode;
+import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 import org.python.core.Py;
@@ -114,6 +116,7 @@ public void exitPair(JSONParser.PairContext ctx) {
      */
     @Override
     public void enterJsonObject(JSONParser.JsonObjectContext ctx) {
+        String METHOD = "enterJsonObject";
         if (currentPairName.isEmpty()) {
             // This should only happen for the outermost object that the file defines.
             //
@@ -128,6 +131,15 @@ public void enterJsonObject(JSONParser.JsonObjectContext ctx) {
         } else {
             newObjectDict = new PyDictionary();
         }
+
+        String name = currentPairName.peek();
+        if (currentDict.peek().has_key(new PyString(name))) {
+            String message = ExceptionHelper.getMessage("WLSDPLY-18028", name);
+            ParseCancellationException ex =
+                new ParseCancellationException(message);
+            getLogger().throwing(getClassName(), METHOD, ex);
+            throw ex;
+        }
         currentDict.push(newObjectDict);
         currentValueType.push(ValueType.OBJECT);
     }

core/src/main/java/oracle/weblogic/deploy/json/JsonTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.json;
@@ -12,6 +12,7 @@
 import oracle.weblogic.deploy.logging.WLSDeployLogFactory;
 import oracle.weblogic.deploy.util.FileUtils;
 
+import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.python.core.PyDictionary;
 
 /**
@@ -59,7 +60,7 @@ public PyDictionary parse() throws JsonException {
         PyDictionary result;
         try (FileInputStream fis = new FileInputStream(jsonFile)) {
             result = parseInternal(jsonFile.getPath(), fis);
-        } catch (IOException ioe) {
+        } catch (IOException | ParseCancellationException ioe) {
             JsonException ex =
                 new JsonException("WLSDPLY-18007", ioe, "JSON", jsonFile.getPath(), ioe.getLocalizedMessage());
             LOGGER.throwing(CLASS, METHOD, ex);

core/src/main/java/oracle/weblogic/deploy/yaml/AbstractYamlTranslator.java

@@ -10,6 +10,7 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 
+import oracle.weblogic.deploy.exception.ExceptionHelper;
 import oracle.weblogic.deploy.logging.PlatformLogger;
 import oracle.weblogic.deploy.util.PyOrderedDict;
 import oracle.weblogic.deploy.util.StringUtils;
@@ -20,6 +21,7 @@
 import org.antlr.v4.runtime.atn.PredictionMode;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
+import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.python.core.Py;
 import org.python.core.PyDictionary;
 import org.python.core.PyFloat;
@@ -119,15 +121,22 @@ public void enterYamlListItemObject(YamlParser.YamlListItemObjectContext ctx) {
      */
     @Override
     public void enterObject(YamlParser.ObjectContext ctx) {
+        String METHOD = "enterObject";
         String name = getQuotedStringText(ctx.name().getText());
         PyDictionary objDict;
         if (useOrderedDict) {
             objDict = new PyOrderedDict();
         } else {
             objDict = new PyDictionary();
         }
-
         PyDictionary container = currentDict.peek();
+        if (container.has_key(new PyString(name))) {
+            String message = ExceptionHelper.getMessage("WLSDPLY-18028", name);
+            ParseCancellationException ex =
+                new ParseCancellationException(message);
+            getLogger().throwing(getClassName(), METHOD, ex);
+            throw ex;
+        }
         container.__setitem__(new PyString(name), objDict);
         currentDict.push(objDict);
 

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -1251,6 +1251,7 @@ WLSDPLY-18015=File {0} does not appear to be a valid file for JSON output: {1}
 WLSDPLY-18016=An error occurred while closing the JSON file output stream...continuing: {0}
 WLSDPLY-18017=The {0} parser encountered {1} error(s) while parsing {2}
 
+
 # oracle.weblogic.deploy.util.ParsingErrorListener.java
 WLSDPLY-18018=Parse error for file {0} at line {1} position {2}: {3}
 WLSDPLY-18019=Parser reported ambiguous decision {0} from alternatives {1} while parsing "{2}" from file {3}
@@ -1263,6 +1264,7 @@ WLSDPLY-18024=Detected integer value {0} that could not be parsed to an integer
 WLSDPLY-18025=Detected float value {0} that could not be parsed to a floating point number so it will be set to 0: {1}
 WLSDPLY-18026=Detected number field with an empty value so it will be set to 0
 WLSDPLY-18027=Element {0} has an unknown value type {1} so its value will be set to None
+WLSDPLY-18028=Unable to parse the model file because it contains a duplicate category entry {0}
 
 ###############################################################################
 #                  Tool Util Messages (19000 - 19999)                         #