Skip to content

Commit 7eade59

Browse files
quaffquaff
committed
Make inner classes as static where feasible
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
1 parent 30287d7 commit 7eade59

16 files changed

Lines changed: 59 additions & 60 deletions

File tree

‎spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ public interface Foo {
687687
}
688688

689689

690-
public class Bar implements Foo {
690+
public static class Bar implements Foo {
691691

692692
private double version;
693693

@@ -710,7 +710,7 @@ public interface ObjectWithId<T extends Comparable<T>> {
710710
}
711711

712712

713-
public class Promotion implements ObjectWithId<Long> {
713+
public static class Promotion implements ObjectWithId<Long> {
714714

715715
private Long id;
716716

‎spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ interface TextBookOperations extends BookOperations {
934934
}
935935

936936

937-
abstract class Library {
937+
abstract static class Library {
938938

939939
public Book getBook() {
940940
return null;
@@ -945,7 +945,7 @@ public void setBook(Book book) {
945945
}
946946

947947

948-
class LawLibrary extends Library implements TextBookOperations {
948+
static class LawLibrary extends Library implements TextBookOperations {
949949

950950
@Override
951951
public LawBook getBook() {

‎spring-beans/src/test/java/org/springframework/beans/factory/support/AutowireUtilsTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void genericMethodReturnTypes() {
8282
public interface MyInterfaceType<T> {
8383
}
8484

85-
public class MySimpleInterfaceType implements MyInterfaceType<String> {
85+
public static class MySimpleInterfaceType implements MyInterfaceType<String> {
8686
}
8787

8888
public static class MyTypeWithMethods<T> {

‎spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void singleExecutionShouldNotHaveNextExecution() {
9595
assertThat(scheduledTask.nextExecution()).isNull();
9696
}
9797

98-
class CountingRunnable implements Runnable {
98+
static class CountingRunnable implements Runnable {
9999

100100
int executionCount;
101101

‎spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ public boolean isValid(Object value, ConstraintValidatorContext context) {
525525
}
526526

527527

528-
public class BeanWithListElementConstraint {
528+
public static class BeanWithListElementConstraint {
529529

530530
@Valid
531531
private List<@NotNull String> property;
@@ -540,7 +540,7 @@ public void setProperty(List<String> property) {
540540
}
541541

542542

543-
public class BeanWithMapEntryConstraint {
543+
public static class BeanWithMapEntryConstraint {
544544

545545
@Valid
546546
private Map<@NotNull String, @NotNull String> property;

‎spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,23 +89,23 @@ private Class<? extends Throwable> findClosestMatch(
8989
}
9090

9191
@SuppressWarnings("serial")
92-
public class HighestDepthException extends Throwable {
92+
public static class HighestDepthException extends Throwable {
9393
}
9494

9595
@SuppressWarnings("serial")
96-
public class LowestDepthException extends HighestDepthException {
96+
public static class LowestDepthException extends HighestDepthException {
9797
}
9898

9999
@SuppressWarnings("serial")
100-
public class TargetException extends LowestDepthException {
100+
public static class TargetException extends LowestDepthException {
101101
}
102102

103103
@SuppressWarnings("serial")
104-
public class SameDepthException extends LowestDepthException {
104+
public static class SameDepthException extends LowestDepthException {
105105
}
106106

107107
@SuppressWarnings("serial")
108-
public class NoDepthException extends TargetException {
108+
public static class NoDepthException extends TargetException {
109109
}
110110

111111
}

‎spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -273,39 +273,39 @@ default T get() {
273273
}
274274
}
275275

276-
public class MySimpleInterfaceType implements MyInterfaceType<String> {
276+
public static class MySimpleInterfaceType implements MyInterfaceType<String> {
277277
}
278278

279-
public class MyParameterizedInterfaceType<P> implements MyInterfaceType<Collection<P>> {
279+
public static class MyParameterizedInterfaceType<P> implements MyInterfaceType<Collection<P>> {
280280
}
281281

282-
public class MyOptionalInterfaceType extends MyParameterizedInterfaceType<Optional<String>> {
282+
public static class MyOptionalInterfaceType extends MyParameterizedInterfaceType<Optional<String>> {
283283
@Override
284284
public Collection<Optional<String>> get() {
285285
return super.get();
286286
}
287287
}
288288

289-
public class MyCollectionInterfaceType implements MyInterfaceType<Collection<String>> {
289+
public static class MyCollectionInterfaceType implements MyInterfaceType<Collection<String>> {
290290
@Override
291291
public Collection<String> get() {
292292
return MyInterfaceType.super.get();
293293
}
294294
}
295295

296-
public abstract class MyAbstractType<T> implements MyInterfaceType<T> {
296+
public abstract static class MyAbstractType<T> implements MyInterfaceType<T> {
297297
}
298298

299-
public class MyConcreteType extends MyAbstractType<Character> {
299+
public static class MyConcreteType extends MyAbstractType<Character> {
300300
}
301301

302-
public abstract class MySuperclassType<T> {
302+
public abstract static class MySuperclassType<T> {
303303
}
304304

305-
public class MySimpleSuperclassType extends MySuperclassType<String> {
305+
public static class MySimpleSuperclassType extends MySuperclassType<String> {
306306
}
307307

308-
public class MyCollectionSuperclassType extends MySuperclassType<Collection<String>> {
308+
public static class MyCollectionSuperclassType extends MySuperclassType<Collection<String>> {
309309
}
310310

311311
public static class MyTypeWithMethods<T> {
@@ -407,17 +407,17 @@ public static class MySimpleTypeWithMethods extends MyTypeWithMethods<Integer> {
407407
static class GenericClass<T> {
408408
}
409409

410-
class A {}
410+
static class A {}
411411

412-
class B<T> {}
412+
static class B<T> {}
413413

414-
class C extends A {}
414+
static class C extends A {}
415415

416-
class D extends B<Long> {}
416+
static class D extends B<Long> {}
417417

418-
class E extends C {}
418+
static class E extends C {}
419419

420-
class TestIfc<T> {}
420+
static class TestIfc<T> {}
421421

422422
class TestImpl<I extends A, T extends B<I>> extends TestIfc<T> {
423423
}

‎spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,7 +1825,7 @@ public TypedConstructors(Map<String, Long> p) {
18251825
public interface MyInterfaceType<T> {
18261826
}
18271827

1828-
public class MyGenericInterfaceType<T> implements MyInterfaceType<T>, ResolvableTypeProvider {
1828+
public static class MyGenericInterfaceType<T> implements MyInterfaceType<T>, ResolvableTypeProvider {
18291829

18301830
private final Class<T> type;
18311831

@@ -1842,26 +1842,26 @@ public ResolvableType getResolvableType() {
18421842
}
18431843
}
18441844

1845-
public class MySimpleInterfaceType implements MyInterfaceType<String> {
1845+
public static class MySimpleInterfaceType implements MyInterfaceType<String> {
18461846
}
18471847

1848-
public abstract class MySimpleInterfaceTypeWithImplementsRaw implements MyInterfaceType<String>, List {
1848+
public abstract static class MySimpleInterfaceTypeWithImplementsRaw implements MyInterfaceType<String>, List {
18491849
}
18501850

1851-
public abstract class ExtendsMySimpleInterfaceTypeWithImplementsRaw extends MySimpleInterfaceTypeWithImplementsRaw {
1851+
public abstract static class ExtendsMySimpleInterfaceTypeWithImplementsRaw extends MySimpleInterfaceTypeWithImplementsRaw {
18521852
}
18531853

1854-
public class MyCollectionInterfaceType implements MyInterfaceType<Collection<String>> {
1854+
public static class MyCollectionInterfaceType implements MyInterfaceType<Collection<String>> {
18551855
}
18561856

18571857

1858-
public abstract class MySuperclassType<T> {
1858+
public abstract static class MySuperclassType<T> {
18591859
}
18601860

1861-
public class MySimpleSuperclassType extends MySuperclassType<String> {
1861+
public static class MySimpleSuperclassType extends MySuperclassType<String> {
18621862
}
18631863

1864-
public class MyCollectionSuperclassType extends MySuperclassType<Collection<String>> {
1864+
public static class MyCollectionSuperclassType extends MySuperclassType<Collection<String>> {
18651865
}
18661866

18671867

@@ -1871,22 +1871,22 @@ public interface Consumer<T> {
18711871
private static class SubConsumer<N extends Number> implements Consumer<N> {
18721872
}
18731873

1874-
public class Wildcard<T extends CharSequence> {
1874+
public static class Wildcard<T extends CharSequence> {
18751875
}
18761876

1877-
public class WildcardFixed extends Wildcard<String> {
1877+
public static class WildcardFixed extends Wildcard<String> {
18781878
}
18791879

1880-
public class WildcardConsumer<T extends CharSequence & Serializable> implements Consumer<Wildcard<T>> {
1880+
public static class WildcardConsumer<T extends CharSequence & Serializable> implements Consumer<Wildcard<T>> {
18811881
}
18821882

1883-
public class DoubleWildcard<T extends CharSequence & Serializable> {
1883+
public static class DoubleWildcard<T extends CharSequence & Serializable> {
18841884
}
18851885

1886-
public class DoubleWildcardFixed extends DoubleWildcard<String> {
1886+
public static class DoubleWildcardFixed extends DoubleWildcard<String> {
18871887
}
18881888

1889-
public class DoubleWildcardConsumer<T extends CharSequence & Serializable> implements Consumer<DoubleWildcard<T>> {
1889+
public static class DoubleWildcardConsumer<T extends CharSequence & Serializable> implements Consumer<DoubleWildcard<T>> {
18901890
}
18911891

18921892

@@ -1905,10 +1905,10 @@ interface ListOfListSupplier<T> {
19051905
}
19061906

19071907

1908-
class Foo<T extends Foo<T>> {
1908+
static class Foo<T extends Foo<T>> {
19091909
}
19101910

1911-
class Bar extends Foo<Bar> {
1911+
static class Bar extends Foo<Bar> {
19121912
}
19131913

19141914

@@ -1940,19 +1940,19 @@ public interface IProvider<P> {
19401940
public interface IBase<BT extends IBase<BT>> {
19411941
}
19421942

1943-
public abstract class AbstractBase<BT extends IBase<BT>> implements IBase<BT> {
1943+
public abstract static class AbstractBase<BT extends IBase<BT>> implements IBase<BT> {
19441944
}
19451945

1946-
public class BaseImplementation extends AbstractBase<BaseImplementation> {
1946+
public static class BaseImplementation extends AbstractBase<BaseImplementation> {
19471947
}
19481948

1949-
public class BaseProvider<BT extends IBase<BT>> implements IProvider<IBase<BT>> {
1949+
public static class BaseProvider<BT extends IBase<BT>> implements IProvider<IBase<BT>> {
19501950

19511951
public Collection<IBase<BT>> stuff;
19521952
}
19531953

19541954

1955-
public abstract class UnresolvedWithGenerics {
1955+
public abstract static class UnresolvedWithGenerics {
19561956

19571957
Set<Integer> set;
19581958
}

‎spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1519,7 +1519,7 @@ interface TransactionalService {
15191519
@Nullable Object doIt();
15201520
}
15211521

1522-
class TransactionalServiceImpl implements TransactionalService {
1522+
static class TransactionalServiceImpl implements TransactionalService {
15231523

15241524
@Override
15251525
public @Nullable Object doIt() {

‎spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2805,7 +2805,7 @@ interface TransactionalService {
28052805
void doIt();
28062806
}
28072807

2808-
class TransactionalServiceImpl implements TransactionalService {
2808+
static class TransactionalServiceImpl implements TransactionalService {
28092809

28102810
@Override
28112811
public void doIt() {
@@ -3300,8 +3300,7 @@ static class SecurityConfig {
33003300
@interface DoublyComposedRootAnnotation {
33013301
}
33023302

3303-
class DomainType {
3304-
3303+
static class DomainType {
33053304
@RootAnnotation
33063305
Object directlyAnnotated;
33073306

0 commit comments

Comments
 (0)