#94 Added Testing Rules for the Lookup Resource

.gitignore

@@ -6,3 +6,4 @@ build/
 .idea/
 *.log
 *.iml
+.run/

doc/Docker.md

@@ -1,11 +1,39 @@
 # RESO Commander and Docker
-Both the command-line and automated testing tools can be run in a Docker container.
+RESO automated testing tools and Commander utilities can both be run in a Docker containers. 
+The containers are slightly different in each case. 
 
-A [Dockerfile](./Dockerfile) has been provided to dockerize the application. 
-This can be used for CI/CD environments such as Jenkins or TravisCI. The following command will build an image for you:
+### RESO Automated Testing Tools
+A [GradleDockerfile](../GradleDockerfile) has been provided in order to prepare a Gradle 
+environment for the Commander. The container builds itself from the main branch of the source code, so you don't need
+the entire repo checked out locally, just the file.
 
+This can also be used in CI/CD environments such as Jenkins or TravisCI.
+
+Run the RESO Certification tests in a Docker container locally by issuing one of the following commands.
+Docker must be running on your local machine. 
+
+One way to do this is to build the container first and then run it:
+
+```docker build --file GradleDockerfile -t web-api-commander-gradle .```
+
+Once the container is built, you can use the Gradle commands normally with:
+```docker run -it web-api-commander-gradle testWebApiCore_2_0_0 -DpathToRESOScript=/home/gradle/project/resoscripts/your.resoscript -DshowResponses=true```
+
+You can also build the container on the fly:
+
+```docker run --rm -it -v "$PWD":/home/gradle/project -v /path/to/your/resoscripts:/home/gradle/project/resoscripts -w /home/gradle/project -it $(docker build -f GradleDockerfile -q .) testWebApiCore_2_0_0 -DpathToRESOScript=/home/gradle/project/resoscripts/your.resoscript -DshowResponses=true```
+
+Note that this will create a directory in your home directory for the project, and build artifacts and the log will be placed in that directory,
+which is also where you will end up after runtime.
+
+You may need to adjust the path separators if using Windows.
+
+
+### Commander Utilities
+A [Dockerfile](../Dockerfile) has also been provided to Dockerize the application for Commander utilities.
+
+To run the Commander utilities, use the following commands:
 
-### Commander Features Other Than Automated Web API Testing
 ```
 $ docker build -t web-api-commander .
 ```
@@ -21,28 +49,3 @@ If you have input files you may need to mount your filesystem into the docker co
 ```
 $ docker run -it -v $PWD:/app web-api-commander --validateMetadata --inputFile <pathInContainer>
 ```
-
-### Automated Web API Testing
-
-You may also run the tests in a Docker container locally by issuing one of the following commands. 
-Docker must be running on your local machine.
-
-#### MacOS or Linux All-In-One Commands
-```
-cd ~; \
-rm -rf commander-tmp/; \
-mkdir commander-tmp; \
-cd commander-tmp; \
-git clone https://github.com/RESOStandards/web-api-commander.git; \
-cd web-api-commander; \
-docker run --rm -u gradle -v "$PWD":/home/gradle/project -v /path/to/your/resoscripts:/home/gradle/project/resoscripts -w /home/gradle/project gradle gradle testWebAPIServer_2_0_0_Core -DpathToRESOScript=/home/gradle/project/resoscripts/your.web-api-server.core.2.0.0.resoscript -DshowResponses=true
-```
-
-Note that this will create a directory in your home directory for the project, and build artifacts and the log will be placed in that directory, 
-which is also where you will end up after runtime.
-
-
-#### Windows All-In-One WIP
-```
-cd C:\;mkdir commander-tmp;cd commander-tmp;git clone https://github.com/RESOStandards/web-api-commander.git;cd web-api-commander; docker run --rm -u gradle -v C:\current\path\web-api-commander:/home/gradle/project -v C:\path\to\your\resoscripts:/home/gradle/project/resoscripts -w /home/gradle/project gradle gradle testWebAPIServer_2_0_0_Core -DpathToRESOScript=/home/gradle/project/resoscripts/your.web-api-server.core.2.0.0.resoscript -DshowResponses=true
-```

