GEODE-2007: fix unchecked warnings

mmartell · Oct 17, 2016 · a53c4b1 · a53c4b1
1 parent 7330733
commit a53c4b1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/...odules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java b/...odules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
@@ -535,8 +535,7 @@ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
     }
   }
 
-  @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);
   }
 

diff --git a/.../src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java b/.../src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
@@ -19,6 +19,7 @@
 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 void postSetUp() throws Exception {
   @Override
   public void preTearDown() {
     vm0.invoke(() -> {
-      GemFireCacheImpl.getInstance().getCacheServers().forEach(e -> ((CacheServer)e).stop());
+      (GemFireCacheImpl.getInstance().getCacheServers()).forEach(cacheServer -> cacheServer.stop());
     });
     server.stopContainer();
   }

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
@@ -4015,7 +4015,7 @@ public void setGatewayConflictResolver(GatewayConflictResolver resolver) {
     }
   }
 
-  public List getCacheServers() {
+  public List<CacheServer> getCacheServers() {
     List cacheServersWithoutReceiver = null;
     if (!allCacheServers.isEmpty()) {
     Iterator allCacheServersIterator = allCacheServers.iterator();

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
@@ -22,6 +22,7 @@
 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 @@ public void run() {
                 && !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);

diff --git a/...st/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/...st/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -200,10 +200,10 @@ public boolean done() {
 
   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

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
@@ -102,8 +102,8 @@ private void convertThrowableForOldClient(String geodeClassName) throws Exceptio
     }
   }
 
-  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();