Fix or suppress build warnings (molgenis#8828)

* Fix/suppress generics warnings * remove test-jar from pom, since no test code exists in this module
sidohaakma · Jan 7, 2020 · e6ae33b · e6ae33b
1 parent 83f2164
commit e6ae33b
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 22 deletions.
diff --git a/...nis-api-permissions/src/main/java/org/molgenis/api/permissions/PermissionsController.java b/...nis-api-permissions/src/main/java/org/molgenis/api/permissions/PermissionsController.java
@@ -377,7 +377,7 @@ private TypePermissionsResponse convertToTypeResponse(
   }
 
   private Set<PermissionResponse> convertToPermissions(Set<LabelledPermission> permissions) {
-    LinkedHashSet<PermissionResponse> result = new LinkedHashSet();
+    LinkedHashSet<PermissionResponse> result = new LinkedHashSet<>();
     permissions.stream()
         .map(
             labelledPermission ->

diff --git a/...nis-data-icd10/src/main/java/org/molgenis/data/icd10/CollectionsQueryTransformerImpl.java b/...nis-data-icd10/src/main/java/org/molgenis/data/icd10/CollectionsQueryTransformerImpl.java
@@ -43,6 +43,7 @@ public Query<Entity> transformQuery(
     return query;
   }
 
+  @SuppressWarnings("unchecked")
   private void transformQueryRule(QueryRule rule, String icd10EntityTypeId) {
     List<Object> queryValues;
 
@@ -52,7 +53,6 @@ private void transformQueryRule(QueryRule rule, String icd10EntityTypeId) {
         rule.setOperator(QueryRule.Operator.IN);
         break;
       case IN:
-        //noinspection unchecked
         queryValues = (List<Object>) rule.getValue();
         break;
       default:

diff --git a/molgenis-data-icd10/src/main/java/org/molgenis/data/icd10/Icd10ExpanderDecoratorFactory.java b/molgenis-data-icd10/src/main/java/org/molgenis/data/icd10/Icd10ExpanderDecoratorFactory.java
@@ -31,7 +31,7 @@ public Icd10ExpanderDecoratorFactory(Gson gson, CollectionsQueryTransformer quer
 
   @Override
   @SuppressWarnings("unchecked")
-  public Repository createDecoratedRepository(
+  public Repository<Entity> createDecoratedRepository(
       Repository<Entity> repository, Map<String, Object> parameters) {
     return new Icd10ExpanderDecorator(
         repository,

diff --git a/molgenis-data-import/src/main/java/org/molgenis/data/export/mapper/AttributeMapper.java b/molgenis-data-import/src/main/java/org/molgenis/data/export/mapper/AttributeMapper.java
@@ -44,7 +44,7 @@ public class AttributeMapper {
   public static final ImmutableMap<String, String> ATTRIBUTE_ATTRS;
 
   static {
-    Builder builder =
+    Builder<String, String> builder =
         ImmutableMap.<String, String>builder()
             .put(EMX_ATTRIBUTES_NAME, AttributeMetadata.NAME)
             .put(EMX_ATTRIBUTES_LABEL, AttributeMetadata.LABEL)

diff --git a/molgenis-data-import/src/main/java/org/molgenis/data/export/mapper/EntityTypeMapper.java b/molgenis-data-import/src/main/java/org/molgenis/data/export/mapper/EntityTypeMapper.java
@@ -32,7 +32,7 @@ public class EntityTypeMapper {
   public static final ImmutableMap<String, String> ENTITIES_ATTRS;
 
   static {
-    Builder builder =
+    Builder<String, String> builder =
         ImmutableMap.<String, String>builder()
             .put(EMX_ENTITIES_NAME, EntityTypeMetadata.ID)
             .put(EMX_ENTITIES_PACKAGE, EntityTypeMetadata.PACKAGE)

diff --git a/...ta-security/src/main/java/org/molgenis/data/security/owned/OwnershipDecoratorFactory.java b/...ta-security/src/main/java/org/molgenis/data/security/owned/OwnershipDecoratorFactory.java
@@ -27,7 +27,7 @@ public OwnershipDecoratorFactory(Gson gson, MutableAclService mutableAclService)
 
   @Override
   @SuppressWarnings("unchecked")
-  public Repository createDecoratedRepository(
+  public Repository<Entity> createDecoratedRepository(
       Repository<Entity> repository, Map<String, Object> parameters) {
     String ownerAttribute = parameters.get(OWNER_ATTRIBUTE).toString();
     return new OwnershipDecorator(repository, mutableAclService, ownerAttribute);

diff --git a/molgenis-test/pom.xml b/molgenis-test/pom.xml
@@ -16,22 +16,6 @@
     <sonar.skip>true</sonar.skip>
   </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.junit.jupiter</groupId>