JingGe commented on a change in pull request #18726:
URL: https://github.com/apache/flink/pull/18726#discussion_r807004649
##########
File path:
flink-architecture-tests/flink-architecture-tests-test/src/main/java/org/apache/flink/architecture/rules/ITCaseRules.java
##########
@@ -63,29 +66,41 @@
.should(
fulfill(
// JUnit 5 violation check
-
containAnyFieldsInClassHierarchyThat(
-
arePublicStaticFinalOfType(
-
MiniClusterExtension.class))
- .and(
-
containAnyFieldsInClassHierarchyThat(
-
arePublicStaticFinalOfTypeWithAnnotation(
-
AllCallbackWrapper
-
.class,
-
RegisterExtension
-
.class)))
+ miniClusterExtensionRule()
+
.or(miniClusterWithClientExtensionRule())
// JUnit 4 violation
check, which should be
// removed
// after the JUnit 4->5
migration is closed.
- .or(
-
containAnyFieldsInClassHierarchyThat(
-
arePublicStaticFinalOfTypeWithAnnotation(
-
MiniClusterWithClientResource
-
.class,
-
ClassRule.class)))
- .or(
-
containAnyFieldsInClassHierarchyThat(
-
arePublicFinalOfTypeWithAnnotation(
-
MiniClusterWithClientResource
-
.class,
-
Rule.class))))));
+
.or(miniClusterWithClientResourceClassRule())
+
.or(miniClusterWithClientResourceRule()))));
+
+ private static DescribedPredicate<JavaClass>
miniClusterWithClientResourceClassRule() {
+ return containAnyFieldsInClassHierarchyThat(
+ arePublicStaticFinalOfTypeWithAnnotation(
+ MiniClusterWithClientResource.class, ClassRule.class));
+ }
+
+ private static DescribedPredicate<JavaClass>
miniClusterWithClientResourceRule() {
+ return containAnyFieldsInClassHierarchyThat(
+ arePublicFinalOfTypeWithAnnotation(
+ MiniClusterWithClientResource.class, Rule.class));
+ }
+
+ private static DescribedPredicate<JavaClass> miniClusterExtensionRule() {
+ return containAnyFieldsInClassHierarchyThat(
+ arePublicStaticFinalOfType(MiniClusterExtension.class))
+ .and(
+ containAnyFieldsInClassHierarchyThat(
+ arePublicStaticFinalOfTypeWithAnnotation(
+ AllCallbackWrapper.class,
RegisterExtension.class)));
+ }
+
+ private static DescribedPredicate<JavaClass>
miniClusterWithClientExtensionRule() {
+ return containAnyFieldsInClassHierarchyThat(
+
arePublicStaticFinalOfType(MiniClusterWithClientExtension.class))
+ .and(
+ containAnyFieldsInClassHierarchyThat(
+ arePublicStaticFinalOfTypeWithAnnotation(
+ AllCallbackWrapper.class,
RegisterExtension.class)));
+ }
Review comment:
how about with one method by using:
`containAnyFieldsInClassHierarchyThat(
arePublicStaticFinalOfType(
MiniClusterExtension.class)).or(containAnyFieldsInClassHierarchyThat(
arePublicStaticFinalOfType(
MiniClusterWithClientExtension.class))).and(
containAnyFieldsInClassHierarchyThat(
arePublicStaticFinalOfTypeWithAnnotation(
AllCallbackWrapper.class,
RegisterExtension.class)))`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@flink.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
