Revert our changes and use FireMasterK's improvements

.github/workflows/maven.yml

@@ -0,0 +1,31 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

README.md

@@ -2,6 +2,5 @@
 
 This is a fork of [nanojson](https://github.com/mmastrac/nanojson) for use by NewPipe(Extractor). It has the following changes:
 
-- It returns an empty `JsonObject` or `JsonArray` by default instead of `null`, preventing `NullPointerException`s.
-- It accepts JS-like JSON, such as `{ this: 'is', an: 'example' }`.
 - Added ``JsonArray#streamAs`` and ``JsonArray#streamAsJsonObjects`` shortcut methods.
+- Various performance improvements borrowed from [@FireMasterK's fork](https://github.com/FireMasterK/nanojson).

checkstyle.xml

@@ -20,8 +20,7 @@
 	</module>
 
 	<module name="LineLength">
-		<property name="max" value="120" />
-		<property name="tabWidth" value="4" />
+		<property name="max" value="150" />
 	</module>
 
 	<!-- If you set the basedir property below, then all reported file names 
@@ -70,7 +69,7 @@
 		<!-- Checks for Javadoc comments. -->
 		<!-- See http://checkstyle.sf.net/config_javadoc.html -->
 		<module name="JavadocMethod">
-			<property name="scope" value="public" />
+			<property name="accessModifiers" value="public" />
 			<property name="allowMissingParamTags" value="true" />
 			<property name="allowMissingReturnTag" value="true" />
 		</module>

pom.xml

@@ -13,19 +13,35 @@
     <artifactId>nanojson</artifactId>
     <packaging>jar</packaging>
     <name>nanojson</name>
-    <version>1.8-SNAPSHOT</version>
+    <version>1.11-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
     </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.13.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.randelshofer</groupId>
+            <artifactId>fastdoubleparser</artifactId>
+            <version>2.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
     <reporting>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.11.3</version>
                 <reportSets>
                     <reportSet>
                         <id>html</id>
@@ -44,7 +60,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.6.0</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
                     <propertyExpansion>basedir=${basedir}</propertyExpansion>
@@ -66,7 +82,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.5.3</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -77,21 +93,12 @@
             </plugin>
         </plugins>
     </reporting>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -104,7 +111,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.11.3</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -117,7 +124,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.6.0</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
                     <propertyExpansion>basedir=${basedir}</propertyExpansion>
@@ -145,7 +152,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.5.1</version>
 
                 <configuration>
                     <executable>java</executable>
@@ -165,15 +172,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.14.0</version>
                 <configuration>
-                    <debug>true</debug>
-                    <debuglevel>none</debuglevel>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <archive>
-                        <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
+                    <debug>false</debug>
+                    <release>11</release>
                     <compilerArgument>-Xlint:all</compilerArgument>
                     <compilerArguments>
                         <Werror />
@@ -183,21 +185,44 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.9.1</version>
+                <version>3.21.0</version>
                 <configuration>
                 </configuration>
             </plugin>
-	<plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-jar-plugin</artifactId>
-		<configuration>
-			<archive>
-				<manifestEntries>
-					<Automatic-Module-Name>com.grack.nanojson</Automatic-Module-Name>
-				</manifestEntries>
-			</archive>
-		</configuration>
-	</plugin>
+          <plugin>
+              <groupId>biz.aQute.bnd</groupId>
+              <artifactId>bnd-maven-plugin</artifactId>
+              <extensions>true</extensions>
+              <executions>
+                  <execution>
+                      <id>jar</id>
+                      <goals>
+                          <goal>jar</goal>
+                      </goals>
+                          <configuration>
+                              <bnd><![CDATA[
+                                  Bundle-SymbolicName: ${groupId}.${artifactId}
+                                  Export-Package: com.grack.nanojson
+                                  -jpms-module-info: com.grack.nanojson
+                                  -noextraheaders: 
+                                  -removeheaders: \
+                                    Tool, \
+                                    Bnd-LastModified, \
+                                    Bnd-ManifestVersion, \
+                                    Build-Jdk, \
+                                    Built-By, \
+                                    Created-By, \
+                                    Private-Package, \
+                                    Bundle-DocURL, \
+                                    Bundle-Name, \
+                                    Bundle-Vendor,\
+                                    Bundle-Description,\
+                                    Bundle-SCM
+                              ]]></bnd>
+                          </configuration>
+                  </execution>
+              </executions>
+          </plugin>
         </plugins>
     </build>
 
@@ -210,7 +235,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.8</version>
+                        <version>1.7.0</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>sonatype-nexus-staging</serverId>
@@ -221,7 +246,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.2.8</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

src/main/java/com/grack/nanojson/CharBufferPool.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2011 The nanojson Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.grack.nanojson;
+
+import java.nio.CharBuffer;
+import java.util.PriorityQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public final class CharBufferPool {
+
+    private static final AtomicInteger SIZE = new AtomicInteger(0);
+    private static final int MAX_SIZE = 1000;
+    private static final int MAX_RETAINED_BUFFER_SIZE = 16 * 1024; // 16KB limit for pooled buffers
+
+    private static final PriorityQueue<CharBuffer> BUFFERS = new PriorityQueue<>();
+
+    private CharBufferPool() {
+    }
+
+    public static CharBuffer get(int capacity) {
+        synchronized (BUFFERS) {
+            if (!BUFFERS.isEmpty()) {
+                CharBuffer buffer = BUFFERS.poll();
+                if (buffer.capacity() < capacity) {
+                    return CharBuffer.allocate(capacity);
+                }
+                return buffer;
+            }
+        }
+
+        if (SIZE.incrementAndGet() > MAX_SIZE) {
+            SIZE.decrementAndGet();
+            throw new IllegalStateException("Buffer pool size limit exceeded");
+        }
+
+        return CharBuffer.allocate(capacity);
+    }
+
+    public static void release(CharBuffer buffer) {
+        if (buffer == null || buffer.capacity() <= 0) {
+            return;
+        }
+
+        if (buffer.limit() > MAX_RETAINED_BUFFER_SIZE) {
+            // If the buffer is too large, decrement SIZE so another can be created
+            SIZE.decrementAndGet();
+            return;
+        }
+
+        buffer.clear();
+
+        synchronized (BUFFERS) {
+            BUFFERS.add(buffer);
+        }
+    }
+}