From eb6f16e2f9985aef0b5d0c550c6c0bba7d1e3073 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <gaul@apache.org>
Date: Fri, 29 Jan 2016 08:50:09 -0800
Subject: [PATCH] Enable CollectionIncompatibleType

Also suppress two false positives.
---
 .../integration/internal/BaseServiceIntegrationTest.java         | 1 +
 .../main/java/org/jclouds/json/internal/NamingStrategies.java    | 1 +
 project/pom.xml                                                  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java
index 1b3854c49d..31780e4c14 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java
@@ -34,6 +34,7 @@ import com.google.common.collect.Iterables;
 
 public class BaseServiceIntegrationTest extends BaseBlobStoreIntegrationTest {
 
+   @SuppressWarnings("CollectionIncompatibleType")
    @Test(groups = { "integration", "live" })
    void containerDoesntExist() {
       Set<? extends StorageMetadata> list = view.getBlobStore().list();
diff --git a/core/src/main/java/org/jclouds/json/internal/NamingStrategies.java b/core/src/main/java/org/jclouds/json/internal/NamingStrategies.java
index ddee5dd49f..534a469b77 100644
--- a/core/src/main/java/org/jclouds/json/internal/NamingStrategies.java
+++ b/core/src/main/java/org/jclouds/json/internal/NamingStrategies.java
@@ -271,6 +271,7 @@ public class NamingStrategies {
          return tryFind(constructors(token), hasMarker).orNull();
       }
 
+      @SuppressWarnings("CollectionIncompatibleType")
       @VisibleForTesting
       <T> String translateName(Invokable<T, T> c, int index) {
          String name = null;
diff --git a/project/pom.xml b/project/pom.xml
index ddfbf556f4..2b12e42398 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -748,6 +748,7 @@
               <compilerArg>-Xlint:-serial</compilerArg>
               <compilerArg>-Xlint:-unchecked</compilerArg>
               <compilerArg>-Xep:ClassCanBeStatic:ERROR</compilerArg>
+              <compilerArg>-Xep:CollectionIncompatibleType:ERROR</compilerArg>
               <compilerArg>-Xep:EqualsHashCode:ERROR</compilerArg>
               <compilerArg>-Xep:GuiceAssistedInjectScoping:OFF</compilerArg>
               <compilerArg>-Xep:LongLiteralLowerCaseSuffix:OFF</compilerArg>