Skip to content

Commit 50a08b3

Browse files
prepairing for release and fixing tiny bug
1 parent 8e43064 commit 50a08b3

File tree

8 files changed

+20
-15
lines changed

8 files changed

+20
-15
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Java-SerialX dev
2-
This branch is used for testing and stuff!
2+
This the main development branch!

SerialX-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</parent>
88

99
<groupId>org.ugp.serialx</groupId>
10-
<artifactId>core</artifactId>
10+
<artifactId>serialx-core</artifactId>
1111
<version>1.3.8</version>
1212

1313
<name>SerialX core</name>

SerialX-devtools/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</parent>
88

99
<groupId>org.ugp.serialx</groupId>
10-
<artifactId>devtools</artifactId>
10+
<artifactId>serialx-devtools</artifactId>
1111
<version>1.3.8</version>
1212

1313
<name>SerialX devtools</name>
@@ -16,7 +16,7 @@
1616
<dependencies>
1717
<dependency>
1818
<groupId>org.ugp.serialx</groupId>
19-
<artifactId>core</artifactId>
19+
<artifactId>serialx-core</artifactId>
2020
<version>${revision}</version>
2121
</dependency>
2222
</dependencies>

SerialX-json/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</parent>
88

99
<groupId>org.ugp.serialx</groupId>
10-
<artifactId>json</artifactId>
10+
<artifactId>serialx-json</artifactId>
1111
<version>1.3.8</version>
1212

1313
<name>SerialX json</name>
@@ -16,7 +16,7 @@
1616
<dependencies>
1717
<dependency>
1818
<groupId>org.ugp.serialx</groupId>
19-
<artifactId>juss</artifactId>
19+
<artifactId>serialx-juss</artifactId>
2020
<version>${revision}</version>
2121
</dependency>
2222
</dependencies>

SerialX-json/src/main/java/org/ugp/serialx/json/converters/JsonObjectConverter.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,29 @@
1414
*
1515
* @author PETO
1616
*
17-
* @since 1.3.5
17+
* @since 1.3.5 (separated from JsonSerializer since 1.3.8)
1818
*/
1919
public class JsonObjectConverter extends ObjectConverter
2020
{
2121
@SuppressWarnings("unchecked")
2222
@Override
2323
public CharSequence toString(ParserRegistry myHomeRegistry, Object arg, Object... args)
2424
{
25+
if (arg == null)
26+
return CONTINUE;
27+
2528
if (arg.getClass().isArray())
2629
return super.toString(myHomeRegistry, new Scope(Utils.fromAmbiguousArray(arg)), args);
2730

2831
if (arg instanceof Map)
2932
{
3033
Map<?, ?> map = (Map<?, ?>) arg;
31-
if (map.isEmpty() || map.keySet().iterator().next() instanceof CharSequence)
34+
if (map.isEmpty())
35+
return "{}";
36+
if (map.keySet().iterator().next() instanceof CharSequence)
3237
return super.toString(myHomeRegistry, new Scope((Map<String, ?>) map), args);
3338
}
34-
39+
3540
SerializationProtocol<Object> prot = (SerializationProtocol<Object>) getProtocolFor(arg, SerializationProtocol.MODE_SERIALIZE, args);
3641
if (prot != null && !(arg instanceof Scope))
3742
try

SerialX-juss/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
</parent>
88

99
<groupId>org.ugp.serialx</groupId>
10-
<artifactId>juss</artifactId>
10+
<artifactId>serialx-juss</artifactId>
1111
<version>1.3.8</version>
1212

13-
<name>SerialX-juss</name>
13+
<name>SerialX juss</name>
1414
<description>SerialX support for Java Universal Serial Script data format, custom default format of SerialX!</description>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>org.ugp.serialx</groupId>
19-
<artifactId>core</artifactId>
19+
<artifactId>serialx-core</artifactId>
2020
<version>${revision}</version>
2121
</dependency>
2222
</dependencies>

SerialX-operators/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</parent>
88

99
<groupId>org.ugp.serialx</groupId>
10-
<artifactId>operators</artifactId>
10+
<artifactId>serialx-operators</artifactId>
1111
<version>1.3.8</version>
1212

1313
<name>SerialX operators</name>
@@ -16,7 +16,7 @@
1616
<dependencies>
1717
<dependency>
1818
<groupId>org.ugp.serialx</groupId>
19-
<artifactId>core</artifactId>
19+
<artifactId>serialx-core</artifactId>
2020
<version>${revision}</version>
2121
</dependency>
2222
</dependencies>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</modules>
1616

1717
<name>SerialX root</name>
18-
<description>Store Java objects into file via SerialX. SerialX is a powerful utility library to serialize objects in Java programmatically via recursive descent parser for custom domain-specific languages!</description>
18+
<description>Store Java objects into JSON or any format you want! SerialX is a powerful lightweight utility library to serialize Java objects programmatically via tweakable recursive descent parser for custom domain-specific languages!</description>
1919
<url>https://github.com/SimplyProgrammer/Java-SerialX</url>
2020
<inceptionYear>2020</inceptionYear>
2121

0 commit comments

Comments
 (0)