Merge pull request #70 from oracle/issue#69-element-id-cannot-be-property

Issue#69 - Allow ID to be specified as @@prop:key@@. Fixes #69

Author: ddsharpe

core/src/main/antlr4/oracle/weblogic/deploy/yaml/Yaml.g4

@@ -287,11 +287,12 @@ fragment ID_CONTINUE
 fragment QUOTED_ID_START
     : ID_START
     | '$'
+    | '@'
     ;
 
 fragment QUOTED_ID_CONTINUE
     : ID_CONTINUE
-    | [@#\-(){}[\]]
+    | [@#\-(){}[\]:]
     ;
 
 fragment SQUOTED_STRING_CHARS

core/src/test/python/variables_test.py

@@ -31,6 +31,7 @@ def testSubstituteYaml(self):
         self.assertEqual(model['topology']['Server']['s1']['ListenPort'], '1009')
         self.assertEqual(model['topology']['Server']['s2']['Cluster'], 'myCluster')
         self.assertEqual(True, 'myCluster' in model['topology']['Cluster'])
+        self.assertEqual(True, 's3' in model['topology']['Server'])
 
     def testSubstituteJson(self):
         model = FileToPython(self._resources_dir + '/variables-test.json', self._use_ordering).parse()
@@ -40,6 +41,7 @@ def testSubstituteJson(self):
         self.assertEqual(model['topology']['Server']['s1']['ListenPort'], '1009')
         self.assertEqual(model['topology']['Server']['s2']['Cluster'], 'myCluster')
         self.assertEqual(True, 'myCluster' in model['topology']['Cluster'])
+        self.assertEqual(True, 's3' in model['topology']['Server'])
 
     def testVariableNotFound(self):
         """

core/src/test/resources/variables-test.json

@@ -20,6 +20,10 @@
                 "ListenAddress": "127.0.0.1",
                 "ListenPort": 8101,
                 "Cluster": "@@PROP:my.cluster@@"
+            },
+            "@@PROP:server3.id@@": {
+                "ListenAddress": "127.0.0.2",
+                "ListenPort": 8102
             }
         }
     }

core/src/test/resources/variables-test.yaml

@@ -15,3 +15,6 @@ topology:
             ListenAddress: 127.0.0.1
             ListenPort: 8101
             Cluster: '@@PROP:my.cluster@@'
+        '@@PROP:server3.id@@':
+            ListenAddress: 127.0.0.2
+            ListenPort: 8102

core/src/test/resources/variables.properties

@@ -4,6 +4,7 @@
 my.port=1009
 my.server=myServer
 my.cluster=myCluster
+server3.id=s3
 
 my-abc=xyz
 my_arf=123