Repository: aurora Updated Branches: refs/heads/master e27163440 -> 2ab406599
Fixing stylecheck errors. Reviewed at https://reviews.apache.org/r/35633/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/2ab40659 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/2ab40659 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/2ab40659 Branch: refs/heads/master Commit: 2ab406599e7c0922eb503ce8724adca23538f577 Parents: e271634 Author: Maxim Khutornenko <[email protected]> Authored: Thu Jun 18 16:18:43 2015 -0700 Committer: Maxim Khutornenko <[email protected]> Committed: Thu Jun 18 16:18:43 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/aurora/auth/UnsecureAuthModule.java | 9 +++++---- .../java/org/apache/aurora/auth/UnsecureSessionContext.java | 1 + .../org/apache/aurora/auth/UnsecureSessionContextTest.java | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/2ab40659/src/main/java/org/apache/aurora/auth/UnsecureAuthModule.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/auth/UnsecureAuthModule.java b/src/main/java/org/apache/aurora/auth/UnsecureAuthModule.java index 010e714..476dd9a 100644 --- a/src/main/java/org/apache/aurora/auth/UnsecureAuthModule.java +++ b/src/main/java/org/apache/aurora/auth/UnsecureAuthModule.java @@ -37,10 +37,11 @@ public class UnsecureAuthModule extends AbstractModule { LOG.info("Using default (UNSECURE!!!) authentication module."); bind(SessionValidator.class).to(UnsecureSessionValidator.class); bind(CapabilityValidator.class).to(UnsecureCapabilityValidator.class); - // NOTE: This binding is very important, as UnsecureSessionContext has an optional injection, so its provider must - // be created in the same injector as the one that *might* have its optional dependency. Omitting this binding will - // cause a Just-In-Time binding to be created in the parent injector, where it will not have access to the optional - // dependency in the child injector (so its optional dependency will never be used). This was the cause of + // NOTE: This binding is very important, as UnsecureSessionContext has an optional injection, + // so its provider must be created in the same injector as the one that *might* have its + // optional dependency. Omitting this binding will cause a Just-In-Time binding to be created + // in the parent injector, where it will not have access to the optional dependency in the + // child injector (so its optional dependency will never be used). This was the cause of // https://issues.apache.org/jira/browse/AURORA-1352. This can be mitigated slightly by // https://issues.apache.org/jira/browse/AURORA-1357 bind(SessionContext.class).to(UnsecureSessionContext.class); http://git-wip-us.apache.org/repos/asf/aurora/blob/2ab40659/src/main/java/org/apache/aurora/auth/UnsecureSessionContext.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/auth/UnsecureSessionContext.java b/src/main/java/org/apache/aurora/auth/UnsecureSessionContext.java index 0226144..9e1f35a 100644 --- a/src/main/java/org/apache/aurora/auth/UnsecureSessionContext.java +++ b/src/main/java/org/apache/aurora/auth/UnsecureSessionContext.java @@ -22,6 +22,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; import com.twitter.common.stats.StatsProvider; + import org.apache.shiro.subject.Subject; /** http://git-wip-us.apache.org/repos/asf/aurora/blob/2ab40659/src/test/java/org/apache/aurora/auth/UnsecureSessionContextTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/auth/UnsecureSessionContextTest.java b/src/test/java/org/apache/aurora/auth/UnsecureSessionContextTest.java index a8badd4..6391736 100644 --- a/src/test/java/org/apache/aurora/auth/UnsecureSessionContextTest.java +++ b/src/test/java/org/apache/aurora/auth/UnsecureSessionContextTest.java @@ -50,8 +50,9 @@ public class UnsecureSessionContextTest extends EasyMockTest { private void constructAndReplay() { Capture<Supplier<Integer>> gaugeCapture = createCapture(); - expect(statsProvider.makeGauge(eq(UnsecureSessionContext.SHIRO_AUDIT_LOGGING_ENABLED), capture(gaugeCapture))) - .andReturn(null); + expect(statsProvider.makeGauge( + eq(UnsecureSessionContext.SHIRO_AUDIT_LOGGING_ENABLED), + capture(gaugeCapture))).andReturn(null); control.replay();
