Skip to content

Commit 62ae580

Browse files
committed
Minor renaming, warnings removal
1 parent 2982d83 commit 62ae580

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/main/java/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ public String findNameForRegularGetter(AnnotatedMethod am, String name)
7070
// coverage without false matches; but for now let's assume there is
7171
// no reason to use any such getter from CGLib.
7272
if ("getCallbacks".equals(name)) {
73-
if (isCglibGetCallbacks(am)) {
73+
if (_isCglibGetCallbacks(am)) {
7474
return null;
7575
}
7676
} else if ("getMetaClass".equals(name)) {
7777
// 30-Apr-2009, tatu: Need to suppress serialization of a cyclic reference
78-
if (isGroovyMetaClassGetter(am)) {
78+
if (_isGroovyMetaClassGetter(am)) {
7979
return null;
8080
}
8181
}
@@ -173,7 +173,7 @@ protected static String stdManglePropertyName(final String basename, final int o
173173

174174
/*
175175
/**********************************************************************
176-
/* Legacy methods copied in 2.12 from "BeanUtil" -- are these still needed?
176+
/* Legacy methods moved in 2.12 from "BeanUtil" -- are these still needed?
177177
/**********************************************************************
178178
*/
179179

@@ -182,7 +182,7 @@ protected static String stdManglePropertyName(final String basename, final int o
182182
// At this point caller has detected a potential getter method with
183183
// name "getCallbacks" and we need to determine if it is indeed injected
184184
// by Cglib. We do this by verifying that the result type is "net.sf.cglib.proxy.Callback[]"
185-
private static boolean isCglibGetCallbacks(AnnotatedMethod am)
185+
protected boolean _isCglibGetCallbacks(AnnotatedMethod am)
186186
{
187187
Class<?> rt = am.getRawType();
188188
// Ok, first: must return an array type
@@ -206,7 +206,7 @@ private static boolean isCglibGetCallbacks(AnnotatedMethod am)
206206
}
207207

208208
// Another helper method to deal with Groovy's problematic metadata accessors
209-
private static boolean isGroovyMetaClassGetter(AnnotatedMethod am) {
209+
protected boolean _isGroovyMetaClassGetter(AnnotatedMethod am) {
210210
return am.getRawType().getName().startsWith("groovy.lang");
211211
}
212212

src/test/java/com/fasterxml/jackson/databind/type/ContainerTypesTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.fasterxml.jackson.databind.JavaType;
77
import com.fasterxml.jackson.databind.ObjectMapper;
88
import com.fasterxml.jackson.databind.util.LRUMap;
9+
import com.fasterxml.jackson.databind.util.LookupCache;
910
import com.fasterxml.jackson.databind.util.UnlimitedLookupCache;
1011

1112
// for [databind#1415]
@@ -43,7 +44,7 @@ public void testImplicitCollectionType() throws Exception
4344
// [databind#1725]
4445
public void testMissingCollectionType() throws Exception
4546
{
46-
TypeFactory tf = MAPPER.getTypeFactory().withCache(new LRUMap<Object,JavaType>(4, 8));
47+
TypeFactory tf = MAPPER.getTypeFactory().withCache((LookupCache<Object,JavaType>)new LRUMap<Object,JavaType>(4, 8));
4748
JavaType t = tf.constructParametricType(List.class, HashMap.class);
4849
assertEquals(CollectionType.class, t.getClass());
4950
assertEquals(List.class, t.getRawClass());

0 commit comments

Comments
 (0)