fixup!

Author: jfreden

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/service/ServiceAccountTokenStore.java

@@ -21,42 +21,28 @@ public interface ServiceAccountTokenStore {
     void authenticate(ServiceAccountToken token, ActionListener<StoreAuthenticationResult> listener);
 
     class StoreAuthenticationResult {
-        public enum Status {
-            SUCCESS,
-            CONTINUE,
-            TERMINATE
-        }
-
-        private final Status status;
         private final TokenSource tokenSource;
+        private final boolean success;
 
-        private StoreAuthenticationResult(TokenSource tokenSource, Status status) {
-            this.status = status;
+        private StoreAuthenticationResult(TokenSource tokenSource, boolean success) {
             this.tokenSource = tokenSource;
+            this.success = success;
         }
 
         public static StoreAuthenticationResult successful(TokenSource tokenSource) {
-            return new StoreAuthenticationResult(tokenSource, Status.SUCCESS);
-        }
-
-        public static StoreAuthenticationResult terminate(TokenSource tokenSource) {
-            return new StoreAuthenticationResult(tokenSource, Status.TERMINATE);
+            return new StoreAuthenticationResult(tokenSource, true);
         }
 
         public static StoreAuthenticationResult failed(TokenSource tokenSource) {
-            return new StoreAuthenticationResult(tokenSource, Status.CONTINUE);
+            return new StoreAuthenticationResult(tokenSource, false);
         }
 
         public static StoreAuthenticationResult fromBooleanResult(TokenSource tokenSource, boolean result) {
             return result ? successful(tokenSource) : failed(tokenSource);
         }
 
         public boolean isSuccess() {
-            return status == Status.SUCCESS;
-        }
-
-        public Status getStatus() {
-            return status;
+            return success;
         }
 
         public TokenSource getTokenSource() {

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/CompositeServiceAccountTokenStore.java

@@ -40,7 +40,7 @@ public void authenticate(ServiceAccountToken token, ActionListener<StoreAuthenti
                 stores,
                 threadContext,
                 Function.identity(),
-                storeAuthenticationResult -> storeAuthenticationResult.getStatus() == StoreAuthenticationResult.Status.CONTINUE
+                storeAuthenticationResult -> storeAuthenticationResult.isSuccess() == false
             );
         try {
             authenticatingListener.run();