Fix automatic character encoding detection

Closes #10
leadpony · Jan 23, 2021 · 1479206 · 1479206
1 parent 7a540f4
commit 1479206
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/joy-core/src/main/java/org/leadpony/joy/core/JsonPointerImpl.java b/joy-core/src/main/java/org/leadpony/joy/core/JsonPointerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the Joy Authors.
+ * Copyright 2019-2021 the Joy Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/joy-core/src/main/java/org/leadpony/joy/core/Message.java b/joy-core/src/main/java/org/leadpony/joy/core/Message.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the Joy Authors.
+ * Copyright 2019-2021 the Joy Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,6 +102,10 @@ public static String thatParserHasBeenAlreadyClosed() {
         return format("ParserHasBeenAlreadyClosed");
     }
 
+    public static String thatCharacterEncodingCannotBeDetected() {
+        return format("CharacterEncodingCannotBeDetected");
+    }
+
     /*
      * Messages for JSON generator
      */

diff --git a/joy-core/src/main/java/org/leadpony/joy/core/PatchOperation.java b/joy-core/src/main/java/org/leadpony/joy/core/PatchOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the Joy Authors.
+ * Copyright 2019-2021 the Joy Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/joy-core/src/main/java/org/leadpony/joy/core/StreamReaders.java b/joy-core/src/main/java/org/leadpony/joy/core/StreamReaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the Joy Authors.
+ * Copyright 2019-2021 the Joy Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,6 +72,9 @@ static Reader createStreamReader(InputStream in) {
             int b2 = in.read();
             if (b2 < 0) {
                 // 1 letter
+                if (b1 == 0) {
+                    throw unknownEncodingException();
+                }
                 return createReader(in, DEFAULT_ENCODING, (byte) b1);
             }
 
@@ -154,6 +157,10 @@ private static Reader createReader(InputStream in, Charset charset, byte... byte
         return new InputStreamReader(s, charset);
     }
 
+    private static JsonException unknownEncodingException() {
+        return new JsonException(Message.thatCharacterEncodingCannotBeDetected());
+    }
+
     private StreamReaders() {
     }
 }
diff --git a/joy-core/src/main/resources/org/leadpony/joy/core/messages.properties b/joy-core/src/main/resources/org/leadpony/joy/core/messages.properties
@@ -38,6 +38,8 @@ IOErrorOccurredWhileParserWasClosing=An I/O error occurred while the parser was
 
 ParserHasBeenAlreadyClosed=The parser has been already closed.
 
+CharacterEncodingCannotBeDetected=Character encoding cannot be detected automatically.
+
 #
 # Messages for JsonGenerator
 #

diff --git a/pom.xml b/pom.xml
@@ -62,7 +62,7 @@
             <dependency>
                 <groupId>org.leadpony</groupId>
                 <artifactId>jsonp-test-suite</artifactId>
-                <version>2.1.0-SNAPSHOT</version>
+                <version>2.1.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
-Original file line number
+Diff line change
@@ Expand Up @@
     ParserHasBeenAlreadyClosed=The parser has been already closed.
+    CharacterEncodingCannotBeDetected=Character encoding cannot be detected automatically.
     #
     # Messages for JsonGenerator
     #
@@ Expand Down @@