You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/10/17 23:37:25 UTC
[1/5] incubator-geode git commit: GEODE-2007: fix unchecked warnings
Repository: incubator-geode
Updated Branches:
refs/heads/develop a3bd25664 -> 5c50954d1
GEODE-2007: fix unchecked warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a53c4b15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a53c4b15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a53c4b15
Branch: refs/heads/develop
Commit: a53c4b1509867a1847b8a21ef8b926911f874bb1
Parents: 7330733
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Oct 17 12:49:00 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Oct 17 16:30:19 2016 -0700
----------------------------------------------------------------------
.../apache/geode/modules/session/catalina/DeltaSession7.java | 3 +--
.../modules/session/Tomcat8SessionsClientServerDUnitTest.java | 3 ++-
.../org/apache/geode/internal/cache/GemFireCacheImpl.java | 2 +-
.../org/apache/geode/internal/cache/ha/HARegionQueue.java | 7 ++++---
.../cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java | 4 ++--
.../test/java/org/apache/geode/OldClientSupportDUnitTest.java | 4 ++--
6 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a53c4b15/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java b/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
index 0df05ff..c0dfe23 100644
--- a/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
+++ b/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
@@ -535,8 +535,7 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
}
}
- @SuppressWarnings({"unchecked", "rawtypes"})
- protected ConcurrentMap readInAttributes(final DataInput in) throws IOException, ClassNotFoundException {
+ protected ConcurrentMap<String, Object> readInAttributes(final DataInput in) throws IOException, ClassNotFoundException {
return DataSerializer.readObject(in);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a53c4b15/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
index 8b29048..384689e 100644
--- a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
+++ b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
@@ -19,6 +19,7 @@ package org.apache.geode.modules.session;
import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.apache.geode.internal.cache.CacheServerLauncher.serverPort;
+import java.util.List;
import java.util.Properties;
import org.junit.experimental.categories.Category;
@@ -49,7 +50,7 @@ public class Tomcat8SessionsClientServerDUnitTest extends TestSessionsTomcat8Bas
@Override
public void preTearDown() {
vm0.invoke(() -> {
- GemFireCacheImpl.getInstance().getCacheServers().forEach(e -> ((CacheServer)e).stop());
+ (GemFireCacheImpl.getInstance().getCacheServers()).forEach(cacheServer -> cacheServer.stop());
});
server.stopContainer();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a53c4b15/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 6c195e7..f673ded 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -4015,7 +4015,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
}
}
- public List getCacheServers() {
+ public List<CacheServer> getCacheServers() {
List cacheServersWithoutReceiver = null;
if (!allCacheServers.isEmpty()) {
Iterator allCacheServersIterator = allCacheServers.iterator();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a53c4b15/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
index 027a1b5..f2b1185 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
@@ -22,6 +22,7 @@ import org.apache.geode.cache.TimeoutException;
import org.apache.geode.cache.query.internal.CqQueryVsdStats;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.InternalCqQuery;
+import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DM;
@@ -2987,10 +2988,10 @@ protected boolean checkEventForRemoval(Long counter, ThreadIdentifier threadid,
&& !queueRemovalMessageList.isEmpty()) { // messages exist
QueueRemovalMessage qrm = new QueueRemovalMessage();
qrm.resetRecipients();
- List<CacheServerImpl> servers = this.cache.getCacheServers();
+ List<CacheServer> servers = this.cache.getCacheServers();
List<DistributedMember> recipients = new LinkedList();
- for (CacheServerImpl server: servers) {
- recipients.addAll(server.getCacheServerAdvisor().adviseBridgeServers());
+ for (CacheServer server: servers) {
+ recipients.addAll(CacheServerImpl.class.cast(server).getCacheServerAdvisor().adviseBridgeServers());
}
qrm.setRecipients(recipients);
qrm.setMessagesList(queueRemovalMessageList);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a53c4b15/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index 3990265..119b382 100644
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -200,10 +200,10 @@ public class DeltaPropagationWithCQDUnitTest extends JUnit4DistributedTestCase {
public static void verifyFullValueRequestsFromClients(Long expected)
throws Exception {
- List<CacheServerImpl> servers = ((GemFireCacheImpl)cache).getCacheServers();
+ List<CacheServer> servers = ((GemFireCacheImpl)cache).getCacheServers();
assertEquals("expected one server but found these: " + servers, 1, servers.size());
- CacheClientProxy[] proxies = servers.get(0).getAcceptor().getCacheClientNotifier()
+ CacheClientProxy[] proxies = CacheServerImpl.class.cast(servers.get(0)).getAcceptor().getCacheClientNotifier()
.getClientProxies().toArray(new CacheClientProxy[0]);
// find the proxy for the client that processed the CQs - it will have
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a53c4b15/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java b/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
index 0b48e16..36d13b5 100644
--- a/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
+++ b/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
@@ -102,8 +102,8 @@ public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
}
}
- private Object instantiate(Class aClass) throws Exception {
- Constructor c = null;
+ private Object instantiate(Class<?> aClass) throws Exception {
+ Constructor<?> c = null;
try {
c = aClass.getConstructor();
return c.newInstance();
[4/5] incubator-geode git commit: GEODE-2006: add FlakyTest category
to testSelectCommand
Posted by kl...@apache.org.
GEODE-2006: add FlakyTest category to testSelectCommand
Also, remove unused serial id.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/474ff41e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/474ff41e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/474ff41e
Branch: refs/heads/develop
Commit: 474ff41e9ff4f357baaea27e6b4da7d4328f2231
Parents: 3d173b1
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Oct 17 11:06:12 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Oct 17 16:30:19 2016 -0700
----------------------------------------------------------------------
.../internal/cli/commands/GemfireDataCommandsDUnitTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/474ff41e/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 5417ccb..8be6d99 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -91,7 +91,6 @@ import org.apache.geode.test.junit.categories.FlakyTest;
@SuppressWarnings("serial")
public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
- private static final long serialVersionUID = 1L;
private static final String REGION_NAME = "FunctionCommandsReplicatedRegion";
private static final String REBALANCE_REGION_NAME = "GemfireDataCommandsDUnitTestRegion";
private static final String REBALANCE_REGION2_NAME = "GemfireDataCommandsDUnitTestRegion2";
@@ -522,6 +521,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
validateResult(cmdResult, true);
}
+ @Category(FlakyTest.class) // GEODE-2006
@Test
public void testSelectCommand() {
setupForSelect();
[5/5] incubator-geode git commit: GEODE-2011: add FlakyTest to
category to testNonPersistentServerRestartAutoSerializer
Posted by kl...@apache.org.
GEODE-2011: add FlakyTest to category to testNonPersistentServerRestartAutoSerializer
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5c50954d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5c50954d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5c50954d
Branch: refs/heads/develop
Commit: 5c50954d12644b95739ee0e754852ea0f88524b8
Parents: a53c4b1
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Oct 17 13:56:30 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Oct 17 16:30:20 2016 -0700
----------------------------------------------------------------------
.../test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c50954d/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
index 1afb1ad..22c6571 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
@@ -54,6 +54,7 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
public class PdxClientServerDUnitTest extends JUnit4CacheTestCase {
@@ -187,6 +188,7 @@ public class PdxClientServerDUnitTest extends JUnit4CacheTestCase {
* Test of bug 47338 - what happens to the client type
* registry if the server is restarted.
*/
+ @Category(FlakyTest.class) // GEODE-2011
@Test
public void testNonPersistentServerRestartAutoSerializer() {
Host host = Host.getHost(0);
[3/5] incubator-geode git commit: GEODE-2005: fix javadoc warning and
format
Posted by kl...@apache.org.
GEODE-2005: fix javadoc warning and format
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3d173b18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3d173b18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3d173b18
Branch: refs/heads/develop
Commit: 3d173b1852facd50bc6396521bf862dd442bfa46
Parents: a3bd256
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Oct 17 10:43:02 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Oct 17 16:30:19 2016 -0700
----------------------------------------------------------------------
.../web/controllers/CommonCrudController.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3d173b18/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
index 2bcb31b..30c8b3a 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.geode.rest.internal.web.controllers;
import java.util.ArrayList;
@@ -48,21 +47,20 @@ import org.apache.geode.rest.internal.web.exception.GemfireRestException;
import org.apache.geode.rest.internal.web.util.ArrayUtils;
import org.apache.geode.rest.internal.web.util.JSONUtils;
-
/**
* The CommonCrudController serves REST Requests related to listing regions,
* listing keys in region, delete keys or delete all data in region.
- * <p/>
+ *
* @since GemFire 8.0
*/
-
@SuppressWarnings("unused")
public abstract class CommonCrudController extends AbstractBaseController {
private static final Logger logger = LogService.getLogger();
/**
- * list all available resources (Regions) in the GemFire cluster
+ * List all available resources (Regions) in the GemFire cluster
+ *
* @return JSON document containing result
*/
@RequestMapping(method = RequestMethod.GET, produces = { MediaType.APPLICATION_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
@@ -89,7 +87,8 @@ public abstract class CommonCrudController extends AbstractBaseController {
/**
* List all keys for the given region in the GemFire cluster
- * @param region gemfire region
+ *
+ * @param region gemfire region
* @return JSON document containing result
*/
@RequestMapping(method = RequestMethod.GET, value = "/{region}/keys",
@@ -122,8 +121,9 @@ public abstract class CommonCrudController extends AbstractBaseController {
/**
* Delete data for single key or specific keys in region
- * @param region gemfire region
- * @param keys for which data is requested
+ *
+ * @param region gemfire region
+ * @param keys for which data is requested
* @return JSON document containing result
*/
@RequestMapping(method = RequestMethod.DELETE, value = "/{region}/{keys}",
@@ -153,7 +153,8 @@ public abstract class CommonCrudController extends AbstractBaseController {
/**
* Delete all data in region
- * @param region gemfire region
+ *
+ * @param region gemfire region
* @return JSON document containing result
*/
@RequestMapping(method = RequestMethod.DELETE, value = "/{region}")
@@ -180,8 +181,8 @@ public abstract class CommonCrudController extends AbstractBaseController {
}
/**
- * Ping is not secured so that it may not be used to determine a valid username/password
- * @return
+ * Ping is not secured so that it may not be used to determine a valid
+ * username/password
*/
@RequestMapping(method = { RequestMethod.GET, RequestMethod.HEAD }, value = "/ping")
@ApiOperation(
[2/5] incubator-geode git commit: GEODE-2009: add FlakyTest category
to testCreateAlterDestroyUpdatesSharedConfig
Posted by kl...@apache.org.
GEODE-2009: add FlakyTest category to testCreateAlterDestroyUpdatesSharedConfig
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7330733e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7330733e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7330733e
Branch: refs/heads/develop
Commit: 7330733e31ea9fde5452ae983bb99d255f4ed2fc
Parents: 474ff41
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Oct 17 12:18:35 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Oct 17 16:30:19 2016 -0700
----------------------------------------------------------------------
.../cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7330733e/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index 5fa06d9..effe294 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -785,6 +785,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
/**
* Asserts that creating, altering and destroying regions correctly updates the shared configuration.
*/
+ @Category(FlakyTest.class) // GEODE-2009
@Test
public void testCreateAlterDestroyUpdatesSharedConfig() {
disconnectAllFromDS();