Merge branch 'main' of github.com:NOAA-GSL/idss-engine-commons into main

NOAA-GSL · Nov 8, 2022 · d5f88d3 · d5f88d3
2 parents 77e4480 + 1cf5dc0
commit d5f88d3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/java-commons.yml b/.github/workflows/java-commons.yml
@@ -5,7 +5,6 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ main ]
   pull_request:
     branches: [ main ]
 
@@ -16,14 +15,24 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - uses: gradle/wrapper-validation-action@v1
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
         java-version: '11'
         distribution: 'adopt'
-    - name: Grant execute permission for gradlew
-      run: chmod +x ./java/gradlew
+
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+
     - name: Build with Gradle
       run:  |
             cd ./java
+            chmod +x ./gradlew
             ./gradlew build
+      
+    - name: Archive test report
+      uses: actions/upload-artifact@v2
+      with:
+        name: Test report
+        path: ./java//build/reports/tests/test
diff --git a/README.md b/README.md
@@ -113,7 +113,7 @@ Using the port mapping `-p 15672:15672` allows access to the RabbitMQ Web UI Man
 ` idss.engine.commons.couchdb.server:<tag>`
 
 > **Recommended Tags** development `:dev` stable release `:major.minor` ie. `:1.0` targeted environment `:aws` test `:test`
-From the `idss-engine-commons/rabbitmq` directory:
+From the `idss-engine-commons/couchdb` directory:
 
 #### Build
 

diff --git a/java/src/main/java/gov/noaa/gsl/idssEngine/commons/aspect/Units.java b/java/src/main/java/gov/noaa/gsl/idssEngine/commons/aspect/Units.java
@@ -66,10 +66,13 @@ public static Units get(String unitString) {
         map.put("kgPerM2", KgPerM2);
         map.put("mph", MilesPerHour); 
         map.put("MPH", MilesPerHour); 
+        map.put("milesPerHour", MilesPerHour); 
+        map.put("MilesPerHour", MilesPerHour); 
         map.put("m/h", MetersPerHour); 
         map.put("m.s-1", MetersPerSecond); 
         map.put("m/s", MetersPerSecond); 
         map.put("metersPerSecond", MetersPerSecond); 
+        map.put("MetersPerSecond", MetersPerSecond); 
         map.put("F", Fahrenheit); 
         map.put("DEG F", Fahrenheit); 
         map.put("K", Kelvin);