Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1296 [created] 7d037aed5
TINKERPOP-1707 Removed deprecated AuthenticationSettings.className Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d635d321 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d635d321 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d635d321 Branch: refs/heads/TINKERPOP-1296 Commit: d635d32149234ca50fc0761b8c78ad5b3a5174f9 Parents: 7fc3dcd Author: Stephen Mallette <[email protected]> Authored: Wed Apr 25 19:44:37 2018 -0400 Committer: Stephen Mallette <[email protected]> Committed: Wed Apr 25 19:44:37 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.4.x.asciidoc | 5 ++++- .../tinkerpop/gremlin/server/AbstractChannelizer.java | 7 +------ .../org/apache/tinkerpop/gremlin/server/Settings.java | 12 +----------- .../server/GremlinServerAuditLogIntegrateTest.java | 2 +- .../gremlin/server/GremlinServerAuthIntegrateTest.java | 2 +- .../server/GremlinServerAuthKrb5IntegrateTest.java | 2 +- 7 files changed, 10 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d635d321/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index f693730..f60bfec 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -34,6 +34,7 @@ This release also includes changes from <<release-3-3-3, 3.3.3>>. * Moved `TraversalEngine` to `gremlin-test` as it has long been only used in testing infrastructure. * Removed previously deprecated Structure API exceptions related to "element not found" situations. * Removed previously deprecated `rebindings` options from the Java driver API. +* Removed previously deprecated `AuthenticationSettings.className` configuration option in Gremlin Server. * Removed support for Giraph. == TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d635d321/docs/src/upgrade/release-3.4.x.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/upgrade/release-3.4.x.asciidoc b/docs/src/upgrade/release-3.4.x.asciidoc index cae8917..6f47646 100644 --- a/docs/src/upgrade/release-3.4.x.asciidoc +++ b/docs/src/upgrade/release-3.4.x.asciidoc @@ -91,12 +91,15 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.driver.Client#rebind(String)` ** `org.apache.tinkerpop.gremlin.driver.Client.ReboundClusterdClient` ** `org.apache.tinkerpop.gremlin.driver.Tokens#ARGS_REBINDINGS` +* `gremlin-server` +** `org.apache.tinkerpop.gremlin.server.Settings.AuthenticationSettings.className` Please see the javadoc deprecation notes or upgrade documentation specific to when the deprecation took place to understand how to resolve this breaking change. See: link:https://issues.apache.org/jira/browse/TINKERPOP-1143[TINKERPOP-1143], -link:https://issues.apache.org/jira/browse/TINKERPOP-1705[TINKERPOP-1705] +link:https://issues.apache.org/jira/browse/TINKERPOP-1705[TINKERPOP-1705], +link:https://issues.apache.org/jira/browse/TINKERPOP-1707[TINKERPOP-1707] ==== Modifications to reducing barrier steps http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d635d321/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java index e7f299b..388bf0b 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java @@ -179,12 +179,7 @@ public abstract class AbstractChannelizer extends ChannelInitializer<SocketChann } private Authenticator createAuthenticator(final Settings.AuthenticationSettings config) { - String authenticatorClass = null; - if (config.authenticator == null) { - authenticatorClass = config.className; - } else { - authenticatorClass = config.authenticator; - } + final String authenticatorClass = config.authenticator; try { final Class<?> clazz = Class.forName(authenticatorClass); final Authenticator authenticator = (Authenticator) clazz.newInstance(); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d635d321/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java index 9921817..66fcd86 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java @@ -30,7 +30,6 @@ import org.apache.tinkerpop.gremlin.server.auth.Authenticator; import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer; import org.apache.tinkerpop.gremlin.server.handler.AbstractAuthenticationHandler; import org.apache.tinkerpop.gremlin.server.util.DefaultGraphManager; -import info.ganglia.gmetric4j.gmetric.GMetric; import org.apache.tinkerpop.gremlin.server.util.LifeCycleHook; import org.apache.tinkerpop.gremlin.structure.Graph; import org.yaml.snakeyaml.TypeDescription; @@ -411,16 +410,7 @@ public class Settings { * used to load the implementation from the classpath. Defaults to {@link AllowAllAuthenticator} when * not specified. */ - public String authenticator = null; - - /** - * The fully qualified class name of the {@link Authenticator} implementation. This class name will be - * used to load the implementation from the classpath. Defaults to {@link AllowAllAuthenticator} when - * not specified. - * @deprecated As of release 3.2.5, replaced by {@link #authenticator}. - */ - @Deprecated - public String className = AllowAllAuthenticator.class.getName(); + public String authenticator = AllowAllAuthenticator.class.getName(); /** * The fully qualified class name of the {@link AbstractAuthenticationHandler} implementation. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d635d321/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java index c31ee69..ce58c62 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java @@ -115,7 +115,7 @@ public class GremlinServerAuditLogIntegrateTest extends AbstractGremlinServerInt final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings(); settings.authentication = authSettings; authSettings.enableAuditLog = AUDIT_LOG_ENABLED; - authSettings.className = Krb5Authenticator.class.getName(); + authSettings.authenticator = Krb5Authenticator.class.getName(); final Map<String,Object> authConfig = new HashMap<>(); authSettings.config = authConfig; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d635d321/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java index 6dda40b..2fc7b22 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java @@ -54,7 +54,7 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra @Override public Settings overrideSettings(final Settings settings) { final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings(); - authSettings.className = SimpleAuthenticator.class.getName(); + authSettings.authenticator = SimpleAuthenticator.class.getName(); // use a credentials graph with one user in it: stephen/password final Map<String,Object> authConfig = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d635d321/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java index 5a02d0a..cda97d7 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java @@ -97,7 +97,7 @@ public class GremlinServerAuthKrb5IntegrateTest extends AbstractGremlinServerInt settings.ssl = sslConfig; final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings(); settings.authentication = authSettings; - authSettings.className = Krb5Authenticator.class.getName(); + authSettings.authenticator = Krb5Authenticator.class.getName(); final Map<String,Object> authConfig = new HashMap<>(); authConfig.put("principal", kdcServer.serverPrincipal); authConfig.put("keytab", kdcServer.serviceKeytabFile.getAbsolutePath());
