Skip to content

Commit b105775

Browse files
authored
Simplified Authentication interface (#237)
1 parent e942517 commit b105775

4 files changed

Lines changed: 10 additions & 34 deletions

File tree

client-api/src/main/java/io/oxia/client/api/Authentication.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323
*/
2424
public interface Authentication {
2525

26+
/**
27+
* Plugins which use ":" and/or "," in a configuration parameter value need to implement this
28+
* interface.
29+
*
30+
* @param encodedAuthParamString the encoded configuration parameter value
31+
*/
32+
void configure(String encodedAuthParamString);
33+
2634
/**
2735
* Generates a set of credentials represented as key-value pairs.
2836
*

client-api/src/main/java/io/oxia/client/api/EncodedAuthenticationParameterSupport.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

client/src/main/java/io/oxia/client/auth/AuthenticationFactory.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import com.google.common.base.Strings;
1919
import io.oxia.client.api.Authentication;
20-
import io.oxia.client.api.EncodedAuthenticationParameterSupport;
2120
import io.oxia.client.api.exceptions.UnsupportedAuthenticationException;
2221
import java.lang.reflect.Constructor;
2322

@@ -31,9 +30,7 @@ public static Authentication create(String authPluginClassName, String authParam
3130
Constructor<?> declaredConstructor = authClass.getDeclaredConstructor();
3231
declaredConstructor.setAccessible(true);
3332
Authentication auth = (Authentication) declaredConstructor.newInstance();
34-
if (auth instanceof EncodedAuthenticationParameterSupport) {
35-
((EncodedAuthenticationParameterSupport) auth).configure(authParamsString);
36-
}
33+
auth.configure(authParamsString);
3734
return auth;
3835
}
3936
} catch (Throwable t) {

client/src/main/java/io/oxia/client/auth/TokenAuthentication.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package io.oxia.client.auth;
1717

1818
import io.oxia.client.api.Authentication;
19-
import io.oxia.client.api.EncodedAuthenticationParameterSupport;
2019
import java.io.IOException;
2120
import java.net.URI;
2221
import java.nio.file.Files;
@@ -25,7 +24,7 @@
2524
import java.util.Map;
2625
import java.util.function.Supplier;
2726

28-
public class TokenAuthentication implements Authentication, EncodedAuthenticationParameterSupport {
27+
public class TokenAuthentication implements Authentication {
2928

3029
private static final String AUTHORIZATION_KEY = "Authorization";
3130
private static final String BEARER_TYPE = "Bearer";

0 commit comments

Comments
 (0)