Merge pull request #121 from jenkinsci/fix/more-serialisation-hacks

fix: more serialisation hacks

Author: h1dden-da3m0n

.github/workflows/codeql-analysis.yml

@@ -28,10 +28,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11

.github/workflows/update-release-draft.yml

@@ -11,6 +11,6 @@ jobs:
     if: ${{ ! contains(github.event.head_commit.message, '[maven-release-plugin] prepare release') }}
     steps:
       - name: Update Release Draft
-        uses: release-drafter/release-drafter@v5.18.1
+        uses: release-drafter/release-drafter@v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/upload-release-artifact.yml

@@ -11,18 +11,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Update Release Draft
-        uses: release-drafter/release-drafter@v5.15.0
+        uses: release-drafter/release-drafter@v5.19.0
         id: release-drafter
         with:
           publish: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.34</version>
+    <version>4.37</version>
     <relativePath />
   </parent>
 

src/main/java/io/jenkins/plugins/restlistparam/logic/ValueResolver.java

@@ -1,9 +1,6 @@
 package io.jenkins.plugins.restlistparam.logic;
 
-import com.jayway.jsonpath.InvalidJsonException;
-import com.jayway.jsonpath.InvalidPathException;
-import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.PathNotFoundException;
+import com.jayway.jsonpath.*;
 import io.jenkins.plugins.restlistparam.Messages;
 import io.jenkins.plugins.restlistparam.model.MimeType;
 import io.jenkins.plugins.restlistparam.model.ResultContainer;
@@ -128,7 +125,7 @@ public static ResultContainer<List<ValueItem>> resolveJsonPath(final String json
           resolved.stream()
                   .map(JsonPath::parse)
                   .map(context -> context.read("$"))
-                  .map(read -> (read instanceof Map) ? JsonPath.parse(read).jsonString() : (String) read)
+                  .map(ValueResolver::convertToString)
                   .map(value -> new ValueItem(value, parseDisplayValue(value, displayExpression)))
                   .collect(Collectors.toList())
         );
@@ -158,6 +155,24 @@ public static ResultContainer<List<ValueItem>> resolveJsonPath(final String json
     return container;
   }
 
+  public static String convertToString(Object obj) {
+    if (obj instanceof Map) {
+      return JsonPath.parse(obj).jsonString();
+    }
+    else if (obj instanceof Integer) {
+      return Integer.toString((Integer) obj);
+    }
+    else if (obj instanceof Float) {
+      return Float.toString((Float) obj);
+    }
+    else if (obj instanceof String) {
+      return (String) obj;
+    }
+    else {
+      throw new ClassCastException("Unable to cast '" + obj.getClass().getCanonicalName() + "' to String");
+    }
+  }
+
   /**
    * Apply the display expression filter on a given value (only JSON supported).
    *