change year + offset some code + fix warning

UrielCh · UrielCh · commit 212c00ace429 · 2025-08-02T19:11:54.000+02:00
diff --git a/accessors-smart/pom.xml b/accessors-smart/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2011-2024 JSON-SMART authors
+Copyright 2011-2025 JSON-SMART 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/accessors-smart/src/main/java/net/minidev/asm/ASMUtil.java b/accessors-smart/src/main/java/net/minidev/asm/ASMUtil.java
@@ -1,7 +1,7 @@
 package net.minidev.asm;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/accessors-smart/src/main/java/net/minidev/asm/Accessor.java b/accessors-smart/src/main/java/net/minidev/asm/Accessor.java
@@ -1,7 +1,7 @@
 package net.minidev.asm;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/accessors-smart/src/main/java/net/minidev/asm/BeansAccess.java b/accessors-smart/src/main/java/net/minidev/asm/BeansAccess.java
@@ -1,7 +1,7 @@
 package net.minidev.asm;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/accessors-smart/src/main/java/net/minidev/asm/DynamicClassLoader.java b/accessors-smart/src/main/java/net/minidev/asm/DynamicClassLoader.java
@@ -1,7 +1,7 @@
 package net.minidev.asm;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/accessors-smart/src/test/java/net/minidev/asm/ASMTest.java b/accessors-smart/src/test/java/net/minidev/asm/ASMTest.java
@@ -114,7 +114,6 @@ public void testGet() throws Exception {
     // T1 = System.currentTimeMillis() - T1;
   }
 
