Merge pull request #16 from Optum/convert-periods-to-underscore

Convert periods to underscore

Author: JohnMThayer

envvars-cli/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.envvars</groupId>
         <artifactId>envvars</artifactId>
-        <version>3.1.X-SNAPSHOT</version>
+        <version>3.2.X-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

envvars-json/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.envvars</groupId>
         <artifactId>envvars</artifactId>
-        <version>3.1.X-SNAPSHOT</version>
+        <version>3.2.X-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.optum.envvars</groupId>
             <artifactId>envvars-lib</artifactId>
-            <version>3.1.X-SNAPSHOT</version>
+            <version>3.2.X-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

envvars-lib/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.envvars</groupId>
         <artifactId>envvars</artifactId>
-        <version>3.1.X-SNAPSHOT</version>
+        <version>3.2.X-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

envvars-lib/src/main/java/com/optum/envvars/mapdata/EnvVarsMapDataEngine.java

@@ -169,23 +169,21 @@ void addEnvVarsForDefaultSelector(Map previousScope, EnvVarsMapData envVarsData,
      * @return The scope of the selector, if found, otherwise null.
      */
     Map addEnvVarsForSelectorImpl(Map previousScope, EnvVarsMapData envVarsData, EnvVarsRuntimeSelectors.Node node, String selector, boolean required) throws EnvVarsException {
-        final String messageContext = "[" + node.context + ":" + selector + "]";
-
         /////////////////////////////////////
         // We start by looking for a SELECTOR
         /////////////////////////////////////
         Object currentScopeObject = previousScope.get(selector);
         if ((currentScopeObject == null)) {
             if (required) {
-                throw new EnvVarsException("Unable to find " + messageContext + " which is required.");
+                throw new EnvVarsException("Missing selector \"" + selector + "\".  Unable to find an element named \"" + selector + "\" inside the node \"" + node.context + "\", and rules for this node require that it exists.");
             } else {
                 // Selector not found.  Selector not required.  Do nothing, and be happy about it.
                 return null;
             }
         }
 
         if (!(currentScopeObject instanceof Map)) {
-            throw new EnvVarsException("The element " + messageContext + " must be a map, but it is not.");
+            throw new EnvVarsException("Invalid selector \"" + selector + "\".  The element \"" + selector + "\" inside the node \"" + node.context + "\" must be a map, but it is not.");
         }
 
         Map currentScope = (Map)currentScopeObject;
@@ -266,7 +264,7 @@ private static Map<String, String> processCurrentScopeMap(String mapName, Map cu
         }
 
         if (!(envvarsObject instanceof Map)) {
-            throw new EnvVarsException("The element " + messageContext + " must be a map, but it is not.");
+            throw new EnvVarsException("Invalid context \"" + mapName + "\".  The element \"" + mapName + "\" inside the selector \"" + selector + "\" inside the node \"" + node.context + "\" must be a map, but it is not.");
         }
 
         Map<String, String> results = new HashMap<>();

envvars-lib/src/main/java/com/optum/envvars/set/EnvVarsStaticSets.java

@@ -144,7 +144,7 @@ private boolean argSwap(int argNumber, String value, List<String> strings) {
                     StringBuilder sb = new StringBuilder(prefix.length() + value.length() + suffix.length());
                     sb.append(prefix);
                     if (toUpper) {
-                        sb.append(value.toUpperCase().replace("-", "_"));
+                        sb.append(value.toUpperCase().replace("-", "_").replace(".", "_"));
                     } else if (toLower) {
                         sb.append(value.toLowerCase().replace("_", "-"));
                     } else {

envvars-lib/src/test/groovy/com/optum/envvars/EnvVarEngineSpec.groovy

@@ -75,7 +75,7 @@ class EnvVarEngineSpec extends Specification {
 
         then:
         EnvVarsException ex = thrown()
-        ex.message == 'Unable to find [environments:missing] which is required.'
+        ex.message == 'Missing selector "missing".  Unable to find an element named "missing" inside the node "environments", and rules for this node require that it exists.'
     }
 
     def "SELECTOR: Missing optional selector"() {

envvars-lib/src/test/groovy/com/optum/envvars/EnvVarMapDataEngineSpec.groovy

@@ -65,7 +65,7 @@ class EnvVarMapDataEngineSpec extends Specification {
 
         then:
         EnvVarsException ex = thrown()
-        ex.message == 'Unable to find [environments:missing] which is required.'
+        ex.message == 'Missing selector "missing".  Unable to find an element named "missing" inside the node "environments", and rules for this node require that it exists.'
     }
 
     def "SELECTOR: Missing optional selector" () {
@@ -108,7 +108,7 @@ class EnvVarMapDataEngineSpec extends Specification {
 
         then:
         EnvVarsException ex = thrown()
-        ex.message == 'The element [environments:env1:define] must be a map, but it is not.'
+        ex.message == 'Invalid context "define".  The element "define" inside the selector "env1" inside the node "environments" must be a map, but it is not.'
     }
 
     def "BLOCK: Bad secretEnvvars" () {
@@ -119,7 +119,7 @@ class EnvVarMapDataEngineSpec extends Specification {
 
         then:
         EnvVarsException ex = thrown()
-        ex.message == 'The element [environments:env2:defineSecrets] must be a map, but it is not.'
+        ex.message == 'Invalid context "defineSecrets".  The element "defineSecrets" inside the selector "env2" inside the node "environments" must be a map, but it is not.'
     }
 
     def "BLOCK: Bad injectEnvvars" () {
@@ -152,7 +152,7 @@ class EnvVarMapDataEngineSpec extends Specification {
 
         then:
         EnvVarsException ex = thrown()
-        ex.message == 'The element [environments:badenv] must be a map, but it is not.'
+        ex.message == 'Invalid selector "badenv".  The element "badenv" inside the node "environments" must be a map, but it is not.'
     }
     /**
      * Three different flows, so each test in each of these blocks: envvars, injectedEnvvars, injectedQualifiedEnvvars.
@@ -465,7 +465,7 @@ class EnvVarMapDataEngineSpec extends Specification {
 
         then:
         EnvVarsException ex = thrown()
-        ex.message == 'Unable to find [applications:default] which is required.'
+        ex.message == 'Missing selector "default".  Unable to find an element named "default" inside the node "applications", and rules for this node require that it exists.'
     }
 
     final Map envKeys = new JsonSlurper().parseText("""{

envvars-yaml/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.envvars</groupId>
         <artifactId>envvars</artifactId>
-        <version>3.1.X-SNAPSHOT</version>
+        <version>3.2.X-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.optum.envvars</groupId>
     <artifactId>envvars</artifactId>
-    <version>3.1.X-SNAPSHOT</version>
+    <version>3.2.X-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>envvars</name>