relocated Service.java to impl module (along with tests). (#529)

jwtk · Oct 27, 2019 · dacdb2c · dacdb2c
1 parent c21c30a
commit dacdb2c
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 13 deletions.
diff --git a/api/src/test/resources/META-INF/services/io.jsonwebtoken.StubService b/api/src/test/resources/META-INF/services/io.jsonwebtoken.StubService
diff --git 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.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
@@ -21,7 +21,7 @@
 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
@@ -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/...n/java/io/jsonwebtoken/lang/Services.java → ...a/io/jsonwebtoken/impl/lang/Services.java b/...n/java/io/jsonwebtoken/lang/Services.java → ...a/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/...g/UnavailableImplementationException.java → ...g/UnavailableImplementationException.java b/...g/UnavailableImplementationException.java → ...g/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
@@ -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
@@ -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/...groovy/io/jsonwebtoken/StubService.groovy → ...groovy/io/jsonwebtoken/StubService.groovy b/...groovy/io/jsonwebtoken/StubService.groovy → ...groovy/io/jsonwebtoken/StubService.groovy
diff --git a/...io/jsonwebtoken/DefaultStubService.groovy → ...onwebtoken/impl/DefaultStubService.groovy b/...io/jsonwebtoken/DefaultStubService.groovy → ...onwebtoken/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/...c/test/groovy/io/jsonwebtoken/impl/compression/DefaultCompressionCodecResolverTest.groovy b/...c/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/.../io/jsonwebtoken/lang/ServicesTest.groovy → ...sonwebtoken/impl/lang/ServicesTest.groovy b/.../io/jsonwebtoken/lang/ServicesTest.groovy → ...sonwebtoken/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
@@ -0,0 +1 @@
+io.jsonwebtoken.impl.DefaultStubService