You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/05/27 19:41:22 UTC

[isis] branch master updated: ISIS-1841: further cleaning up some compiler warnings

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 86a1265  ISIS-1841: further cleaning up some compiler warnings
86a1265 is described below

commit 86a1265e50991b202e67d6c967c404448692a75d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun May 27 21:40:12 2018 +0200

    ISIS-1841: further cleaning up some compiler warnings
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-1841
---
 .../isis/core/integtestsupport/IsisSystemForTest.java       |  6 +++---
 .../apache/isis/tool/mavenplugin/util/MavenProjects.java    |  1 -
 .../annotation/RemoveAnnotatedMethodsFacetFactory.java      |  6 +++---
 .../annotprop/MemberGroupLayoutFacetFactory.java            |  1 -
 .../isis/core/metamodel/services/swagger/internal/Util.java | 13 ++++---------
 .../isis/core/metamodel/spec/feature/ObjectAction.java      |  6 +++---
 .../org/apache/isis/core/runtime/headless/IsisSystem.java   |  1 -
 .../IsisComponentProviderUsingInstallers.java               |  1 -
 .../isis/viewer/restfulobjects/server/ResourceContext.java  |  1 -
 9 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
index 0a9be65..ef8cd70 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
@@ -153,8 +153,9 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
 
         private AppManifest appManifestIfAny;
 
-        private final List<Object> services = _Lists.newArrayList();
-        private final List<InstallableFixture> fixtures = _Lists.newArrayList();
+//[ahuber] not used        
+//        private final List<Object> services = _Lists.newArrayList();
+//        private final List<InstallableFixture> fixtures = _Lists.newArrayList();
 
         private final List <Listener> listeners = _Lists.newArrayList();
 
@@ -628,7 +629,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
      * @see org.apache.isis.core.integtestsupport.ServiceProvider#getService(java.lang.Class)
      */
     @Override
