dawidwys commented on a change in pull request #18726:
URL: https://github.com/apache/flink/pull/18726#discussion_r807008383
##########
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 important is that refactoring? It takes ages to regenerate the rule
files.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
