modified: .gitlab-ci.yml

whit2333 · baltzell · commit 141e407e8927 · 2025-02-21T10:32:21.000-05:00
modified:   common-tools/clas-io/src/main/java/org/jlab/utils/JsonUtils.java
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -39,6 +39,19 @@ coatjava_dind_build:
                    -t $CI_REGISTRY_IMAGE/coatjava_dind:${CI_COMMIT_REF_NAME}  .
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
     - docker push $CI_REGISTRY_IMAGE/coatjava_dind:${CI_COMMIT_REF_NAME}
+
+
+print_help:
+  image: $CI_REGISTRY_IMAGE/coatjava:${CI_COMMIT_REF_NAME}
+  needs: ["coatjava_build"]
+  script:
+    - export PATH=/opt/coatjava/coatjava/bin:$PATH
+    - source /opt/coatjava/coatjava/libexec/env.sh
+    - ls -lrth
+    - printenv
+    - decoder -help || true
+    - recon-util -help || true
+
     
 alert_testing:
   needs: ["coatjava_build"]
diff --git a/common-tools/clas-io/src/main/java/org/jlab/utils/JsonUtils.java b/common-tools/clas-io/src/main/java/org/jlab/utils/JsonUtils.java
@@ -109,13 +109,13 @@ public static JsonObject Map2Json(Map<String,Object> map) {
         JsonObject ret = new JsonObject();
         for (Map.Entry<String,Object> entry : map.entrySet()) {
             String topKey = entry.getKey();
-                System.out.println("topKey " + topKey);
             if (entry.getValue() instanceof Map) {
                 ret.add(topKey,Map2Json((Map)entry.getValue()));
             }
             else {
-                System.out.println("value " + entry.getValue());
-                ret.add(topKey, entry.getValue().toString());
+                if(entry.getValue() != null) {
+                    ret.add(topKey, entry.getValue().toString());
+                }
             }
         }
         return ret;

Original file line number	Diff line number	Diff line change
`@@ -109,13 +109,13 @@ public static JsonObject Map2Json(Map<String,Object> map) {`
`109`	`109`	`JsonObject ret = new JsonObject();`
`110`	`110`	`for (Map.Entry<String,Object> entry : map.entrySet()) {`
`111`	`111`	`String topKey = entry.getKey();`
`112`		`- System.out.println("topKey " + topKey);`
`113`	`112`	`if (entry.getValue() instanceof Map) {`
`114`	`113`	`ret.add(topKey,Map2Json((Map)entry.getValue()));`
`115`	`114`	`}`
`116`	`115`	`else {`
`117`		`- System.out.println("value " + entry.getValue());`
`118`		`- ret.add(topKey, entry.getValue().toString());`
	`116`	`+ if(entry.getValue() != null) {`
	`117`	`+ ret.add(topKey, entry.getValue().toString());`
	`118`	`+ }`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`return ret;`