-    @SuppressWarnings("unchecked")
     public <T> T getService(Class<T> serviceClass) {
         final ServicesInjector servicesInjector = isisSessionFactory.getServicesInjector();
         return servicesInjector.lookupServiceElseFail(serviceClass);
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/MavenProjects.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/MavenProjects.java
index d74dcdb..9eda11a 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/MavenProjects.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/MavenProjects.java
@@ -29,7 +29,6 @@ public final class MavenProjects {
 
     public static Plugin lookupPlugin(MavenProject mavenProject, String key) {
     
-        @SuppressWarnings("unchecked")
         List<Plugin> plugins = mavenProject.getBuildPlugins();
     
         for (Plugin plugin : plugins) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
index 6d456e6..4f5f708 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
@@ -28,6 +28,7 @@ import javax.annotation.PreDestroy;
 import com.google.common.eventbus.Subscribe;
 
 import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.commons.internal.base._Casts;
 import org.apache.isis.core.commons.lang.ClassUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facetapi.MethodRemover;
@@ -43,8 +44,8 @@ public class RemoveAnnotatedMethodsFacetFactory extends FacetFactoryAbstract {
 
         try {
             // doing this reflectively so that don't bring in a dependency on axon.
-            Class cls = (Class) ClassUtil.forName("org.axonframework.eventhandling.annotation.EventHandler");
-            eventHandlerClass = cls;
+            eventHandlerClass = _Casts.uncheckedCast(
+            		ClassUtil.forName("org.axonframework.eventhandling.annotation.EventHandler"));
 
         } catch(Exception ignore) {
             // ignore
@@ -57,7 +58,6 @@ public class RemoveAnnotatedMethodsFacetFactory extends FacetFactoryAbstract {
         removeIgnoredMethods(processClassContext.getCls(), processClassContext);
     }
 
-    @SuppressWarnings("deprecation")
     private void removeIgnoredMethods(final Class<?> cls, final MethodRemover methodRemover) {
         if (cls == null) {
             return;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
index 0b46def..9a26a21 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
@@ -108,7 +108,6 @@ public class MemberGroupLayoutFacetFactory extends FacetFactoryAbstract implemen
                 return true;
             }
 
-            @SuppressWarnings("unchecked")
             private int numCollectionsOf(ObjectSpecification objectSpec) {
                 List<ObjectAssociation> objectCollections = objectSpec.getAssociations(
                         Contributed.EXCLUDED, com.google.common.base.Predicates.and(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
index 97a7b24..d81f3e0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
@@ -22,9 +22,8 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import com.google.common.base.Predicate;
-
 import org.apache.isis.applib.services.swagger.SwaggerService;
+import org.apache.isis.commons.internal.base._Casts;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -34,6 +33,8 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 
+import com.google.common.base.Predicate;
+
 import io.swagger.models.Response;
 
 public final class Util {
@@ -116,7 +117,6 @@ public final class Util {
     static <T extends ObjectAssociation> List<T> associationsOf(
             final ObjectSpecification objectSpecification,
             final Predicate<ObjectAssociation> associationPredicate, final SwaggerService.Visibility visibility) {
-        @SuppressWarnings("rawtypes")
         final List<ObjectAssociation> list =
                 objectSpecification.getAssociations(
                         Contributed.INCLUDED,
@@ -124,12 +124,7 @@ public final class Util {
                                 associationPredicate,
                                 associationsWith(visibility) ));
 
-        return cast(list);
-    }
-
-    @SuppressWarnings("unchecked")
-    static <T> List<T> cast(final List list) {
-        return list;
+        return _Casts.uncheckedCast(list);
     }
 
     static List<ObjectAction> actionsOf(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index c4d16a4..24f32de 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -163,7 +163,7 @@ public interface ObjectAction extends ObjectMember {
      * @return
      */
     List<ObjectActionParameter> getParameters(
-            @SuppressWarnings("deprecation") Predicate<ObjectActionParameter> predicate);
+            Predicate<ObjectActionParameter> predicate);
 
     /**
      * Returns the parameter with provided id.
@@ -304,7 +304,7 @@ public interface ObjectAction extends ObjectMember {
 
             final ObjectSpecification adapterSpec = adapter.getSpecification();
 
-            @SuppressWarnings({ "unchecked", "deprecation" })
+            @SuppressWarnings({ "unchecked" })
             Predicate<ObjectAction> predicate = com.google.common.base.Predicates
                     .and(ObjectAction.Predicates.memberOrderNotAssociationOf(adapterSpec),
                             ObjectAction.Predicates.dynamicallyVisible(adapter, InteractionInitiatedBy.USER, Where.ANYWHERE),
@@ -344,7 +344,7 @@ public interface ObjectAction extends ObjectMember {
                 final ObjectAssociation association, final List<ObjectAction> associatedActions) {
             final ObjectSpecification objectSpecification = adapter.getSpecification();
 
-            @SuppressWarnings({ "unchecked", "deprecation" })
+            @SuppressWarnings({ "unchecked" })
             Predicate<ObjectAction> predicate = com.google.common.base.Predicates
                     .and(ObjectAction.Predicates.memberOrderOf(association), ObjectAction.Predicates.notBulkOnly(),
                             ObjectAction.Predicates.excludeWizardActions(objectSpecification));
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
index fce5a55..7a873fa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
@@ -436,7 +436,6 @@ public class IsisSystem {
 
     // -- getService
 
-    @SuppressWarnings("unchecked")
     public <C> C getService(Class<C> serviceClass) {
         final ServicesInjector servicesInjector = isisSessionFactory.getServicesInjector();
         return servicesInjector.lookupServiceElseFail(serviceClass);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
index dd667c4..1c798ea 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
@@ -205,7 +205,6 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
             return (T) getInstaller(implName);
         }
 
-        @SuppressWarnings("unchecked")
         public Installer getInstaller(final String implClassName) {
             try {
                 return ObjectExtensions.asT(InstanceUtil.createInstance(implClassName));
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index 4221a74..901ea19 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -173,7 +173,6 @@ public class ResourceContext implements RendererContext6 {
     }
 
     protected JsonRepresentation requestArgsAsMap() {
-        @SuppressWarnings("unchecked")
         final Map<String,String[]> params = httpServletRequest.getParameterMap();
 
         if(simpleQueryArgs(params)) {

-- 
To stop receiving notification emails like this one, please contact
ahuber@apache.org.