[isis] branch v2 updated: ISIS-2039 minor cleanup

[ahuber]

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

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


The following commit(s) were added to refs/heads/v2 by this push:
     new b9b0925  ISIS-2039 minor cleanup
b9b0925 is described below

commit b9b0925332d84256fc7517fdba8f04d46dff571d
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Dec 12 00:13:05 2018 +0100

    ISIS-2039 minor cleanup
---
 .../actions/action/prototype/PrototypeFacetForActionAnnotation.java   | 1 -
 .../facets/actions/action/PrototypeFacetAnnotationFactoryTest.java    | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
index 685d659..dc3939e 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
@@ -37,7 +37,6 @@ public class PrototypeFacetForActionAnnotation extends 
PrototypeFacetAbstract {
         
         return actions.stream()
                 .map(Action::restrictTo)
-                .filter(restrictTo -> restrictTo != RestrictTo.NOT_SPECIFIED)
                 .filter(restrictTo -> restrictTo == RestrictTo.PROTOTYPING)
                 .findFirst()
                 .map(restrictTo -> new 
PrototypeFacetForActionAnnotation(holder, deploymentType))
diff --git 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
index c3fe0b7..9037c9f 100644
--- 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
+++ 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
@@ -28,11 +28,10 @@ import 
org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
 import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
 import 
org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
 
 public class PrototypeFacetAnnotationFactoryTest extends 
AbstractFacetFactoryTest {
 
-    private JUnitRuleMockery2 context = 
JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+    //private JUnitRuleMockery2 context = 
JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
 
     private ActionAnnotationFacetFactory facetFactory;
 
@@ -52,7 +51,6 @@ public class PrototypeFacetAnnotationFactoryTest extends 
AbstractFacetFactoryTes
 
     public void testAnnotationPickedUp() {
         class Customer {
-            @SuppressWarnings("unused")
             @Action(restrictTo = RestrictTo.PROTOTYPING)
             public void someAction() {
             }