WELD-2507 Change test package, use Reflections util class.

weld · Jul 24, 2018 · 07279a2 · 07279a2
1 parent 184a670
commit 07279a2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/proxy/InterceptedSubclassFactory.java b/impl/src/main/java/org/jboss/weld/bean/proxy/InterceptedSubclassFactory.java
@@ -252,7 +252,7 @@ private boolean superClassAbstractAndPackagePrivate(Class<?> clazz) {
             return false;
         }
         int modifiers = superClass.getModifiers();
-        return Modifier.isAbstract(modifiers) && !Modifier.isPrivate(modifiers) && !Modifier.isProtected(modifiers) && !Modifier.isPublic(modifiers);
+        return Modifier.isAbstract(modifiers) && Reflections.isPackagePrivate(modifiers);
     }
 
     private boolean bridgeMethodsContainsMethod(Set<BridgeMethod> processedBridgeMethods, MethodSignature signature, Type returnType, boolean isMethodAbstract) {

diff --git a/...ePrivate/AbstractPackagePrivateClass.java → ...ePrivate/AbstractPackagePrivateClass.java b/...ePrivate/AbstractPackagePrivateClass.java → ...ePrivate/AbstractPackagePrivateClass.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.tests.interceptor.inheritance.packagePrivate;
+package org.jboss.weld.tests.interceptors.inheritance.packagePrivate;
 
 /**
  * Class is intentionally kept as package private

diff --git a/...nheritance/packagePrivate/ActualImpl.java → ...nheritance/packagePrivate/ActualImpl.java b/...nheritance/packagePrivate/ActualImpl.java → ...nheritance/packagePrivate/ActualImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.tests.interceptor.inheritance.packagePrivate;
+package org.jboss.weld.tests.interceptors.inheritance.packagePrivate;
 
 import javax.enterprise.context.ApplicationScoped;
 

diff --git a/...rivate/PackagePrivateInterceptedTest.java → ...rivate/PackagePrivateInterceptedTest.java b/...rivate/PackagePrivateInterceptedTest.java → ...rivate/PackagePrivateInterceptedTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.tests.interceptor.inheritance.packagePrivate;
+package org.jboss.weld.tests.interceptors.inheritance.packagePrivate;
 
 import javax.inject.Inject;
 

diff --git a/...tance/packagePrivate/SomeInterceptor.java → ...tance/packagePrivate/SomeInterceptor.java b/...tance/packagePrivate/SomeInterceptor.java → ...tance/packagePrivate/SomeInterceptor.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.tests.interceptor.inheritance.packagePrivate;
+package org.jboss.weld.tests.interceptors.inheritance.packagePrivate;
 
 import javax.annotation.Priority;
 import javax.interceptor.AroundInvoke;

diff --git a/...heritance/packagePrivate/TestBinding.java → ...heritance/packagePrivate/TestBinding.java b/...heritance/packagePrivate/TestBinding.java → ...heritance/packagePrivate/TestBinding.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.tests.interceptor.inheritance.packagePrivate;
+package org.jboss.weld.tests.interceptors.inheritance.packagePrivate;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;