Merge pull request #12 from kbase/dev-new_client

Move caches from internal -> cache package
kbase · Apr 12, 2024 · 881552f · 881552f
2 parents 64b2ed6 + e50e7aa
commit 881552f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,13 +17,9 @@ repositories {
 }
 
 compileJava {
-	if (JavaVersion.current() <= JavaVersion.VERSION_1_8) {
-		// TODO BUILD remove when we no longer support java 8
-		java.sourceCompatibility = JavaVersion.VERSION_1_8
-		java.targetCompatibility = JavaVersion.VERSION_1_8
-	} else {
-		options.release = 8
-	}
+	// TODO BUILD remove when we no longer support java 8, use `options.release = 11 if necessary`
+	java.sourceCompatibility = JavaVersion.VERSION_1_8
+	java.targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 test {

diff --git a/src/main/java/us/kbase/auth/client/AuthClient.java b/src/main/java/us/kbase/auth/client/AuthClient.java
@@ -22,8 +22,8 @@
 
 import us.kbase.auth.AuthException;
 import us.kbase.auth.AuthToken;
-import us.kbase.auth.client.internal.StringCache;
-import us.kbase.auth.client.internal.TokenCache;
+import us.kbase.auth.client.cache.StringCache;
+import us.kbase.auth.client.cache.TokenCache;
 
 /** A client for the KBase Auth2 authentication server (https://github.com/kbase/auth2).
  * 

diff --git a/...ase/auth/client/internal/StringCache.java → .../kbase/auth/client/cache/StringCache.java b/...ase/auth/client/internal/StringCache.java → .../kbase/auth/client/cache/StringCache.java
@@ -1,4 +1,4 @@
-package us.kbase.auth.client.internal;
+package us.kbase.auth.client.cache;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...base/auth/client/internal/TokenCache.java → ...s/kbase/auth/client/cache/TokenCache.java b/...base/auth/client/internal/TokenCache.java → ...s/kbase/auth/client/cache/TokenCache.java
@@ -1,4 +1,4 @@
-package us.kbase.auth.client.internal;
+package us.kbase.auth.client.cache;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;

diff --git a/...auth/client/internal/StringCacheTest.java → ...st/auth/client/cache/StringCacheTest.java b/...auth/client/internal/StringCacheTest.java → ...st/auth/client/cache/StringCacheTest.java
@@ -1,4 +1,4 @@
-package us.kbase.test.auth.client.internal;
+package us.kbase.test.auth.client.cache;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
@@ -12,7 +12,7 @@
 
 import org.junit.Test;
 
-import us.kbase.auth.client.internal.StringCache;
+import us.kbase.auth.client.cache.StringCache;
 import us.kbase.test.common.TestCommon;
 
 public class StringCacheTest {

diff --git a/.../auth/client/internal/TokenCacheTest.java → ...est/auth/client/cache/TokenCacheTest.java b/.../auth/client/internal/TokenCacheTest.java → ...est/auth/client/cache/TokenCacheTest.java
@@ -1,4 +1,4 @@
-package us.kbase.test.auth.client.internal;
+package us.kbase.test.auth.client.cache;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertNotNull;
@@ -14,7 +14,7 @@
 import org.junit.Test;
 
 import us.kbase.auth.AuthToken;
-import us.kbase.auth.client.internal.TokenCache;
+import us.kbase.auth.client.cache.TokenCache;
 import us.kbase.test.common.TestCommon;
 
 public class TokenCacheTest {