Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: display value json input #208

Merged
merged 1 commit into from
Dec 4, 2024
Merged

fix: display value json input #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/main/java/io/jenkins/plugins/restlistparam/logic/ValueResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import io.jenkins.plugins.restlistparam.model.MimeType;
import io.jenkins.plugins.restlistparam.model.ResultContainer;
import io.jenkins.plugins.restlistparam.model.ValueItem;
import org.json.JSONStringer;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
Expand Down Expand Up @@ -125,8 +126,7 @@
resolved.stream()
.map(JsonPath::parse)
.map(context -> context.read("$"))
.map(ValueResolver::convertToString)
.map(value -> new ValueItem(value, parseDisplayValue(value, displayExpression)))
.map(value -> new ValueItem(convertToString(value), parseDisplayValue(convertToJson(value), displayExpression)))
.collect(Collectors.toList())
);
}
Expand Down Expand Up @@ -155,8 +155,12 @@
return container;
}

private static String convertToJson(Object obj) {
return JSONStringer.valueToString(obj);
}

public static String convertToString(Object obj) {
if (obj instanceof Map) {
if (obj instanceof Map || obj instanceof List) {

Check warning on line 163 in src/main/java/io/jenkins/plugins/restlistparam/logic/ValueResolver.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line 

Line 163 is only partially covered, one branch is missing
return JsonPath.parse(obj).jsonString();
}
else if (obj instanceof Integer) {
Expand All @@ -165,6 +169,12 @@
else if (obj instanceof Float) {
return Float.toString((Float) obj);
}
else if (obj instanceof Double) {
return Double.toString((Double) obj);
}
else if (obj instanceof Boolean) {
return Boolean.toString((Boolean) obj);
}
else if (obj instanceof String) {
return (String) obj;
}
Expand Down
42 changes: 42 additions & 0 deletions src/test/java/io/jenkins/plugins/restlistparam/TestConst.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,48 @@ public class TestConst {
" }\n" +
"]\n";

public static final String numberLikeTestJson = "[\n" +
" {\n" +
" \"name\": \"2024.19\",\n" +
" },\n" +
" {\n" +
" \"name\": \"2024.20\",\n" +
" },\n" +
" {\n" +
" \"name\": \"2024.0\",\n" +
" }\n" +
"]\n";

public static final String numberValuesTestJson = "[\n" +
" {\n" +
" \"value\": 1.0\n" +
" },\n" +
" {\n" +
" \"value\": 10\n" +
" },\n" +
" {\n" +
" \"value\": 11.50\n" +
" }\n" +
"]\n";

public static final String mixedTypeValuesTestJson = "[\n" +
" {\n" +
" \"value\": 1.0\n" +
" },\n" +
" {\n" +
" \"value\": 10\n" +
" },\n" +
" {\n" +
" \"value\": \"11.50\"\n" +
" },\n" +
" {\n" +
" \"value\": true\n" +
" },\n" +
" {\n" +
" \"value\": false\n" +
" }\n" +
"]\n";

public static final String validJsonValueItem = "{" +
"\"name\":\"v10.6.4\"," +
"\"zipball_url\":\"https://api.github.com/repos/jellyfin/jellyfin/zipball/v10.6.4\"," +
Expand Down
41 changes: 41 additions & 0 deletions src/test/java/io/jenkins/plugins/restlistparam/ValueResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.junit.Assert;
import org.junit.Test;

import java.util.HashMap;
import java.util.List;

public class ValueResolverTest {
Expand All @@ -20,6 +21,46 @@ public void resolveJsonPathTest() {
Assert.assertEquals(3, res.getValue().size());
Assert.assertArrayEquals(new String[]{"v10.6.4", "v10.6.3", "v10.6.2"},
res.getValue().stream().map(ValueItem::getValue).toArray());
Assert.assertArrayEquals(new String[]{"v10.6.4", "v10.6.3", "v10.6.2"},
res.getValue().stream().map(ValueItem::getDisplayValue).toArray());
}

@Test
public void resolveJsonPathNumberLikeValuesTest() {
ResultContainer<List<ValueItem>> res = ValueResolver.resolveJsonPath(TestConst.numberLikeTestJson, "$.*.name", "$");
Assert.assertNotNull(res);
Assert.assertFalse(res.getErrorMsg().isPresent());
Assert.assertEquals(3, res.getValue().size());
Assert.assertArrayEquals(new String[]{"2024.19", "2024.20", "2024.0"},
res.getValue().stream().map(ValueItem::getValue).toArray());
Assert.assertArrayEquals(new String[]{"2024.19", "2024.20", "2024.0"},
res.getValue().stream().map(ValueItem::getDisplayValue).toArray());
}

@Test
public void resolveJsonPathNumberValuesTest() {
ResultContainer<List<ValueItem>> res = ValueResolver.resolveJsonPath(TestConst.numberValuesTestJson, "$.*.value", "$");
Assert.assertNotNull(res);
Assert.assertFalse(res.getErrorMsg().isPresent());
Assert.assertEquals(3, res.getValue().size());
Assert.assertArrayEquals(new String[]{"1.0", "10", "11.5"},
res.getValue().stream().map(ValueItem::getValue).toArray());
// trailing 0 and decimal points are shaved off numbers by JSONStringer
Assert.assertArrayEquals(new String[]{"1", "10", "11.5"},
res.getValue().stream().map(ValueItem::getDisplayValue).toArray());
}

@Test
public void resolveJsonPathMixedTypeValuesTest() {
ResultContainer<List<ValueItem>> res = ValueResolver.resolveJsonPath(TestConst.mixedTypeValuesTestJson, "$.*.value", "$");
Assert.assertNotNull(res);
Assert.assertFalse(res.getErrorMsg().isPresent());
Assert.assertEquals(5, res.getValue().size());
Assert.assertArrayEquals(new String[]{"1.0", "10", "11.50", "true", "false"},
res.getValue().stream().map(ValueItem::getValue).toArray());
// trailing 0 and decimal points are shaved off numbers by JSONStringer
Assert.assertArrayEquals(new String[]{"1", "10", "11.50", "true", "false"},
res.getValue().stream().map(ValueItem::getDisplayValue).toArray());
}

@Test
Expand Down
Loading