parse virtual-host-gatherer null value (uyuni-project#7282)

mbussolotto · Aug 3, 2023 · 260d02e · 260d02e
1 parent 5a33b14
commit 260d02e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/java/code/src/com/suse/manager/gatherer/GathererJsonIO.java b/java/code/src/com/suse/manager/gatherer/GathererJsonIO.java
@@ -26,6 +26,7 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 import java.io.IOException;
@@ -100,11 +101,18 @@ public GathererModule read(JsonReader reader) throws IOException {
             reader.beginObject();
             while (reader.hasNext()) {
               String key = reader.nextName();
+              String value = null;
+              if (reader.peek() == JsonToken.NULL) {
+                  reader.nextNull();
+              }
+              else {
+                  value = reader.nextString();
+              }
               if (key.equals("module")) {
-                gm.setName(reader.nextString());
+                  gm.setName(value);
               }
               else {
-                  gm.addParameter(key, reader.nextString());
+                  gm.addParameter(key, value);
               }
             }
             reader.endObject();

diff --git a/java/code/src/com/suse/manager/gatherer/test/GathererJsonIOTest.java b/java/code/src/com/suse/manager/gatherer/test/GathererJsonIOTest.java
@@ -55,9 +55,10 @@ public void testReadGathererModules() throws Exception {
                 FileUtils.readStringFromFile(TestUtils.findTestData(MODULELIST).getPath());
         Map<String, GathererModule> mods = new GathererJsonIO().readGathererModules(json);
 
-        assertEquals(2, mods.keySet().size());
+        assertEquals(3, mods.keySet().size());
         assertTrue(mods.keySet().contains("VMware"));
         assertTrue(mods.keySet().contains("SUSECloud"));
+        assertTrue(mods.keySet().contains("Libvirt"));
 
         for (GathererModule g : mods.values()) {
             if (g.getName().equals("VMware")) {
@@ -76,6 +77,11 @@ else if (g.getName().equals("SUSECloud")) {
                 assertTrue(g.getParameters().containsKey("protocol"));
                 assertTrue(g.getParameters().containsKey("tenant"));
             }
+            else if (g.getName().equals("Libvirt")) {
+                assertTrue(g.getParameters().containsKey("uri"));
+                assertTrue(g.getParameters().containsKey("sasl_username"));
+                assertTrue(g.getParameters().containsKey("sasl_password"));
+            }
             else {
                 fail("Unknown Module");
             }

diff --git a/java/code/src/com/suse/manager/gatherer/test/modulelist.json b/java/code/src/com/suse/manager/gatherer/test/modulelist.json
@@ -14,6 +14,12 @@
         "port": 443,
         "username": "",
         "password": ""
+    },
+    "Libvirt": {
+        "module": "Libvirt",
+        "uri": "",
+        "sasl_username": null,
+        "sasl_password": null
     }
 }
 
diff --git a/java/spacewalk-java.changes.mbussolotto.parse_null b/java/spacewalk-java.changes.mbussolotto.parse_null
@@ -0,0 +1 @@
+- parse virtual-host-gatherer null value