geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject geode git commit: review feedback fixup
Date Tue, 06 Jun 2017 23:56:21 GMT
Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-2632-21 4cf6942a5 -> 1fb878a30


review feedback fixup


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/1fb878a3
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/1fb878a3
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/1fb878a3

Branch: refs/heads/feature/GEODE-2632-21
Commit: 1fb878a30f5ef545271cf4ea7c2aab0baaf5e2ea
Parents: 4cf6942
Author: Kirk Lund <klund@apache.org>
Authored: Tue Jun 6 16:56:01 2017 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Tue Jun 6 16:56:01 2017 -0700

----------------------------------------------------------------------
 .../internal/security/SecurityServiceFactory.java | 10 ++++++++++
 .../internal/cli/commands/IndexCommands.java      |  6 ------
 .../support/LoginHandlerInterceptor.java          | 10 ++--------
 .../web/security/SecurityServiceProvider.java     | 18 ------------------
 4 files changed, 12 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/1fb878a3/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
index 1493a3e..306e25e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
@@ -23,6 +23,8 @@ import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIR
 import org.apache.commons.lang.StringUtils;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.cache.CacheConfig;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.security.shiro.ConfigInitialization;
 import org.apache.geode.security.PostProcessor;
 import org.apache.geode.security.SecurityManager;
@@ -89,6 +91,14 @@ public class SecurityServiceFactory {
     }
   }
 
+  public static SecurityService findSecurityService() {
+    InternalCache cache = GemFireCacheImpl.getInstance();
+    if (cache != null) {
+      return cache.getSecurityService();
+    }
+    return SecurityServiceFactory.create();
+  }
+
   static SecurityServiceType determineType(Properties securityConfig,
       SecurityManager securityManager, PostProcessor postProcessor) {
     boolean hasShiroConfig = hasProperty(securityConfig, SECURITY_SHIRO_INIT);

http://git-wip-us.apache.org/repos/asf/geode/blob/1fb878a3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
index 628547e..5a4a3d7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
@@ -80,12 +80,6 @@ public class IndexCommands implements GfshCommand {
   private static final Set<IndexInfo> indexDefinitions =
       Collections.synchronizedSet(new HashSet<IndexInfo>());
 
-  @Override
-  public Set<DistributedMember> getMembers(final InternalCache cache) {
-    // TODO determine what this does (as it is untested and unmockable!)
-    return CliUtil.getAllMembers(cache);
-  }
-
   @CliCommand(value = CliStrings.LIST_INDEX, help = CliStrings.LIST_INDEX__HELP)
   @CliMetaData(shellOnly = false,
       relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})

http://git-wip-us.apache.org/repos/asf/geode/blob/1fb878a3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
index 737ea5f..5e502f5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
@@ -14,6 +14,8 @@
  */
 package org.apache.geode.management.internal.web.controllers.support;
 
+import static org.apache.geode.internal.security.SecurityServiceFactory.findSecurityService;
+
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalCache;
@@ -76,14 +78,6 @@ public class LoginHandlerInterceptor extends HandlerInterceptorAdapter
{
     return ENV.get();
   }
 
-  private static SecurityService findSecurityService() {
-    InternalCache cache = GemFireCacheImpl.getInstance();
-    if (cache != null) {
-      return cache.getSecurityService();
-    }
-    return SecurityServiceFactory.create();
-  }
-
   @Override
   public boolean preHandle(final HttpServletRequest request, final HttpServletResponse response,
       final Object handler) throws Exception {

http://git-wip-us.apache.org/repos/asf/geode/blob/1fb878a3/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/SecurityServiceProvider.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/SecurityServiceProvider.java
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/SecurityServiceProvider.java
deleted file mode 100644
index e1cca5b..0000000
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/SecurityServiceProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information
regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version
2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain
a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express
- * or implied. See the License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.geode.rest.internal.web.security;
-
-public class SecurityServiceProvider {
-}


Mime
View raw message