From dacdb2ce25d1161c03904a874da88107b0459766 Mon Sep 17 00:00:00 2001
From: Micah Silverman <micah@afitnerd.com>
Date: Sun, 27 Oct 2019 17:13:49 -0400
Subject: [PATCH] relocated Service.java to impl module (along with tests).
 (#529)

---
 .../META-INF/services/io.jsonwebtoken.StubService        | 1 -
 .../io/jsonwebtoken/impl/DefaultJwtParserBuilder.java    | 2 +-
 .../compression/DefaultCompressionCodecResolver.java     | 2 +-
 .../java/io/jsonwebtoken/impl/lang/LegacyServices.java   | 2 --
 .../main/java/io/jsonwebtoken/impl}/lang/Services.java   | 4 +++-
 .../impl}/lang/UnavailableImplementationException.java   | 2 +-
 .../groovy/io/jsonwebtoken/DeprecatedJwtsTest.groovy     | 2 +-
 impl/src/test/groovy/io/jsonwebtoken/JwtsTest.groovy     | 2 +-
 .../src/test/groovy/io/jsonwebtoken/StubService.groovy   | 0
 .../io/jsonwebtoken/impl}/DefaultStubService.groovy      | 4 +++-
 .../DefaultCompressionCodecResolverTest.groovy           | 2 +-
 .../io/jsonwebtoken/impl}/lang/ServicesTest.groovy       | 9 +++++++--
 .../META-INF/services/io.jsonwebtoken.StubService        | 1 +
 13 files changed, 20 insertions(+), 13 deletions(-)
 delete mode 100644 api/src/test/resources/META-INF/services/io.jsonwebtoken.StubService
 rename {api/src/main/java/io/jsonwebtoken => impl/src/main/java/io/jsonwebtoken/impl}/lang/Services.java (97%)
 rename {api/src/main/java/io/jsonwebtoken => impl/src/main/java/io/jsonwebtoken/impl}/lang/UnavailableImplementationException.java (97%)
 rename {api => impl}/src/test/groovy/io/jsonwebtoken/StubService.groovy (100%)
 rename {api/src/test/groovy/io/jsonwebtoken => impl/src/test/groovy/io/jsonwebtoken/impl}/DefaultStubService.groovy (90%)
 rename {api/src/test/groovy/io/jsonwebtoken => impl/src/test/groovy/io/jsonwebtoken/impl}/lang/ServicesTest.groovy (92%)
 create mode 100644 impl/src/test/resources/META-INF/services/io.jsonwebtoken.StubService

diff --git a/api/src/test/resources/META-INF/services/io.jsonwebtoken.StubService b/api/src/test/resources/META-INF/services/io.jsonwebtoken.StubService
deleted file mode 100644
index 067b1cca..00000000
--- a/api/src/test/resources/META-INF/services/io.jsonwebtoken.StubService
+++ /dev/null
@@ -1 +0,0 @@
-io.jsonwebtoken.DefaultStubService
\ No newline at end of file
diff --git a/impl/src/main/java/io/jsonwebtoken/impl/DefaultJwtParserBuilder.java b/impl/src/main/java/io/jsonwebtoken/impl/DefaultJwtParserBuilder.java
index 3189500e..477af7f4 100644
--- a/impl/src/main/java/io/jsonwebtoken/impl/DefaultJwtParserBuilder.java
+++ b/impl/src/main/java/io/jsonwebtoken/impl/DefaultJwtParserBuilder.java
@@ -26,7 +26,7 @@ import io.jsonwebtoken.io.Decoder;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.io.Deserializer;
 import io.jsonwebtoken.lang.Assert;
-import io.jsonwebtoken.lang.Services;
+import io.jsonwebtoken.impl.lang.Services;
 
 import java.security.Key;
 import java.util.Date;
diff --git a/impl/src/main/java/io/jsonwebtoken/impl/compression/DefaultCompressionCodecResolver.java b/impl/src/main/java/io/jsonwebtoken/impl/compression/DefaultCompressionCodecResolver.java
index 88602dac..de5636db 100644
--- a/impl/src/main/java/io/jsonwebtoken/impl/compression/DefaultCompressionCodecResolver.java
+++ b/impl/src/main/java/io/jsonwebtoken/impl/compression/DefaultCompressionCodecResolver.java
@@ -21,7 +21,7 @@ import io.jsonwebtoken.CompressionCodecs;
 import io.jsonwebtoken.CompressionException;
 import io.jsonwebtoken.Header;
 import io.jsonwebtoken.lang.Assert;
