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/07/08 15:52:00 UTC
[40/50] [abbrv] incubator-geode git commit: GEODE-1571: use a
different method for data serialization and fix the tests
GEODE-1571: use a different method for data serialization and fix the 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/1a4bd5d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1a4bd5d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1a4bd5d4
Branch: refs/heads/develop
Commit: 1a4bd5d4ec64126dcb70d69a26589cc461bacb17
Parents: 8a26ac0
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Jul 6 15:47:46 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Jul 6 15:47:46 2016 -0700
----------------------------------------------------------------------
.../internal/AbstractDistributionConfig.java | 21 ++++++++-----
.../cache/tier/sockets/CacheClientProxy.java | 17 ++++++-----
.../internal/DistributionConfigJUnitTest.java | 32 +++++++++++---------
...urityNoShowValue1PostProcessorDUnitTest.java | 4 +++
...ntegratedSecurityPostProcessorDUnitTest.java | 4 +++
5 files changed, 50 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1a4bd5d4/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index 01c893f..fdda8a9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -16,6 +16,19 @@
*/
package com.gemstone.gemfire.distributed.internal;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.InvalidValueException;
import com.gemstone.gemfire.UnmodifiableException;
@@ -27,13 +40,6 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
-
/**
* Provides an implementation of <code>DistributionConfig</code> that
* knows how to read the configuration file.
@@ -1125,6 +1131,7 @@ public abstract class AbstractDistributionConfig
m.put(DISTRIBUTED_TRANSACTIONS, "Flag to indicate whether all transactions including JTA should be distributed transactions. Default is false, meaning colocated transactions.");
m.put(SECURITY_SHIRO_INIT, "The name of the shiro configuration file in the classpath, e.g. shiro.ini");
+ m.put(SECURITY_MANAGER, "User defined fully qualified method name implementing SecurityManager interface for integrated security. Defaults to \"{0}\". Legal values can be any \"method name\" of a static method that is present in the classpath.");
dcAttDescriptions = Collections.unmodifiableMap(m);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1a4bd5d4/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
index 23b7bde..5aac686 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
@@ -47,6 +47,7 @@ import org.apache.shiro.util.ThreadState;
import com.gemstone.gemfire.CancelException;
import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.GemFireIOException;
import com.gemstone.gemfire.StatisticsFactory;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheClosedException;
@@ -108,6 +109,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
import com.gemstone.gemfire.internal.security.AuthorizeRequestPP;
import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
+import com.gemstone.gemfire.internal.util.BlobHelper;
import com.gemstone.gemfire.security.AccessControl;
/**
@@ -1655,15 +1657,16 @@ public class CacheClientProxy implements ClientSession {
// post process
Object oldValue = clientMessage.getValue();
if(oldValue instanceof byte[]){
- EntryEventImpl.deserialize((byte[])oldValue);
- Object newValue = GeodeSecurityUtil.postProcess(clientMessage.getRegionName(),
- clientMessage.getKeyOfInterest(),
- EntryEventImpl.deserialize((byte[])oldValue));
- clientMessage.setLatestValue(EntryEventImpl.serialize(newValue));
+ Object newValue = GeodeSecurityUtil.postProcess(clientMessage.getRegionName(), clientMessage.getKeyOfInterest(),
+ EntryEventImpl.deserialize((byte[])oldValue));
+ try {
+ clientMessage.setLatestValue(BlobHelper.serializeToBlob(newValue));
+ } catch (IOException e) {
+ throw new GemFireIOException("Exception serializing entry value", e);
+ }
}
else{
- Object newValue = GeodeSecurityUtil.postProcess(clientMessage.getRegionName(),
- clientMessage.getKeyOfInterest(), oldValue);
+ Object newValue = GeodeSecurityUtil.postProcess(clientMessage.getRegionName(), clientMessage.getKeyOfInterest(), oldValue);
clientMessage.setLatestValue(newValue);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1a4bd5d4/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
index 9d0740e..aab46fb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
@@ -17,24 +17,28 @@
package com.gemstone.gemfire.distributed.internal;
import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.*;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.UnmodifiableException;
import com.gemstone.gemfire.internal.ConfigSource;
import com.gemstone.gemfire.management.internal.security.JSONAuthorization;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.*;
-
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
@Category(UnitTest.class)
public class DistributionConfigJUnitTest {
@@ -73,7 +77,7 @@ public class DistributionConfigJUnitTest {
@Test
public void testGetAttributeNames() {
String[] attNames = AbstractDistributionConfig._getAttNames();
- assertEquals(attNames.length, 141);
+ assertEquals(attNames.length, 142);
List boolList = new ArrayList();
List intList = new ArrayList();
@@ -107,7 +111,7 @@ public class DistributionConfigJUnitTest {
assertEquals(boolList.size(), 30);
assertEquals(intList.size(), 33);
- assertEquals(stringList.size(), 70);
+ assertEquals(stringList.size(), 71);
assertEquals(fileList.size(), 5);
assertEquals(otherList.size(), 3);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1a4bd5d4/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedSecurityNoShowValue1PostProcessorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedSecurityNoShowValue1PostProcessorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedSecurityNoShowValue1PostProcessorDUnitTest.java
index 98a62df..0599e57 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedSecurityNoShowValue1PostProcessorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedSecurityNoShowValue1PostProcessorDUnitTest.java
@@ -24,13 +24,17 @@ import java.util.List;
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.Pool;
import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import com.gemstone.gemfire.test.junit.categories.SecurityTest;
+@Category({ DistributedTest.class, SecurityTest.class })
public class IntegratedSecurityNoShowValue1PostProcessorDUnitTest extends AbstractIntegratedClientAuthDistributedTest {
public IntegratedSecurityNoShowValue1PostProcessorDUnitTest(){
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1a4bd5d4/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedSecurityPostProcessorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedSecurityPostProcessorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedSecurityPostProcessorDUnitTest.java
index 9f3e8b7..ceae94c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedSecurityPostProcessorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedSecurityPostProcessorDUnitTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.EntryEvent;
import com.gemstone.gemfire.cache.Region;
@@ -36,7 +37,10 @@ import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.security.templates.SamplePostProcessor;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import com.gemstone.gemfire.test.junit.categories.SecurityTest;
+@Category({ DistributedTest.class, SecurityTest.class })
public class IntegratedSecurityPostProcessorDUnitTest extends AbstractIntegratedClientAuthDistributedTest {
public IntegratedSecurityPostProcessorDUnitTest(){