Skip to content

Commit 71c43c3

Browse files
committed
Fix a bug where empty objects were returned as null (meaning parse failure) rather than as an empty list. Increment minor version
1 parent ae8188e commit 71c43c3

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"java.configuration.updateBuildConfiguration": "automatic"
2+
"java.configuration.updateBuildConfiguration": "automatic",
3+
"java.compile.nullAnalysis.mode": "disabled"
34
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.github.stevenlagoy</groupId>
66
<artifactId>json-java-objectifier</artifactId>
7-
<version>1.0.1</version>
7+
<version>1.0.2</version>
88
<packaging>jar</packaging>
99
<name>JSON Java Objectifier</name>
1010
<description>Java tools for converting JSON into typed object structures</description>

src/main/java/core/JSONProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public static List<JSONObject> processObject(String objectLine) {
114114
return null;
115115
String members = objectLine.substring(1, objectLine.length() - 1).trim();
116116
if (members.isEmpty())
117-
return null;
117+
return new ArrayList<>();
118118
return processMembers(members);
119119
}
120120

src/tests/java/ProcessorTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import org.junit.Test;
77

8+
import java.util.ArrayList;
89
import java.util.List;
910

1011
import core.JSONObject;
@@ -114,7 +115,7 @@ public void testProcessArray() {
114115
@Test
115116
public void testProcessObject() {
116117
// Test empty object
117-
assertNull(JSONProcessor.processObject("{}"));
118+
assertEquals(new ArrayList<>(), JSONProcessor.processObject("{}"));
118119

119120
// Test simple object
120121
List<JSONObject> simple = JSONProcessor.processObject("{\"key\":\"value\"}");

src/tests/java/Tests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.junit.Test;
66

77
import core.FileOperations;
8+
import core.JSONObject;
89
import core.JSONProcessor;
910

1011
public class Tests {

0 commit comments

Comments
 (0)