-import io.jsonwebtoken.lang.Services;
+import io.jsonwebtoken.impl.lang.Services;
 import io.jsonwebtoken.lang.Strings;
 
 import java.util.Collections;
diff --git a/impl/src/main/java/io/jsonwebtoken/impl/lang/LegacyServices.java b/impl/src/main/java/io/jsonwebtoken/impl/lang/LegacyServices.java
index aa75fca2..52070913 100644
--- a/impl/src/main/java/io/jsonwebtoken/impl/lang/LegacyServices.java
+++ b/impl/src/main/java/io/jsonwebtoken/impl/lang/LegacyServices.java
@@ -1,8 +1,6 @@
 package io.jsonwebtoken.impl.lang;
 
 import io.jsonwebtoken.lang.Classes;
-import io.jsonwebtoken.lang.Services;
-import io.jsonwebtoken.lang.UnavailableImplementationException;
 import io.jsonwebtoken.lang.UnknownClassException;
 
 /**
diff --git a/api/src/main/java/io/jsonwebtoken/lang/Services.java b/impl/src/main/java/io/jsonwebtoken/impl/lang/Services.java
similarity index 97%
rename from api/src/main/java/io/jsonwebtoken/lang/Services.java
rename to impl/src/main/java/io/jsonwebtoken/impl/lang/Services.java
index fde9a603..0a90a3fe 100644
--- a/api/src/main/java/io/jsonwebtoken/lang/Services.java
+++ b/impl/src/main/java/io/jsonwebtoken/impl/lang/Services.java
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.jsonwebtoken.lang;
+package io.jsonwebtoken.impl.lang;
+
+import io.jsonwebtoken.lang.Assert;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/api/src/main/java/io/jsonwebtoken/lang/UnavailableImplementationException.java b/impl/src/main/java/io/jsonwebtoken/impl/lang/UnavailableImplementationException.java
similarity index 97%
rename from api/src/main/java/io/jsonwebtoken/lang/UnavailableImplementationException.java
rename to impl/src/main/java/io/jsonwebtoken/impl/lang/UnavailableImplementationException.java
index 6fedbf08..3fe9eaa4 100644
--- a/api/src/main/java/io/jsonwebtoken/lang/UnavailableImplementationException.java
+++ b/impl/src/main/java/io/jsonwebtoken/impl/lang/UnavailableImplementationException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.jsonwebtoken.lang;
+package io.jsonwebtoken.impl.lang;
 
 /**
  * Exception indicating that no implementation of an jjwt-api SPI was found on the classpath.
diff --git a/impl/src/test/groovy/io/jsonwebtoken/DeprecatedJwtsTest.groovy b/impl/src/test/groovy/io/jsonwebtoken/DeprecatedJwtsTest.groovy
index 6cf72035..5d928595 100644
--- a/impl/src/test/groovy/io/jsonwebtoken/DeprecatedJwtsTest.groovy
+++ b/impl/src/test/groovy/io/jsonwebtoken/DeprecatedJwtsTest.groovy
@@ -21,7 +21,7 @@ import io.jsonwebtoken.impl.compression.DefaultCompressionCodecResolver
 import io.jsonwebtoken.impl.compression.GzipCompressionCodec
 import io.jsonwebtoken.io.Encoders
 import io.jsonwebtoken.io.Serializer
-import io.jsonwebtoken.lang.Services
+import io.jsonwebtoken.impl.lang.Services
 import io.jsonwebtoken.lang.Strings
 import io.jsonwebtoken.security.Keys
 import io.jsonwebtoken.security.WeakKeyException
diff --git a/impl/src/test/groovy/io/jsonwebtoken/JwtsTest.groovy b/impl/src/test/groovy/io/jsonwebtoken/JwtsTest.groovy
index 39d08424..25ef25c6 100644
--- a/impl/src/test/groovy/io/jsonwebtoken/JwtsTest.groovy
+++ b/impl/src/test/groovy/io/jsonwebtoken/JwtsTest.groovy
@@ -21,7 +21,7 @@ import io.jsonwebtoken.impl.compression.DefaultCompressionCodecResolver
 import io.jsonwebtoken.impl.compression.GzipCompressionCodec
 import io.jsonwebtoken.io.Encoders
 import io.jsonwebtoken.io.Serializer
-import io.jsonwebtoken.lang.Services
+import io.jsonwebtoken.impl.lang.Services
 import io.jsonwebtoken.lang.Strings
 import io.jsonwebtoken.security.Keys
 import io.jsonwebtoken.security.WeakKeyException
diff --git a/api/src/test/groovy/io/jsonwebtoken/StubService.groovy b/impl/src/test/groovy/io/jsonwebtoken/StubService.groovy
similarity index 100%
rename from api/src/test/groovy/io/jsonwebtoken/StubService.groovy
rename to impl/src/test/groovy/io/jsonwebtoken/StubService.groovy
diff --git a/api/src/test/groovy/io/jsonwebtoken/DefaultStubService.groovy b/impl/src/test/groovy/io/jsonwebtoken/impl/DefaultStubService.groovy
similarity index 90%
rename from api/src/test/groovy/io/jsonwebtoken/DefaultStubService.groovy
rename to impl/src/test/groovy/io/jsonwebtoken/impl/DefaultStubService.groovy
index 52b831a9..398fa75f 100644
--- a/api/src/test/groovy/io/jsonwebtoken/DefaultStubService.groovy
+++ b/impl/src/test/groovy/io/jsonwebtoken/impl/DefaultStubService.groovy
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.jsonwebtoken
+package io.jsonwebtoken.impl
+
+import io.jsonwebtoken.StubService
 
 class DefaultStubService implements StubService {
 }
diff --git a/impl/src/test/groovy/io/jsonwebtoken/impl/compression/DefaultCompressionCodecResolverTest.groovy b/impl/src/test/groovy/io/jsonwebtoken/impl/compression/DefaultCompressionCodecResolverTest.groovy
index b1441ed7..6115e234 100644
--- a/impl/src/test/groovy/io/jsonwebtoken/impl/compression/DefaultCompressionCodecResolverTest.groovy
+++ b/impl/src/test/groovy/io/jsonwebtoken/impl/compression/DefaultCompressionCodecResolverTest.groovy
@@ -19,7 +19,7 @@ import io.jsonwebtoken.CompressionCodec
 import io.jsonwebtoken.CompressionException
 import io.jsonwebtoken.impl.DefaultHeader
 import io.jsonwebtoken.impl.io.FakeServiceDescriptorClassLoader
-import io.jsonwebtoken.lang.Services
+import io.jsonwebtoken.impl.lang.Services
 import org.junit.Assert
 import org.junit.Test
 
diff --git a/api/src/test/groovy/io/jsonwebtoken/lang/ServicesTest.groovy b/impl/src/test/groovy/io/jsonwebtoken/impl/lang/ServicesTest.groovy
similarity index 92%
rename from api/src/test/groovy/io/jsonwebtoken/lang/ServicesTest.groovy
rename to impl/src/test/groovy/io/jsonwebtoken/impl/lang/ServicesTest.groovy
index 9f9aed35..820d242a 100644
--- a/api/src/test/groovy/io/jsonwebtoken/lang/ServicesTest.groovy
+++ b/impl/src/test/groovy/io/jsonwebtoken/impl/lang/ServicesTest.groovy
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.jsonwebtoken.lang
+package io.jsonwebtoken.impl.lang
 
-import io.jsonwebtoken.DefaultStubService
+import io.jsonwebtoken.impl.DefaultStubService
 import io.jsonwebtoken.StubService
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -50,6 +50,11 @@ class ServicesTest {
         }
     }
 
+    @Test
+    void testPrivateConstructor() {
+        new Services(); // not allowed in Java, including here for test coverage
+    }
+
     static class NoServicesClassLoader extends ClassLoader {
         private NoServicesClassLoader(ClassLoader parent) {
             super(parent)
diff --git a/impl/src/test/resources/META-INF/services/io.jsonwebtoken.StubService b/impl/src/test/resources/META-INF/services/io.jsonwebtoken.StubService
new file mode 100644
index 00000000..8f381c6a
--- /dev/null
+++ b/impl/src/test/resources/META-INF/services/io.jsonwebtoken.StubService
@@ -0,0 +1 @@
+io.jsonwebtoken.impl.DefaultStubService
\ No newline at end of file