sample-web-api-server.core.1.0.2.resoscript → sample-web-api-server.core.2.0.0.resoscript

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <!--
-  >>> To be used as a template for Web API Server Core 1.0.2 Certification <<<
+  >>> To be used as a template for Web API Server Core 2.0.0 Certification <<<
 
   NOTES:
     * Anything marked REQUIRED should be filled in.

src/main/java/org/reso/certification/codegen/DDLProcessor.java

@@ -205,7 +205,7 @@ private String buildInsertLookupsStatement() {
       standardFieldMap.forEach((standardName, referenceStandardField) -> {
         String inserts = buildLookupValueInserts(referenceStandardField);
         if (inserts.length() > 0) {
-          markupMap.putIfAbsent(referenceStandardField.getLookupStandardName(),
+          markupMap.putIfAbsent(referenceStandardField.getLookupName(),
               (markupMap.keySet().size() > 0 ? ", " : EMPTY_STRING) + PADDING + inserts);
         }
       });
@@ -219,16 +219,16 @@ private String buildInsertLookupsStatement() {
   private String buildLookupValueInserts(ReferenceStandardField standardField) {
     StringBuilder content = new StringBuilder();
 
-    if (getEnumerations().get(standardField.getLookupStandardName()) != null) {
+    if (getEnumerations().get(standardField.getLookupName()) != null) {
       AtomicReference<String> fieldHash = new AtomicReference<>();
 
       //iterate through each of the lookup values and generate their edm:EnumType content
-      getEnumerations().get(standardField.getLookupStandardName()).forEach(lookup -> {
+      getEnumerations().get(standardField.getLookupName()).forEach(lookup -> {
 
         // key is the sha256 of the following values
         fieldHash.set(sha256()
             .hashString(
-                standardField.getLookupStandardName()
+                standardField.getLookupName()
                     + lookup.getLookupDisplayName()
                     + lookup.getLookupValue(), StandardCharsets.UTF_8)
             .toString());
@@ -237,7 +237,7 @@ private String buildLookupValueInserts(ReferenceStandardField standardField) {
             .append(content.length() > 0 ? ", " : EMPTY_STRING).append("\n")
             .append(PADDING).append("(")
             .append("\"").append(fieldHash.get()).append("\"")
-            .append(", ").append("\"").append(standardField.getLookupStandardName()).append("\"")
+            .append(", ").append("\"").append(standardField.getLookupName()).append("\"")
             .append(", ").append("\"").append(lookup.getLookupDisplayName()).append("\"")
             .append(", ").append("\"").append(lookup.getLookupDisplayName()).append("\"")
             .append(", ").append("\"").append(lookup.getLookupValue()).append("\"")

src/main/java/org/reso/certification/codegen/EDMXProcessor.java

@@ -198,11 +198,11 @@ private String buildEnumTypeMarkup() {
     standardFieldsMap.forEach((resourceName, standardFieldMap) -> {
       standardFieldMap.forEach((standardName, referenceStandardField) -> {
         if (referenceStandardField.isSingleEnumeration()) {
-          markupMap.putIfAbsent(referenceStandardField.getLookupStandardName(), buildSingleEnumTypeMarkup(referenceStandardField));
+          markupMap.putIfAbsent(referenceStandardField.getLookupName(), buildSingleEnumTypeMarkup(referenceStandardField));
         }
 
         if (referenceStandardField.isMultipleEnumeration()) {
-          markupMap.putIfAbsent(referenceStandardField.getLookupStandardName(), buildMultipleEnumTypeMarkup(referenceStandardField));
+          markupMap.putIfAbsent(referenceStandardField.getLookupName(), buildMultipleEnumTypeMarkup(referenceStandardField));
         }
       });
     });
@@ -241,11 +241,11 @@ private String buildNavigationPropertyMarkup(String resourceName) {
   private String buildSingleEnumTypeMarkup(ReferenceStandardField standardField) {
     StringBuilder content = new StringBuilder();
 
-    if (getEnumerations().get(standardField.getLookupStandardName()) != null) {
-      content.append("<EnumType Name=\"").append(standardField.getLookupStandardName()).append("\">");
+    if (getEnumerations().get(standardField.getLookupName()) != null) {
+      content.append("<EnumType Name=\"").append(standardField.getLookupName()).append("\">");
 
       //iterate through each of the lookup values and generate their edm:EnumType content
-      getEnumerations().get(standardField.getLookupStandardName()).forEach(lookup -> {
+      getEnumerations().get(standardField.getLookupName()).forEach(lookup -> {
         content
             .append("<Member Name=\"").append(lookup.getLookupValue()).append("\">")
             .append(EDMXTemplates.buildDisplayNameAnnotation(lookup.getLookupDisplayName()))
@@ -258,9 +258,9 @@ private String buildSingleEnumTypeMarkup(ReferenceStandardField standardField) {
     } else {
       content
           .append("<!-- TODO: implement if you are using the single-valued enumeration \"")
-          .append(standardField.getLookupStandardName()).append("\" -->")
-          .append("<EnumType Name=\"").append(standardField.getLookupStandardName()).append("\">")
-          .append("<Member Name=\"Sample").append(standardField.getLookupStandardName()).append("EnumValue").append("\"/>")
+          .append(standardField.getLookupName()).append("\" -->")
+          .append("<EnumType Name=\"").append(standardField.getLookupName()).append("\">")
+          .append("<Member Name=\"Sample").append(standardField.getLookupName()).append("EnumValue").append("\"/>")
           .append("</EnumType>");
     }
     return content.toString();
@@ -269,11 +269,11 @@ private String buildSingleEnumTypeMarkup(ReferenceStandardField standardField) {
   private String buildMultipleEnumTypeMarkup(ReferenceStandardField standardField) {
     StringBuilder content = new StringBuilder();
 
-    if (getEnumerations().get(standardField.getLookupStandardName()) != null) {
-      content.append("<EnumType Name=\"").append(standardField.getLookupStandardName()).append("\">");
+    if (getEnumerations().get(standardField.getLookupName()) != null) {
+      content.append("<EnumType Name=\"").append(standardField.getLookupName()).append("\">");
 
       //iterate through each of the lookup values and generate their edm:EnumType content
-      getEnumerations().get(standardField.getLookupStandardName()).forEach(lookup -> {
+      getEnumerations().get(standardField.getLookupName()).forEach(lookup -> {
         content
             .append("<Member Name=\"").append(lookup.getLookupValue()).append("\">")
             .append(EDMXTemplates.buildDisplayNameAnnotation(lookup.getLookupDisplayName()))
@@ -285,8 +285,8 @@ private String buildMultipleEnumTypeMarkup(ReferenceStandardField standardField)
       content.append("</EnumType>");
     } else {
       content
-          .append("<!-- TODO: implement if you are using the multi-valued enumeration \"").append(standardField.getLookupStandardName()).append("\" -->")
-          .append("<EnumType Name=\"").append(standardField.getLookupStandardName()).append("\">")
+          .append("<!-- TODO: implement if you are using the multi-valued enumeration \"").append(standardField.getLookupName()).append("\" -->")
+          .append("<EnumType Name=\"").append(standardField.getLookupName()).append("\">")
           .append(EDMXTemplates.buildDDWikiUrlAnnotation(standardField.getWikiPageUrl()))
           .append(EDMXTemplates.buildDescriptionAnnotation(standardField.getDefinition()))
           .append("<Member Name=\"Sample").append(standardField.getStandardName()).append("EnumValue").append("\"/>")
@@ -394,7 +394,7 @@ public static String buildEnumTypeMultiMember(ReferenceStandardField field) {
       if (!field.getLookup().toLowerCase().contains("lookups")) return EMPTY_STRING;
       return ""
           + "<Property Name=\"" + field.getStandardName()
-          + "\" Type=\"Collection(" + RESO_NAMESPACE + ".enums." + field.getLookupStandardName() + ")\">"
+          + "\" Type=\"Collection(" + RESO_NAMESPACE + ".enums." + field.getLookupName() + ")\">"
           + buildDisplayNameAnnotation(field.getDisplayName())
           + buildDDWikiUrlAnnotation(field.getWikiPageUrl())
           + buildDescriptionAnnotation(field.getDefinition())