From d94957104572784564c10bd4cf0a3f995b5e8586 Mon Sep 17 00:00:00 2001 From: Rick Ossendrijver Date: Mon, 11 Dec 2023 21:27:43 +0100 Subject: [PATCH] Issue #14129: Make long class and interface names shorter --- .../modifier/RedundantModifierCheckTest.java | 2 +- ...putRedundantModifierNestedClassInInt.java} | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/{InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java => InputRedundantModifierNestedClassInInt.java} (60%) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java index af4601e7fef..c7a01f7c622 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java @@ -135,7 +135,7 @@ public void testNestedClassConsInPublicInterfaceHasValidPublicModifier() throws }; verifyWithInlineConfigParser( - getPath("InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java"), + getPath("InputRedundantModifierNestedClassInInt.java"), expected); } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInInt.java similarity index 60% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInInt.java index 03a0cb906b3..bafe3ca16bf 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInInt.java @@ -8,7 +8,7 @@ package com.puppycrawl.tools.checkstyle.checks.modifier.redundantmodifier; -public interface InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers { +public interface InputRedundantModifierNestedClassInInt { interface PublicInnerInterface { interface PublicInnerInnerInterface { class PublicInnerClassInNestedPublicInterfaces { @@ -16,14 +16,14 @@ public PublicInnerClassInNestedPublicInterfaces() { } // OK in public class } } } - class PublicClassInsideInterface { - private interface PrivateNestedInterface { - class ClassInPrivateNestedInterface { - public ClassInPrivateNestedInterface() { } // violation + class PublicClassInsideInt { + private interface PrivateNestedInt { + class ClassInPrivateNestedInt { + public ClassInPrivateNestedInt() { } // violation } - public interface PrivateNestedInterfaceWithPublicModifier { // violation - class ClassInPrivateNestedInterface { - public ClassInPrivateNestedInterface() { } // violation + public interface PrivateNestedIntWithPublicModifier { // violation + class ClassInPrivateNestedInt { + public ClassInPrivateNestedInt() { } // violation } } } @@ -33,13 +33,13 @@ public PublicInnerClassInNestedPublicInterfaces() { } // OK in public class } } protected interface PublicInnerInnerProtectedInterface { - class PublicInnerClassInNestedProtectedInterfaces { - public PublicInnerClassInNestedProtectedInterfaces() { } // violation + class PublicInnerClassInNestedProtectedInt { + public PublicInnerClassInNestedProtectedInt() { } // violation } } } - class PublicNestedClassInInterfaceWithPublicConstructor { - public PublicNestedClassInInterfaceWithPublicConstructor() { } // OK in public class + class PublicNestedClassInInterfaceWithPublicConst { + public PublicNestedClassInInterfaceWithPublicConst() { } // OK in public class private class PrivateClassInPublicNestedClass { public class PublicInPrivateClass { public PublicInPrivateClass() { } // violation