[geode] branch feature/GEODE-6143-2 deleted (was 4a18a40)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-2 in repository https://gitbox.apache.org/repos/asf/geode.git. was 4a18a40 GEODE-6143: remove PowerMock from PartitionedRepositoryManagerJUnitTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6143-3 updated (c499514 -> ac4f06e)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-3 in repository https://gitbox.apache.org/repos/asf/geode.git. omit c499514 GEODE-6143: remove PowerMock from VMStatsMonitorTest add 88e1305 GEODE-6143: Remove PowerMock and improve LuceneEventListenerJUnitTest add 53b1433 GEODE-6032: Updated javadoc to clarify what is communicated with hasD… (#2953) add 1f364dd GEODE-6102: add gfsh destroy data-source (#2918) add 4a18a40 GEODE-6143: remove PowerMock from PartitionedRepositoryManagerJUnitTest add df834c9 GEODE-6143: remove PowerMock from PartitionedRepositoryManagerJUnitTest (#2980) add ac4f06e GEODE-6143: remove PowerMock from VMStatsMonitorTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c499514) \ N -- N -- N refs/heads/feature/GEODE-6143-3 (ac4f06e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../cli/DestroyDataSourceCommandDUnitTest.java | 38 ++--- .../internal/cli/DestroyDataSourceCommand.java | 79 --- .../org.springframework.shell.core.CommandMarker | 1 + .../internal/cli/DestroyDataSourceCommandTest.java | 154 + .../DestroyJndiBindingCommandDUnitTest.java| 3 - .../functions/DestroyJndiBindingFunctionTest.java | 56 +++- .../src/main/java/org/apache/geode/Delta.java | 3 +- .../apache/geode/internal/jndi/JNDIInvoker.java| 12 ++ .../cli/commands/DestroyJndiBindingCommand.java| 3 +- .../cli/functions/DestroyJndiBindingFunction.java | 37 +++-- .../commands/DestroyJndiBindingCommandTest.java| 24 ++-- .../cache/lucene/internal/LuceneEventListener.java | 10 +- .../internal/LuceneEventListenerJUnitTest.java | 52 --- .../PartitionedRepositoryManagerJUnitTest.java | 29 ++-- 14 files changed, 375 insertions(+), 126 deletions(-) copy geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandDUnitTest.java => geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyDataSourceCommandDUnitTest.java (75%) copy geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java => geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyDataSourceCommand.java (56%) copy geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java => geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyDataSourceCommandTest.java (55%)
[geode] branch feature/GEODE-6143-4 created (now 7ea8294)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-4 in repository https://gitbox.apache.org/repos/asf/geode.git. at 7ea8294 GEODE-6143: remove PowerMock from UnregisterInterestTest This branch includes the following new commits: new 7ea8294 GEODE-6143: remove PowerMock from UnregisterInterestTest The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-6143: remove PowerMock from UnregisterInterestTest
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6143-4
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 7ea829401bc9b764d984b7d594a28ad980b1f0ac
Author: zhouxh
AuthorDate: Tue Dec 11 11:21:39 2018 -0800
GEODE-6143: remove PowerMock from UnregisterInterestTest
---
.../cache/tier/sockets/command/UnregisterInterestTest.java| 11 ---
1 file changed, 11 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
index c27175d..02ac078 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
@@ -26,15 +26,9 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.operations.UnregisterInterestOperationContext;
@@ -55,9 +49,6 @@ import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"*.UnitTest"})
-@PrepareForTest({CacheClientNotifier.class})
@Category({ClientServerTest.class})
public class UnregisterInterestTest {
@@ -145,8 +136,6 @@ public class UnregisterInterestTest {
when(this.unregisterInterestOperationContext.getKey()).thenReturn(KEY);
CacheClientNotifier ccn = mock(CacheClientNotifier.class);
-PowerMockito.mockStatic(CacheClientNotifier.class,
Mockito.CALLS_REAL_METHODS);
-PowerMockito.when(CacheClientNotifier.getInstance()).thenReturn(ccn);
when(this.acceptor.getCacheClientNotifier()).thenReturn(ccn);
}
[geode] branch feature/GEODE-6143-3 updated (ac4f06e -> 1d367f4)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-3 in repository https://gitbox.apache.org/repos/asf/geode.git. discard ac4f06e GEODE-6143: remove PowerMock from VMStatsMonitorTest add 1d9e34c GEODE-6179: update create data-source help (#2983) add 9c145bf GEODE-6143: Adding test category back to CacheClientNotifierIntegrationTest (#2981) add d7e7e87 GEODE-6143: Removing PowerMock from MBeanProxyFactoryTest (#2975) add 56c3593 GEODE-6156: add --id option to create jdbc-mapping (#2969) add 1d367f4 GEODE-6143: remove PowerMock from VMStatsMonitorTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ac4f06e) \ N -- N -- N refs/heads/feature/GEODE-6143-3 (1d367f4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../TableMetaDataManagerIntegrationTest.java | 50 ++-- .../jdbc/internal/TestConfigService.java | 2 +- .../cli/CreateMappingCommandDUnitTest.java | 6 +- .../cli/DescribeMappingCommandDUnitTest.java | 6 +- .../internal/cli/ListMappingCommandDUnitTest.java | 2 +- .../geode/connectors/jdbc/internal/SqlHandler.java | 4 +- .../jdbc/internal/TableMetaDataManager.java| 40 +- .../jdbc/internal/cli/CreateDataSourceCommand.java | 14 ++- .../jdbc/internal/cli/CreateMappingCommand.java| 9 +- .../jdbc/internal/cli/DescribeMappingCommand.java | 2 + .../jdbc/internal/configuration/RegionMapping.java | 28 - .../connectors/jdbc/internal/xml/ElementType.java | 1 + .../xml/JdbcConnectorServiceXmlParser.java | 1 + .../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 1 + .../sanctioned-geode-connectors-serializables.txt | 2 +- .../jdbc/internal/RegionMappingTest.java | 73 +++ .../connectors/jdbc/internal/SqlHandlerTest.java | 4 +- .../jdbc/internal/TableMetaDataManagerTest.java| 139 + .../internal/cli/CreateMappingCommandTest.java | 22 ++-- .../internal/cli/CreateMappingFunctionTest.java| 2 +- .../internal/cli/DescribeMappingCommandTest.java | 11 +- .../jdbc/internal/cli/ListMappingCommandTest.java | 4 +- .../jdbc/internal/xml/ElementTypeTest.java | 3 + .../CacheClientNotifierIntegrationTest.java| 3 + .../management/internal/MBeanProxyFactory.java | 8 +- .../management/internal/MBeanProxyFactoryTest.java | 24 +--- .../internal/beans/stats/VMStatsMonitorTest.java | 3 +- 27 files changed, 336 insertions(+), 128 deletions(-)
[geode] branch feature/GEODE-6143-4 updated (7ea8294 -> 8eb92b9)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-4 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 7ea8294 GEODE-6143: remove PowerMock from UnregisterInterestTest add 1d9e34c GEODE-6179: update create data-source help (#2983) add 9c145bf GEODE-6143: Adding test category back to CacheClientNotifierIntegrationTest (#2981) add d7e7e87 GEODE-6143: Removing PowerMock from MBeanProxyFactoryTest (#2975) add 56c3593 GEODE-6156: add --id option to create jdbc-mapping (#2969) add 835b9c7 GEODE-6188: Select zone for testing at random to avoid availability conflicts. Do not deviate from the us-central1 region, however. add 0c10b3f Merge pull request #2988 from PurelyApplied/geode-6188 add 8eb92b9 GEODE-6143: remove PowerMock from UnregisterInterestTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7ea8294) \ N -- N -- N refs/heads/feature/GEODE-6143-4 (8eb92b9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ci/scripts/create_instance.sh | 5 +- .../TableMetaDataManagerIntegrationTest.java | 50 ++-- .../jdbc/internal/TestConfigService.java | 2 +- .../cli/CreateMappingCommandDUnitTest.java | 6 +- .../cli/DescribeMappingCommandDUnitTest.java | 6 +- .../internal/cli/ListMappingCommandDUnitTest.java | 2 +- .../geode/connectors/jdbc/internal/SqlHandler.java | 4 +- .../jdbc/internal/TableMetaDataManager.java| 40 +- .../jdbc/internal/cli/CreateDataSourceCommand.java | 14 ++- .../jdbc/internal/cli/CreateMappingCommand.java| 9 +- .../jdbc/internal/cli/DescribeMappingCommand.java | 2 + .../jdbc/internal/configuration/RegionMapping.java | 28 - .../connectors/jdbc/internal/xml/ElementType.java | 1 + .../xml/JdbcConnectorServiceXmlParser.java | 1 + .../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 1 + .../sanctioned-geode-connectors-serializables.txt | 2 +- .../jdbc/internal/RegionMappingTest.java | 73 +++ .../connectors/jdbc/internal/SqlHandlerTest.java | 4 +- .../jdbc/internal/TableMetaDataManagerTest.java| 139 + .../internal/cli/CreateMappingCommandTest.java | 22 ++-- .../internal/cli/CreateMappingFunctionTest.java| 2 +- .../internal/cli/DescribeMappingCommandTest.java | 11 +- .../jdbc/internal/cli/ListMappingCommandTest.java | 4 +- .../jdbc/internal/xml/ElementTypeTest.java | 3 + .../CacheClientNotifierIntegrationTest.java| 3 + .../management/internal/MBeanProxyFactory.java | 8 +- .../management/internal/MBeanProxyFactoryTest.java | 24 +--- 27 files changed, 339 insertions(+), 127 deletions(-)
[geode] branch develop updated (2d6a617 -> 0b74d42)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 2d6a617 GEODE-6166: Improves put performance (#2970) add 8eb92b9 GEODE-6143: remove PowerMock from UnregisterInterestTest new 0b74d42 Merge pull request #2985 from apache/feature/GEODE-6143-4 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cache/tier/sockets/command/UnregisterInterestTest.java| 11 --- 1 file changed, 11 deletions(-)
[geode] 01/01: Merge pull request #2985 from apache/feature/GEODE-6143-4
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git commit 0b74d425f466137c3adbaac4678aadb1df731c72 Merge: 2d6a617 8eb92b9 Author: Xiaojian Zhou AuthorDate: Tue Dec 11 16:38:00 2018 -0800 Merge pull request #2985 from apache/feature/GEODE-6143-4 GEODE-6143: remove PowerMock from UnregisterInterestTest .../cache/tier/sockets/command/UnregisterInterestTest.java| 11 --- 1 file changed, 11 deletions(-)
[geode] branch feature/GEODE-6143-4 deleted (was 8eb92b9)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-4 in repository https://gitbox.apache.org/repos/asf/geode.git. was 8eb92b9 GEODE-6143: remove PowerMock from UnregisterInterestTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6143-3 updated (1d367f4 -> 44e1ac1)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-3 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 1d367f4 GEODE-6143: remove PowerMock from VMStatsMonitorTest add 835b9c7 GEODE-6188: Select zone for testing at random to avoid availability conflicts. Do not deviate from the us-central1 region, however. add 0c10b3f Merge pull request #2988 from PurelyApplied/geode-6188 add 2d6a617 GEODE-6166: Improves put performance (#2970) add 8eb92b9 GEODE-6143: remove PowerMock from UnregisterInterestTest add 0b74d42 Merge pull request #2985 from apache/feature/GEODE-6143-4 add 44e1ac1 GEODE-6143: remove PowerMock from VMStatsMonitorTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1d367f4) \ N -- N -- N refs/heads/feature/GEODE-6143-3 (44e1ac1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ci/scripts/create_instance.sh | 5 +- .../geode/cache/client/internal/DestroyOp.java | 8 +-- .../cache/client/internal/OpExecutorImpl.java | 8 ++- .../apache/geode/cache/client/internal/PutOp.java | 4 +- .../internal/pooling/ConnectionManagerImpl.java| 21 +++ .../geode/internal/InternalDataSerializer.java | 13 ++-- .../internal/cache/tier/sockets/BaseCommand.java | 23 +++ .../geode/internal/cache/tier/sockets/Message.java | 7 +++ .../geode/internal/cache/tier/sockets/Part.java| 25 .../cache/tier/sockets/command/Destroy65.java | 66 +-- .../internal/cache/tier/sockets/command/Put65.java | 73 +++--- .../sockets/command/UnregisterInterestTest.java| 11 12 files changed, 153 insertions(+), 111 deletions(-)
[geode] branch feature/GEODE-6143-5 created (now caa0458)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-5 in repository https://gitbox.apache.org/repos/asf/geode.git. at caa0458 GEODE-6143: remove PowerMock from DataTypeJUnitTest This branch includes the following new commits: new caa0458 GEODE-6143: remove PowerMock from DataTypeJUnitTest The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-6143: remove PowerMock from DataTypeJUnitTest
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6143-5
in repository https://gitbox.apache.org/repos/asf/geode.git
commit caa0458f3ec70479a6f6b5871234585fa762f66c
Author: zhouxh
AuthorDate: Tue Dec 11 17:35:50 2018 -0800
GEODE-6143: remove PowerMock from DataTypeJUnitTest
---
.../geode/internal/offheap/DataTypeJUnitTest.java | 83 --
1 file changed, 30 insertions(+), 53 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
index 90b5532..ffa1685 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
@@ -16,13 +16,8 @@ package org.apache.geode.internal.offheap;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.when;
import java.io.ByteArrayOutputStream;
-import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
@@ -50,32 +45,30 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.Instantiator;
import org.apache.geode.distributed.internal.ReplyMessage;
import org.apache.geode.internal.DSCODE;
-import org.apache.geode.internal.DSFIDFactory;
import org.apache.geode.internal.DataSerializableFixedID;
import
org.apache.geode.internal.DataSerializableJUnitTest.DataSerializableImpl;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.InternalInstantiator;
import org.apache.geode.internal.admin.remote.ShutdownAllResponse;
import org.apache.geode.internal.cache.execute.data.CustId;
+import org.apache.geode.internal.cache.persistence.DiskStoreID;
/**
* Tests the DataType support for off-heap MemoryInspector.
*/
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("*.UnitTest")
-@PrepareForTest({InternalInstantiator.class, Instantiator.class,
DataSerializer.class,
-DSFIDFactory.class})
public class DataTypeJUnitTest {
+ static {
+Instantiator.register(new Instantiator(CustId.class, (short) 1) {
+ public DataSerializable newInstance() {
+return new CustId();
+ }
+});
+ }
@Test
public void testDataSerializableFixedIDByte() throws IOException {
@@ -104,19 +97,16 @@ public class DataTypeJUnitTest {
@Test
public void testDataSerializableFixedIDInt() throws IOException,
ClassNotFoundException {
-Integer someDSFIDInt = new Integer(1);
-
-PowerMockito.mockStatic(DSFIDFactory.class);
-when(DSFIDFactory.create(eq(someDSFIDInt),
any())).thenReturn(someDSFIDInt);
-DSFIDFactory.create(someDSFIDInt, null);
+// DiskStoreID is a DataSerializableFixedID
+DiskStoreID dsId = new DiskStoreID(0x1L, 0x2L);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(baos);
-DataSerializer.writeByte(DSCODE.DS_FIXED_ID_INT.toByte(), out);
-DataSerializer.writeInteger(someDSFIDInt, out);
+DataSerializer.writeObject(dsId, out);
byte[] bytes = baos.toByteArray();
+
String type = DataType.getDataType(bytes);
-assertEquals("org.apache.geode.internal.DataSerializableFixedID:" +
Integer.class.getName(),
+assertEquals("org.apache.geode.internal.DataSerializableFixedID:" +
DiskStoreID.class.getName(),
type);
}
@@ -712,16 +702,8 @@ public class DataTypeJUnitTest {
@Test
public void getDataTypeShouldReturnUserDataSeriazliable() throws IOException
{
-Instantiator mockInstantiator = PowerMockito.mock(Instantiator.class);
-doReturn(CustId.class).when(mockInstantiator).getInstantiatedClass();
-mockInstantiator.getInstantiatedClass();
-
int someClassId = 1;
-PowerMockito.mockStatic(InternalInstantiator.class);
-
when(InternalInstantiator.getClassId(mockInstantiator.getClass())).thenReturn(someClassId);
-
when(InternalInstantiator.getInstantiator(someClassId)).thenReturn(mockInstantiator);
-
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(baos);
out.writeByte(DSCODE.USER_DATA_SERIALIZABLE.toByte());
@@ -736,15 +718,7 @@ public class
[geode] branch feature/GEODE-6143-3 updated (44e1ac1 -> aa349d7)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-3 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 44e1ac1 GEODE-6143: remove PowerMock from VMStatsMonitorTest add aa349d7 GEODE-6143: remove PowerMock from VMStatsMonitorTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (44e1ac1) \ N -- N -- N refs/heads/feature/GEODE-6143-3 (aa349d7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[geode] branch feature/GEODE-6143-3 updated (aa349d7 -> 058cd83)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-3 in repository https://gitbox.apache.org/repos/asf/geode.git. discard aa349d7 GEODE-6143: remove PowerMock from VMStatsMonitorTest add 058cd83 GEODE-6143: remove PowerMock from VMStatsMonitorTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (aa349d7) \ N -- N -- N refs/heads/feature/GEODE-6143-3 (058cd83) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[geode] branch feature/GEODE-6143-6 created (now 1bb7058)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-6 in repository https://gitbox.apache.org/repos/asf/geode.git. at 1bb7058 GEODE-6143: remove PowerMock from RemotePutMessageTest This branch includes the following new commits: new 1bb7058 GEODE-6143: remove PowerMock from RemotePutMessageTest The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-6143: remove PowerMock from RemotePutMessageTest
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6143-6
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 1bb705871ff241e61777692578b24cdd36d2c247
Author: zhouxh
AuthorDate: Wed Dec 12 09:43:41 2018 -0800
GEODE-6143: remove PowerMock from RemotePutMessageTest
---
.../internal/cache/tx/RemotePutMessageTest.java| 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
index f5a8c1f..575ecd2 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.internal.cache.tx;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -22,27 +23,27 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.RegionDestroyedException;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.CacheDistributionAdvisor;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.RemoteOperationException;
-@PowerMockIgnore("*.UnitTest")
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(RemotePutMessage.class)
public class RemotePutMessageTest {
@Test
public void testDistributeNotFailWithRegionDestroyedException() throws
RemoteOperationException {
EntryEventImpl event = mock(EntryEventImpl.class);
+EventID eventID = mock(EventID.class);
DistributedRegion region = mock(DistributedRegion.class);
+InternalDistributedSystem ids = mock(InternalDistributedSystem.class);
+DistributionManager dm = mock(DistributionManager.class);
+CancelCriterion cc = mock(CancelCriterion.class);
CacheDistributionAdvisor advisor = mock(CacheDistributionAdvisor.class);
InternalDistributedMember member = mock(InternalDistributedMember.class);
Set replicates = new
HashSet<>(Arrays.asList(member));
@@ -50,16 +51,15 @@ public class RemotePutMessageTest {
Object expectedOldValue = new Object();
when(event.getRegion()).thenReturn(region);
+when(event.getEventId()).thenReturn(eventID);
when(region.getCacheDistributionAdvisor()).thenReturn(advisor);
when(advisor.adviseInitializedReplicates()).thenReturn(replicates);
when(response.waitForResult()).thenThrow(new RegionDestroyedException("",
""));
-
-PowerMockito.mockStatic(RemotePutMessage.class);
-PowerMockito
-.when(RemotePutMessage.distribute(event, 1, false, false,
expectedOldValue, false, false))
-.thenCallRealMethod();
-PowerMockito.when(RemotePutMessage.send(member, region, event, 1, false,
false,
-expectedOldValue, false, false, false)).thenReturn(response);
+when(region.getSystem()).thenReturn(ids);
+when(region.getDistributionManager()).thenReturn(dm);
+when(ids.getDistributionManager()).thenReturn(dm);
+when(dm.getCancelCriterion()).thenReturn(cc);
+when(dm.putOutgoing(any())).thenReturn(null);
RemotePutMessage.distribute(event, 1, false, false, expectedOldValue,
false, false);
}
[geode] branch feature/GEODE-6143-6 updated (1bb7058 -> eabf1de)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-6 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 1bb7058 GEODE-6143: remove PowerMock from RemotePutMessageTest add 2d6a617 GEODE-6166: Improves put performance (#2970) add 8eb92b9 GEODE-6143: remove PowerMock from UnregisterInterestTest add 0b74d42 Merge pull request #2985 from apache/feature/GEODE-6143-4 add 82dd208 GEODE-6143: remove PowerMock from VMStatsMonitorTest (#2984) add eabf1de GEODE-6143: remove PowerMock from RemotePutMessageTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1bb7058) \ N -- N -- N refs/heads/feature/GEODE-6143-6 (eabf1de) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../geode/cache/client/internal/DestroyOp.java | 8 +-- .../cache/client/internal/OpExecutorImpl.java | 8 ++- .../apache/geode/cache/client/internal/PutOp.java | 4 +- .../internal/pooling/ConnectionManagerImpl.java| 21 +++ .../geode/internal/InternalDataSerializer.java | 13 ++-- .../internal/cache/tier/sockets/BaseCommand.java | 23 +++ .../geode/internal/cache/tier/sockets/Message.java | 7 +++ .../geode/internal/cache/tier/sockets/Part.java| 25 .../cache/tier/sockets/command/Destroy65.java | 66 +-- .../internal/cache/tier/sockets/command/Put65.java | 73 +++--- .../internal/beans/stats/VMStatsMonitor.java | 11 ++-- .../sockets/command/UnregisterInterestTest.java| 11 .../internal/beans/stats/VMStatsMonitorTest.java | 25 +--- 13 files changed, 159 insertions(+), 136 deletions(-)
[geode] branch feature/GEODE-6143-5 updated (caa0458 -> b58aa50)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-5 in repository https://gitbox.apache.org/repos/asf/geode.git. discard caa0458 GEODE-6143: remove PowerMock from DataTypeJUnitTest add 2d6a617 GEODE-6166: Improves put performance (#2970) add 8eb92b9 GEODE-6143: remove PowerMock from UnregisterInterestTest add 0b74d42 Merge pull request #2985 from apache/feature/GEODE-6143-4 add 82dd208 GEODE-6143: remove PowerMock from VMStatsMonitorTest (#2984) add b58aa50 GEODE-6143: remove PowerMock from DataTypeJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (caa0458) \ N -- N -- N refs/heads/feature/GEODE-6143-5 (b58aa50) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../geode/cache/client/internal/DestroyOp.java | 8 +-- .../cache/client/internal/OpExecutorImpl.java | 8 ++- .../apache/geode/cache/client/internal/PutOp.java | 4 +- .../internal/pooling/ConnectionManagerImpl.java| 21 +++ .../geode/internal/InternalDataSerializer.java | 13 ++-- .../internal/cache/tier/sockets/BaseCommand.java | 23 +++ .../geode/internal/cache/tier/sockets/Message.java | 7 +++ .../geode/internal/cache/tier/sockets/Part.java| 25 .../cache/tier/sockets/command/Destroy65.java | 66 +-- .../internal/cache/tier/sockets/command/Put65.java | 73 +++--- .../internal/beans/stats/VMStatsMonitor.java | 11 ++-- .../sockets/command/UnregisterInterestTest.java| 11 .../geode/internal/offheap/DataTypeJUnitTest.java | 11 +++- .../internal/beans/stats/VMStatsMonitorTest.java | 25 +--- 14 files changed, 169 insertions(+), 137 deletions(-)
[geode] 01/01: Merge pull request #2992 from apache/feature/GEODE-6143-6
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git commit 35d044629d297040dfcdda8e1d0582b99b00ea99 Merge: f932299 eabf1de Author: Xiaojian Zhou AuthorDate: Wed Dec 12 16:30:57 2018 -0800 Merge pull request #2992 from apache/feature/GEODE-6143-6 GEODE-6143: remove PowerMock from RemotePutMessageTest .../internal/cache/tx/RemotePutMessageTest.java| 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-)
[geode] branch feature/GEODE-6143-6 deleted (was eabf1de)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-6 in repository https://gitbox.apache.org/repos/asf/geode.git. was eabf1de GEODE-6143: remove PowerMock from RemotePutMessageTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated (f932299 -> 35d0446)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from f932299 GEODE-5674: Stop using random values for test ports (#2958) add eabf1de GEODE-6143: remove PowerMock from RemotePutMessageTest new 35d0446 Merge pull request #2992 from apache/feature/GEODE-6143-6 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../internal/cache/tx/RemotePutMessageTest.java| 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-)
[geode] branch feature/GEODE-6143-7 created (now 57cc068)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-7 in repository https://gitbox.apache.org/repos/asf/geode.git. at 57cc068 GEODE-6143: remove PowerMock from HeapMemoryMonitorTest This branch includes the following new commits: new 57cc068 GEODE-6143: remove PowerMock from HeapMemoryMonitorTest The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-6143: remove PowerMock from HeapMemoryMonitorTest
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6143-7
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 57cc068af2a4433494b819e1eab9c0848b84fa70
Author: zhouxh
AuthorDate: Wed Dec 12 23:21:32 2018 -0800
GEODE-6143: remove PowerMock from HeapMemoryMonitorTest
---
...MemoryMonitorDisableLowMemoryExceptionTest.java | 52 +
...MemoryMonitorEnableLowMemoryExceptionTest.java} | 126 +---
.../cache/control/HeapMemoryMonitorTestBase.java | 128 +
3 files changed, 182 insertions(+), 124 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/control/HeapMemoryMonitorDisableLowMemoryExceptionTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/control/HeapMemoryMonitorDisableLowMemoryExceptionTest.java
new file mode 100644
index 000..63edd96
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/control/HeapMemoryMonitorDisableLowMemoryExceptionTest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.internal.cache.control;
+
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+
+public class HeapMemoryMonitorDisableLowMemoryExceptionTest extends
HeapMemoryMonitorTestBase {
+
+ private static String savedParam = "false";
+
+ @BeforeClass
+ public static void setupSystemProperties() {
+savedParam =
+System.setProperty(DistributionConfig.GEMFIRE_PREFIX +
"disableLowMemoryException", "true");
+ }
+
+ @BeforeClass
+ public static void resetSystemProperties() {
+System.setProperty(DistributionConfig.GEMFIRE_PREFIX +
"disableLowMemoryException", savedParam);
+ }
+
+ // == tests for createLowMemoryIfNeeded (with Set argument)
==
+ @Test
+ public void
createLowMemoryIfNeededWithSetArg_ReturnsNullWhenLowMemoryExceptionDisabled()
+ throws Exception {
+createLowMemoryIfNeededWithSetArg_returnsNull(true, true, memberSet);
+ }
+
+ // == tests for checkForLowMemory (with Set argument) ==
+ @Test
+ public void
checkForLowMemoryWithSetArg_DoesNotThrowWhenLowMemoryExceptionDisabled()
+ throws Exception {
+checkForLowMemoryWithSetArg_doesNotThrow(true, true, memberSet);
+ }
+
+}
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/control/HeapMemoryMonitorTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/control/HeapMemoryMonitorEnableLowMemoryExceptionTest.java
similarity index 58%
rename from
geode-core/src/test/java/org/apache/geode/internal/cache/control/HeapMemoryMonitorTest.java
rename to
geode-core/src/test/java/org/apache/geode/internal/cache/control/HeapMemoryMonitorEnableLowMemoryExceptionTest.java
index f5ddc52..7c34c80 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/control/HeapMemoryMonitorTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/control/HeapMemoryMonitorEnableLowMemoryExceptionTest.java
@@ -14,62 +14,20 @@
*/
package org.apache.geode.internal.cache.control;
-import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
import org.apache.geode.cache.LowMemoryException;
-import org.apache.geode.cache.execute.Function;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.DistributedSystem;
import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.cache.InternalCache;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({
[geode] branch feature/GEODE-6143-5 updated (b58aa50 -> a4c76d4)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-5 in repository https://gitbox.apache.org/repos/asf/geode.git. discard b58aa50 GEODE-6143: remove PowerMock from DataTypeJUnitTest add f932299 GEODE-5674: Stop using random values for test ports (#2958) add eabf1de GEODE-6143: remove PowerMock from RemotePutMessageTest add 35d0446 Merge pull request #2992 from apache/feature/GEODE-6143-6 add a4c76d4 GEODE-6143: remove PowerMock from DataTypeJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b58aa50) \ N -- N -- N refs/heads/feature/GEODE-6143-5 (a4c76d4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../AvailablePortHelperIntegrationTest.java| 66 +++ .../org/apache/geode/internal/AvailablePort.java | 1 + .../internal/cache/tx/RemotePutMessageTest.java| 30 +-- .../apache/geode/test/dunit/internal/ChildVM.java | 2 + .../apache/geode/internal/AvailablePortHelper.java | 203 ++--- 5 files changed, 224 insertions(+), 78 deletions(-)
[geode] branch feature/GEODE-6143-7 updated (57cc068 -> c761c58)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-7 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 57cc068 GEODE-6143: remove PowerMock from HeapMemoryMonitorTest add a17d659 GEODE-6189: Remove unused windows scripts. add d3d420b Merge pull request #2989 from PurelyApplied/geode-6189 add c761c58 GEODE-6143: remove PowerMock from HeapMemoryMonitorTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (57cc068) \ N -- N -- N refs/heads/feature/GEODE-6143-7 (c761c58) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ci/scripts/windows/test-archive.sh | 130 - ci/scripts/windows/test-run.sh | 94 --- 2 files changed, 224 deletions(-) delete mode 100755 ci/scripts/windows/test-archive.sh delete mode 100755 ci/scripts/windows/test-run.sh
[geode] branch feature/GEODE-6143-7 updated (77cfa0f -> 2d6229c)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-7 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 77cfa0f GEODE-6143: remove PowerMock from HeapMemoryMonitorTest add 2d6229c GEODE-6143: remove PowerMock from HeapMemoryMonitorTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (77cfa0f) \ N -- N -- N refs/heads/feature/GEODE-6143-7 (2d6229c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../HeapMemoryMonitorDisableLowMemoryExceptionTest.java | 3 +-- .../HeapMemoryMonitorEnableLowMemoryExceptionTest.java | 12 2 files changed, 13 insertions(+), 2 deletions(-)
[geode] 01/01: Merge pull request #3005 from apache/feature/GEODE-6143-8
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git commit 03d5629f751fb15644c5e72b8e1c26133bc1bb55 Merge: 35041a5 6a1a302 Author: Xiaojian Zhou AuthorDate: Thu Dec 13 15:18:35 2018 -0800 Merge pull request #3005 from apache/feature/GEODE-6143-8 GEODE-6143: remove PowerMock from HeapMemoryMonitorTest .../apache/geode/internal/cache/control/MemoryThresholds.java | 6 +- .../geode/internal/cache/control/HeapMemoryMonitorTest.java| 10 +- 2 files changed, 6 insertions(+), 10 deletions(-)
[geode] branch feature/GEODE-6143-7 deleted (was 2d6229c)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-7 in repository https://gitbox.apache.org/repos/asf/geode.git. was 2d6229c GEODE-6143: remove PowerMock from HeapMemoryMonitorTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated (35041a5 -> 03d5629)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 35041a5 GEODE-6036: order sanctioned serializables lists (#2997) add 6a1a302 GEODE-6143: remove PowerMock from HeapMemoryMonitorTest new 03d5629 Merge pull request #3005 from apache/feature/GEODE-6143-8 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/geode/internal/cache/control/MemoryThresholds.java | 6 +- .../geode/internal/cache/control/HeapMemoryMonitorTest.java| 10 +- 2 files changed, 6 insertions(+), 10 deletions(-)
[geode] branch feature/GEODE-6143-8 deleted (was 6a1a302)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-8 in repository https://gitbox.apache.org/repos/asf/geode.git. was 6a1a302 GEODE-6143: remove PowerMock from HeapMemoryMonitorTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6143-5 updated (a4c76d4 -> d7c262b)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-5 in repository https://gitbox.apache.org/repos/asf/geode.git. discard a4c76d4 GEODE-6143: remove PowerMock from DataTypeJUnitTest add a17d659 GEODE-6189: Remove unused windows scripts. add d3d420b Merge pull request #2989 from PurelyApplied/geode-6189 add 8caf2c9 GEODE-6102: fail destroy data-source if in use (#2996) add 0b87a36 Geode-5793: LocatorDUnitTest. testNonSSLLocatorDiesWhenConnectingToSSLLocator (#2654) add 35041a5 GEODE-6036: order sanctioned serializables lists (#2997) add 6a1a302 GEODE-6143: remove PowerMock from HeapMemoryMonitorTest add 03d5629 Merge pull request #3005 from apache/feature/GEODE-6143-8 add e3e7c3a GEODE-6197: Fix create and destroy jdbc-mapping (#2994) add e6d2a6c GEODE-6122: Delete old Logging performance tests add e7181ee GEODE-5674: Stop picking ports randomly for tests (#3007) add 088fd4d GEODE-5971: refactor expiration config objects (#2991) add d7c262b GEODE-6143: remove PowerMock from DataTypeJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a4c76d4) \ N -- N -- N refs/heads/feature/GEODE-6143-5 (d7c262b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ci/scripts/windows/test-archive.sh | 130 -- ci/scripts/windows/test-run.sh | 94 -- .../integrationTest/resources/assembly_content.txt |7 +- .../cli/DestroyDataSourceCommandDUnitTest.java | 31 +- .../jdbc/internal/cli/CreateMappingCommand.java|2 +- .../internal/cli/DestroyDataSourceCommand.java | 36 + .../jdbc/internal/cli/DestroyMappingCommand.java |2 +- .../internal/cli/CreateMappingCommandTest.java |6 +- .../internal/cli/DestroyDataSourceCommandTest.java | 49 + .../internal/cli/DestroyMappingCommandTest.java|6 +- ...tServerHostNameVerificationDistributedTest.java | 73 +- .../apache/geode/distributed/LocatorDUnitTest.java | 1538 +--- .../distributed/LocatorUDPSecurityDUnitTest.java | 27 +- .../TcpServerBackwardCompatDUnitTest.java | 189 +-- .../geode/internal/cache/GridAdvisorDUnitTest.java | 1340 ++--- ...egionCommandPersistsConfigurationDUnitTest.java | 23 +- .../codeAnalysis/sanctionedDataSerializables.txt | 231 ++- .../apache/geode/cache/ExpirationAttributes.java |9 - .../configuration/ExpirationAttributesType.java| 155 -- .../cache/configuration/RegionAttributesType.java | 287 ++-- .../geode/distributed/DistributedSystem.java |2 +- .../distributed/internal/InternalLocator.java | 14 +- .../distributed/internal/tcpserver/TcpClient.java | 55 +- .../distributed/internal/tcpserver/TcpServer.java |4 +- .../internal/cache/control/MemoryThresholds.java |6 +- .../internal/cli/domain/RegionConfigFactory.java | 321 ++-- .../cli/functions/RegionAlterFunction.java | 42 - .../sanctioned-geode-core-serializables.txt|4 +- .../logging/LogWriterDisabledPerformanceTest.java | 46 - .../internal/logging/LogWriterPerformanceTest.java | 105 -- .../logging/LoggingPerformanceTestCase.java| 200 --- .../log4j/Log4J2DisabledPerformanceTest.java | 49 - .../logging/log4j/Log4J2PerformanceTest.java | 126 -- .../LogWriterLoggerDisabledPerformanceTest.java| 49 - .../log4j/LogWriterLoggerPerformanceTest.java | 125 -- .../geode/cache/configuration/CacheConfigTest.java | 38 +- .../cache/control/HeapMemoryMonitorTest.java | 10 +- .../geode/internal/offheap/DataTypeJUnitTest.java | 62 +- .../cli/domain/RegionConfigFactoryTest.java| 20 +- .../AnalyzeSerializablesJUnitTestBase.java |3 - .../geode/codeAnalysis/CompiledClassUtils.java | 18 +- .../apache/geode/internal/AvailablePortHelper.java |2 +- .../internal/logging/TestLogWriterFactory.java | 133 -- .../sanctioned-geode-lucene-serializables.txt |2 +- 44 files changed, 1889 insertions(+), 3782 deletions(-) delete mode 100755 ci/scripts/windows/test-archive.sh delete mode 100755 ci/scripts/windows/test-run.sh delete mode 100644 geode-core/src/main/java/org/apache/geode/cache/configuration/ExpirationAttributesType.java delete mode 10
[geode] branch feature/GEODE-6143-5 updated (d7c262b -> 59d7baa)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-5 in repository https://gitbox.apache.org/repos/asf/geode.git. omit d7c262b GEODE-6143: remove PowerMock from DataTypeJUnitTest add e8720ca GEODE-5786: Create txEntryState based on createIfAbsent condition. (#3008) add 66dd66d GEODE-6122: Use LogWriterLevel instead of InternalLogWriter add 334db40 GEODE-6195: Check if returned value is caused by a retried putIfAbsent operation (#2993) add 59d7baa GEODE-6143: remove PowerMock from DataTypeJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d7c262b) \ N -- N -- N refs/heads/feature/GEODE-6143-5 (59d7baa) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../geode/cache/ConnectionPoolDUnitTest.java | 6 +- .../internal/LocatorLoadBalancingDUnitTest.java| 3 - .../geode/cache30/PartitionedRegionDUnitTest.java | 5 +- .../apache/geode/distributed/LocatorDUnitTest.java | 11 +- ...erRepeatableReadTransactionDistributedTest.java | 220 + .../cache/execute/ColocationFailoverDUnitTest.java | 3 - .../RepeatableReadTransactionDistributedTest.java | 208 .../java/org/apache/geode/TXJUnitTest.java | 97 +++- .../client/internal/QueueManagerJUnitTest.java | 4 +- .../pooling/ConnectionManagerJUnitTest.java| 3 +- .../logging/MergeLogFilesIntegrationTest.java | 3 +- ...LogWriterAppenderWithLimitsIntegrationTest.java | 4 +- .../distributed/internal/DistributionConfig.java | 14 +- .../geode/distributed/internal/ProductUseLog.java | 4 +- .../apache/geode/internal/cache/EntriesSet.java| 6 +- .../geode/internal/cache/InternalDataView.java | 2 +- .../apache/geode/internal/cache/LocalRegion.java | 70 -- .../geode/internal/cache/LocalRegionDataView.java | 2 +- .../internal/cache/PausedTXStateProxyImpl.java | 2 +- .../org/apache/geode/internal/cache/TXEntry.java | 7 +- .../org/apache/geode/internal/cache/TXState.java | 35 +-- .../geode/internal/cache/TXStateInterface.java | 7 - .../geode/internal/cache/TXStateProxyImpl.java | 4 +- .../apache/geode/internal/cache/TXStateStub.java | 2 +- .../internal/cache/ValueComparisonHelper.java | 272 + .../cache/entries/AbstractRegionEntry.java | 250 +-- .../internal/cache/xmlcache/CacheCreation.java | 4 +- .../geode/internal/jta/TransactionUtils.java | 5 +- .../geode/internal/logging/LogFileParser.java | 3 +- .../geode/internal/logging/LoggingThreadGroup.java | 4 +- .../internal/logging/log4j/LogWriterLogger.java| 25 +- .../client/internal/OpExecutorImplJUnitTest.java | 3 +- .../internal/ServerLocatorJUnitTest.java | 4 +- .../geode/internal/cache/LocalRegionTest.java | 122 - .../internal/logging/ManagerLogWriterTest.java | 8 +- .../geode/internal/offheap/DataTypeJUnitTest.java | 18 +- 36 files changed, 1073 insertions(+), 367 deletions(-) create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerRepeatableReadTransactionDistributedTest.java create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/RepeatableReadTransactionDistributedTest.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/ValueComparisonHelper.java
[geode] branch feature/GEODE-6143-5 updated (59d7baa -> 28b3ed4)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-5 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 59d7baa GEODE-6143: remove PowerMock from DataTypeJUnitTest add f98547f GEODE-3613: Allocate unique ports to containers add deb8d1e GEODE-6209 Remove anchor/links for cache.xml subsections in docs (#3009) add 28b3ed4 GEODE-6143: remove PowerMock from DataTypeJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (59d7baa) \ N -- N -- N refs/heads/feature/GEODE-6143-5 (28b3ed4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../release/session/bin/modify_war | 12 +- geode-assembly/build.gradle| 4 +- geode-assembly/geode-assembly-test/build.gradle| 2 +- .../geode/session/tests/ContainerInstall.java | 94 ++-- .../geode/session/tests/ContainerManager.java | 22 +- .../geode/session/tests/ServerContainer.java | 49 +- .../geode/session/tests/TomcatContainer.java | 5 +- .../apache/geode/session/tests/TomcatInstall.java | 24 +- .../apache/geode/session/tests/CargoTestBase.java | 86 +++- .../tests/GenericAppServerClientServerTest.java| 43 +- .../session/tests/GenericAppServerContainer.java | 9 +- .../session/tests/GenericAppServerInstall.java | 29 +- .../tests/Jetty9CachingClientServerTest.java | 39 +- .../session/tests/Jetty9ClientServerTest.java | 28 +- .../geode/session/tests/Jetty9PeerToPeerTest.java | 28 +- .../org/apache/geode/session/tests/Jetty9Test.java | 42 -- .../session/tests/Tomcat6ClientServerTest.java | 25 +- .../apache/geode/session/tests/Tomcat6Test.java| 24 +- .../session/tests/Tomcat7ClientServerTest.java | 25 +- .../apache/geode/session/tests/Tomcat7Test.java| 24 +- .../session/tests/Tomcat8ClientServerTest.java | 25 +- .../apache/geode/session/tests/Tomcat8Test.java| 24 +- .../session/tests/Tomcat9ClientServerTest.java | 24 +- .../apache/geode/session/tests/Tomcat9Test.java| 24 +- .../session/tests/TomcatClientServerTest.java | 10 +- ...omcatSessionBackwardsCompatibilityTestBase.java | 52 +- .../source/subnavs/geode-subnav.erb| 538 + gradle/dependency-versions.properties | 2 +- 28 files changed, 322 insertions(+), 991 deletions(-) copy geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientDataSerializableObject.java => geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9PeerToPeerTest.java (60%) delete mode 100644 geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9Test.java
[geode] 01/01: GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6143-9
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5d3b00c5d0d9233a2844e301961c52ff5533c6dc
Author: zhouxh
AuthorDate: Mon Dec 17 15:03:47 2018 -0800
GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest
---
.../cache/ha/HARegionQueueIntegrationTest.java | 89 --
.../cache/tier/sockets/CacheClientNotifier.java| 2 +-
2 files changed, 31 insertions(+), 60 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
index 29def33..c2a643d 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.powermock.api.mockito.PowerMockito.mock;
import java.util.ArrayList;
import java.util.List;
@@ -45,13 +45,8 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
import util.TestException;
import org.apache.geode.CancelCriterion;
@@ -94,10 +89,6 @@ import
org.apache.geode.internal.concurrent.ConcurrentHashSet;
import org.apache.geode.internal.util.BlobHelper;
import
org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock;
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"javax.script.*", "javax.management.*",
"org.springframework.shell.event.*",
-"org.springframework.shell.core.*", "*.IntegrationTest"})
-@PrepareForTest({CacheClientNotifier.class})
public class HARegionQueueIntegrationTest {
private Cache cache;
@@ -117,10 +108,12 @@ public class HARegionQueueIntegrationTest {
dataRegion = createDataRegion();
ccn = createCacheClientNotifier();
member = createMember();
+HAContainerWrapper haContainerWrapper = (HAContainerWrapper)
ccn.getHaContainer();
}
@After
public void tearDown() throws Exception {
+ccn.shutdown(0);
cache.close();
}
@@ -133,9 +126,9 @@ public class HARegionQueueIntegrationTest {
}
private InternalCache createMockInternalCache() {
-InternalCache mockInternalCache = Mockito.mock(InternalCache.class);
-
doReturn(Mockito.mock(SystemTimer.class)).when(mockInternalCache).getCCPTimer();
-
doReturn(Mockito.mock(CancelCriterion.class)).when(mockInternalCache).getCancelCriterion();
+InternalCache mockInternalCache = mock(InternalCache.class);
+doReturn(mock(SystemTimer.class)).when(mockInternalCache).getCCPTimer();
+
doReturn(mock(CancelCriterion.class)).when(mockInternalCache).getCancelCriterion();
InternalDistributedSystem mockInteralDistributedSystem =
createMockInternalDistributedSystem();
doReturn(mockInteralDistributedSystem).when(mockInternalCache).getInternalDistributedSystem();
@@ -146,25 +139,24 @@ public class HARegionQueueIntegrationTest {
private InternalDistributedSystem createMockInternalDistributedSystem() {
InternalDistributedSystem mockInternalDistributedSystem =
-Mockito.mock(InternalDistributedSystem.class);
-DistributionManager mockDistributionManager =
Mockito.mock(DistributionManager.class);
+mock(InternalDistributedSystem.class);
+DistributionManager mockDistributionManager =
mock(DistributionManager.class);
-
doReturn(Mockito.mock(InternalDistributedMember.class)).when(mockInternalDistributedSystem)
+
doReturn(mock(InternalDistributedMember.class)).when(mockInternalDistributedSystem)
.getDistributedMember();
-
doReturn(Mockito.mock(Statistics.class)).when(mockInternalDistributedSystem)
+doReturn(mock(Statistics.class)).when(mockInternalDistributedSystem)
.createAtomicStatistics(any(StatisticsType.class), any(String.class));
-
doReturn(Mockito.mock(DistributionConfig.class)).when(mockDistributionManager).getConfig();
+
doReturn(mock(DistributionConfig.class)).when(mockDistributionManager).getConfig();
doReturn(mockDistributionManager).when(mockInternalDistributedSystem).getDistributionManager()
[geode] branch feature/GEODE-6143-9 created (now 5d3b00c)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-9 in repository https://gitbox.apache.org/repos/asf/geode.git. at 5d3b00c GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest This branch includes the following new commits: new 5d3b00c GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch feature/GEODE-6143-9 updated (5d3b00c -> 8c09b90)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-9 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 5d3b00c GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest add 8c09b90 GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5d3b00c) \ N -- N -- N refs/heads/feature/GEODE-6143-9 (8c09b90) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[geode] branch feature/GEODE-6143-5 updated (28b3ed4 -> ff08013)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-5 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 28b3ed4 GEODE-6143: remove PowerMock from DataTypeJUnitTest add ea62d29 GEODE-6177: WAN Event processing continues after authentication fails add 10668f5 GEODE-6177: wait for queue processing in test add 14fee9a GEODE-6177: Spotless add 213e07f GEODE-6177: make test hook visible across threads add ff08013 GEODE-6143: remove PowerMock from DataTypeJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (28b3ed4) \ N -- N -- N refs/heads/feature/GEODE-6143-5 (ff08013) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../geode/pdx/PdxRegistryMismatchException.java| 2 +- .../wan/misc/NewWanAuthenticationDUnitTest.java| 637 - .../wan/GatewaySenderEventRemoteDispatcher.java| 145 +++-- 3 files changed, 454 insertions(+), 330 deletions(-)
[geode] branch feature/GEODE-6143-9 updated (8c09b90 -> 678071d)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-9 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 8c09b90 GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest add ea62d29 GEODE-6177: WAN Event processing continues after authentication fails add 10668f5 GEODE-6177: wait for queue processing in test add 14fee9a GEODE-6177: Spotless add 213e07f GEODE-6177: make test hook visible across threads add 678071d GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8c09b90) \ N -- N -- N refs/heads/feature/GEODE-6143-9 (678071d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../geode/pdx/PdxRegistryMismatchException.java| 2 +- .../wan/misc/NewWanAuthenticationDUnitTest.java| 637 - .../wan/GatewaySenderEventRemoteDispatcher.java| 145 +++-- 3 files changed, 454 insertions(+), 330 deletions(-)
[geode] branch feature/GEODE-6143-5 deleted (was ff08013)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-5 in repository https://gitbox.apache.org/repos/asf/geode.git. was ff08013 GEODE-6143: remove PowerMock from DataTypeJUnitTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated (411b22c -> b2492bd)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 411b22c GEODE-6198: Add geode-all-bom for dependency versioning (#2995) add ff08013 GEODE-6143: remove PowerMock from DataTypeJUnitTest new b2492bd Merge pull request #2990 from apache/feature/GEODE-6143-5 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../geode/internal/offheap/DataTypeJUnitTest.java | 142 + 1 file changed, 87 insertions(+), 55 deletions(-)
[geode] 01/01: Merge pull request #2990 from apache/feature/GEODE-6143-5
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git commit b2492bdc93b0a04e657c36454874226bf0c1da40 Merge: 411b22c ff08013 Author: Xiaojian Zhou AuthorDate: Mon Dec 17 17:38:10 2018 -0800 Merge pull request #2990 from apache/feature/GEODE-6143-5 GEODE-6143: remove PowerMock from DataTypeJUnitTest .../geode/internal/offheap/DataTypeJUnitTest.java | 142 + 1 file changed, 87 insertions(+), 55 deletions(-)
[geode] branch feature/GEODE-6143-10 created (now e26a1e5)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-10 in repository https://gitbox.apache.org/repos/asf/geode.git. at e26a1e5 GEODE-6143: remove PowerMock from import This branch includes the following new commits: new e26a1e5 GEODE-6143: remove PowerMock from import The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-6143: remove PowerMock from import
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a commit to branch feature/GEODE-6143-10 in repository https://gitbox.apache.org/repos/asf/geode.git commit e26a1e5244981c20abc1e2b4436770112a921c9b Author: zhouxh AuthorDate: Tue Dec 18 15:41:06 2018 -0800 GEODE-6143: remove PowerMock from import --- .../geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java | 2 +- .../apache/geode/management/internal/beans/ManagementAdapterTest.java | 2 +- .../internal/cache/persistence/PersistenceInitialImageAdvisorTest.java | 1 - .../geode/management/internal/cli/commands/ListGatewayCommandTest.java | 2 +- .../test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java| 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java index 0c3afb8..27d2b1f 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java @@ -24,7 +24,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.powermock.api.mockito.PowerMockito.when; +import static org.mockito.Mockito.when; import java.io.IOException; import java.net.ConnectException; diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java index 40a4157..677cc9b 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java @@ -14,8 +14,8 @@ */ package org.apache.geode.management.internal.beans; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.powermock.api.mockito.PowerMockito.doReturn; import java.io.File; import java.io.FileNotFoundException; diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java index f976fd3..82a45cf 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java @@ -32,7 +32,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.powermock.api.mockito.PowerMockito.doThrow; import java.time.Duration; import java.util.HashSet; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java index 5d0c31f..5a7d0a7 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java @@ -17,9 +17,9 @@ package org.apache.geode.management.internal.cli.commands; import static java.util.stream.Collectors.toSet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import static org.powermock.api.mockito.PowerMockito.doReturn; import java.util.Collections; import java.util.HashMap; diff --git a/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java b/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java index b0de788..c1b148f 100644 --- a/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java +++ b/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java @@ -20,9 +20,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.powermock.api.mockito.PowerMockito.doNothing; import
[geode] branch feature/GEODE-6143-9 updated (678071d -> e4f7df2)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch feature/GEODE-6143-9
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard 678071d GEODE-6143: remove PowerMock from
HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from
HARegionQueueJUnitTest
add 411b22c GEODE-6198: Add geode-all-bom for dependency versioning
(#2995)
add ff08013 GEODE-6143: remove PowerMock from DataTypeJUnitTest
add b2492bd Merge pull request #2990 from apache/feature/GEODE-6143-5
add f2e8db7 GEODE-6216 add netstat to images for NetstatDUnitTest (#3014)
add ebde19f GEODE-6186: Reduced the number of EntryNotFoundExceptions
thrown during wan conflation
add b6fa533 GEODE-6143: remove PowerMock from import (#3019)
add e536d19 Anternative fix for CI to #3018
add 693d178 Merge pull request #3020 from
PurelyApplied/alternate-fix-ci-images
add bd9c284 GEODE-6194: add composite keys to jdbc (#3015)
add e4f7df2 GEODE-6143: remove PowerMock from
HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from
HARegionQueueJUnitTest
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (678071d)
\
N -- N -- N refs/heads/feature/GEODE-6143-9 (e4f7df2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
boms/geode-all-bom/build.gradle| 173 +
.../src/test/resources/expected-pom.xml| 712 +
boms/geode-client-bom/build.gradle | 4 +-
.../src/test/{ => resources}/expected-pom.xml | 0
build.gradle | 3 +
ci/docker/Dockerfile | 1 +
ci/images/google-geode-builder/scripts/setup.sh| 1 +
ci/images/test-container/Dockerfile| 1 +
extensions/build.gradle| 1 +
extensions/geode-modules-assembly/build.gradle | 3 +
.../geode-modules-session-internal/build.gradle| 9 +-
extensions/geode-modules-session/build.gradle | 23 +-
extensions/geode-modules-test/build.gradle | 11 +-
extensions/geode-modules-tomcat7/build.gradle | 29 +-
extensions/geode-modules-tomcat8/build.gradle | 23 +-
extensions/geode-modules-tomcat9/build.gradle | 15 +-
extensions/geode-modules/build.gradle | 19 +-
extensions/session-testing-war/build.gradle| 5 +-
geode-assembly/build.gradle| 26 +-
geode-assembly/geode-assembly-test/build.gradle| 17 +-
.../integrationTest/resources/expected_jars.txt| 7 +
geode-assembly/src/test/resources/expected-pom.xml | 11 +
geode-common/build.gradle | 7 +-
geode-common/src/test/resources/expected-pom.xml | 11 +
geode-concurrency-test/build.gradle| 7 +-
.../src/test/resources/expected-pom.xml| 13 +-
geode-connectors/build.gradle | 55 +-
.../jdbc/JdbcAsyncWriterIntegrationTest.java | 116 +++-
.../geode/connectors/jdbc/JdbcDistributedTest.java | 41 +-
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 35 +-
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 103 ++-
.../TableMetaDataManagerIntegrationTest.java | 14 +-
.../jdbc/internal/TestConfigService.java | 17 +-
.../connectors/jdbc/internal/EntryColumnData.java | 9 +-
.../geode/connectors/jdbc/internal/SqlHandler.java | 89 ++-
.../jdbc/internal/SqlStatementFactory.java | 70 +-
.../connectors/jdbc/internal/TableMetaData.java| 11 +-
.../jdbc/internal/TableMetaDataManager.java| 49 +-
.../jdbc/internal/TableMetaDataView.java | 4 +-
.../jdbc/internal/cli/CreateMappingCommand.java| 2 +-
.../connectors/jdbc/internal/SqlHandlerTest.java | 253 +++-
.../jdbc/internal/SqlStatementFactoryTest.java | 81 ++-
.../jdbc/internal/SqlToPdxInstanceCreatorTest.java | 5 +-
.../jdbc/internal/TableMetaDataManagerTest.java| 76 ++-
.../src/test/resources/expected-pom.xml| 17 +-
geode-core/build.gradle| 143 +++--
.../AutoConnectionSourceImplJUnitTest.java | 2 +-
.../cache/ha/HARegionQueueIntegrationTest.java | 1 -
.../internal/beans/ManagementAdapterTest.java | 2 +-
.../geode/internal/cache/BucketRe
[geode] branch feature/GEODE-6143-9 updated (e4f7df2 -> d41ab83)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch feature/GEODE-6143-9
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard e4f7df2 GEODE-6143: remove PowerMock from
HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from
HARegionQueueJUnitTest
add fff4eb7 GEODE-6103 RegionCreateFunction takes RegionConfig in
argument (#2998)
add d5bcc53 GEODE-6223: Add resolveDependencies to Build test job.
add 2242de9 Merge pull request #3021 from PurelyApplied/geode-6223
add d41ab83 GEODE-6143: remove PowerMock from
HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from
HARegionQueueJUnitTest
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e4f7df2)
\
N -- N -- N refs/heads/feature/GEODE-6143-9 (d41ab83)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
ci/scripts/execute_build.sh| 2 +-
.../jdbc/internal/cli/CreateDataSourceCommand.java | 17 +-
.../cli/commands/CreateRegionCommandDUnitTest.java | 98 -
...egionCommandPersistsConfigurationDUnitTest.java | 14 +-
.../CreateRegionCommandIntegrationTest.java| 17 +-
.../org/apache/geode/cache/AttributesFactory.java | 5 +-
.../java/org/apache/geode/cache/DataPolicy.java| 18 +
.../org/apache/geode/cache/EvictionAction.java | 4 +-
.../org/apache/geode/cache/EvictionAlgorithm.java | 4 +-
.../org/apache/geode/cache/EvictionAttributes.java | 13 +-
.../org/apache/geode/cache/ExpirationAction.java | 15 +
.../apache/geode/cache/PartitionAttributes.java| 4 +-
.../java/org/apache/geode/cache/RegionFactory.java | 2 +-
.../geode/cache/configuration/CacheElement.java| 4 +
.../geode/cache/configuration/DeclarableType.java | 3 +-
.../geode/cache/configuration/DiskDirsType.java| 3 +-
.../configuration/RegionAttributesDataPolicy.java | 4 +-
.../RegionAttributesIndexUpdateType.java | 4 +-
.../cache/configuration/RegionAttributesType.java | 17 +-
.../geode/cache/configuration/RegionConfig.java| 5 +-
.../internal/cache/EvictionAttributesImpl.java | 66
.../internal/cache/PartitionAttributesImpl.java| 64 +++
.../internal/cache/execute/InternalFunction.java | 1 -
.../geode/management/internal/cli/CliUtil.java | 8 +-
.../cli/commands/CreateJndiBindingCommand.java | 17 +-
.../internal/cli/commands/CreateRegionCommand.java | 433 +++--
.../internal/cli/domain/ExpirationArgs.java| 59 +++
.../internal/cli/domain/PartitionArgs.java | 92 +
.../internal/cli/domain/RegionConfigFactory.java | 334 +++-
.../cli/exceptions/EntityExistsException.java | 35 +-
...tionArgs.java => CreateRegionFunctionArgs.java} | 27 +-
.../cli/functions/GatewaySenderCreateFunction.java | 53 +--
.../cli/functions/RegionCreateFunction.java| 411 +--
.../internal/cli/functions/RegionFunctionArgs.java | 32 --
.../management/internal/cli/i18n/CliStrings.java | 54 +--
.../management/internal/cli/util/RegionPath.java | 6 +-
.../sanctioned-geode-core-serializables.txt| 11 +
.../cli/commands/CreateRegionCommandTest.java | 53 +--
.../cli/domain/RegionConfigFactoryTest.java| 211 +++---
.../cli/commands/CreateRegionCommandDUnitTest.java | 39 +-
40 files changed, 1394 insertions(+), 865 deletions(-)
create mode 100644
geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/ExpirationArgs.java
create mode 100644
geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionArgs.java
copy
geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/{DestroyDiskStoreFunctionArgs.java
=> CreateRegionFunctionArgs.java} (60%)
[geode] branch feature/GEODE-6143-9 updated (d41ab83 -> ddbe4aa)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-9 in repository https://gitbox.apache.org/repos/asf/geode.git. discard d41ab83 GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest add 947c4db GEODE-6215: Making session meta-data region distributed (#3012) add ddbe4aa GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d41ab83) \ N -- N -- N refs/heads/feature/GEODE-6143-9 (ddbe4aa) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: extensions/geode-modules/build.gradle | 7 + .../util/ClientServerSessionCacheDUnitTest.java| 267 +++ .../geode/modules/util/CreateRegionFunction.java | 6 +- .../geode/modules/util/SessionCustomExpiry.java| 4 + .../geode/session/tests/ContainerManager.java | 7 + .../session/tests/TomcatClientServerTest.java | 18 +- .../Tomcat8ClientServerRollingUpgradeTest.java | 293 + .../internal/ClusterDistributionManager.java | 5 + .../distributed/internal/DistributionManager.java | 2 + .../internal/LonerDistributionManager.java | 5 + .../cache/xmlcache/RegionAttributesCreation.java | 10 +- 11 files changed, 615 insertions(+), 9 deletions(-) create mode 100644 extensions/geode-modules/src/distributedTest/java/org/apache/geode/modules/util/ClientServerSessionCacheDUnitTest.java create mode 100644 geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
[geode] branch feature/GEODE-6143-9 updated (ddbe4aa -> 34ab61b)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-9 in repository https://gitbox.apache.org/repos/asf/geode.git. discard ddbe4aa GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest add ba2 GEODE-6227 add lsof to test images for NetstatDUnitTest (#3024) add 1813f8c GEODE-6154: Remove optional from geode-core spring-shell dependency (#2961) add a8ef73c GEODE-6224: Do not use internal BOM to resolve versions. (#3022) add 34ab61b GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ddbe4aa) \ N -- N -- N refs/heads/feature/GEODE-6143-9 (34ab61b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: boms/geode-all-bom/build.gradle| 143 + ci/docker/Dockerfile | 1 + ci/images/google-geode-builder/scripts/setup.sh| 1 + ci/images/test-container/Dockerfile| 1 + geode-assembly/build.gradle| 3 - geode-assembly/src/test/resources/expected-pom.xml | 669 +++- geode-common/src/test/resources/expected-pom.xml | 669 +++- .../src/test/resources/expected-pom.xml| 669 +++- .../src/test/resources/expected-pom.xml| 669 +++- geode-core/build.gradle| 1 - geode-core/src/test/resources/expected-pom.xml | 670 - geode-cq/src/test/resources/expected-pom.xml | 669 +++- geode-dunit/src/test/resources/expected-pom.xml| 669 +++- .../src/test/resources/expected-pom.xml| 669 +++- geode-json/src/test/resources/expected-pom.xml | 669 +++- geode-junit/src/test/resources/expected-pom.xml| 669 +++- geode-lucene/src/test/resources/expected-pom.xml | 669 +++- .../src/test/resources/expected-pom.xml| 669 +++- geode-protobuf/src/test/resources/expected-pom.xml | 669 +++- geode-pulse/src/test/resources/expected-pom.xml| 669 +++- .../src/test/resources/expected-pom.xml| 669 +++- geode-wan/src/test/resources/expected-pom.xml | 669 +++- geode-web-api/src/test/resources/expected-pom.xml | 669 +++- geode-web/src/test/resources/expected-pom.xml | 669 +++- gradle/geode-dependency-management.gradle | 155 - 25 files changed, 12130 insertions(+), 218 deletions(-)
[geode] branch feature/GEODE-6143-9 updated (34ab61b -> c12018f)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-9 in repository https://gitbox.apache.org/repos/asf/geode.git. omit 34ab61b GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest add c12018f GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (34ab61b) \ N -- N -- N refs/heads/feature/GEODE-6143-9 (c12018f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[geode] branch feature/GEODE-6143-9 deleted (was c12018f)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-9 in repository https://gitbox.apache.org/repos/asf/geode.git. was c12018f GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated (a8ef73c -> c588614)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from a8ef73c GEODE-6224: Do not use internal BOM to resolve versions. (#3022) add c12018f GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest add c588614 Merge pull request #3013 from apache/feature/GEODE-6143-9 No new revisions were added by this update. Summary of changes: .../cache/ha/HARegionQueueIntegrationTest.java | 88 +++--- .../internal/cache/ha/HARegionQueueJUnitTest.java | 2 +- .../cache/tier/sockets/CacheClientNotifier.java| 2 +- 3 files changed, 31 insertions(+), 61 deletions(-)
[geode] branch feature/GEODE-6143-10 deleted (was e26a1e5)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-10 in repository https://gitbox.apache.org/repos/asf/geode.git. was e26a1e5 GEODE-6143: remove PowerMock from import The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6143-11 created (now aa33526)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-11 in repository https://gitbox.apache.org/repos/asf/geode.git. at aa33526 GEODE-6143: remove PowerMock for GatewayReceiverXmlParsingValidationsJUnitTest This branch includes the following new commits: new aa33526 GEODE-6143: remove PowerMock for GatewayReceiverXmlParsingValidationsJUnitTest The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-6143: remove PowerMock for GatewayReceiverXmlParsingValidationsJUnitTest
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6143-11
in repository https://gitbox.apache.org/repos/asf/geode.git
commit aa3352662fe2cedc29bbbfed9272961a309e4748
Author: zhouxh
AuthorDate: Fri Dec 21 11:05:18 2018 -0800
GEODE-6143: remove PowerMock for
GatewayReceiverXmlParsingValidationsJUnitTest
---
...ewayReceiverXmlParsingValidationsJUnitTest.java | 55
.../geode/internal/cache/wan/MyWANFactoryImpl.java | 144 +
apache.geode.internal.cache.wan.spi.WANFactory | 15 +++
3 files changed, 181 insertions(+), 33 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
index 9461abd..e8592b1 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
@@ -16,48 +16,38 @@ package org.apache.geode.internal.cache.wan;
import static
org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.internal.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Iterator;
+import java.util.ServiceLoader;
import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.modules.junit4.PowerMockRunnerDelegate;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheXmlException;
-import org.apache.geode.cache.wan.GatewayReceiverFactory;
+import org.apache.geode.cache.wan.GatewayReceiver;
+import org.apache.geode.internal.cache.wan.spi.WANFactory;
import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
import org.apache.geode.util.test.TestUtil;
-@RunWith(PowerMockRunner.class)
@Category({WanTest.class})
-@PrepareForTest(WANServiceProvider.class)
-@PowerMockRunnerDelegate(Parameterized.class)
-@PowerMockIgnore({"javax.management.*", "javax.security.*",
"*.IntegrationTest"})
+@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class GatewayReceiverXmlParsingValidationsJUnitTest {
private Cache cache;
- private GatewayReceiverFactory receiverFactory;
@Parameterized.Parameter
public static String validationStrategy;
@@ -70,13 +60,6 @@ public class GatewayReceiverXmlParsingValidationsJUnitTest {
return Arrays.asList("DTD", "XSD");
}
- @Before
- public void setUp() throws Exception {
-mockStatic(WANServiceProvider.class);
-receiverFactory = spy(GatewayReceiverFactory.class);
-
when(WANServiceProvider.createGatewayReceiverFactory(any())).thenReturn(receiverFactory);
- }
-
@Test(expected = CacheXmlException.class)
public void multipleReceiversShouldThrowException() {
String cacheXmlFileName = TestUtil.getResourcePath(getClass(),
@@ -90,15 +73,20 @@ public class GatewayReceiverXmlParsingValidationsJUnitTest {
getClass().getSimpleName() + "." + testName.getMethodName() +
".cache.xml");
cache = new CacheFactory().set(MCAST_PORT, "0").set(CACHE_XML_FILE,
cacheXmlFileName).create();
-assertThat(cache.getGatewayReceivers()).isNotNull();
-verify(receiverFactory, times(1)).setEndPort(1501);
-verify(receiverFactory, times(1)).setStartPort(1500);
-verify(receiverFactory, times(1)).setManualStart(true);
-verify(receiverFactory, times(1)).setSocketBufferSize(32768);
-verify(receiverFactory, times(1)).setBindAddress("localhost");
-verify(receiverF
[geode] 01/01: GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidationsJUnitTest
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6143-12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ce9c9e395539104af9708979dcbe17a2135e33e1
Author: zhouxh
AuthorDate: Fri Dec 21 15:00:02 2018 -0800
GEODE-6143: remove PowerMock from
GatewayReceiverXmlParsingValidationsJUnitTest
---
...ewayReceiverXmlParsingValidationsJUnitTest.java | 52 +++-
.../geode/internal/cache/wan/MyWANFactoryImpl.java | 144 +
...nsJUnitTest.correctConfiguration[DTD].cache.xml | 0
...nsJUnitTest.correctConfiguration[XSD].cache.xml | 0
...pleReceiversShouldThrowException[DTD].cache.xml | 0
...pleReceiversShouldThrowException[XSD].cache.xml | 0
6 files changed, 165 insertions(+), 31 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
b/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
similarity index 66%
rename from
geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
rename to
geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
index 9461abd..3501dd3 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
+++
b/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
@@ -16,44 +16,36 @@ package org.apache.geode.internal.cache.wan;
import static
org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.internal.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Iterator;
+import java.util.ServiceLoader;
import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.modules.junit4.PowerMockRunnerDelegate;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheXmlException;
+import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.cache.wan.GatewayReceiverFactory;
+import org.apache.geode.internal.cache.wan.spi.WANFactory;
import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
import org.apache.geode.util.test.TestUtil;
-@RunWith(PowerMockRunner.class)
@Category({WanTest.class})
-@PrepareForTest(WANServiceProvider.class)
-@PowerMockRunnerDelegate(Parameterized.class)
-@PowerMockIgnore({"javax.management.*", "javax.security.*",
"*.IntegrationTest"})
+@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class GatewayReceiverXmlParsingValidationsJUnitTest {
private Cache cache;
@@ -70,13 +62,6 @@ public class GatewayReceiverXmlParsingValidationsJUnitTest {
return Arrays.asList("DTD", "XSD");
}
- @Before
- public void setUp() throws Exception {
-mockStatic(WANServiceProvider.class);
-receiverFactory = spy(GatewayReceiverFactory.class);
-
when(WANServiceProvider.createGatewayReceiverFactory(any())).thenReturn(receiverFactory);
- }
-
@Test(expected = CacheXmlException.class)
public void multipleReceiversShouldThrowException() {
String cacheXmlFileName = TestUtil.getResourcePath(getClass(),
@@ -90,15 +75,20 @@ public class GatewayReceiverXmlParsingValidationsJUnitTest {
getClass().getSimpleName() + "." + testName.getMethodName() +
".cache.xml");
cache = new CacheFactory().set(MCAST_PORT, "0").set(CACHE_XML_FILE,
cacheXmlFileName).create();
-assertThat(cache.getGatewayReceivers()).isNotNull();
-verify(receiverFactory, time
[geode] branch feature/GEODE-6143-12 created (now ce9c9e3)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-12 in repository https://gitbox.apache.org/repos/asf/geode.git. at ce9c9e3 GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidationsJUnitTest This branch includes the following new commits: new ce9c9e3 GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidationsJUnitTest The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidationsJUnitTest
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6143-12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0b22af12981b4cf4b695aa6497d8029797f9185c
Author: zhouxh
AuthorDate: Fri Dec 21 15:00:02 2018 -0800
GEODE-6143: remove PowerMock from
GatewayReceiverXmlParsingValidationsJUnitTest
---
...ewayReceiverXmlParsingValidationsJUnitTest.java | 110
...ewayReceiverXmlParsingValidationsJUnitTest.java | 190 +
...nsJUnitTest.correctConfiguration[DTD].cache.xml | 0
...nsJUnitTest.correctConfiguration[XSD].cache.xml | 0
...pleReceiversShouldThrowException[DTD].cache.xml | 0
...pleReceiversShouldThrowException[XSD].cache.xml | 0
6 files changed, 190 insertions(+), 110 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
deleted file mode 100644
index 9461abd..000
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
+++ /dev/null
@@ -1,110 +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.internal.cache.wan;
-
-import static
org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.modules.junit4.PowerMockRunnerDelegate;
-
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.CacheXmlException;
-import org.apache.geode.cache.wan.GatewayReceiverFactory;
-import org.apache.geode.test.junit.categories.WanTest;
-import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import org.apache.geode.util.test.TestUtil;
-
-@RunWith(PowerMockRunner.class)
-@Category({WanTest.class})
-@PrepareForTest(WANServiceProvider.class)
-@PowerMockRunnerDelegate(Parameterized.class)
-@PowerMockIgnore({"javax.management.*", "javax.security.*",
"*.IntegrationTest"})
-@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
-public class GatewayReceiverXmlParsingValidationsJUnitTest {
- private Cache cache;
- private GatewayReceiverFactory receiverFactory;
-
- @Parameterized.Parameter
- public static String validationStrategy;
-
- @Rule
- public TestName testName = new SerializableTestName();
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection strategies() throws Exception {
-return Arrays.asList("DTD", "XSD");
- }
-
- @Before
- public void setUp() throws Exception {
-mockStatic(WANServiceProvider.class);
-receiverFactory = spy(GatewayReceiverFactory.class);
-
when(WANServiceProvider.createGatewayReceiverFactory(any())).thenReturn(receiverFactory);
- }
-
- @Test(expected = CacheXmlException.class)
- public void multipleReceiversShouldThrowException() {
-String cacheXmlFileName = TestUtil.getResourcePath(getClass(),
-getClass().get
[geode] branch feature/GEODE-6143-12 updated (ce9c9e3 -> 0b22af1)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-12 in repository https://gitbox.apache.org/repos/asf/geode.git. discard ce9c9e3 GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidationsJUnitTest new 0b22af1 GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidationsJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ce9c9e3) \ N -- N -- N refs/heads/feature/GEODE-6143-12 (0b22af1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...ewayReceiverXmlParsingValidationsJUnitTest.java | 90 + .../geode/internal/cache/wan/MyWANFactoryImpl.java | 144 - 2 files changed, 90 insertions(+), 144 deletions(-) delete mode 100644 geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/MyWANFactoryImpl.java
[geode] branch feature/GEODE-6143-13 created (now ef71a46)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-13 in repository https://gitbox.apache.org/repos/asf/geode.git. at ef71a46 GEODE-6143: remove PowerMock from TypeUtilsJUnitTest This branch includes the following new commits: new ef71a46 GEODE-6143: remove PowerMock from TypeUtilsJUnitTest The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-6143: remove PowerMock from TypeUtilsJUnitTest
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6143-13
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ef71a461c944987e6f73ae95f43839e5538517a0
Author: zhouxh
AuthorDate: Fri Dec 21 17:11:22 2018 -0800
GEODE-6143: remove PowerMock from TypeUtilsJUnitTest
---
.../query/internal/types/TypeUtilsJUnitTest.java | 141 +++--
1 file changed, 18 insertions(+), 123 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
index 2553370..a1f23e5 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
@@ -56,11 +56,6 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.Region;
@@ -75,9 +70,6 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.pdx.internal.PdxInstanceEnum;
import org.apache.geode.pdx.internal.PdxString;
-@PowerMockIgnore("*.UnitTest")
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(TypeUtils.class)
public class TypeUtilsJUnitTest {
private final List equalityOperators =
Arrays.stream(new int[] {TOK_EQ,
TOK_NE}).boxed().collect(Collectors.toList());
@@ -239,41 +231,31 @@ public class TypeUtilsJUnitTest {
@Test
public void
isTypeConvertibleShouldDelegateToIsAssignableFromMethodForNonWrappedTypesAndNullSourceType()
{
-PowerMockito.spy(TypeUtils.class);
-
// Special classes (Enum, Object, Class, Interface) and srcType as null.
assertThat(TypeUtils.isTypeConvertible(null, Enum.class)).isTrue();
-PowerMockito.verifyStatic(TypeUtils.class, times(1));
-TypeUtils.isAssignableFrom(Enum.class, Object.class);
+assertThat(TypeUtils.isAssignableFrom(Enum.class, Object.class)).isTrue();
assertThat(TypeUtils.isTypeConvertible(null, Object.class)).isTrue();
-PowerMockito.verifyStatic(TypeUtils.class, times(1));
-TypeUtils.isAssignableFrom(Object.class, Object.class);
+assertThat(TypeUtils.isAssignableFrom(Object.class,
Object.class)).isTrue();
assertThat(TypeUtils.isTypeConvertible(null, Class.class)).isTrue();
-PowerMockito.verifyStatic(TypeUtils.class, times(1));
-TypeUtils.isAssignableFrom(Class.class, Object.class);
+assertThat(TypeUtils.isAssignableFrom(Class.class, Object.class)).isTrue();
assertThat(TypeUtils.isTypeConvertible(null, TimeUnit.class)).isTrue();
-PowerMockito.verifyStatic(TypeUtils.class, times(1));
-TypeUtils.isAssignableFrom(TimeUnit.class, Object.class);
+assertThat(TypeUtils.isAssignableFrom(TimeUnit.class,
Object.class)).isTrue();
assertThat(TypeUtils.isTypeConvertible(null, Serializable.class)).isTrue();
-PowerMockito.verifyStatic(TypeUtils.class, times(1));
-TypeUtils.isAssignableFrom(Serializable.class, Object.class);
+assertThat(TypeUtils.isAssignableFrom(Serializable.class,
Object.class)).isTrue();
// Regular, non java wrapped classes.
assertThat(TypeUtils.isTypeConvertible(AtomicInteger.class,
Number.class)).isTrue();
-PowerMockito.verifyStatic(TypeUtils.class, times(1));
-TypeUtils.isAssignableFrom(AtomicInteger.class, Number.class);
+assertThat(TypeUtils.isAssignableFrom(AtomicInteger.class,
Number.class)).isTrue();
assertThat(TypeUtils.isTypeConvertible(NumericComparator.class,
Comparator.class)).isTrue();
-PowerMockito.verifyStatic(TypeUtils.class, times(1));
-TypeUtils.isAssignableFrom(NumericComparator.class, Comparator.class);
+assertThat(TypeUtils.isAssignableFrom(NumericComparator.class,
Comparator.class)).isTrue();
assertThat(TypeUtils.isTypeConvertible(PartitionedRegion.class,
LocalRegion.class)).isTrue();
-PowerMockito.verifyStatic(TypeUtils.class, times(1));
-TypeUtils.isAssignableFrom(PartitionedRegion.class, LocalRegion.class);
+assertThat(TypeUtils.isAssignableFrom(PartitionedRegion.class,
LocalRegion.class)).isTrue();
}
@Test
@@ -543,13 +525,6 @@ public class TypeUtilsJUnitTest {
@Test
public void comparingTemporalValuesShouldDelegateToTemporalComparator() {
-// We use spies to track the execution of wanted and unwanted methods.
-PowerMockito.spy(TypeUtils.class);
-NumericComparator numericComparator = spy(NumericComparator.class);
-TemporalComparator temporalCompar
[geode] 01/01: Merge pull request #3037 from apache/feature/GEODE-6143-12
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git commit 09f437bcd65aacd2855491585c16d41e496e26a1 Merge: 787236c 0b22af1 Author: Xiaojian Zhou AuthorDate: Thu Jan 3 10:37:59 2019 -0800 Merge pull request #3037 from apache/feature/GEODE-6143-12 GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidation… ...ewayReceiverXmlParsingValidationsJUnitTest.java | 110 ...ewayReceiverXmlParsingValidationsJUnitTest.java | 190 + ...nsJUnitTest.correctConfiguration[DTD].cache.xml | 0 ...nsJUnitTest.correctConfiguration[XSD].cache.xml | 0 ...pleReceiversShouldThrowException[DTD].cache.xml | 0 ...pleReceiversShouldThrowException[XSD].cache.xml | 0 6 files changed, 190 insertions(+), 110 deletions(-)
[geode] branch develop updated (787236c -> 09f437b)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 787236c GEODE-6143: Remove PowerMock from ExecuteFunction tests
(#3045)
add 0b22af1 GEODE-6143: remove PowerMock from
GatewayReceiverXmlParsingValidationsJUnitTest
new 09f437b Merge pull request #3037 from apache/feature/GEODE-6143-12
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...ewayReceiverXmlParsingValidationsJUnitTest.java | 110
...ewayReceiverXmlParsingValidationsJUnitTest.java | 190 +
...nsJUnitTest.correctConfiguration[DTD].cache.xml | 0
...nsJUnitTest.correctConfiguration[XSD].cache.xml | 0
...pleReceiversShouldThrowException[DTD].cache.xml | 0
...pleReceiversShouldThrowException[XSD].cache.xml | 0
6 files changed, 190 insertions(+), 110 deletions(-)
delete mode 100644
geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
create mode 100644
geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
rename {geode-core =>
geode-wan}/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.correctConfiguration[DTD].cache.xml
(100%)
rename {geode-core =>
geode-wan}/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.correctConfiguration[XSD].cache.xml
(100%)
rename {geode-core =>
geode-wan}/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.multipleReceiversShouldThrowException[DTD].cache.xml
(100%)
rename {geode-core =>
geode-wan}/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.multipleReceiversShouldThrowException[XSD].cache.xml
(100%)
[geode] branch feature/GEODE-6143-12 deleted (was 0b22af1)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-12 in repository https://gitbox.apache.org/repos/asf/geode.git. was 0b22af1 GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidationsJUnitTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6143-13 updated (ef71a46 -> 529a800)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-13 in repository https://gitbox.apache.org/repos/asf/geode.git. discard ef71a46 GEODE-6143: remove PowerMock from TypeUtilsJUnitTest add 76c6122 Fixes JAVA_HOME for jstack execution for hung tests. add 1895802 GEODE-3205: Fix timestamp warning add cbf071d GEODE-3205: Cleanup and reenable DiskSpaceLimitIntegrationTest add 32399f0 GEODE-5955 CacheClientUpdater statistics are created and never closed on failed initialization add 176f526 GEODE-5955 CacheClientUpdater statistics not properly closed add 62d8daa0 Merge pull request #3043 from apache/feature/GEODE-5955 add 4d77573 GEODE-6143: Import methods from Mockito instead of PowerMockito add 724fdde GEODE-6221: Cleanup some Protobuf tests (#3039) add 9fc8910 GEODE-6037: Move dunit tests to distributedTest add 34d45b4 GEODE-6124 Sign distributions add 4984450 GEODE-6235 Publish sources and javadoc to maven add 5c51bd3 Update README.md (#3026) add 787236c GEODE-6143: Remove PowerMock from ExecuteFunction tests (#3045) add 0b22af1 GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidationsJUnitTest add 09f437b Merge pull request #3037 from apache/feature/GEODE-6143-12 add 529a800 GEODE-6143: remove PowerMock from TypeUtilsJUnitTest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ef71a46) \ N -- N -- N refs/heads/feature/GEODE-6143-13 (529a800) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: README.md | 6 +- ci/scripts/execute_build.sh| 2 +- ci/scripts/execute_tests.sh| 10 +- geode-assembly/build.gradle| 7 + .../AutoConnectionSourceImplJUnitTest.java | 4 +- ...ewayReceiverXmlParsingValidationsJUnitTest.java | 110 .../statistics/DiskSpaceLimitIntegrationTest.java | 299 - .../internal/beans/ManagementAdapterTest.java | 2 +- .../cache/execute/InternalFunctionService.java | 5 +- .../internal/cache/tier/ClientSideHandshake.java | 4 + .../cache/tier/sockets/CacheClientUpdater.java | 75 +++--- .../tier/sockets/command/ExecuteFunction.java | 150 +++ .../tier/sockets/command/ExecuteFunction65.java| 160 +++ .../tier/sockets/command/ExecuteFunction66.java| 272 ++- .../tier/sockets/command/ExecuteFunction70.java| 45 ++-- .../query/internal/types/TypeUtilsJUnitTest.java | 4 +- .../PersistenceInitialImageAdvisorTest.java| 1 + .../tier/sockets/CacheClientUpdaterJUnitTest.java | 84 ++ .../sockets/command/ExecuteFunction65Test.java | 236 .../sockets/command/ExecuteFunction66Test.java | 257 ++ .../sockets/command/ExecuteFunction70Test.java | 23 +- .../tier/sockets/command/ExecuteFunctionTest.java | 241 + .../cli/commands/ListGatewayCommandTest.java | 8 +- .../geode/pdx/internal/PdxInstanceImplTest.java| 59 ++-- .../cache/examples/CacheTestCaseExampleTest.java | 22 +- .../dunit/examples/BeforeClassExampleTest.java | 0 .../test/dunit/tests/BasicDistributedTest.java | 7 +- .../cache/examples/CacheTestCaseExampleTest.java | 33 --- .../rules/DistributedRestoreSystemProperties.java | 2 +- .../DoNotHandleUnexpectedExceptionExampleTest.java | 55 .../LocatorConnectionAuthenticationDUnitTest.java | 74 ++--- .../v1/acceptance/LocatorConnectionDUnitTest.java | 82 +++--- .../GetAndPutJsonDocumentsDUnitTest.java | 84 +++--- ...ewayReceiverXmlParsingValidationsJUnitTest.java | 190 + ...nsJUnitTest.correctConfiguration[DTD].cache.xml | 0 ...nsJUnitTest.correctConfiguration[XSD].cache.xml | 0 ...pleReceiversShouldThrowException[DTD].cache.xml | 0 ...pleReceiversShouldThrowException[XSD].cache.xml | 0 gradle/publish.gradle | 10 + 39 files changed, 1472 insertions(+), 1151 deletions(-) delete mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/interna
[geode] branch develop updated (a075b0e -> 42c7659)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from a075b0e GEODE-2113 Implement SSL over NIO add 529a800 GEODE-6143: remove PowerMock from TypeUtilsJUnitTest add 42c7659 Merge pull request #3040 from apache/feature/GEODE-6143-13 No new revisions were added by this update. Summary of changes: .../query/internal/types/TypeUtilsJUnitTest.java | 145 +++-- 1 file changed, 20 insertions(+), 125 deletions(-)
[geode] branch feature/GEODE-6143-13 deleted (was 529a800)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-13 in repository https://gitbox.apache.org/repos/asf/geode.git. was 529a800 GEODE-6143: remove PowerMock from TypeUtilsJUnitTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated (f12055a -> ea46d00)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from f12055a GEODE-5971: refactor AlterRegionCommand to use RegionConfig object (#3054) add 7f2950c GEODE-3967: fix the offheap memory leak in serial gateway sender's unprocessedEvents. add ea46d00 Merge pull request #3044 from gesterzhou/feature/GEODE-3967 No new revisions were added by this update. Summary of changes: .../cache30/DistributedAckRegionCCEDUnitTest.java | 2 +- .../codeAnalysis/sanctionedDataSerializables.txt | 8 +- .../internal/cache/AbstractUpdateOperation.java| 29 +- .../apache/geode/internal/cache/LocalRegion.java | 6 +- .../wan/AbstractGatewaySenderEventProcessor.java | 14 + .../internal/cache/wan/GatewaySenderEventImpl.java | 42 ++- .../serial/SerialGatewaySenderEventProcessor.java | 19 +- .../internal/cache/UpdateOperationJUnitTest.java | 120 + ...SerialGatewaySenderEventProcessorJUnitTest.java | 89 +++ .../cache/wan/WANRollingUpgradeDUnitTest.java | 66 - .../WANRollingUpgradeNewSenderProcessOldEvent.java | 293 + 11 files changed, 652 insertions(+), 36 deletions(-) create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/UpdateOperationJUnitTest.java create mode 100644 geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeNewSenderProcessOldEvent.java
[geode] branch develop updated (9d737c9 -> 1e350b1)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 9d737c9 GEODE-4391: Add `@Override` where missing. (#3069)
add 14d69f1 WIP prefactor to allow adding map k,v to desribe mapping
results
add cdd52a9 Added Syncronous value to describe mapping
add d96d1d2 GEODE-6187: Fixed DescribeMapping Dunit test
add 9a47260 Updated function names to be more accurate for GEODE-6187
add 6c91114 Added DescribeMappingResult to list of serializable classes
add 8348a25 WIP
add 8587439 GEODE-6187: Resolved inaccurately merged conflicts with id
story
add 955455c Added Unit test for DescribeMappingResult
add a5f2943 Merge branch 'develop' into feature/GEODE-6187
add 1e350b1 Merge pull request #3032 from
BenjaminPerryRoss/feature/GEODE-6187
No new revisions were added by this update.
Summary of changes:
.../cli/CreateMappingCommandDUnitTest.java | 127 -
.../cli/DescribeMappingCommandDUnitTest.java | 125 ++--
.../cli/DestroyMappingCommandDunitTest.java| 55 +
.../codeAnalysis/sanctionedDataSerializables.txt | 3 +
.../jdbc/internal/JdbcConnectorService.java| 4 +
.../jdbc/internal/JdbcConnectorServiceImpl.java| 14 +++
.../jdbc/internal/cli/CreateMappingCommand.java| 36 +++---
.../jdbc/internal/cli/DescribeMappingCommand.java | 38 +++---
.../jdbc/internal/cli/DescribeMappingFunction.java | 44 ++-
.../jdbc/internal/cli/DestroyMappingCommand.java | 9 +-
.../util/internal/DescribeMappingResult.java | 55 -
.../connectors/util/internal/MappingConstants.java | 22 ++--
.../internal/cli/DescribeMappingFunctionTest.java | 39 ++-
.../util}/DescribeMappingCommandTest.java | 48 +---
.../util/internal/DescribeMappingResultTest.java | 61 ++
15 files changed, 454 insertions(+), 226 deletions(-)
copy
geode-dunit/src/main/java/org/apache/geode/internal/cache/execute/data/Order.java
=>
geode-connectors/src/main/java/org/apache/geode/connectors/util/internal/DescribeMappingResult.java
(51%)
copy
extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/Constants.java
=>
geode-connectors/src/main/java/org/apache/geode/connectors/util/internal/MappingConstants.java
(58%)
rename
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/{internal/cli
=> org/apache/geode/connectors/util}/DescribeMappingCommandTest.java (66%)
create mode 100644
geode-connectors/src/test/java/org/apache/geode/connectors/util/internal/DescribeMappingResultTest.java
[geode] branch feature/GEODE-6277 updated (55062cf -> 666176c)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6277 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 55062cf GEODE-6277: use await() instead of hard-coded sleep(3000) in the test new 666176c GEODE-6277: use await() instead of hard-coded sleep(3000) in the test This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (55062cf) \ N -- N -- N refs/heads/feature/GEODE-6277 (666176c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7249 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/geode/cache30/MultiVMRegionTestCase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[geode] branch feature/GEODE-6273 deleted (was 413803b)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6273 in repository https://gitbox.apache.org/repos/asf/geode.git. was 413803b Removed DataSerialization from DescribeMappingResult The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6344 updated (e04f583 -> 0ca2d39)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch feature/GEODE-6344
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard e04f583 GEODE-6344: should revert GEODE-1183 before a better fix
new 9c35fc7 GEODE-6174: more error handling in
LocatorClusterConfigurationService (#3134)
new 0ca2d39 GEODE-6344: should revert GEODE-1183 before a better fix
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e04f583)
\
N -- N -- N refs/heads/feature/GEODE-6344 (0ca2d39)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 7307 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../internal/rest/RegionManagementDunitTest.java | 7 ++
...ionTest.java => DisabledClusterConfigTest.java} | 38 ++-
.../internal/HttpServiceIntegrationTest.java | 55 +++---
.../internal/api/RegionAPIDUnitTest.java | 13 ---
.../api/LocatorClusterManagementService.java | 64 ++-
.../internal/cli/functions/CliFunctionResult.java | 4 -
.../mutators/RegionConfigMutator.java | 3 +-
.../api/LocatorClusterManagementServiceTest.java | 117 +
.../geode/test/junit/rules/MemberStarterRule.java | 2 +-
.../controllers/ManagementControllerAdvice.java| 12 ++-
10 files changed, 224 insertions(+), 91 deletions(-)
copy
geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/{RegionManagementIntegrationTest.java
=> DisabledClusterConfigTest.java} (65%)
create mode 100644
geode-core/src/test/java/org/apache/geode/management/internal/api/LocatorClusterManagementServiceTest.java
[geode] branch feature/GEODE-6344 updated (0ca2d39 -> 70bb309)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6344 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 0ca2d39 GEODE-6344: should revert GEODE-1183 before a better fix new 70bb309 GEODE-6344: should revert GEODE-1183 before a better fix GEODE-6344: fix CacheClientNotifierDUnitTest to remove the 2nd cacheserver This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0ca2d39) \ N -- N -- N refs/heads/feature/GEODE-6344 (70bb309) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7307 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cache/wan/CacheClientNotifierDUnitTest.java| 26 +- 1 file changed, 16 insertions(+), 10 deletions(-)
[geode] branch feature/GEODE-6344 updated (70bb309 -> 7d4b74c)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6344 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 70bb309 GEODE-6344: should revert GEODE-1183 before a better fix GEODE-6344: fix CacheClientNotifierDUnitTest to remove the 2nd cacheserver new 9fa4dc2 GEODE-6293: Fix fire & forget functions in gfsh (#3138) new 8e3c9d7 GEODE-6342 ThreadsMonitor prints many warnings in gateway sender logs new bbf78d4 Merge pull request #3140 from apache/feature/GEODE-6342 new 7d4b74c GEODE-6344: should revert GEODE-1183 before a better fix GEODE-6344: fix CacheClientNotifierDUnitTest to remove the 2nd cacheserver This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (70bb309) \ N -- N -- N refs/heads/feature/GEODE-6344 (7d4b74c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7310 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../commands/ExecuteFunctionCommandDUnitTest.java | 66 - .../ExecuteFunctionCommandSecurityTest.java| 11 +- .../cache/execute/CoreFunctionSecurityTest.java| 6 +- .../wan/AbstractGatewaySenderEventProcessor.java | 3 + .../internal/monitoring/ThreadsMonitoring.java | 6 + .../internal/monitoring/ThreadsMonitoringImpl.java | 8 + .../monitoring/ThreadsMonitoringImplDummy.java | 3 + .../cli/commands/ExecuteFunctionCommand.java | 7 +- .../cli/functions/UserFunctionExecution.java | 171 +++ .../monitoring/ThreadsMonitoringImplJUnitTest.java | 28 +- .../cli/functions/UserFunctionExecutionTest.java | 328 + ...xecuteFunctionCommandWithSecurityDUnitTest.java | 4 +- 12 files changed, 546 insertions(+), 95 deletions(-) create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecutionTest.java
[geode] branch develop updated (1a6ca26 -> 366bcca)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 1a6ca26 GEODE-6339: centralize thread name string (#3139) add 7d4b74c GEODE-6344: should revert GEODE-1183 before a better fix GEODE-6344: fix CacheClientNotifierDUnitTest to remove the 2nd cacheserver new 366bcca Merge pull request #3141 from apache/feature/GEODE-6344 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cache/tier/sockets/CacheClientNotifier.java| 36 +- .../cache/wan/CacheClientNotifierDUnitTest.java| 26 ++-- .../cache/wan/Simple2CacheServerDUnitTest.java | 2 ++ 3 files changed, 32 insertions(+), 32 deletions(-)
[geode] branch feature/GEODE-6344 deleted (was 7d4b74c)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6344 in repository https://gitbox.apache.org/repos/asf/geode.git. was 7d4b74c GEODE-6344: should revert GEODE-1183 before a better fix GEODE-6344: fix CacheClientNotifierDUnitTest to remove the 2nd cacheserver The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] 01/01: Merge pull request #3141 from apache/feature/GEODE-6344
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git commit 366bcca5effb7014adcb0a39d70595a4506a4fc3 Merge: 1a6ca26 7d4b74c Author: Xiaojian Zhou AuthorDate: Thu Jan 31 10:38:33 2019 -0800 Merge pull request #3141 from apache/feature/GEODE-6344 GEODE-6344: should revert GEODE-1183 before a better fix .../cache/tier/sockets/CacheClientNotifier.java| 36 +- .../cache/wan/CacheClientNotifierDUnitTest.java| 26 ++-- .../cache/wan/Simple2CacheServerDUnitTest.java | 2 ++ 3 files changed, 32 insertions(+), 32 deletions(-)
[geode] branch feature/GEODE-6277 updated (666176c -> 2be43b2)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6277 in repository https://gitbox.apache.org/repos/asf/geode.git. omit 666176c GEODE-6277: use await() instead of hard-coded sleep(3000) in the test add d4da870 GEODE-6276: Use named cli option in benchmark (#3085) add 9d75ff7 GEODE-6269: Extract StatisticsRegistry from IDS (#3068) add 9d6c7f4 GEODE-5913: Use JAVA_HOME/jps in the capture-call-stacks script. add 4ca1c22 GEODE-6288: change isDeserializable to return true on JSON pdx (#3089) add f4b8cf2 GEODE-6244 Healthy member kicked out by sick member add 73fea3c GEODE-6285: Make MBean names immutable in loner add efcfa93 Revert "GEODE-6244 Healthy member kicked out by sick member" add a757ccb GEODE-6289: check for null className on createPdxInstanceFactory (#3090) add 3cf75b6 GEODE-6212: Add unit test coverage for ValueComparisonHelper (#3082) add ffd6b38 GEODE-6244 Healthy member kicked out by sick member add e52f6f6 GEODE-6292 hot loop in GMSJoinLeave.findCoordinator add 86099f9 GEODE-6294: Add disable-jmx config property add 14359cc GEODE-6232: Disable JMX in PersistentPartitionedRegionRegressionTest add bd45232 GEODE-6268: Reduce the number of iterations for unique port ranges in AvailablePortHelperIntegrationTest (#3092) add 5b59595 GEODE-6305: Disable Gradle parallel mode for WindowsGfshDistributedTest jobs (#3103) add 654dc3b GEODE-6297: Add Process info to Launcher status failure msg add a15136a GEODE-6283: have the management rest controller call the internal management service add 9bb8579 GEODE-6280: Create new public module for the Management API (#3083) add f81d185 GEODE-6301: Add call stack support to ExecutorServiceRule add 8d97b01 GEODE-6290: change PdxInstance.equals for empty class name (#3091) add 876c84c GEODE-6307: Attempt to normalize file paths for correct comparison (#3104) add f2a1248 GEODE-6267: Logged out subject add b393482 GEODE-6302 Improve checkPom check and reporting (#3107) add c54983e GEODE-6255: Make ManagementListener testable and interruptible add fc8fcce GEODE-6313: Make ControllableProcess fail if status is only whitespace add 91ea495 GEODE-6308: Use line separators in launcher status add 99ed110 GEODE-6317: Fix intermittent CacheConnectionJUnitTest failures (#3117) add 9529403 Increase benchmark job timeout. (#3121) add 5eca360 GEODE-6112: Improve robustness for SIGINT handling add e775d2c GEODE-6320: Only save client transactions in failoverMap on far side. (#3122) add f253b59 GEODE-6283: expose HttpService on InternalCache so that different com… (#3110) add c877ef8 GEODE-6306: extend the RegionConfigRealizer to honor all region attributes configurations add 425eb59 GEODE-6315: Handle null in comparison in a compressed offheap region (#3115) add 9ae352c GEODE-6319: User Guide - Clarify that partitioned regions can be crea… (#3119) add 607026f GEODE-6309 ClusterConfigLocatorRestartDUnitTest fails to spin up a new server add 246a6ab Merge pull request #3118 from apache/feature/GEODE-6309 add 106200b GEODE-6303 Membership gets confused by multiple locators being specified by gfsh add fdb5627 Merge pull request #3108 from apache/feature/GEODE-6303 add a8bc0a3 GEODE-6287: Cleaned up FilterProfile clientMap when client disconnects normally add e82693f GEODE-6287: Removed inadvertent log messages add 1e5e7dc GEODE-6326 versionTestConcurrentEventsOnEmptyRegion fails in CI in multiple configurations add 19edb37 GEODE-6294 Document new disable-jmx property add 4d23f68 GEODE-6294 Better wording for disable-jmx property description add 9ab7ffe GEODE-6294 Empty commit to cause re-run of failed CI tests add f8007e4 GEODE-6294 Empty commit to re-run failing tests unassociated with this PR add 68608a9 GEODE-6294 Document new disable-jmx property (#3128) add 3493e8c GEODE-6185: management rest end point returns correct status code and message add c97edf9 GEODE-6174: change refid to type and make the default type to be PARTITION (#3130) add 5a20ec0 GEODE-6314 Only rolling build-version semver at build time (#3113) add 33077b3 GEODE-2113 Implement SSL over NIO add 556ac6e GEODE-6325: Clarify start time assertion add 054687a Merge pull request #3133 from demery-pivotal/feature/GEODE-6325 add 546abdd GEODE-6304: Refactor memory monitor to properly reset tolerance counter (#3102) add 6e7527c GEODE-6339: Breadcrumbs match P2P messaging header add d78b1bf GEODE-6330: Return a TransactionException when tx closed add 75585bc GEODE-6333: Adding the jetty-server dependency to geode-core. (#3135) add 2f277f6 GEODE-6334: Create CachePerfStatsTest a
[geode] branch feature/GEODE-6277 deleted (was 2be43b2)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6277 in repository https://gitbox.apache.org/repos/asf/geode.git. was 2be43b2 GEODE-6334: Change cache operation stats to longs (#3142) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6291 updated (e0afd58 -> c046a04)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6291 in repository https://gitbox.apache.org/repos/asf/geode.git. from e0afd58 fixed test to create table on both servers new ff2e121 wip tests passing describe needs work new c046a04 wip updated describe to list field mappings The 7380 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cli/CreateMappingCommandDUnitTest.java | 246 - .../cli/DescribeMappingCommandDUnitTest.java | 38 ++-- .../jdbc/internal/SqlToPdxInstanceCreator.java | 5 +- .../jdbc/internal/cli/CreateMappingCommand.java| 5 + .../CreateMappingPreconditionCheckFunction.java| 64 +- .../jdbc/internal/cli/DescribeMappingCommand.java | 73 ++ .../util/internal/DescribeMappingResult.java | 13 ++ .../internal/cli/CreateMappingCommandTest.java | 3 +- 8 files changed, 417 insertions(+), 30 deletions(-)
[geode] branch feature/GEODE-6414 updated: GEODE-6414: when create a new PdxInstanceImpl(), the BufferBuffer will
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6414
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6414 by this
push:
new d606714 GEODE-6414: when create a new PdxInstanceImpl(), the
BufferBuffer will
d606714 is described below
commit d60671427c998df674f57110939dcfa747b0fd3d
Author: Jianxia Chen
AuthorDate: Fri Feb 15 16:52:28 2019 -0800
GEODE-6414: when create a new PdxInstanceImpl(), the BufferBuffer will
be sliced and copied to a new one to reduce memory usuage.
Co-authored-by: Darrel Schneider
Co-authored-by: Xiaojian Zhou
Co-authored-by: Jianxia Chen
---
.../main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java| 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
index 9c9cdbc..e5c44e0 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
@@ -954,7 +954,13 @@ public class PdxWriterImpl implements PdxWriter {
if (pt == null) {
pt = this.existingType;
}
-return new PdxInstanceImpl(pt, new PdxInputStream(bb), len);
+bb = bb.slice();
+
+ByteBuffer bbCopy = ByteBuffer.allocate(bb.capacity());
+bb.rewind();
+bbCopy.put(bb);
+bbCopy.flip();
+return new PdxInstanceImpl(pt, new PdxInputStream(bbCopy), len);
}
public static boolean isPdx(byte[] valueBytes) {
[geode] branch feature/GEODE-6291 updated: start a new build
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a commit to branch feature/GEODE-6291 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/GEODE-6291 by this push: new ced4b68 start a new build ced4b68 is described below commit ced4b68961c187db5b2c90a92366dd43853b1176 Author: Benjamin Ross AuthorDate: Thu Feb 21 10:10:47 2019 -0800 start a new build Authored-by: Benjamin Ross
[geode] branch develop updated (ca41a5c -> e3f9f41)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from ca41a5c GEODE-6440: synchronize when getting and setting (#3220) add 47236f7 GEODE-6441: refactor the test to use await instead of sleep add e3f9f41 Merge pull request #3222 from apache/feature/GEODE-6441 No new revisions were added by this update. Summary of changes: .../geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[geode] branch develop updated (ca41a5c -> e3f9f41)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from ca41a5c GEODE-6440: synchronize when getting and setting (#3220) add 47236f7 GEODE-6441: refactor the test to use await instead of sleep add e3f9f41 Merge pull request #3222 from apache/feature/GEODE-6441 No new revisions were added by this update. Summary of changes: .../geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[geode] branch feature/GEODE-6441 deleted (was 47236f7)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6441 in repository https://gitbox.apache.org/repos/asf/geode.git. was 47236f7 GEODE-6441: refactor the test to use await instead of sleep The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6441 deleted (was 47236f7)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6441 in repository https://gitbox.apache.org/repos/asf/geode.git. was 47236f7 GEODE-6441: refactor the test to use await instead of sleep The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6481 created (now eb8836c)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6481 in repository https://gitbox.apache.org/repos/asf/geode.git. at eb8836c GEODE-6481: add tests to verify create jdbc mapping should get correct field type This branch includes the following new commits: new eb8836c GEODE-6481: add tests to verify create jdbc mapping should get correct field type The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-6481: add tests to verify create jdbc mapping should get correct field type
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6481
in repository https://gitbox.apache.org/repos/asf/geode.git
commit eb8836c8d58aa3001056f4d49ad914f182b071b6
Author: zhouxh
AuthorDate: Mon Mar 4 11:31:27 2019 -0800
GEODE-6481: add tests to verify create jdbc mapping should get correct
field type
---
.../cli/CreateMappingCommandDUnitTest.java | 80 ++
1 file changed, 80 insertions(+)
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
index 1e3e782..b3e514c 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
@@ -28,6 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
import java.io.IOException;
+import java.io.Serializable;
import java.net.URISyntaxException;
import java.sql.Connection;
import java.sql.JDBCType;
@@ -50,6 +51,7 @@ import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.configuration.RegionAttributesType;
import org.apache.geode.cache.configuration.RegionConfig;
import org.apache.geode.connectors.jdbc.JdbcAsyncWriter;
+import org.apache.geode.connectors.jdbc.JdbcConnectorException;
import org.apache.geode.connectors.jdbc.JdbcLoader;
import org.apache.geode.connectors.jdbc.JdbcWriter;
import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
@@ -69,6 +71,7 @@ import org.apache.geode.test.compiler.JarBuilder;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.assertions.CommandResultAssert;
import org.apache.geode.test.junit.categories.JDBCConnectorTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import
org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@@ -82,6 +85,7 @@ public class CreateMappingCommandDUnitTest {
private static final String EMPLOYEE_REGION = "employeeRegion";
private static final String EMPLOYEE_LOWER = "employee";
private static final String EMPLOYEE_UPPER = "EMPLOYEE";
+ private static final String EMPLOYEE_NUMERIC = "employeeNumeric";
private static final String GROUP1_REGION = "group1Region";
private static final String GROUP2_REGION = "group2Region";
private static final String GROUP1_GROUP2_REGION = "group1Group2Region";
@@ -137,12 +141,16 @@ public class CreateMappingCommandDUnitTest {
executeSql(
"create table mySchema." + EMPLOYEE_UPPER
+ "(ID varchar(10) primary key, name varchar(10), AGE int)");
+executeSql(
+"create table mySchema." + EMPLOYEE_NUMERIC
++ "(ID varchar(10) primary key, name varchar(10), AGE int, income
real, refid bigint)");
}
private void teardownDatabase() {
executeSql("drop table mySchema.myTable");
executeSql("drop table mySchema." + EMPLOYEE_REGION);
executeSql("drop table mySchema." + EMPLOYEE_UPPER);
+executeSql("drop table mySchema." + EMPLOYEE_NUMERIC);
}
private void executeSql(String sql) {
@@ -775,6 +783,54 @@ public class CreateMappingCommandDUnitTest {
}
}
+ public static class EmployeeNumeric implements Serializable {
+private String id;
+private String name;
+private int age;
+private float income;
+private long refid;
+
+public EmployeeNumeric() {
+ // nothing
+}
+
+EmployeeNumeric(String id, String name, int age, float income, long refid)
{
+ this.id = id;
+ this.name = name;
+ this.age = age;
+ this.income = income;
+ this.refid = refid;
+}
+
+String getId() {
+ return id;
+}
+
+String getName() {
+ return name;
+}
+
+int getAge() {
+ return age;
+}
+
+float getIncome() {
+ return income;
+}
+
+void setIncome(float income) {
+ this.income = income;
+}
+
+long getRefid() {
+ return refid;
+}
+
+void setRefid(long refid) {
+ this.refid = refid;
+}
+ }
+
public static class IdAndName implements PdxSerializable {
private String id;
private String name;
@@ -834,6 +890,30 @@ public class CreateMappingCommandDUnitTest {
assertValidEmployeeMappingOnLocator(regionMapping, region1Name, null,
false, false,
"employeeRegion");
});
+
+csb = new CommandStri
[geode] branch feature/GEODE-6481 updated (eb8836c -> c011446)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6481 in repository https://gitbox.apache.org/repos/asf/geode.git. discard eb8836c GEODE-6481: add tests to verify create jdbc mapping should get correct field type new 6d1d82a GEODE-6468 [CI Failure] ClusterCommunicationsDUnitTest fails on createEntryAndVerifyUpdate new 0ec5e49 GEODE-6473: Create a test which utilizes the geode-management.jar (#3254) new c19fda5 GEODE-5135: Refactor AbstractRegionMap dependencies (#3235) new 97f5f91 GEODE-6470: Making double-checked locking thread-safe (#3252) new dc2cb6f GEODE-6384: Document public methods in ClusterManagementServiceProvider new 4ec282f GEODE-6399: Manage dependency versions via java-platform (#3190) new bbe2e27 GEODE-6174: ClusterManagementResult should have a cleaner way to indicate the status code and message (#3251) new 004db48 GEODE-6475: Adding isDisconnected() method to InternalDistributedSystem new 5bef447 GEODE-6174: Test REST API with a secured cluster (#3255) new a441757 GEODE-6477: Reply with exception if exception occurred during processing the message. (#3258) new e77145b GEODE-2059 client SSL handshake attempts do not time out new c011446 GEODE-6481: add tests to verify create jdbc mapping should get correct field type This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (eb8836c) \ N -- N -- N refs/heads/feature/GEODE-6481 (c011446) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7456 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: boms/geode-all-bom/build.gradle| 36 +- .../src/test/resources/expected-pom.xml| 805 +++-- build.gradle | 7 +- buildSrc/build.gradle | 6 +- .../gradle/plugins/DependencyConstraints.groovy| 246 +++ .../gradle/plugins/DependencySetHandler.groovy | 36 +- .../javac/EnsureCorrectRunsWithProcessor.java | 9 +- .../geode-dependency-constraints.properties| 1 + .../geode/javac/TestAnnotationProcessor.java | 14 +- extensions/build.gradle| 2 - extensions/geode-modules-assembly/build.gradle | 29 +- .../geode-modules-session-internal/build.gradle| 6 +- extensions/geode-modules-session/build.gradle | 12 +- extensions/geode-modules-test/build.gradle | 6 +- extensions/geode-modules-tomcat7/build.gradle | 10 +- extensions/geode-modules-tomcat8/build.gradle | 12 +- extensions/geode-modules-tomcat9/build.gradle | 10 +- extensions/geode-modules/build.gradle | 14 +- extensions/session-testing-war/build.gradle| 3 +- geode-assembly/build.gradle| 26 +- geode-assembly/geode-assembly-test/build.gradle| 2 +- ...tandaloneClientManagementAPIAcceptanceTest.java | 119 +++ .../resources/ManagementClientCreateRegion.java| 38 +- .../ClientClusterManagementServiceDunitTest.java | 72 ++ ...ClusterManagementLocatorReconnectDunitTest.java | 3 +- .../internal/rest/RegionManagementDunitTest.java | 69 +- .../RegionManagementRestSecurityDUnitTest.java | 123 .../internal/DisabledClusterConfigTest.java| 4 +- .../integrationTest/resources/assembly_content.txt | 2 + .../resources/dependency_classpath.txt | 1 + geode-assembly/src/test/resources/expected-pom.xml | 694 +- geode-common/build.gradle | 2 +- geode-common/src/test/resources/expected-pom.xml | 694 +- geode-concurrency-test/build.gradle| 2 +- .../src/test/resources/expected-pom.xml| 710 +- geode-connectors/build.gradle | 2 +- .../cli/CreateMappingCommandDUnitTest.java | 67 +- .../jdbc/internal/cli/EmployeeNumeric.java}| 39 +- .../CreateMappingPreconditionCheckFunction.java| 4 +- .../src/test/resources/expected-pom.xml| 710 +- geode-core/build.gradle
[geode] branch feature/GEODE-6481 updated (c011446 -> 6a2b417)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6481 in repository https://gitbox.apache.org/repos/asf/geode.git. discard c011446 GEODE-6481: add tests to verify create jdbc mapping should get correct field type new 6a2b417 GEODE-6481: add tests to verify create jdbc mapping should get correct field type This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c011446) \ N -- N -- N refs/heads/feature/GEODE-6481 (6a2b417) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7456 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cli/CreateMappingCommandDUnitTest.java | 52 - .../jdbc/internal/cli/EmployeeNumeric.java | 65 -- .../CreateMappingPreconditionCheckFunction.java| 1 - .../pdx/internal/AutoSerializableManager.java | 3 +- 4 files changed, 52 insertions(+), 69 deletions(-) delete mode 100644 geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/EmployeeNumeric.java
[geode] branch feature/GEODE-6481 updated (6a2b417 -> 6a6345d)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6481 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 6a2b417 GEODE-6481: add tests to verify create jdbc mapping should get correct field type new 6a6345d GEODE-6481: add tests to verify create jdbc mapping should get correct field type This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6a2b417) \ N -- N -- N refs/heads/feature/GEODE-6481 (6a6345d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7456 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../jdbc/internal/cli/CreateMappingPreconditionCheckFunction.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[geode] branch feature/GEODE-6481 updated (6a6345d -> 559f59f)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6481 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 6a6345d GEODE-6481: add tests to verify create jdbc mapping should get correct field type new 559f59f GEODE-6481: add tests to verify create jdbc mapping should get correct field type This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6a6345d) \ N -- N -- N refs/heads/feature/GEODE-6481 (559f59f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7456 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../jdbc/internal/cli/CreateMappingPreconditionCheckFunction.java | 2 +- .../java/org/apache/geode/pdx/internal/AutoSerializableManager.java| 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
[geode] branch feature/GEODE-6481 updated (559f59f -> 2c438e3)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch feature/GEODE-6481
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard 559f59f GEODE-6481: add tests to verify create jdbc mapping should
get correct field type
new 6f8b7f1 GEODE-5971: refactor DescribeXXCommand to use ResultModel
(#3265)
new a6f2baa GEODE-6443: Log all requests to REST ManagementService (#3225)
new 9d61028 GEODE-6443: Fix method name change in
ManagementRequestLoggingDUnitTest
new 483efb0 GEODE-6295: Use InternalCacheBuilder for constructing
GemFireCacheImpl (#3260)
new 83e3b8d GEODE-6442: Fixup StatisticsImpl and StatisticsImplTest
new 22f7730 GEODE-6442: Fix Statistics textId and numericId
new 068fdd4 GEODE-6421 CI failure:
org.apache.geode.distributed.LocatorDUnitTest.testStartTwoLocators failed with
AssertionError
new 7755e09 GEDOE-6486: Cleanup GemFireStatSampler
new 2d744b7 GEODE-6486: Use PID for StatSamplerStats numericId
new a14ff0d GEODE-6487: Use PID for OsStatistics numericId
new 2c438e3 GEODE-6481: Inner class will be rejected by
AutoSerializableManager in ReflectionBasedAutoSerializer.toData(). Should treat
"$" in className as normal char.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (559f59f)
\
N -- N -- N refs/heads/feature/GEODE-6481 (2c438e3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 7466 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
geode-assembly/build.gradle| 4 +
.../rest/ManagementRequestLoggingDUnitTest.java| 89 +++
.../apache/geode/distributed/LocatorDUnitTest.java | 2 +
.../commands/DescribeMembersCommandDUnitTest.java | 6 +-
.../DescribeConnectionCommandIntegrationTest.java | 11 +-
.../java/org/apache/geode/cache/CacheFactory.java | 312 ---
.../geode/cache/client/ClientCacheFactory.java | 7 +-
...{QueueStatHelper.java => ConnectionConfig.java} | 24 +-
.../distributed/internal/ConnectionConfigImpl.java | 75 +++
.../internal/InternalDistributedSystem.java| 130 +++--
.../apache/geode/internal/cache/CacheConfig.java | 4 +-
.../geode/internal/cache/CacheFactoryStatics.java | 123
.../geode/internal/cache/GemFireCacheImpl.java | 93 +---
.../apache/geode/internal/cache/InternalCache.java | 4 +
.../geode/internal/cache/InternalCacheBuilder.java | 394 +
.../cache/InternalCacheForClientAccess.java| 10 +
.../internal/cache/xmlcache/CacheCreation.java | 10 +
.../statistics/AbstractStatisticsFactory.java | 6 +
.../internal/statistics/GemFireStatSampler.java| 191 ---
.../geode/internal/statistics/HostStatHelper.java | 141 +++--
.../geode/internal/statistics/HostStatSampler.java | 13 +-
.../geode/internal/statistics/StatisticsImpl.java | 430 +++---
.../internal/statistics/StatisticsManager.java | 7 +-
.../internal/statistics/StatisticsRegistry.java| 29 +-
.../geode/management/internal/cli/CliUtil.java | 21 -
.../cli/commands/DescribeClientCommand.java| 3 +-
.../cli/commands/DescribeConfigCommand.java| 3 +-
.../cli/commands/DescribeConnectionCommand.java| 36 +-
.../cli/commands/DescribeMemberCommand.java| 103 ++--
.../management/internal/cli/i18n/CliStrings.java | 2 +-
.../internal/ConnectionConfigImplTest.java | 181 ++
.../internal/InternalDistributedSystemTest.java| 22 +-
.../geode/internal/cache/GemFireCacheImplTest.java | 304 +-
...ernalCacheBuilderAllowsMultipleSystemsTest.java | 468
.../internal/cache/InternalCacheBuilderTest.java | 618 +
.../internal/statistics/HostStatSamplerTest.java | 40 +-
.../internal/statistics/StatisticsImplTest.java| 268 ++---
.../statistics/StatisticsRegistryTest.java | 50 +-
.../test/junit/assertions/CommandResultAssert.java | 17 +-
.../geode/internal/cache/wan/WANTestBase.java | 23 +-
.../internal/rest/ManagementLoggingFilter.java | 33 +-
.../src/main/webapp/WEB-INF/web.xml| 10 +
42 files changed, 3189 insertions(+),
[geode] branch feature/GEODE-6481 updated (2c438e3 -> 9d680bf)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6481 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 2c438e3 GEODE-6481: Inner class will be rejected by AutoSerializableManager in ReflectionBasedAutoSerializer.toData(). Should treat "$" in className as normal char. new 9d680bf GEODE-6481: Inner class will be rejected by AutoSerializableManager in ReflectionBasedAutoSerializer.toData(). Should treat "$" in className as normal char. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2c438e3) \ N -- N -- N refs/heads/feature/GEODE-6481 (9d680bf) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7466 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../internal/cli/CreateMappingPreconditionCheckFunctionTest.java | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-)
[geode] branch develop updated (a14ff0d -> 2d6ab6f)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from a14ff0d GEODE-6487: Use PID for OsStatistics numericId add 9d680bf GEODE-6481: Inner class will be rejected by AutoSerializableManager in ReflectionBasedAutoSerializer.toData(). Should treat "$" in className as normal char. add 2d6ab6f Merge pull request #3262 from apache/feature/GEODE-6481 No new revisions were added by this update. Summary of changes: .../cli/CreateMappingCommandDUnitTest.java | 83 ++ .../CreateMappingPreconditionCheckFunction.java| 2 +- ...CreateMappingPreconditionCheckFunctionTest.java | 8 ++- 3 files changed, 89 insertions(+), 4 deletions(-)
[geode] branch feature/GEODE-6481 deleted (was 9d680bf)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6481 in repository https://gitbox.apache.org/repos/asf/geode.git. was 9d680bf GEODE-6481: Inner class will be rejected by AutoSerializableManager in ReflectionBasedAutoSerializer.toData(). Should treat "$" in className as normal char. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] 01/01: GEODE-6518: for proxy region, should not add loader and writer for jdbc-mapping
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6518
in repository https://gitbox.apache.org/repos/asf/geode.git
commit d148855504f0f565e2c62f1b9b584158746dd021
Author: zhouxh
AuthorDate: Thu Mar 14 17:34:48 2019 -0700
GEODE-6518: for proxy region, should not add loader and writer for
jdbc-mapping
---
...reateMappingCommandForProxyRegionDUnitTest.java | 434 +
.../jdbc/internal/cli/CreateMappingFunction.java | 16 +-
2 files changed, 448 insertions(+), 2 deletions(-)
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandForProxyRegionDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandForProxyRegionDUnitTest.java
new file mode 100644
index 000..ee57839
--- /dev/null
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandForProxyRegionDUnitTest.java
@@ -0,0 +1,434 @@
+/*
+ * 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.connectors.jdbc.internal.cli;
+
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING;
+import static
org.apache.geode.connectors.util.internal.MappingConstants.DATA_SOURCE_NAME;
+import static
org.apache.geode.connectors.util.internal.MappingConstants.GROUP_NAME;
+import static
org.apache.geode.connectors.util.internal.MappingConstants.ID_NAME;
+import static
org.apache.geode.connectors.util.internal.MappingConstants.PDX_NAME;
+import static
org.apache.geode.connectors.util.internal.MappingConstants.REGION_NAME;
+import static
org.apache.geode.connectors.util.internal.MappingConstants.SCHEMA_NAME;
+import static
org.apache.geode.connectors.util.internal.MappingConstants.TABLE_NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.sql.Connection;
+import java.sql.JDBCType;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
+import org.apache.geode.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.RegionAttributesType;
+import org.apache.geode.cache.configuration.RegionConfig;
+import org.apache.geode.connectors.jdbc.JdbcAsyncWriter;
+import org.apache.geode.connectors.jdbc.JdbcLoader;
+import org.apache.geode.connectors.jdbc.JdbcWriter;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.configuration.FieldMapping;
+import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
+import org.apache.geode.connectors.util.internal.MappingCommandUtils;
+import org.apache.geode.distributed.internal.InternalLocator;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.jndi.JNDIInvoker;
+import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.pdx.FieldType;
+import org.apache.geode.pdx.PdxReader;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxWriter;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.categories.JDBCConnectorTest;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+import
org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
+import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
+
+@Category({JDBCConnectorTest.class})
+public class CreateMappingCommandForProxyRegionDUnitTest {
+
+ private static final String TEST_REGION = "testRegion";
+ private static final String TEST_GROUP1 = "t
[geode] branch feature/GEODE-6518 created (now d148855)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6518 in repository https://gitbox.apache.org/repos/asf/geode.git. at d148855 GEODE-6518: for proxy region, should not add loader and writer for jdbc-mapping This branch includes the following new commits: new d148855 GEODE-6518: for proxy region, should not add loader and writer for jdbc-mapping The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch feature/GEODE-6518 updated (d148855 -> df1a63a)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6518 in repository https://gitbox.apache.org/repos/asf/geode.git. discard d148855 GEODE-6518: for proxy region, should not add loader and writer for jdbc-mapping new 3c9ddc5 GEODE-6412: Improve concurrency for getBucketIndex (#3198) new 18f0f21 GEODE-6461: Report errors when table metadata and region mapping do not match (#3256) new 46641b4 GEODE-6512: Remove defunct test-by-category. new 1deeb48 GEODE-6380: Renaming pmd project to pmd-rules new 61a25da GEODE-5971: Refactoring various commands (#3294) new a8241d7 GEODE-5971: refactor ExportLogsCommand and ExecuteScriptCommand to us… (#3285) new d03ee19 GEODE-6447: Honor the PARALLEL_GRADLE flag in builds new cbfa6a8 GEODE-6511 Change data source to use connection pool by default (#3293) new 8ee587c GEODE-6295: Add Micrometer-based metrics system (#3277) new b2e3884 GEODE-6519: Fix CreateGatewaySenderCommand Flags (#3298) new 957574d GEODE-6505: Use Enum instead of String for RegionConfig type (#3287) new d8b8344 GEODE-6506: Don't return JSONy objects when converting from json to Object arrays (#3289) new a734c4e GEODE-5971: refactor DestroyRegionCommand and CreateRegionCommand.interceptor (#3299) new 45e945e GEODE-6295: Extract default from CompositeMeterRegistryFactory new b32631e GEODE-6503: Moving redis into a separate module new 326873f GEODE-6517: Fix a race by counting down the latch. (#3297) new aa38e22 GEODE-5013 Replace org.json with Jackson in GfJsonObject new df1a63a GEODE-6518: for proxy region, should not add loader and writer for jdbc-mapping This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d148855) \ N -- N -- N refs/heads/feature/GEODE-6518 (df1a63a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7507 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/test/resources/expected-pom.xml| 10 + build.gradle | 1 - .../gradle/plugins/DependencyConstraints.groovy| 2 + ci/scripts/execute_tests.sh| 2 +- extensions/geode-modules-assembly/build.gradle | 1 + .../release/session/bin/modify_war | 2 + geode-assembly/build.gradle| 3 + .../apache/geode/session/tests/TomcatInstall.java | 4 +- .../resources/ManagementClientCreateRegion.java| 3 +- ...ClusterManagementLocatorReconnectDunitTest.java | 3 +- .../rest/ManagementRequestLoggingDUnitTest.java| 3 +- .../internal/rest/RegionManagementDunitTest.java | 5 +- .../RegionManagementRestSecurityDUnitTest.java | 3 +- .../integrationTest/resources/assembly_content.txt | 9 + .../resources/dependency_classpath.txt | 4 + .../integrationTest/resources/expected_jars.txt| 3 + geode-assembly/src/main/dist/LICENSE | 2 + .../jdbc/JdbcAsyncWriterIntegrationTest.java | 25 +- .../geode/connectors/jdbc/JdbcDistributedTest.java | 81 .../connectors/jdbc/JdbcLoaderIntegrationTest.java | 2 +- .../connectors/jdbc/JdbcWriterIntegrationTest.java | 37 +- .../jdbc/MySqlJdbcLoaderIntegrationTest.java | 6 +- .../jdbc/PostgresJdbcLoaderIntegrationTest.java| 6 +- .../jdbc/PostgresJdbcWriterIntegrationTest.java| 6 +- .../cli/DescribeDataSourceCommandDUnitTest.java| 16 +- .../cli/DestroyDataSourceCommandDUnitTest.java | 88 - .../cli/ListDataSourceCommandDUnitTest.java| 18 +- .../jdbc/internal/JdbcConnectorService.java| 6 + .../jdbc/internal/JdbcConnectorServiceImpl.java| 115 ++ .../geode/connectors/jdbc/internal/SqlHandler.java | 58 ++- .../connectors/jdbc/internal/SqlToPdxInstance.java | 6 +- .../jdbc/internal/cli/CreateDataSourceCommand.java | 9 +- .../jdbc/internal/cli/DescribeMappingCommand.java | 2 + .../jdbc/internal/configuration/RegionMapping.java | 51 +-- .../internal/xml/RegionMappingConfiguration.java | 1 + .../connectors/util/internal/MappingConstants.java | 1 + .../geode.apache.org/schema/j
[geode] branch feature/GEODE-6518 updated (df1a63a -> cd5fb96)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6518 in repository https://gitbox.apache.org/repos/asf/geode.git. discard df1a63a GEODE-6518: for proxy region, should not add loader and writer for jdbc-mapping new 8fed2fe GEODE-6295: Extract default from CollectingServiceLoader interface new 9879c97 GEODE-3322: Fix javadoc warning in CacheFactory new 2d2ea75 GEODE-6503: Fixing javadoc warnings about redis new d4fb4a1 GEODE-5971: fix NPE in the gfsh command (#3310) new 6d7e625 GEODE-6525: Add a SSL component to StandaloneClientManagementAPIAcceptanceTest (#3302) new a12dca0 GEODE-6522 Server hangs during shutdown after becoming membership coordinator new 7e59011 GEODE-6522 Server hangs during shutdown after becoming membership coordinator new 59b9b02 GEODE-6523 Disables Geode Management API with feature flag (#3306) new e1eba81 GEODE-6534: Encapsulate LocalRegion entryUserAttributes new b0d6929 GEODE-6483: Fix jinja logic for concourse-to-github creds new 02eda0a GEODE-6534: Extract RegionPerfStats from LocalRegion (#3315) new 6fc7ea4 GEODE-6528: Use Micrometer Binder for JVM Metrics (#3312) new 428b55b GEODE-6271: Restoring pdx type copying behavior in client new 3ffbc41 GEODE-6488: Migrating cancellation state to execution context (#3322) new 50e67e6 GEODE-5016 Replace org.json with Jackson in geode-web-api new ff8e008 GEODE-6539: Use RegionStats-regionName for RegionPerfStats TextId new 645db96 GEODE-6488: Fixing QueryMonitor JMH test new 77fe516 GEODE-6534: Extract NonTXEntry from LocalRegion (#3319) new 65b416e GEODE-2275: Update and cleanup ClearTXLockingDUnitTest (#3326) new 0974ae3 added org.json implementation for downstream artifacts new 5f120f7 Update Expected POM new c90f7d9 GEODE-6540: Resolves entities with https urls. (#3332) new 381130c GEODE-6529: Use EntryEventFactory instead of factory methods (#3334) new 47c0ecd GEODE-5971: refactor DescribeRegionCommand to use ResultModel and improve Tabular asserts new a986748 fix test and rat failures new 28d65eb provide asList() method for situations requiring more exotic ListAssert validations new 301700d GEODE-6513: Revised README and BUILDING new c97b156 GEODE-6450: can use default SSL when invoking CMS on server (#3320) new 3b54352 GEODE-5971: refactor RebalanceCommand to use ResultModel (#3303) new ec5a24b GEODE-6271: Ignore failures from other pools new 2e2f419 GEODE-6550: Use cache-writer in AlterRegionCommand (#3336) new 919f4e7 GEODE-6534: Extract ExpiryRegionEntry from LocalRegion new 8fd839e GEODE-6532: Using implementation/api in geode-core instead of compile new cd5fb96 GEODE-6518: for proxy region, should not add loader and writer for jdbc-mapping but need to add AEQ-id to the region attributes This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (df1a63a) \ N -- N -- N refs/heads/feature/GEODE-6518 (cd5fb96) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7540 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/PULL_REQUEST_TEMPLATE.md |2 +- BUILDING.md| 21 +- README.md |7 +- .../src/test/resources/expected-pom.xml| 10 +- build.gradle |2 +- .../gradle/plugins/DependencyConstraints.groovy|2 + ci/pipelines/shared/shared_jinja.yml |2 +- .../release/session/bin/modify_war |2 - extensions/geode-modules-session/build.gradle |1 + geode-assembly/build.gradle|3 - ...tandaloneClientManagementAPIAcceptanceTest.java | 74 +- .../resources/ManagementClientCreateRegion.java| 18 +- .../acceptanceTest/resources/ssl/trusted.keystore | Bin 0 -> 547 bytes .../rest/ClusterManagementServiceOnServerTest.java | 149 +++ .../rest/GeodeManagementFeatureFlagDUnitTest.java | 51 + .../integrationTest/resources/a
[geode] branch feature/GEODE-6518 updated (cd5fb96 -> f0a97a2)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6518 in repository https://gitbox.apache.org/repos/asf/geode.git. discard cd5fb96 GEODE-6518: for proxy region, should not add loader and writer for jdbc-mapping but need to add AEQ-id to the region attributes new f0a97a2 GEODE-6518: for proxy region, should not add loader and writer for jdbc-mapping but need to add AEQ-id to the region attributes This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cd5fb96) \ N -- N -- N refs/heads/feature/GEODE-6518 (f0a97a2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7540 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/geode/internal/cache/PartitionedRegion.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[geode] branch feature/GEODE-6518 updated (f0a97a2 -> e0a7e3e)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6518 in repository https://gitbox.apache.org/repos/asf/geode.git. discard f0a97a2 GEODE-6518: for proxy region, should not add loader and writer for jdbc-mapping but need to add AEQ-id to the region attributes new e0a7e3e GEODE-6518: for proxy region, should not add loader and writer for jdbc-mapping but need to add AEQ-id to the region attributes This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f0a97a2) \ N -- N -- N refs/heads/feature/GEODE-6518 (e0a7e3e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7540 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../jdbc/internal/cli/CreateMappingCommandTest.java | 20 .../internal/cli/DescribeMappingCommandTest.java | 6 ++ 2 files changed, 26 insertions(+)
