You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/06/27 21:21:40 UTC
[50/50] [abbrv] incubator-geode git commit: Fixed GetAll and tests
Fixed GetAll and tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b43d0266
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b43d0266
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b43d0266
Branch: refs/heads/feature/GEODE-1571
Commit: b43d0266dfac2df0c3569278bc0d4b7eafe9f1c9
Parents: 99dfa45
Author: Kevin J. Duling <kd...@pivotal.io>
Authored: Mon Jun 27 13:57:37 2016 -0700
Committer: Kevin J. Duling <kd...@pivotal.io>
Committed: Mon Jun 27 13:57:37 2016 -0700
----------------------------------------------------------------------
.../cache/tier/sockets/command/GetAll.java | 2 +-
.../cache/tier/sockets/command/GetAll651.java | 2 +-
.../cache/tier/sockets/command/GetAll70.java | 2 +-
...tegratedClientGetAllAuthDistributedTest.java | 20 +++++++++++---------
4 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b43d0266/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll.java
index c88ccb3..5ae5d12 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll.java
@@ -116,7 +116,7 @@ public class GetAll extends BaseCommand {
servConn.setAsTrue(RESPONDED);
return;
}
- GeodeSecurityUtil.authorizeRegionRead(region.getName());
+
// Send header
ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
chunkedResponseMsg.setMessageType(MessageType.RESPONSE);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b43d0266/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll651.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll651.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll651.java
index 600ee46..5b278e3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll651.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll651.java
@@ -114,7 +114,7 @@ public class GetAll651 extends BaseCommand {
servConn.setAsTrue(RESPONDED);
return;
}
- GeodeSecurityUtil.authorizeRegionRead(region.getName());
+
// Send header
ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
chunkedResponseMsg.setMessageType(MessageType.RESPONSE);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b43d0266/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll70.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll70.java
index 1953051..c1ab7a9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll70.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll70.java
@@ -127,7 +127,7 @@ public class GetAll70 extends BaseCommand {
servConn.setAsTrue(RESPONDED);
return;
}
- GeodeSecurityUtil.authorizeRegionRead(region.getName());
+
// Send header
ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
chunkedResponseMsg.setMessageType(MessageType.RESPONSE);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b43d0266/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetAllAuthDistributedTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetAllAuthDistributedTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetAllAuthDistributedTest.java
index a690163..f4b346d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetAllAuthDistributedTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetAllAuthDistributedTest.java
@@ -16,22 +16,21 @@
*/
package com.gemstone.gemfire.security;
-import static com.googlecode.catchexception.CatchException.*;
-import static org.assertj.core.api.Assertions.*;
+import static com.gemstone.gemfire.internal.Assert.assertTrue;
+import static org.jgroups.util.Util.assertEquals;
import java.util.Arrays;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
-import com.gemstone.gemfire.cache.client.ClientRegionFactory;
import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
-import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
@Category(DistributedTest.class)
public class IntegratedClientGetAllAuthDistributedTest extends AbstractIntegratedClientAuthDistributedTest {
@@ -44,7 +43,8 @@ public class IntegratedClientGetAllAuthDistributedTest extends AbstractIntegrate
.create();
Region region = cache.createClientRegionFactory(ClientRegionShortcut.PROXY).create(REGION_NAME);
- assertNotAuthorized(() -> region.getAll(Arrays.asList("key1", "key2", "key3", "key4")), "DATA:READ:AuthRegion");
+ Map emptyMap = region.getAll(Arrays.asList("key1", "key2", "key3", "key4"));
+ assertTrue(emptyMap.isEmpty());
});
client2.invoke("logging in super-user with correct password", () -> {
@@ -54,7 +54,9 @@ public class IntegratedClientGetAllAuthDistributedTest extends AbstractIntegrate
.create();
Region region = cache.createClientRegionFactory(ClientRegionShortcut.PROXY).create(REGION_NAME);
- region.getAll(Arrays.asList("key1", "key2", "key3", "key4"));
+ Map filledMap = region.getAll(Arrays.asList("key1", "key2", "key3", "key4"));
+ assertEquals("Map should contain 4 entries", 4, filledMap.size());
+ assertTrue(filledMap.containsKey("key1"));
});
}
}