From 636e87568d3906e9d42136bcf87e40fee405aff3 Mon Sep 17 00:00:00 2001 From: sullis Date: Sun, 20 Feb 2022 19:26:04 -0800 Subject: [PATCH] update ArchUnit rules (#11671) --- .../codegen/ArchUnitRulesTest.java | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ArchUnitRulesTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ArchUnitRulesTest.java index fee76d588f6..1eb57d9014f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ArchUnitRulesTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ArchUnitRulesTest.java @@ -4,36 +4,34 @@ import com.tngtech.archunit.core.domain.JavaClasses; import com.tngtech.archunit.core.domain.JavaModifier; import com.tngtech.archunit.core.importer.ClassFileImporter; import com.tngtech.archunit.lang.ArchRule; -import com.tngtech.archunit.library.GeneralCodingRules; import org.junit.Test; -import org.slf4j.Logger; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.*; +import static com.tngtech.archunit.library.GeneralCodingRules.NO_CLASSES_SHOULD_ACCESS_STANDARD_STREAMS; +import static com.tngtech.archunit.library.GeneralCodingRules.NO_CLASSES_SHOULD_USE_JAVA_UTIL_LOGGING; public class ArchUnitRulesTest { + private static final JavaClasses CLASSES = new ClassFileImporter() + .importPackages("org.openapitools.codegen.languages"); @Test public void testLoggersAreNotPublicFinalAndNotStatic() { - final JavaClasses importedClasses = new ClassFileImporter() - .importPackages("org.openapitools.codegen.languages"); - - ArchUnitRulesTest.LOGGERS_SHOULD_BE_NOT_PUBLIC_NOT_STATIC_AND_FINAL.check(importedClasses); + ArchUnitRulesTest.LOGGERS_SHOULD_BE_NOT_PUBLIC_NOT_STATIC_AND_FINAL.check(CLASSES); } @Test public void classesNotAllowedToUseStandardStreams() { - final JavaClasses importedClasses = new ClassFileImporter() - .importPackages("org.openapitools.codegen.languages"); + NO_CLASSES_SHOULD_ACCESS_STANDARD_STREAMS.check(CLASSES); + } - GeneralCodingRules.NO_CLASSES_SHOULD_ACCESS_STANDARD_STREAMS.check(importedClasses); + @Test + public void disallowJavaUtilLogging() { + NO_CLASSES_SHOULD_USE_JAVA_UTIL_LOGGING.check(CLASSES); } @Test public void abstractClassesAreAbstract() { - final JavaClasses importedClasses = new ClassFileImporter() - .importPackages("org.openapitools.codegen.languages"); - - ArchUnitRulesTest.ABSTRACT_CLASS_MUST_BE_ABSTRACT.check(importedClasses); + ArchUnitRulesTest.ABSTRACT_CLASS_MUST_BE_ABSTRACT.check(CLASSES); } /** @@ -43,7 +41,7 @@ public class ArchUnitRulesTest { public static final ArchRule LOGGERS_SHOULD_BE_NOT_PUBLIC_NOT_STATIC_AND_FINAL = fields() .that() - .haveRawType(Logger.class) + .haveRawType(org.slf4j.Logger.class) .should().notBePublic() .andShould().notBeStatic() .andShould().beFinal()