-  @Test
   private void subtext(BeansAccess<BTest> acc) {
     BTest t = new BTest();
     acc.set(t, "pubBoolValue", true);
diff --git a/json-smart/pom.xml b/json-smart/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2011-2024 JSON-SMART authors
+Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/JSONArray.java b/json-smart/src/main/java/net/minidev/json/JSONArray.java
@@ -1,7 +1,7 @@
 package net.minidev.json;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/JSONAware.java b/json-smart/src/main/java/net/minidev/json/JSONAware.java
@@ -1,7 +1,7 @@
 package net.minidev.json;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/JSONAwareEx.java b/json-smart/src/main/java/net/minidev/json/JSONAwareEx.java
@@ -1,7 +1,7 @@
 package net.minidev.json;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/JSONNavi.java b/json-smart/src/main/java/net/minidev/json/JSONNavi.java
@@ -1,7 +1,7 @@
 package net.minidev.json;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/JSONObject.java b/json-smart/src/main/java/net/minidev/json/JSONObject.java
@@ -1,7 +1,7 @@
 package net.minidev.json;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/JSONStreamAware.java b/json-smart/src/main/java/net/minidev/json/JSONStreamAware.java
@@ -1,7 +1,7 @@
 package net.minidev.json;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/JSONStreamAwareEx.java b/json-smart/src/main/java/net/minidev/json/JSONStreamAwareEx.java
@@ -1,7 +1,7 @@
 package net.minidev.json;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/JSONStyle.java b/json-smart/src/main/java/net/minidev/json/JSONStyle.java
@@ -1,7 +1,7 @@
 package net.minidev.json;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/JSONUtil.java b/json-smart/src/main/java/net/minidev/json/JSONUtil.java
@@ -6,7 +6,7 @@
 import net.minidev.json.annotate.JsonIgnore;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/JSONValue.java b/json-smart/src/main/java/net/minidev/json/JSONValue.java
@@ -1,7 +1,7 @@
 package net.minidev.json;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/JStylerObj.java b/json-smart/src/main/java/net/minidev/json/JStylerObj.java
@@ -1,7 +1,7 @@
 package net.minidev.json;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/parser/JSONParser.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParser.java
@@ -1,7 +1,7 @@
 package net.minidev.json.parser;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java
@@ -1,7 +1,7 @@
 package net.minidev.json.parser;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -216,10 +216,6 @@ protected <T> T parse(JsonReaderI<T> mapper) throws ParseException {
    * use to return Primitive Type, or String, Or JsonObject or JsonArray generated by a
    * ContainerFactory
    */
-  protected <T> T parseNext(JsonReaderI<T> mapper) throws ParseException {
-    this.pos = this.pos > 0 ? this.pos : -1;
-    return parseInner(mapper);
-  }
 
   private <T> T parseInner(JsonReaderI<T> mapper) throws ParseException {
     T result;
@@ -819,6 +815,11 @@ public void append(int c) {
       b[p] = (char) c;
     }
 
+    protected <T> T parseNext(JsonReaderI<T> mapper) throws ParseException {
+      this.pos = this.pos >= 0 ? this.pos : -1;
+      return parseInner(mapper);
+    }
+
     public String toString() {
       return new String(b, 0, p + 1);
     }
diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParserByteArray.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserByteArray.java
@@ -1,7 +1,7 @@
 package net.minidev.json.parser;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/parser/JSONParserInputStream.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserInputStream.java
@@ -1,7 +1,7 @@
 package net.minidev.json.parser;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/parser/JSONParserMemory.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserMemory.java
@@ -1,7 +1,7 @@
 package net.minidev.json.parser;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,9 @@ protected void readNQString(boolean[] stop) throws IOException {
     extractStringTrim(start, pos);
   }
 
+  /**
+   * this function must be sync with JSONParserStream.readNumber
+   */
   protected Object readNumber(boolean[] stop) throws ParseException, IOException {
     int start = pos;
     // accept first char digit or -
@@ -129,6 +132,7 @@ protected void readString() throws ParseException, IOException {
       return;
     }
     sb.clear();
+    
     readString2();
   }
 
diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParserReader.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserReader.java
@@ -1,7 +1,7 @@
 package net.minidev.json.parser;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,11 +26,11 @@
  * Parser for JSON text. Please note that JSONParser is NOT thread-safe.
  *
  * @author Uriel Chemouni &lt;uchemouni@gmail.com&gt;
+ * 
  */
 class JSONParserReader extends JSONParserStream {
   private Reader in;
 
-  // len
   public JSONParserReader(int permissiveMode) {
     super(permissiveMode);
   }
diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParserStream.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserStream.java
@@ -1,7 +1,7 @@
 package net.minidev.json.parser;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 import static net.minidev.json.parser.ParseException.ERROR_UNEXPECTED_CHAR;
+// import static net.minidev.json.parser.ParseException.ERROR_UNEXPECTED_EOF;
 import static net.minidev.json.parser.ParseException.ERROR_UNEXPECTED_TOKEN;
 
 import java.io.IOException;
@@ -28,6 +29,8 @@
  * @see JSONParserReader
  */
 abstract class JSONParserStream extends JSONParserBase {
+  // no protected int len field
+
   public JSONParserStream(int permissiveMode) {
     super(permissiveMode);
   }
@@ -38,6 +41,9 @@ protected void readNQString(boolean[] stop) throws IOException {
     xs = sb.toString().trim();
   }
 
+  /**
+   * this function must be sync with JSONParserMemory.readNumber
+   */
   protected Object readNumber(boolean[] stop) throws ParseException, IOException {
     sb.clear();
     sb.append(c); // accept first char digit or -
@@ -109,8 +115,23 @@ protected void readString() throws ParseException, IOException {
       }
       throw new ParseException(pos, ERROR_UNEXPECTED_CHAR, c);
     }
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
+    // acceptIncomplete not implemented for stream
     sb.clear();
-
     /* assert (c == '\"' || c == '\'') */
     readString2();
   }
diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParserString.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserString.java
@@ -1,7 +1,7 @@
 package net.minidev.json.parser;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
 /**
  * Parser for JSON text. Please note that JSONParser is NOT thread-safe.
  *
+ * 
+ * 
  * @author Uriel Chemouni &lt;uchemouni@gmail.com&gt;
  */
 class JSONParserString extends JSONParserMemory {
diff --git a/json-smart/src/main/java/net/minidev/json/parser/ParseException.java b/json-smart/src/main/java/net/minidev/json/parser/ParseException.java
@@ -1,7 +1,7 @@
 package net.minidev.json.parser;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/writer/ArraysMapper.java b/json-smart/src/main/java/net/minidev/json/writer/ArraysMapper.java
@@ -1,7 +1,7 @@
 package net.minidev.json.writer;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/writer/BeansMapper.java b/json-smart/src/main/java/net/minidev/json/writer/BeansMapper.java
@@ -1,7 +1,7 @@
 package net.minidev.json.writer;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/writer/CollectionMapper.java b/json-smart/src/main/java/net/minidev/json/writer/CollectionMapper.java
@@ -1,7 +1,7 @@
 package net.minidev.json.writer;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/writer/CompessorMapper.java b/json-smart/src/main/java/net/minidev/json/writer/CompessorMapper.java
@@ -1,7 +1,7 @@
 package net.minidev.json.writer;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/writer/DefaultMapperCollection.java b/json-smart/src/main/java/net/minidev/json/writer/DefaultMapperCollection.java
@@ -1,7 +1,7 @@
 package net.minidev.json.writer;
 
 /*
- *    Copyright 2011-2024 JSON-SMART authors
+ *    Copyright 2011-2025 JSON-SMART 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/json-smart/src/main/java/net/minidev/json/writer/DefaultMapperOrdered.java b/json-smart/src/main/java/net/minidev/json/writer/DefaultMapperOrdered.java
diff --git a/json-smart/src/main/java/net/minidev/json/writer/FakeMapper.java b/json-smart/src/main/java/net/minidev/json/writer/FakeMapper.java
diff --git a/json-smart/src/main/java/net/minidev/json/writer/JsonReader.java b/json-smart/src/main/java/net/minidev/json/writer/JsonReader.java
diff --git a/json-smart/src/main/java/net/minidev/json/writer/JsonReaderI.java b/json-smart/src/main/java/net/minidev/json/writer/JsonReaderI.java

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package net.minidev.asm;`
`2`	`2`
`3`	`3`	`/*`
`4`		`- * Copyright 2011-2024 JSON-SMART authors`
	`4`	`+ * Copyright 2011-2025 JSON-SMART authors`
`5`	`5`	`*`
`6`	`6`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`7`	`7`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@ public void testGet() throws Exception {`
`114`	`114`	`// T1 = System.currentTimeMillis() - T1;`
`115`	`115`	`}`
`116`	`116`
`117`		`- @Test`
`118`	`117`	`private void subtext(BeansAccess<BTest> acc) {`
`119`	`118`	`BTest t = new BTest();`
`120`	`119`	`acc.set(t, "pubBoolValue", true);`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package net.minidev.json;`
`2`	`2`
`3`	`3`	`/*`
`4`		`- * Copyright 2011-2024 JSON-SMART authors`
	`4`	`+ * Copyright 2011-2025 JSON-SMART authors`
`5`	`5`	`*`
`6`	`6`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`7`	`7`	`* you may not use this file except in compliance with the License.`