From 5990ae40d62b99be44ce81b0c2f4422cc9b47c67 Mon Sep 17 00:00:00 2001 From: Luke McPhee Date: Mon, 26 Aug 2024 20:22:22 +0100 Subject: [PATCH 1/2] port to currenthealth package --- README.md | 2 +- build.gradle | 33 ++- pom.xml | 203 ------------------ settings.gradle | 17 ++ .../{org => com/currenthealth}/json/CDL.java | 2 +- .../currenthealth}/json/Cookie.java | 2 +- .../currenthealth}/json/CookieList.java | 2 +- .../{org => com/currenthealth}/json/HTTP.java | 2 +- .../currenthealth}/json/HTTPTokener.java | 2 +- .../currenthealth}/json/JSONArray.java | 2 +- .../currenthealth}/json/JSONException.java | 2 +- .../currenthealth}/json/JSONML.java | 2 +- .../json/JSONMLParserConfiguration.java | 2 +- .../currenthealth}/json/JSONObject.java | 2 +- .../json/JSONParserConfiguration.java | 2 +- .../currenthealth}/json/JSONPointer.java | 2 +- .../json/JSONPointerException.java | 2 +- .../json/JSONPropertyIgnore.java | 2 +- .../currenthealth}/json/JSONPropertyName.java | 2 +- .../currenthealth}/json/JSONString.java | 2 +- .../currenthealth}/json/JSONStringer.java | 2 +- .../currenthealth}/json/JSONTokener.java | 2 +- .../currenthealth}/json/JSONWriter.java | 2 +- .../json/ParserConfiguration.java | 2 +- .../currenthealth}/json/Property.java | 2 +- .../json/StringBuilderWriter.java | 2 +- .../{org => com/currenthealth}/json/XML.java | 2 +- .../json/XMLParserConfiguration.java | 2 +- .../currenthealth}/json/XMLTokener.java | 2 +- .../json/XMLXsiTypeConverter.java | 2 +- .../currenthealth}/json/junit/CDLTest.java | 10 +- .../json/junit/CookieListTest.java | 5 +- .../currenthealth}/json/junit/CookieTest.java | 5 +- .../currenthealth}/json/junit/EnumTest.java | 12 +- .../currenthealth}/json/junit/HTTPTest.java | 5 +- .../json/junit/JSONArrayTest.java | 20 +- .../currenthealth}/json/junit/JSONMLTest.java | 8 +- .../json/junit/JSONObjectLocaleTest.java | 5 +- .../json/junit/JSONObjectNumberTest.java | 4 +- .../json/junit/JSONObjectTest.java | 62 +++--- .../junit/JSONParserConfigurationTest.java | 10 +- .../json/junit/JSONPointerTest.java | 12 +- .../json/junit/JSONStringTest.java | 6 +- .../json/junit/JSONStringerTest.java | 6 +- .../json/junit/JSONTokenerTest.java | 12 +- .../json/junit/PropertyTest.java | 4 +- .../json/junit/StringBuilderWriterTest.java | 4 +- .../currenthealth}/json/junit/Util.java | 6 +- .../json/junit/XMLConfigurationTest.java | 12 +- .../currenthealth}/json/junit/XMLTest.java | 9 +- .../json/junit/data/BrokenToString.java | 2 +- .../json/junit/data/ExceptionalBean.java | 6 +- .../json/junit/data/Fraction.java | 2 +- .../json/junit/data/GenericBean.java | 2 +- .../json/junit/data/GenericBeanInt.java | 2 +- .../json/junit/data/MyBean.java | 2 +- .../json/junit/data/MyBeanCustomName.java | 4 +- .../junit/data/MyBeanCustomNameInterface.java | 6 +- .../junit/data/MyBeanCustomNameSubClass.java | 8 +- .../json/junit/data/MyBigNumberBean.java | 2 +- .../json/junit/data/MyEnum.java | 2 +- .../json/junit/data/MyEnumClass.java | 2 +- .../json/junit/data/MyEnumField.java | 2 +- .../json/junit/data/MyJsonString.java | 3 +- .../json/junit/data/MyLocaleBean.java | 2 +- .../json/junit/data/MyNumber.java | 2 +- .../json/junit/data/MyNumberContainer.java | 2 +- .../json/junit/data/MyPublicClass.java | 2 +- .../json/junit/data/RecursiveBean.java | 2 +- .../json/junit/data/RecursiveBeanEquals.java | 2 +- .../json/junit/data/Singleton.java | 2 +- .../json/junit/data/SingletonEnum.java | 2 +- .../junit/data/StringsResourceBundle.java | 2 +- .../json/junit/data/WeirdList.java | 2 +- 74 files changed, 216 insertions(+), 373 deletions(-) delete mode 100644 pom.xml create mode 100644 settings.gradle rename src/main/java/{org => com/currenthealth}/json/CDL.java (99%) rename src/main/java/{org => com/currenthealth}/json/Cookie.java (99%) rename src/main/java/{org => com/currenthealth}/json/CookieList.java (98%) rename src/main/java/{org => com/currenthealth}/json/HTTP.java (99%) rename src/main/java/{org => com/currenthealth}/json/HTTPTokener.java (97%) rename src/main/java/{org => com/currenthealth}/json/JSONArray.java (99%) rename src/main/java/{org => com/currenthealth}/json/JSONException.java (97%) rename src/main/java/{org => com/currenthealth}/json/JSONML.java (99%) rename src/main/java/{org => com/currenthealth}/json/JSONMLParserConfiguration.java (98%) rename src/main/java/{org => com/currenthealth}/json/JSONObject.java (99%) rename src/main/java/{org => com/currenthealth}/json/JSONParserConfiguration.java (99%) rename src/main/java/{org => com/currenthealth}/json/JSONPointer.java (99%) rename src/main/java/{org => com/currenthealth}/json/JSONPointerException.java (96%) rename src/main/java/{org => com/currenthealth}/json/JSONPropertyIgnore.java (95%) rename src/main/java/{org => com/currenthealth}/json/JSONPropertyName.java (95%) rename src/main/java/{org => com/currenthealth}/json/JSONString.java (95%) rename src/main/java/{org => com/currenthealth}/json/JSONStringer.java (98%) rename src/main/java/{org => com/currenthealth}/json/JSONTokener.java (99%) rename src/main/java/{org => com/currenthealth}/json/JSONWriter.java (99%) rename src/main/java/{org => com/currenthealth}/json/ParserConfiguration.java (99%) rename src/main/java/{org => com/currenthealth}/json/Property.java (98%) rename src/main/java/{org => com/currenthealth}/json/StringBuilderWriter.java (98%) rename src/main/java/{org => com/currenthealth}/json/XML.java (99%) rename src/main/java/{org => com/currenthealth}/json/XMLParserConfiguration.java (99%) rename src/main/java/{org => com/currenthealth}/json/XMLTokener.java (99%) rename src/main/java/{org => com/currenthealth}/json/XMLXsiTypeConverter.java (97%) rename src/test/java/{org => com/currenthealth}/json/junit/CDLTest.java (98%) rename src/test/java/{org => com/currenthealth}/json/junit/CookieListTest.java (98%) rename src/test/java/{org => com/currenthealth}/json/junit/CookieTest.java (98%) rename src/test/java/{org => com/currenthealth}/json/junit/EnumTest.java (98%) rename src/test/java/{org => com/currenthealth}/json/junit/HTTPTest.java (97%) rename src/test/java/{org => com/currenthealth}/json/junit/JSONArrayTest.java (99%) rename src/test/java/{org => com/currenthealth}/json/junit/JSONMLTest.java (99%) rename src/test/java/{org => com/currenthealth}/json/junit/JSONObjectLocaleTest.java (94%) rename src/test/java/{org => com/currenthealth}/json/junit/JSONObjectNumberTest.java (98%) rename src/test/java/{org => com/currenthealth}/json/junit/JSONObjectTest.java (99%) rename src/test/java/{org => com/currenthealth}/json/junit/JSONParserConfigurationTest.java (98%) rename src/test/java/{org => com/currenthealth}/json/junit/JSONPointerTest.java (98%) rename src/test/java/{org => com/currenthealth}/json/junit/JSONStringTest.java (98%) rename src/test/java/{org => com/currenthealth}/json/junit/JSONStringerTest.java (98%) rename src/test/java/{org => com/currenthealth}/json/junit/JSONTokenerTest.java (97%) rename src/test/java/{org => com/currenthealth}/json/junit/PropertyTest.java (96%) rename src/test/java/{org => com/currenthealth}/json/junit/StringBuilderWriterTest.java (93%) rename src/test/java/{org => com/currenthealth}/json/junit/Util.java (97%) rename src/test/java/{org => com/currenthealth}/json/junit/XMLConfigurationTest.java (99%) rename src/test/java/{org => com/currenthealth}/json/junit/XMLTest.java (99%) rename src/test/java/{org => com/currenthealth}/json/junit/data/BrokenToString.java (84%) rename src/test/java/{org => com/currenthealth}/json/junit/data/ExceptionalBean.java (90%) rename src/test/java/{org => com/currenthealth}/json/junit/data/Fraction.java (99%) rename src/test/java/{org => com/currenthealth}/json/junit/data/GenericBean.java (97%) rename src/test/java/{org => com/currenthealth}/json/junit/data/GenericBeanInt.java (96%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyBean.java (89%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyBeanCustomName.java (86%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyBeanCustomNameInterface.java (53%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyBeanCustomNameSubClass.java (78%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyBigNumberBean.java (82%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyEnum.java (69%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyEnumClass.java (91%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyEnumField.java (93%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyJsonString.java (71%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyLocaleBean.java (83%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyNumber.java (98%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyNumberContainer.java (86%) rename src/test/java/{org => com/currenthealth}/json/junit/data/MyPublicClass.java (82%) rename src/test/java/{org => com/currenthealth}/json/junit/data/RecursiveBean.java (93%) rename src/test/java/{org => com/currenthealth}/json/junit/data/RecursiveBeanEquals.java (93%) rename src/test/java/{org => com/currenthealth}/json/junit/data/Singleton.java (97%) rename src/test/java/{org => com/currenthealth}/json/junit/data/SingletonEnum.java (96%) rename src/test/java/{org => com/currenthealth}/json/junit/data/StringsResourceBundle.java (90%) rename src/test/java/{org => com/currenthealth}/json/junit/data/WeirdList.java (96%) diff --git a/README.md b/README.md index 78920a180..4f2eb290b 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ javac -cp .:json-java.jar Test.java (Unix Systems) *Test file contents* ```java -import org.json.JSONObject; +import com.currenthealth.json.JSONObject; public class Test { public static void main(String args[]){ JSONObject jo = new JSONObject("{ \"abc\" : \"def\" }"); diff --git a/build.gradle b/build.gradle index 30a85785b..9169d4fc1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,19 @@ -/* - * This file was generated by the Gradle 'init' task. - */ -apply plugin: 'java' -apply plugin: 'eclipse' -// apply plugin: 'jacoco' -apply plugin: 'maven-publish' - -//plugins { - // id 'java' - //id 'maven-publish' -// } +plugins { + id 'java' + id 'eclipse' + id 'com.currenthealth.gradle.nexus-publisher' version '1.4.0' +} repositories { + gradlePluginPortal() mavenLocal() - mavenCentral() + maven { - url = uri('https://oss.sonatype.org/content/repositories/snapshots') + url "https://nexus.snap40.com/repository/maven-public/" + credentials { + username System.getenv('nexus_username') ?: "$nexus_username" + password System.getenv('nexus_password') ?: "$nexus_password" + } } } @@ -42,13 +40,6 @@ java { withJavadocJar() } -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} tasks.withType(JavaCompile) { options.encoding = 'UTF-8' diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 7b102433b..000000000 --- a/pom.xml +++ /dev/null @@ -1,203 +0,0 @@ - - 4.0.0 - - org.json - json - 20240303 - bundle - - JSON in Java - - JSON is a light-weight, language independent, data interchange format. - See http://www.JSON.org/ - - The files in this package implement JSON encoders/decoders in Java. - It also includes the capability to convert between JSON and XML, HTTP - headers, Cookies, and CDL. - - This is a reference implementation. There are a large number of JSON packages - in Java. Perhaps someday the Java community will standardize on one. Until - then, choose carefully. - - https://github.com/douglascrockford/JSON-java - - - https://github.com/douglascrockford/JSON-java.git - scm:git:git://github.com/douglascrockford/JSON-java.git - scm:git:git@github.com:douglascrockford/JSON-java.git - - - - - Public Domain - https://github.com/stleary/JSON-java/blob/master/LICENSE - repo - - - - - - Douglas Crockford - douglas@crockford.com - - - - - UTF-8 - - - - - - ossrh - Central Repository OSSRH - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - - - - - junit - junit - 4.13.2 - test - - - com.jayway.jsonpath - json-path - 2.4.0 - test - - - org.mockito - mockito-core - 4.2.0 - test - - - - - - - org.apache.felix - maven-bundle-plugin - 5.1.9 - true - - - - org.json - - ${project.artifactId} - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - 1.8 - 1.8 - - -Xlint:unchecked - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - - attach-javadocs - - jar - - - -Xdoclint:none - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.3 - true - - ossrh - https://oss.sonatype.org/ - false - - - - org.moditect - moditect-maven-plugin - 1.0.0.Final - - - add-module-infos - package - - add-module-info - - - 9 - - - module org.json { - exports org.json; - } - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..d7c6d284b --- /dev/null +++ b/settings.gradle @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + mavenLocal() + + maven { + url "https://nexus.snap40.com/repository/maven-public/" + credentials { + username System.getenv('nexus_username') + password System.getenv('nexus_password') + } + } + + gradlePluginPortal() + } +} + +rootProject.name = 'services.device-management' diff --git a/src/main/java/org/json/CDL.java b/src/main/java/com/currenthealth/json/CDL.java similarity index 99% rename from src/main/java/org/json/CDL.java rename to src/main/java/com/currenthealth/json/CDL.java index b495de12b..1282de34e 100644 --- a/src/main/java/org/json/CDL.java +++ b/src/main/java/com/currenthealth/json/CDL.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/com/currenthealth/json/Cookie.java similarity index 99% rename from src/main/java/org/json/Cookie.java rename to src/main/java/com/currenthealth/json/Cookie.java index ab908a304..ebc94236a 100644 --- a/src/main/java/org/json/Cookie.java +++ b/src/main/java/com/currenthealth/json/Cookie.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; import java.util.Locale; diff --git a/src/main/java/org/json/CookieList.java b/src/main/java/com/currenthealth/json/CookieList.java similarity index 98% rename from src/main/java/org/json/CookieList.java rename to src/main/java/com/currenthealth/json/CookieList.java index d1064db52..6c7ba0b23 100644 --- a/src/main/java/org/json/CookieList.java +++ b/src/main/java/com/currenthealth/json/CookieList.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/HTTP.java b/src/main/java/com/currenthealth/json/HTTP.java similarity index 99% rename from src/main/java/org/json/HTTP.java rename to src/main/java/com/currenthealth/json/HTTP.java index 44ab3a6d3..82bcad482 100644 --- a/src/main/java/org/json/HTTP.java +++ b/src/main/java/com/currenthealth/json/HTTP.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/HTTPTokener.java b/src/main/java/com/currenthealth/json/HTTPTokener.java similarity index 97% rename from src/main/java/org/json/HTTPTokener.java rename to src/main/java/com/currenthealth/json/HTTPTokener.java index 48cad31a3..d6c36d93b 100644 --- a/src/main/java/org/json/HTTPTokener.java +++ b/src/main/java/com/currenthealth/json/HTTPTokener.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/com/currenthealth/json/JSONArray.java similarity index 99% rename from src/main/java/org/json/JSONArray.java rename to src/main/java/com/currenthealth/json/JSONArray.java index 382359858..f9461da32 100644 --- a/src/main/java/org/json/JSONArray.java +++ b/src/main/java/com/currenthealth/json/JSONArray.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/JSONException.java b/src/main/java/com/currenthealth/json/JSONException.java similarity index 97% rename from src/main/java/org/json/JSONException.java rename to src/main/java/com/currenthealth/json/JSONException.java index 02c29f3fc..0e8d4d0d8 100644 --- a/src/main/java/org/json/JSONException.java +++ b/src/main/java/com/currenthealth/json/JSONException.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/com/currenthealth/json/JSONML.java similarity index 99% rename from src/main/java/org/json/JSONML.java rename to src/main/java/com/currenthealth/json/JSONML.java index 7b53e4da7..4d9572d8e 100644 --- a/src/main/java/org/json/JSONML.java +++ b/src/main/java/com/currenthealth/json/JSONML.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/JSONMLParserConfiguration.java b/src/main/java/com/currenthealth/json/JSONMLParserConfiguration.java similarity index 98% rename from src/main/java/org/json/JSONMLParserConfiguration.java rename to src/main/java/com/currenthealth/json/JSONMLParserConfiguration.java index 43ba0db62..3c7358943 100644 --- a/src/main/java/org/json/JSONMLParserConfiguration.java +++ b/src/main/java/com/currenthealth/json/JSONMLParserConfiguration.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. */ diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/com/currenthealth/json/JSONObject.java similarity index 99% rename from src/main/java/org/json/JSONObject.java rename to src/main/java/com/currenthealth/json/JSONObject.java index 642e96703..5b58df711 100644 --- a/src/main/java/org/json/JSONObject.java +++ b/src/main/java/com/currenthealth/json/JSONObject.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/com/currenthealth/json/JSONParserConfiguration.java similarity index 99% rename from src/main/java/org/json/JSONParserConfiguration.java rename to src/main/java/com/currenthealth/json/JSONParserConfiguration.java index ad0d7fb72..173572f01 100644 --- a/src/main/java/org/json/JSONParserConfiguration.java +++ b/src/main/java/com/currenthealth/json/JSONParserConfiguration.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /** * Configuration object for the JSON parser. The configuration is immutable. diff --git a/src/main/java/org/json/JSONPointer.java b/src/main/java/com/currenthealth/json/JSONPointer.java similarity index 99% rename from src/main/java/org/json/JSONPointer.java rename to src/main/java/com/currenthealth/json/JSONPointer.java index 859e1e644..d39f486b1 100644 --- a/src/main/java/org/json/JSONPointer.java +++ b/src/main/java/com/currenthealth/json/JSONPointer.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; import static java.lang.String.format; diff --git a/src/main/java/org/json/JSONPointerException.java b/src/main/java/com/currenthealth/json/JSONPointerException.java similarity index 96% rename from src/main/java/org/json/JSONPointerException.java rename to src/main/java/com/currenthealth/json/JSONPointerException.java index dc5a25ad6..afc64b959 100644 --- a/src/main/java/org/json/JSONPointerException.java +++ b/src/main/java/com/currenthealth/json/JSONPointerException.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/JSONPropertyIgnore.java b/src/main/java/com/currenthealth/json/JSONPropertyIgnore.java similarity index 95% rename from src/main/java/org/json/JSONPropertyIgnore.java rename to src/main/java/com/currenthealth/json/JSONPropertyIgnore.java index d3a5bc5a1..dc93ae11b 100644 --- a/src/main/java/org/json/JSONPropertyIgnore.java +++ b/src/main/java/com/currenthealth/json/JSONPropertyIgnore.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/JSONPropertyName.java b/src/main/java/com/currenthealth/json/JSONPropertyName.java similarity index 95% rename from src/main/java/org/json/JSONPropertyName.java rename to src/main/java/com/currenthealth/json/JSONPropertyName.java index 0e4123f37..adfb4d9a7 100644 --- a/src/main/java/org/json/JSONPropertyName.java +++ b/src/main/java/com/currenthealth/json/JSONPropertyName.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/JSONString.java b/src/main/java/com/currenthealth/json/JSONString.java similarity index 95% rename from src/main/java/org/json/JSONString.java rename to src/main/java/com/currenthealth/json/JSONString.java index cd8d1847d..d08ec3a2f 100644 --- a/src/main/java/org/json/JSONString.java +++ b/src/main/java/com/currenthealth/json/JSONString.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/JSONStringer.java b/src/main/java/com/currenthealth/json/JSONStringer.java similarity index 98% rename from src/main/java/org/json/JSONStringer.java rename to src/main/java/com/currenthealth/json/JSONStringer.java index 2f6cf9ed8..d73451ded 100644 --- a/src/main/java/org/json/JSONStringer.java +++ b/src/main/java/com/currenthealth/json/JSONStringer.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/com/currenthealth/json/JSONTokener.java similarity index 99% rename from src/main/java/org/json/JSONTokener.java rename to src/main/java/com/currenthealth/json/JSONTokener.java index 63effc5f7..92ab3e837 100644 --- a/src/main/java/org/json/JSONTokener.java +++ b/src/main/java/com/currenthealth/json/JSONTokener.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; import java.io.*; import java.nio.charset.Charset; diff --git a/src/main/java/org/json/JSONWriter.java b/src/main/java/com/currenthealth/json/JSONWriter.java similarity index 99% rename from src/main/java/org/json/JSONWriter.java rename to src/main/java/com/currenthealth/json/JSONWriter.java index 11f4a5c7e..75144a546 100644 --- a/src/main/java/org/json/JSONWriter.java +++ b/src/main/java/com/currenthealth/json/JSONWriter.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; import java.io.IOException; import java.util.Collection; diff --git a/src/main/java/org/json/ParserConfiguration.java b/src/main/java/com/currenthealth/json/ParserConfiguration.java similarity index 99% rename from src/main/java/org/json/ParserConfiguration.java rename to src/main/java/com/currenthealth/json/ParserConfiguration.java index 06cc44366..344c442da 100644 --- a/src/main/java/org/json/ParserConfiguration.java +++ b/src/main/java/com/currenthealth/json/ParserConfiguration.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. */ diff --git a/src/main/java/org/json/Property.java b/src/main/java/com/currenthealth/json/Property.java similarity index 98% rename from src/main/java/org/json/Property.java rename to src/main/java/com/currenthealth/json/Property.java index ba6c56967..d7d8cf2b3 100644 --- a/src/main/java/org/json/Property.java +++ b/src/main/java/com/currenthealth/json/Property.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/StringBuilderWriter.java b/src/main/java/com/currenthealth/json/StringBuilderWriter.java similarity index 98% rename from src/main/java/org/json/StringBuilderWriter.java rename to src/main/java/com/currenthealth/json/StringBuilderWriter.java index 4aaa4903f..92c2bfc87 100644 --- a/src/main/java/org/json/StringBuilderWriter.java +++ b/src/main/java/com/currenthealth/json/StringBuilderWriter.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; import java.io.IOException; import java.io.Writer; diff --git a/src/main/java/org/json/XML.java b/src/main/java/com/currenthealth/json/XML.java similarity index 99% rename from src/main/java/org/json/XML.java rename to src/main/java/com/currenthealth/json/XML.java index e59ec7a4a..4d002ac5c 100644 --- a/src/main/java/org/json/XML.java +++ b/src/main/java/com/currenthealth/json/XML.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/com/currenthealth/json/XMLParserConfiguration.java similarity index 99% rename from src/main/java/org/json/XMLParserConfiguration.java rename to src/main/java/com/currenthealth/json/XMLParserConfiguration.java index bc4a80074..dfc5e3cec 100644 --- a/src/main/java/org/json/XMLParserConfiguration.java +++ b/src/main/java/com/currenthealth/json/XMLParserConfiguration.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. */ diff --git a/src/main/java/org/json/XMLTokener.java b/src/main/java/com/currenthealth/json/XMLTokener.java similarity index 99% rename from src/main/java/org/json/XMLTokener.java rename to src/main/java/com/currenthealth/json/XMLTokener.java index bc18b31c9..12a0d8974 100644 --- a/src/main/java/org/json/XMLTokener.java +++ b/src/main/java/com/currenthealth/json/XMLTokener.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. diff --git a/src/main/java/org/json/XMLXsiTypeConverter.java b/src/main/java/com/currenthealth/json/XMLXsiTypeConverter.java similarity index 97% rename from src/main/java/org/json/XMLXsiTypeConverter.java rename to src/main/java/com/currenthealth/json/XMLXsiTypeConverter.java index ea6739d34..7038f04ef 100644 --- a/src/main/java/org/json/XMLXsiTypeConverter.java +++ b/src/main/java/com/currenthealth/json/XMLXsiTypeConverter.java @@ -1,4 +1,4 @@ -package org.json; +package com.currenthealth.json; /* Public Domain. */ diff --git a/src/test/java/org/json/junit/CDLTest.java b/src/test/java/com/currenthealth/json/junit/CDLTest.java similarity index 98% rename from src/test/java/org/json/junit/CDLTest.java rename to src/test/java/com/currenthealth/json/junit/CDLTest.java index 511218ed3..d6a109772 100644 --- a/src/test/java/org/json/junit/CDLTest.java +++ b/src/test/java/com/currenthealth/json/junit/CDLTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -7,10 +7,10 @@ import static org.junit.Assert.*; import org.junit.Test; -import org.json.JSONException; -import org.json.JSONObject; -import org.json.JSONArray; -import org.json.CDL; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.CDL; /** * Tests for CDL.java. diff --git a/src/test/java/org/json/junit/CookieListTest.java b/src/test/java/com/currenthealth/json/junit/CookieListTest.java similarity index 98% rename from src/test/java/org/json/junit/CookieListTest.java rename to src/test/java/com/currenthealth/json/junit/CookieListTest.java index 0af96401b..493a24ef9 100644 --- a/src/test/java/org/json/junit/CookieListTest.java +++ b/src/test/java/com/currenthealth/json/junit/CookieListTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -8,6 +8,9 @@ import java.util.*; +import com.currenthealth.json.CookieList; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; import org.json.*; import org.junit.Test; diff --git a/src/test/java/org/json/junit/CookieTest.java b/src/test/java/com/currenthealth/json/junit/CookieTest.java similarity index 98% rename from src/test/java/org/json/junit/CookieTest.java rename to src/test/java/com/currenthealth/json/junit/CookieTest.java index edd8a7eeb..5691775d1 100644 --- a/src/test/java/org/json/junit/CookieTest.java +++ b/src/test/java/com/currenthealth/json/junit/CookieTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -6,6 +6,9 @@ import static org.junit.Assert.*; +import com.currenthealth.json.Cookie; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; import org.json.*; import org.junit.Test; diff --git a/src/test/java/org/json/junit/EnumTest.java b/src/test/java/com/currenthealth/json/junit/EnumTest.java similarity index 98% rename from src/test/java/org/json/junit/EnumTest.java rename to src/test/java/com/currenthealth/json/junit/EnumTest.java index 1496a636a..9759e12a1 100644 --- a/src/test/java/org/json/junit/EnumTest.java +++ b/src/test/java/com/currenthealth/json/junit/EnumTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -12,11 +12,11 @@ import java.util.List; import java.util.Map; -import org.json.JSONArray; -import org.json.JSONObject; -import org.json.junit.data.MyEnum; -import org.json.junit.data.MyEnumClass; -import org.json.junit.data.MyEnumField; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.junit.data.MyEnum; +import com.currenthealth.json.junit.data.MyEnumClass; +import com.currenthealth.json.junit.data.MyEnumField; import org.junit.Test; import com.jayway.jsonpath.Configuration; diff --git a/src/test/java/org/json/junit/HTTPTest.java b/src/test/java/com/currenthealth/json/junit/HTTPTest.java similarity index 97% rename from src/test/java/org/json/junit/HTTPTest.java rename to src/test/java/com/currenthealth/json/junit/HTTPTest.java index 703d5ad2f..111e1e943 100644 --- a/src/test/java/org/json/junit/HTTPTest.java +++ b/src/test/java/com/currenthealth/json/junit/HTTPTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -6,6 +6,9 @@ import static org.junit.Assert.*; +import com.currenthealth.json.HTTP; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; import org.json.*; import org.junit.Test; diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/com/currenthealth/json/junit/JSONArrayTest.java similarity index 99% rename from src/test/java/org/json/junit/JSONArrayTest.java rename to src/test/java/com/currenthealth/json/junit/JSONArrayTest.java index 485d43e7b..c0db9e036 100644 --- a/src/test/java/org/json/junit/JSONArrayTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONArrayTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -25,15 +25,15 @@ import java.util.List; import java.util.Map; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.json.JSONParserConfiguration; -import org.json.JSONPointerException; -import org.json.JSONString; -import org.json.JSONTokener; -import org.json.ParserConfiguration; -import org.json.junit.data.MyJsonString; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.JSONParserConfiguration; +import com.currenthealth.json.JSONPointerException; +import com.currenthealth.json.JSONString; +import com.currenthealth.json.JSONTokener; +import com.currenthealth.json.ParserConfiguration; +import com.currenthealth.json.junit.data.MyJsonString; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/com/currenthealth/json/junit/JSONMLTest.java similarity index 99% rename from src/test/java/org/json/junit/JSONMLTest.java rename to src/test/java/com/currenthealth/json/junit/JSONMLTest.java index d3568401b..38b426e52 100644 --- a/src/test/java/org/json/junit/JSONMLTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONMLTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -11,6 +11,12 @@ import java.nio.file.Paths; import java.util.stream.Collectors; import java.util.stream.Stream; + +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONML; +import com.currenthealth.json.JSONMLParserConfiguration; +import com.currenthealth.json.JSONObject; import org.json.*; import org.junit.Test; diff --git a/src/test/java/org/json/junit/JSONObjectLocaleTest.java b/src/test/java/com/currenthealth/json/junit/JSONObjectLocaleTest.java similarity index 94% rename from src/test/java/org/json/junit/JSONObjectLocaleTest.java rename to src/test/java/com/currenthealth/json/junit/JSONObjectLocaleTest.java index 1cdaf743d..0c0ec7e72 100755 --- a/src/test/java/org/json/junit/JSONObjectLocaleTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONObjectLocaleTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -8,8 +8,9 @@ import java.util.*; +import com.currenthealth.json.JSONObject; import org.json.*; -import org.json.junit.data.MyLocaleBean; +import com.currenthealth.json.junit.data.MyLocaleBean; import org.junit.*; /** diff --git a/src/test/java/org/json/junit/JSONObjectNumberTest.java b/src/test/java/com/currenthealth/json/junit/JSONObjectNumberTest.java similarity index 98% rename from src/test/java/org/json/junit/JSONObjectNumberTest.java rename to src/test/java/com/currenthealth/json/junit/JSONObjectNumberTest.java index 739de838f..20216c3c7 100644 --- a/src/test/java/org/json/junit/JSONObjectNumberTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONObjectNumberTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -8,7 +8,7 @@ import java.util.Arrays; import java.util.Collection; -import org.json.JSONObject; +import com.currenthealth.json.JSONObject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/com/currenthealth/json/junit/JSONObjectTest.java similarity index 99% rename from src/test/java/org/json/junit/JSONObjectTest.java rename to src/test/java/com/currenthealth/json/junit/JSONObjectTest.java index d32a2db68..60a2e965f 100644 --- a/src/test/java/org/json/junit/JSONObjectTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONObjectTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -26,36 +26,36 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; -import org.json.CDL; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.json.JSONPointerException; -import org.json.JSONParserConfiguration; -import org.json.JSONString; -import org.json.JSONTokener; -import org.json.ParserConfiguration; -import org.json.XML; -import org.json.junit.data.BrokenToString; -import org.json.junit.data.ExceptionalBean; -import org.json.junit.data.Fraction; -import org.json.junit.data.GenericBean; -import org.json.junit.data.GenericBeanInt; -import org.json.junit.data.MyBean; -import org.json.junit.data.MyBeanCustomName; -import org.json.junit.data.MyBeanCustomNameSubClass; -import org.json.junit.data.MyBigNumberBean; -import org.json.junit.data.MyEnum; -import org.json.junit.data.MyEnumField; -import org.json.junit.data.MyJsonString; -import org.json.junit.data.MyNumber; -import org.json.junit.data.MyNumberContainer; -import org.json.junit.data.MyPublicClass; -import org.json.junit.data.RecursiveBean; -import org.json.junit.data.RecursiveBeanEquals; -import org.json.junit.data.Singleton; -import org.json.junit.data.SingletonEnum; -import org.json.junit.data.WeirdList; +import com.currenthealth.json.CDL; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.JSONPointerException; +import com.currenthealth.json.JSONParserConfiguration; +import com.currenthealth.json.JSONString; +import com.currenthealth.json.JSONTokener; +import com.currenthealth.json.ParserConfiguration; +import com.currenthealth.json.XML; +import com.currenthealth.json.junit.data.BrokenToString; +import com.currenthealth.json.junit.data.ExceptionalBean; +import com.currenthealth.json.junit.data.Fraction; +import com.currenthealth.json.junit.data.GenericBean; +import com.currenthealth.json.junit.data.GenericBeanInt; +import com.currenthealth.json.junit.data.MyBean; +import com.currenthealth.json.junit.data.MyBeanCustomName; +import com.currenthealth.json.junit.data.MyBeanCustomNameSubClass; +import com.currenthealth.json.junit.data.MyBigNumberBean; +import com.currenthealth.json.junit.data.MyEnum; +import com.currenthealth.json.junit.data.MyEnumField; +import com.currenthealth.json.junit.data.MyJsonString; +import com.currenthealth.json.junit.data.MyNumber; +import com.currenthealth.json.junit.data.MyNumberContainer; +import com.currenthealth.json.junit.data.MyPublicClass; +import com.currenthealth.json.junit.data.RecursiveBean; +import com.currenthealth.json.junit.data.RecursiveBeanEquals; +import com.currenthealth.json.junit.data.Singleton; +import com.currenthealth.json.junit.data.SingletonEnum; +import com.currenthealth.json.junit.data.WeirdList; import org.junit.After; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/com/currenthealth/json/junit/JSONParserConfigurationTest.java similarity index 98% rename from src/test/java/org/json/junit/JSONParserConfigurationTest.java rename to src/test/java/com/currenthealth/json/junit/JSONParserConfigurationTest.java index 427aad4df..e899a37c8 100644 --- a/src/test/java/org/json/junit/JSONParserConfigurationTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONParserConfigurationTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; import java.io.IOException; import java.nio.file.Files; @@ -7,10 +7,10 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.json.JSONParserConfiguration; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.JSONParserConfiguration; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/com/currenthealth/json/junit/JSONPointerTest.java similarity index 98% rename from src/test/java/org/json/junit/JSONPointerTest.java rename to src/test/java/com/currenthealth/json/junit/JSONPointerTest.java index 45c7dbd3d..e0da1a08e 100644 --- a/src/test/java/org/json/junit/JSONPointerTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONPointerTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -10,11 +10,11 @@ import java.io.InputStream; -import org.json.JSONArray; -import org.json.JSONObject; -import org.json.JSONPointer; -import org.json.JSONPointerException; -import org.json.JSONTokener; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.JSONPointer; +import com.currenthealth.json.JSONPointerException; +import com.currenthealth.json.JSONTokener; import org.junit.Test; public class JSONPointerTest { diff --git a/src/test/java/org/json/junit/JSONStringTest.java b/src/test/java/com/currenthealth/json/junit/JSONStringTest.java similarity index 98% rename from src/test/java/org/json/junit/JSONStringTest.java rename to src/test/java/com/currenthealth/json/junit/JSONStringTest.java index 235df1806..1e7dbdd1d 100644 --- a/src/test/java/org/json/junit/JSONStringTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONStringTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -9,6 +9,10 @@ import java.io.StringWriter; import java.util.*; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.JSONString; import org.json.*; import org.junit.Test; diff --git a/src/test/java/org/json/junit/JSONStringerTest.java b/src/test/java/com/currenthealth/json/junit/JSONStringerTest.java similarity index 98% rename from src/test/java/org/json/junit/JSONStringerTest.java rename to src/test/java/com/currenthealth/json/junit/JSONStringerTest.java index 0ecb9d662..7903047eb 100644 --- a/src/test/java/org/json/junit/JSONStringerTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONStringerTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -9,6 +9,10 @@ import java.math.BigDecimal; import java.util.*; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.JSONStringer; import org.json.*; import org.junit.Test; diff --git a/src/test/java/org/json/junit/JSONTokenerTest.java b/src/test/java/com/currenthealth/json/junit/JSONTokenerTest.java similarity index 97% rename from src/test/java/org/json/junit/JSONTokenerTest.java rename to src/test/java/com/currenthealth/json/junit/JSONTokenerTest.java index 59ca6d8f6..bb6d1629a 100644 --- a/src/test/java/org/json/junit/JSONTokenerTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONTokenerTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -16,14 +16,14 @@ import java.io.Reader; import java.io.StringReader; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.json.JSONTokener; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.JSONTokener; import org.junit.Test; /** - * Test specific to the {@link org.json.JSONTokener} class. + * Test specific to the {@link JSONTokener} class. * @author John Aylward * */ diff --git a/src/test/java/org/json/junit/PropertyTest.java b/src/test/java/com/currenthealth/json/junit/PropertyTest.java similarity index 96% rename from src/test/java/org/json/junit/PropertyTest.java rename to src/test/java/com/currenthealth/json/junit/PropertyTest.java index eee482fbf..8dfc5b4cf 100644 --- a/src/test/java/org/json/junit/PropertyTest.java +++ b/src/test/java/com/currenthealth/json/junit/PropertyTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -8,6 +8,8 @@ import static org.junit.Assert.*; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.Property; import org.json.*; import org.junit.Test; diff --git a/src/test/java/org/json/junit/StringBuilderWriterTest.java b/src/test/java/com/currenthealth/json/junit/StringBuilderWriterTest.java similarity index 93% rename from src/test/java/org/json/junit/StringBuilderWriterTest.java rename to src/test/java/com/currenthealth/json/junit/StringBuilderWriterTest.java index b12f5db0c..fcfe49724 100644 --- a/src/test/java/org/json/junit/StringBuilderWriterTest.java +++ b/src/test/java/com/currenthealth/json/junit/StringBuilderWriterTest.java @@ -1,8 +1,8 @@ -package org.json.junit; +package com.currenthealth.json.junit; import static org.junit.Assert.assertEquals; -import org.json.StringBuilderWriter; +import com.currenthealth.json.StringBuilderWriter; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/json/junit/Util.java b/src/test/java/com/currenthealth/json/junit/Util.java similarity index 97% rename from src/test/java/org/json/junit/Util.java rename to src/test/java/com/currenthealth/json/junit/Util.java index b676045b8..b23cdb5c1 100644 --- a/src/test/java/org/json/junit/Util.java +++ b/src/test/java/com/currenthealth/json/junit/Util.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -8,6 +8,8 @@ import java.util.*; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONObject; import org.json.*; /** @@ -24,7 +26,7 @@ public class Util { * @param expectedJsonArray created specifically for comparing */ public static void compareActualVsExpectedJsonArrays(JSONArray jsonArray, - JSONArray expectedJsonArray) { + JSONArray expectedJsonArray) { assertTrue("jsonArray lengths should be equal", jsonArray.length() == expectedJsonArray.length()); for (int i = 0; i < jsonArray.length(); ++i) { diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/com/currenthealth/json/junit/XMLConfigurationTest.java similarity index 99% rename from src/test/java/org/json/junit/XMLConfigurationTest.java rename to src/test/java/com/currenthealth/json/junit/XMLConfigurationTest.java index 92a109ad9..dae05f040 100755 --- a/src/test/java/org/json/junit/XMLConfigurationTest.java +++ b/src/test/java/com/currenthealth/json/junit/XMLConfigurationTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -13,11 +13,11 @@ import java.util.HashSet; import java.util.Set; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.json.XML; -import org.json.XMLParserConfiguration; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.XML; +import com.currenthealth.json.XMLParserConfiguration; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/com/currenthealth/json/junit/XMLTest.java similarity index 99% rename from src/test/java/org/json/junit/XMLTest.java rename to src/test/java/com/currenthealth/json/junit/XMLTest.java index be478643c..a03dfddcc 100644 --- a/src/test/java/org/json/junit/XMLTest.java +++ b/src/test/java/com/currenthealth/json/junit/XMLTest.java @@ -1,4 +1,4 @@ -package org.json.junit; +package com.currenthealth.json.junit; /* Public Domain. @@ -22,6 +22,13 @@ import java.util.HashMap; import java.util.Map; +import com.currenthealth.json.JSONArray; +import com.currenthealth.json.JSONException; +import com.currenthealth.json.JSONObject; +import com.currenthealth.json.JSONTokener; +import com.currenthealth.json.XML; +import com.currenthealth.json.XMLParserConfiguration; +import com.currenthealth.json.XMLXsiTypeConverter; import org.json.*; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/json/junit/data/BrokenToString.java b/src/test/java/com/currenthealth/json/junit/data/BrokenToString.java similarity index 84% rename from src/test/java/org/json/junit/data/BrokenToString.java rename to src/test/java/com/currenthealth/json/junit/data/BrokenToString.java index 585d7518a..3200fbb3b 100644 --- a/src/test/java/org/json/junit/data/BrokenToString.java +++ b/src/test/java/com/currenthealth/json/junit/data/BrokenToString.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; /** * test class for verifying write errors. diff --git a/src/test/java/org/json/junit/data/ExceptionalBean.java b/src/test/java/com/currenthealth/json/junit/data/ExceptionalBean.java similarity index 90% rename from src/test/java/org/json/junit/data/ExceptionalBean.java rename to src/test/java/com/currenthealth/json/junit/data/ExceptionalBean.java index 91067b86b..acc3be427 100644 --- a/src/test/java/org/json/junit/data/ExceptionalBean.java +++ b/src/test/java/com/currenthealth/json/junit/data/ExceptionalBean.java @@ -1,14 +1,16 @@ /** * */ -package org.json.junit.data; +package com.currenthealth.json.junit.data; + +import com.currenthealth.json.JSONObject; import java.io.Closeable; import java.io.IOException; import java.lang.reflect.InvocationTargetException; /** - * Object for testing the exception handling in {@link org.json.JSONObject#populateMap}. + * Object for testing the exception handling in {@link JSONObject#populateMap}. * * @author John Aylward */ diff --git a/src/test/java/org/json/junit/data/Fraction.java b/src/test/java/com/currenthealth/json/junit/data/Fraction.java similarity index 99% rename from src/test/java/org/json/junit/data/Fraction.java rename to src/test/java/com/currenthealth/json/junit/data/Fraction.java index c418179f9..8e12c89c7 100644 --- a/src/test/java/org/json/junit/data/Fraction.java +++ b/src/test/java/com/currenthealth/json/junit/data/Fraction.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/test/java/org/json/junit/data/GenericBean.java b/src/test/java/com/currenthealth/json/junit/data/GenericBean.java similarity index 97% rename from src/test/java/org/json/junit/data/GenericBean.java rename to src/test/java/com/currenthealth/json/junit/data/GenericBean.java index dd46b88e6..4a9979dc5 100644 --- a/src/test/java/org/json/junit/data/GenericBean.java +++ b/src/test/java/com/currenthealth/json/junit/data/GenericBean.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; import java.io.StringReader; diff --git a/src/test/java/org/json/junit/data/GenericBeanInt.java b/src/test/java/com/currenthealth/json/junit/data/GenericBeanInt.java similarity index 96% rename from src/test/java/org/json/junit/data/GenericBeanInt.java rename to src/test/java/com/currenthealth/json/junit/data/GenericBeanInt.java index 505661162..1322c74bf 100644 --- a/src/test/java/org/json/junit/data/GenericBeanInt.java +++ b/src/test/java/com/currenthealth/json/junit/data/GenericBeanInt.java @@ -1,7 +1,7 @@ /** * */ -package org.json.junit.data; +package com.currenthealth.json.junit.data; /** * @author john diff --git a/src/test/java/org/json/junit/data/MyBean.java b/src/test/java/com/currenthealth/json/junit/data/MyBean.java similarity index 89% rename from src/test/java/org/json/junit/data/MyBean.java rename to src/test/java/com/currenthealth/json/junit/data/MyBean.java index 31909810f..5b6bbcde6 100644 --- a/src/test/java/org/json/junit/data/MyBean.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyBean.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; import java.io.*; diff --git a/src/test/java/org/json/junit/data/MyBeanCustomName.java b/src/test/java/com/currenthealth/json/junit/data/MyBeanCustomName.java similarity index 86% rename from src/test/java/org/json/junit/data/MyBeanCustomName.java rename to src/test/java/com/currenthealth/json/junit/data/MyBeanCustomName.java index 56756c2b3..1b066a071 100644 --- a/src/test/java/org/json/junit/data/MyBeanCustomName.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyBeanCustomName.java @@ -1,6 +1,6 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; -import org.json.JSONPropertyName; +import com.currenthealth.json.JSONPropertyName; /** * Test bean for the {@link JSONPropertyName} annotation. diff --git a/src/test/java/org/json/junit/data/MyBeanCustomNameInterface.java b/src/test/java/com/currenthealth/json/junit/data/MyBeanCustomNameInterface.java similarity index 53% rename from src/test/java/org/json/junit/data/MyBeanCustomNameInterface.java rename to src/test/java/com/currenthealth/json/junit/data/MyBeanCustomNameInterface.java index b25b57873..647e936d4 100644 --- a/src/test/java/org/json/junit/data/MyBeanCustomNameInterface.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyBeanCustomNameInterface.java @@ -1,7 +1,7 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; -import org.json.JSONPropertyIgnore; -import org.json.JSONPropertyName; +import com.currenthealth.json.JSONPropertyIgnore; +import com.currenthealth.json.JSONPropertyName; public interface MyBeanCustomNameInterface { @JSONPropertyName("InterfaceField") diff --git a/src/test/java/org/json/junit/data/MyBeanCustomNameSubClass.java b/src/test/java/com/currenthealth/json/junit/data/MyBeanCustomNameSubClass.java similarity index 78% rename from src/test/java/org/json/junit/data/MyBeanCustomNameSubClass.java rename to src/test/java/com/currenthealth/json/junit/data/MyBeanCustomNameSubClass.java index 8f0500cce..7f047460f 100644 --- a/src/test/java/org/json/junit/data/MyBeanCustomNameSubClass.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyBeanCustomNameSubClass.java @@ -1,13 +1,13 @@ /** * */ -package org.json.junit.data; +package com.currenthealth.json.junit.data; -import org.json.JSONPropertyIgnore; -import org.json.JSONPropertyName; +import com.currenthealth.json.JSONPropertyName; +import com.currenthealth.json.JSONPropertyIgnore; /** - * Test bean to verify that the {@link org.json.JSONPropertyName} annotation + * Test bean to verify that the {@link JSONPropertyName} annotation * is inherited. */ public class MyBeanCustomNameSubClass extends MyBeanCustomName { diff --git a/src/test/java/org/json/junit/data/MyBigNumberBean.java b/src/test/java/com/currenthealth/json/junit/data/MyBigNumberBean.java similarity index 82% rename from src/test/java/org/json/junit/data/MyBigNumberBean.java rename to src/test/java/com/currenthealth/json/junit/data/MyBigNumberBean.java index 934dfee03..d7594a91f 100644 --- a/src/test/java/org/json/junit/data/MyBigNumberBean.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyBigNumberBean.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; import java.math.*; diff --git a/src/test/java/org/json/junit/data/MyEnum.java b/src/test/java/com/currenthealth/json/junit/data/MyEnum.java similarity index 69% rename from src/test/java/org/json/junit/data/MyEnum.java rename to src/test/java/com/currenthealth/json/junit/data/MyEnum.java index 50d9a4faa..124c6c30a 100644 --- a/src/test/java/org/json/junit/data/MyEnum.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyEnum.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; /** * An enum with no methods or data diff --git a/src/test/java/org/json/junit/data/MyEnumClass.java b/src/test/java/com/currenthealth/json/junit/data/MyEnumClass.java similarity index 91% rename from src/test/java/org/json/junit/data/MyEnumClass.java rename to src/test/java/com/currenthealth/json/junit/data/MyEnumClass.java index 048669410..955fb436c 100644 --- a/src/test/java/org/json/junit/data/MyEnumClass.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyEnumClass.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; /** * this is simply a class that contains some enum instances diff --git a/src/test/java/org/json/junit/data/MyEnumField.java b/src/test/java/com/currenthealth/json/junit/data/MyEnumField.java similarity index 93% rename from src/test/java/org/json/junit/data/MyEnumField.java rename to src/test/java/com/currenthealth/json/junit/data/MyEnumField.java index 60e89de23..0f729b9cb 100644 --- a/src/test/java/org/json/junit/data/MyEnumField.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyEnumField.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; /** * An enum that contains getters and some internal fields diff --git a/src/test/java/org/json/junit/data/MyJsonString.java b/src/test/java/com/currenthealth/json/junit/data/MyJsonString.java similarity index 71% rename from src/test/java/org/json/junit/data/MyJsonString.java rename to src/test/java/com/currenthealth/json/junit/data/MyJsonString.java index 4ddde5385..6e45db7fe 100644 --- a/src/test/java/org/json/junit/data/MyJsonString.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyJsonString.java @@ -1,5 +1,6 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; +import com.currenthealth.json.JSONString; import org.json.*; /** diff --git a/src/test/java/org/json/junit/data/MyLocaleBean.java b/src/test/java/com/currenthealth/json/junit/data/MyLocaleBean.java similarity index 83% rename from src/test/java/org/json/junit/data/MyLocaleBean.java rename to src/test/java/com/currenthealth/json/junit/data/MyLocaleBean.java index 5d3cb5297..5af807f71 100755 --- a/src/test/java/org/json/junit/data/MyLocaleBean.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyLocaleBean.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; public class MyLocaleBean { private final String id = "beanId"; diff --git a/src/test/java/org/json/junit/data/MyNumber.java b/src/test/java/com/currenthealth/json/junit/data/MyNumber.java similarity index 98% rename from src/test/java/org/json/junit/data/MyNumber.java rename to src/test/java/com/currenthealth/json/junit/data/MyNumber.java index 4b625affc..8bb3cdcd0 100644 --- a/src/test/java/org/json/junit/data/MyNumber.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyNumber.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; import java.math.BigDecimal; diff --git a/src/test/java/org/json/junit/data/MyNumberContainer.java b/src/test/java/com/currenthealth/json/junit/data/MyNumberContainer.java similarity index 86% rename from src/test/java/org/json/junit/data/MyNumberContainer.java rename to src/test/java/com/currenthealth/json/junit/data/MyNumberContainer.java index 65276529b..80c46ac27 100644 --- a/src/test/java/org/json/junit/data/MyNumberContainer.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyNumberContainer.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; /** * Class that holds our MyNumber override as a property. diff --git a/src/test/java/org/json/junit/data/MyPublicClass.java b/src/test/java/com/currenthealth/json/junit/data/MyPublicClass.java similarity index 82% rename from src/test/java/org/json/junit/data/MyPublicClass.java rename to src/test/java/com/currenthealth/json/junit/data/MyPublicClass.java index 1f303860c..f13332fa1 100644 --- a/src/test/java/org/json/junit/data/MyPublicClass.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyPublicClass.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; /** * Need a class with some public data members for testing diff --git a/src/test/java/org/json/junit/data/RecursiveBean.java b/src/test/java/com/currenthealth/json/junit/data/RecursiveBean.java similarity index 93% rename from src/test/java/org/json/junit/data/RecursiveBean.java rename to src/test/java/com/currenthealth/json/junit/data/RecursiveBean.java index dad6e7a65..1a3ba0b9b 100644 --- a/src/test/java/org/json/junit/data/RecursiveBean.java +++ b/src/test/java/com/currenthealth/json/junit/data/RecursiveBean.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; /** * test class for verifying if recursively defined bean can be correctly identified diff --git a/src/test/java/org/json/junit/data/RecursiveBeanEquals.java b/src/test/java/com/currenthealth/json/junit/data/RecursiveBeanEquals.java similarity index 93% rename from src/test/java/org/json/junit/data/RecursiveBeanEquals.java rename to src/test/java/com/currenthealth/json/junit/data/RecursiveBeanEquals.java index 10166481e..fcb58eb7c 100644 --- a/src/test/java/org/json/junit/data/RecursiveBeanEquals.java +++ b/src/test/java/com/currenthealth/json/junit/data/RecursiveBeanEquals.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; /** test class for verifying if recursively defined bean can be correctly identified */ public class RecursiveBeanEquals { diff --git a/src/test/java/org/json/junit/data/Singleton.java b/src/test/java/com/currenthealth/json/junit/data/Singleton.java similarity index 97% rename from src/test/java/org/json/junit/data/Singleton.java rename to src/test/java/com/currenthealth/json/junit/data/Singleton.java index 224b48a5c..bf9be309b 100644 --- a/src/test/java/org/json/junit/data/Singleton.java +++ b/src/test/java/com/currenthealth/json/junit/data/Singleton.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; /** * Sample singleton for use with bean testing. diff --git a/src/test/java/org/json/junit/data/SingletonEnum.java b/src/test/java/com/currenthealth/json/junit/data/SingletonEnum.java similarity index 96% rename from src/test/java/org/json/junit/data/SingletonEnum.java rename to src/test/java/com/currenthealth/json/junit/data/SingletonEnum.java index 3dd030939..1f16649b4 100644 --- a/src/test/java/org/json/junit/data/SingletonEnum.java +++ b/src/test/java/com/currenthealth/json/junit/data/SingletonEnum.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; /** * Sample singleton done as an Enum for use with bean testing. diff --git a/src/test/java/org/json/junit/data/StringsResourceBundle.java b/src/test/java/com/currenthealth/json/junit/data/StringsResourceBundle.java similarity index 90% rename from src/test/java/org/json/junit/data/StringsResourceBundle.java rename to src/test/java/com/currenthealth/json/junit/data/StringsResourceBundle.java index 4479350ec..60213b9b0 100644 --- a/src/test/java/org/json/junit/data/StringsResourceBundle.java +++ b/src/test/java/com/currenthealth/json/junit/data/StringsResourceBundle.java @@ -1,4 +1,4 @@ -package org.json.junit.data; +package com.currenthealth.json.junit.data; import java.util.*; diff --git a/src/test/java/org/json/junit/data/WeirdList.java b/src/test/java/com/currenthealth/json/junit/data/WeirdList.java similarity index 96% rename from src/test/java/org/json/junit/data/WeirdList.java rename to src/test/java/com/currenthealth/json/junit/data/WeirdList.java index 35605863a..1e7ba3d52 100644 --- a/src/test/java/org/json/junit/data/WeirdList.java +++ b/src/test/java/com/currenthealth/json/junit/data/WeirdList.java @@ -1,7 +1,7 @@ /** * */ -package org.json.junit.data; +package com.currenthealth.json.junit.data; import java.util.ArrayList; import java.util.Arrays; From f1c138d282f17134e241d4d660345445881779cd Mon Sep 17 00:00:00 2001 From: Luke McPhee Date: Mon, 26 Aug 2024 20:26:57 +0100 Subject: [PATCH 2/2] fix tests --- .github/workflows/codeql-analysis.yml | 43 ---- .github/workflows/pipeline.yml | 228 ------------------ build.gradle | 2 +- .../json/junit/CookieListTest.java | 2 +- .../currenthealth/json/junit/CookieTest.java | 2 +- .../currenthealth/json/junit/EnumTest.java | 2 +- .../currenthealth/json/junit/HTTPTest.java | 2 +- .../currenthealth/json/junit/JSONMLTest.java | 6 +- .../json/junit/JSONObjectLocaleTest.java | 2 +- .../json/junit/JSONObjectTest.java | 4 +- .../json/junit/JSONStringTest.java | 2 +- .../json/junit/JSONStringerTest.java | 2 +- .../json/junit/PropertyTest.java | 2 +- .../com/currenthealth/json/junit/Util.java | 2 +- .../com/currenthealth/json/junit/XMLTest.java | 2 +- .../json/junit/data/MyJsonString.java | 2 +- 16 files changed, 17 insertions(+), 288 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml delete mode 100644 .github/workflows/pipeline.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index df4bf7981..000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: "CodeQL" - -on: - push: - branches: [ master ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ master ] - schedule: - - cron: '18 18 * * 1' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'java' ] - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - - run: "mvn clean compile -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true" - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml deleted file mode 100644 index bb4cf0723..000000000 --- a/.github/workflows/pipeline.yml +++ /dev/null @@ -1,228 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://docs.github.com/en/actions/learn-github-actions or https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions - -name: Java CI with Maven - -on: - push: - # branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - # old-school build and jar method. No tests run or compiled. - build-1_6: - name: Java 1.6 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Setup java - uses: actions/setup-java@v1 - with: - java-version: 1.6 - - name: Compile Java 1.6 - run: | - mkdir -p target/classes - javac -version - javac -source 1.6 -target 1.6 -d target/classes/ src/main/java/org/json/*.java - - name: Create java 1.6 JAR - run: | - jar cvf target/org.json.jar -C target/classes . - - name: Upload JAR 1.6 - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Create java 1.6 JAR - path: target/*.jar - - build-8: - runs-on: ubuntu-latest - strategy: - fail-fast: false - max-parallel: 1 - matrix: - # build against supported Java LTS versions: - java: [ 8 ] - name: Java ${{ matrix.java }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - name: Compile Java ${{ matrix.java }} - run: mvn clean compile -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true -D maven.javadoc.skip=true - - name: Run Tests ${{ matrix.java }} - run: | - mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Build Test Report ${{ matrix.java }} - if: ${{ always() }} - run: | - mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Upload Test Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Test Results ${{ matrix.java }} - path: target/surefire-reports/ - - name: Upload Test Report ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Test Report ${{ matrix.java }} - path: target/site/ - - name: Package Jar ${{ matrix.java }} - run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true - - name: Upload Package Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Package Jar ${{ matrix.java }} - path: target/*.jar - - build-11: - runs-on: ubuntu-latest - strategy: - fail-fast: false - max-parallel: 1 - matrix: - # build against supported Java LTS versions: - java: [ 11 ] - name: Java ${{ matrix.java }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - name: Compile Java ${{ matrix.java }} - run: mvn clean compile -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true -D maven.javadoc.skip=true - - name: Run Tests ${{ matrix.java }} - run: | - mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Build Test Report ${{ matrix.java }} - if: ${{ always() }} - run: | - mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Upload Test Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Test Results ${{ matrix.java }} - path: target/surefire-reports/ - - name: Upload Test Report ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Test Report ${{ matrix.java }} - path: target/site/ - - name: Package Jar ${{ matrix.java }} - run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true - - name: Upload Package Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Package Jar ${{ matrix.java }} - path: target/*.jar - - build-17: - runs-on: ubuntu-latest - strategy: - fail-fast: false - max-parallel: 1 - matrix: - # build against supported Java LTS versions: - java: [ 17 ] - name: Java ${{ matrix.java }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - name: Compile Java ${{ matrix.java }} - run: mvn clean compile -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true -D maven.javadoc.skip=true - - name: Run Tests ${{ matrix.java }} - run: | - mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Build Test Report ${{ matrix.java }} - if: ${{ always() }} - run: | - mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Upload Test Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Test Results ${{ matrix.java }} - path: target/surefire-reports/ - - name: Upload Test Report ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Test Report ${{ matrix.java }} - path: target/site/ - - name: Package Jar ${{ matrix.java }} - run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true - - name: Upload Package Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Package Jar ${{ matrix.java }} - path: target/*.jar - - build-21: - runs-on: ubuntu-latest - strategy: - fail-fast: false - max-parallel: 1 - matrix: - # build against supported Java LTS versions: - java: [ 21 ] - name: Java ${{ matrix.java }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - name: Compile Java ${{ matrix.java }} - run: mvn clean compile -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true -D maven.javadoc.skip=true - - name: Run Tests ${{ matrix.java }} - run: | - mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Build Test Report ${{ matrix.java }} - if: ${{ always() }} - run: | - mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} - - name: Upload Test Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Test Results ${{ matrix.java }} - path: target/surefire-reports/ - - name: Upload Test Report ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Test Report ${{ matrix.java }} - path: target/site/ - - name: Package Jar ${{ matrix.java }} - run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true - - name: Upload Package Results ${{ matrix.java }} - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: Package Jar ${{ matrix.java }} - path: target/*.jar diff --git a/build.gradle b/build.gradle index 9169d4fc1..7c1235ec5 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ subprojects { tasks.withType(Javadoc).all { enabled = false } } -group = 'org.json' +group = 'com.currenthealth.json' version = 'v20230618-SNAPSHOT' description = 'JSON in Java' sourceCompatibility = '1.8' diff --git a/src/test/java/com/currenthealth/json/junit/CookieListTest.java b/src/test/java/com/currenthealth/json/junit/CookieListTest.java index 493a24ef9..7b1df6701 100644 --- a/src/test/java/com/currenthealth/json/junit/CookieListTest.java +++ b/src/test/java/com/currenthealth/json/junit/CookieListTest.java @@ -11,7 +11,7 @@ import com.currenthealth.json.CookieList; import com.currenthealth.json.JSONException; import com.currenthealth.json.JSONObject; -import org.json.*; +import com.currenthealth.json.*; import org.junit.Test; import com.jayway.jsonpath.*; diff --git a/src/test/java/com/currenthealth/json/junit/CookieTest.java b/src/test/java/com/currenthealth/json/junit/CookieTest.java index 5691775d1..234c6da3c 100644 --- a/src/test/java/com/currenthealth/json/junit/CookieTest.java +++ b/src/test/java/com/currenthealth/json/junit/CookieTest.java @@ -9,7 +9,7 @@ import com.currenthealth.json.Cookie; import com.currenthealth.json.JSONException; import com.currenthealth.json.JSONObject; -import org.json.*; +import com.currenthealth.json.*; import org.junit.Test; diff --git a/src/test/java/com/currenthealth/json/junit/EnumTest.java b/src/test/java/com/currenthealth/json/junit/EnumTest.java index 9759e12a1..038f40039 100644 --- a/src/test/java/com/currenthealth/json/junit/EnumTest.java +++ b/src/test/java/com/currenthealth/json/junit/EnumTest.java @@ -202,7 +202,7 @@ public void enumValueToString() { * However, an enum within another class will not be rendered * unless that class overrides default toString() */ - String expectedStr3 = "\"org.json.junit.data.MyEnumClass@"; + String expectedStr3 = "\"com.currenthealth.json.junit.data.MyEnumClass@"; myEnumClass.setMyEnum(MyEnum.VAL1); myEnumClass.setMyEnumField(MyEnumField.VAL1); String str3 = JSONObject.valueToString(myEnumClass); diff --git a/src/test/java/com/currenthealth/json/junit/HTTPTest.java b/src/test/java/com/currenthealth/json/junit/HTTPTest.java index 111e1e943..9df5a7aaa 100644 --- a/src/test/java/com/currenthealth/json/junit/HTTPTest.java +++ b/src/test/java/com/currenthealth/json/junit/HTTPTest.java @@ -9,7 +9,7 @@ import com.currenthealth.json.HTTP; import com.currenthealth.json.JSONException; import com.currenthealth.json.JSONObject; -import org.json.*; +import com.currenthealth.json.*; import org.junit.Test; diff --git a/src/test/java/com/currenthealth/json/junit/JSONMLTest.java b/src/test/java/com/currenthealth/json/junit/JSONMLTest.java index 38b426e52..6aaf15324 100644 --- a/src/test/java/com/currenthealth/json/junit/JSONMLTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONMLTest.java @@ -17,11 +17,11 @@ import com.currenthealth.json.JSONML; import com.currenthealth.json.JSONMLParserConfiguration; import com.currenthealth.json.JSONObject; -import org.json.*; +import com.currenthealth.json.*; import org.junit.Test; /** - * Tests for org.json.JSONML.java + * Tests for com.currenthealth.json.JSONML.java * * Certain inputs are expected to result in exceptions. These tests are * executed first. JSONML provides an API to: @@ -149,7 +149,7 @@ public void emptyTagException() { assertTrue("Expecting an exception", false); } catch (JSONException e) { assertEquals("Expecting an exception message", - "JSONArray[0] is not a String (class org.json.JSONArray).", + "JSONArray[0] is not a String (class com.currenthealth.json.JSONArray).", e.getMessage()); } } diff --git a/src/test/java/com/currenthealth/json/junit/JSONObjectLocaleTest.java b/src/test/java/com/currenthealth/json/junit/JSONObjectLocaleTest.java index 0c0ec7e72..de6dfa169 100755 --- a/src/test/java/com/currenthealth/json/junit/JSONObjectLocaleTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONObjectLocaleTest.java @@ -9,7 +9,7 @@ import java.util.*; import com.currenthealth.json.JSONObject; -import org.json.*; +import com.currenthealth.json.*; import com.currenthealth.json.junit.data.MyLocaleBean; import org.junit.*; diff --git a/src/test/java/com/currenthealth/json/junit/JSONObjectTest.java b/src/test/java/com/currenthealth/json/junit/JSONObjectTest.java index 60a2e965f..c3812265e 100644 --- a/src/test/java/com/currenthealth/json/junit/JSONObjectTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONObjectTest.java @@ -764,7 +764,7 @@ public void jsonObjectByObjectAndNames() { @Test public void jsonObjectByResourceBundle() { JSONObject jsonObject = new - JSONObject("org.json.junit.data.StringsResourceBundle", + JSONObject("com.currenthealth.json.junit.data.StringsResourceBundle", Locale.getDefault()); // validate JSON @@ -3628,7 +3628,7 @@ public void jsonObjectClearMethodTest() { jsonObject.put("key3", new JSONObject()); jsonObject.clear(); //Clears the JSONObject assertTrue("expected jsonObject.length() == 0", jsonObject.length() == 0); //Check if its length is 0 - jsonObject.getInt("key1"); //Should throws org.json.JSONException: JSONObject["asd"] not found + jsonObject.getInt("key1"); //Should throws com.currenthealth.json.JSONException: JSONObject["asd"] not found Util.checkJSONObjectMaps(jsonObject); } diff --git a/src/test/java/com/currenthealth/json/junit/JSONStringTest.java b/src/test/java/com/currenthealth/json/junit/JSONStringTest.java index 1e7dbdd1d..4f466ebec 100644 --- a/src/test/java/com/currenthealth/json/junit/JSONStringTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONStringTest.java @@ -13,7 +13,7 @@ import com.currenthealth.json.JSONException; import com.currenthealth.json.JSONObject; import com.currenthealth.json.JSONString; -import org.json.*; +import com.currenthealth.json.*; import org.junit.Test; /** diff --git a/src/test/java/com/currenthealth/json/junit/JSONStringerTest.java b/src/test/java/com/currenthealth/json/junit/JSONStringerTest.java index 7903047eb..0b2ba3c12 100644 --- a/src/test/java/com/currenthealth/json/junit/JSONStringerTest.java +++ b/src/test/java/com/currenthealth/json/junit/JSONStringerTest.java @@ -13,7 +13,7 @@ import com.currenthealth.json.JSONException; import com.currenthealth.json.JSONObject; import com.currenthealth.json.JSONStringer; -import org.json.*; +import com.currenthealth.json.*; import org.junit.Test; import com.jayway.jsonpath.*; diff --git a/src/test/java/com/currenthealth/json/junit/PropertyTest.java b/src/test/java/com/currenthealth/json/junit/PropertyTest.java index 8dfc5b4cf..647859a81 100644 --- a/src/test/java/com/currenthealth/json/junit/PropertyTest.java +++ b/src/test/java/com/currenthealth/json/junit/PropertyTest.java @@ -10,7 +10,7 @@ import com.currenthealth.json.JSONObject; import com.currenthealth.json.Property; -import org.json.*; +import com.currenthealth.json.*; import org.junit.Test; diff --git a/src/test/java/com/currenthealth/json/junit/Util.java b/src/test/java/com/currenthealth/json/junit/Util.java index b23cdb5c1..21f8cf57b 100644 --- a/src/test/java/com/currenthealth/json/junit/Util.java +++ b/src/test/java/com/currenthealth/json/junit/Util.java @@ -10,7 +10,7 @@ import com.currenthealth.json.JSONArray; import com.currenthealth.json.JSONObject; -import org.json.*; +import com.currenthealth.json.*; /** * These are helpful utility methods that perform basic comparisons diff --git a/src/test/java/com/currenthealth/json/junit/XMLTest.java b/src/test/java/com/currenthealth/json/junit/XMLTest.java index a03dfddcc..12a5d6453 100644 --- a/src/test/java/com/currenthealth/json/junit/XMLTest.java +++ b/src/test/java/com/currenthealth/json/junit/XMLTest.java @@ -29,7 +29,7 @@ import com.currenthealth.json.XML; import com.currenthealth.json.XMLParserConfiguration; import com.currenthealth.json.XMLXsiTypeConverter; -import org.json.*; +import com.currenthealth.json.*; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/src/test/java/com/currenthealth/json/junit/data/MyJsonString.java b/src/test/java/com/currenthealth/json/junit/data/MyJsonString.java index 6e45db7fe..d2d467cc8 100644 --- a/src/test/java/com/currenthealth/json/junit/data/MyJsonString.java +++ b/src/test/java/com/currenthealth/json/junit/data/MyJsonString.java @@ -1,7 +1,7 @@ package com.currenthealth.json.junit.data; import com.currenthealth.json.JSONString; -import org.json.*; +import com.currenthealth.json.*; /** * Used in testing when a JSONString is needed