From e0b2f1ef4dd51bbb5695c55de7a0be048bb84338 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 8 Nov 2023 11:39:42 +0100 Subject: [PATCH] Polishing. Fix naming. Original Pull Request: #2940 --- src/main/java/org/springframework/data/util/TypeDiscoverer.java | 2 +- .../java/org/springframework/data/util/TypeInformation.java | 2 +- .../org/springframework/data/mapping/PropertyPathUnitTests.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/util/TypeDiscoverer.java b/src/main/java/org/springframework/data/util/TypeDiscoverer.java index 332ee51ab..45235cfec 100644 --- a/src/main/java/org/springframework/data/util/TypeDiscoverer.java +++ b/src/main/java/org/springframework/data/util/TypeDiscoverer.java @@ -74,7 +74,7 @@ class TypeDiscoverer implements TypeInformation { .map(ResolvableType::toClass).collect(Collectors.toList())); } - static TypeDiscoverer td(ResolvableType type) { + static TypeDiscoverer ofCached(ResolvableType type) { Assert.notNull(type, "Type must not be null"); diff --git a/src/main/java/org/springframework/data/util/TypeInformation.java b/src/main/java/org/springframework/data/util/TypeInformation.java index 3d49c87e7..2b2ff88f9 100644 --- a/src/main/java/org/springframework/data/util/TypeInformation.java +++ b/src/main/java/org/springframework/data/util/TypeInformation.java @@ -60,7 +60,7 @@ public interface TypeInformation { Assert.notNull(type, "Type must not be null"); return type.hasGenerics() || (type.isArray() && type.getComponentType().hasGenerics()) // - || (type.getType() instanceof TypeVariable) ? TypeDiscoverer.td(type) : ClassTypeInformation.from(type); + || (type.getType() instanceof TypeVariable) ? TypeDiscoverer.ofCached(type) : ClassTypeInformation.from(type); } /** diff --git a/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java b/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java index db1f30bf4..51996eb36 100755 --- a/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java @@ -124,7 +124,7 @@ class PropertyPathUnitTests { } @Test - void handlesInvalidCollectionCompountTypeProperl() { + void handlesInvalidCollectionCompoundTypeProperly() { try { PropertyPath.from("usersMame", Bar.class);