removed the constructor in FieldAttributes that was only used in tests.
This commit is contained in:
parent
ddb0c8c825
commit
05ae10a144
@ -55,16 +55,6 @@ public final class FieldAttributes {
|
|||||||
private Type genericType;
|
private Type genericType;
|
||||||
private Collection<Annotation> annotations;
|
private Collection<Annotation> annotations;
|
||||||
|
|
||||||
FieldAttributes(Class<?> declaringClazz, Field f) {
|
|
||||||
this.declaringClazz = $Gson$Preconditions.checkNotNull(declaringClazz);
|
|
||||||
this.name = f.getName();
|
|
||||||
this.declaredType = f.getType();
|
|
||||||
this.isSynthetic = f.isSynthetic();
|
|
||||||
this.modifiers = f.getModifiers();
|
|
||||||
this.field = f;
|
|
||||||
this.resolvedType = getTypeInfoForField(f, declaringClazz);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs a Field Attributes object from the {@code f}.
|
* Constructs a Field Attributes object from the {@code f}.
|
||||||
*
|
*
|
||||||
|
@ -34,7 +34,8 @@ public class DisjunctionExclusionStrategyTest extends TestCase {
|
|||||||
new MockExclusionStrategy(true, true);
|
new MockExclusionStrategy(true, true);
|
||||||
|
|
||||||
private static final Class<?> CLAZZ = String.class;
|
private static final Class<?> CLAZZ = String.class;
|
||||||
private static final FieldAttributes FIELD = new FieldAttributes(CLAZZ, CLAZZ.getFields()[0]);
|
private static final FieldAttributes FIELD =
|
||||||
|
new FieldAttributes(CLAZZ, CLAZZ.getFields()[0], CLAZZ);
|
||||||
|
|
||||||
public void testBadInstantiation() throws Exception {
|
public void testBadInstantiation() throws Exception {
|
||||||
try {
|
try {
|
||||||
|
@ -75,7 +75,7 @@ public class ExposeAnnotationExclusionStrategyTest extends TestCase {
|
|||||||
|
|
||||||
private static FieldAttributes createFieldAttributes(String fieldName) throws Exception {
|
private static FieldAttributes createFieldAttributes(String fieldName) throws Exception {
|
||||||
Field f = MockObject.class.getField(fieldName);
|
Field f = MockObject.class.getField(fieldName);
|
||||||
return new FieldAttributes(MockObject.class, f);
|
return new FieldAttributes(MockObject.class, f, MockObject.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
|
@ -36,12 +36,12 @@ public class FieldAttributesTest extends TestCase {
|
|||||||
@Override
|
@Override
|
||||||
protected void setUp() throws Exception {
|
protected void setUp() throws Exception {
|
||||||
super.setUp();
|
super.setUp();
|
||||||
fieldAttributes = new FieldAttributes(Foo.class, Foo.class.getField("bar"));
|
fieldAttributes = new FieldAttributes(Foo.class, Foo.class.getField("bar"), Foo.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testNullField() throws Exception {
|
public void testNullField() throws Exception {
|
||||||
try {
|
try {
|
||||||
new FieldAttributes(Foo.class, null);
|
new FieldAttributes(Foo.class, null, Foo.class);
|
||||||
fail("Field parameter can not be null");
|
fail("Field parameter can not be null");
|
||||||
} catch (NullPointerException expected) { }
|
} catch (NullPointerException expected) { }
|
||||||
}
|
}
|
||||||
|
@ -34,7 +34,7 @@ public class FieldNamingStrategy2AdapterTest extends TestCase {
|
|||||||
FieldNamingStrategy2 adapter =
|
FieldNamingStrategy2 adapter =
|
||||||
new FieldNamingStrategy2Adapter(new UpperCaseNamingStrategy());
|
new FieldNamingStrategy2Adapter(new UpperCaseNamingStrategy());
|
||||||
assertEquals(expectedFieldName, adapter.translateName(
|
assertEquals(expectedFieldName, adapter.translateName(
|
||||||
new FieldAttributes(String.class, field)));
|
new FieldAttributes(String.class, field, String.class)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
|
@ -46,7 +46,7 @@ public class InnerClassExclusionStrategyTest extends TestCase {
|
|||||||
|
|
||||||
public void testExcludeInnerClassField() throws Exception {
|
public void testExcludeInnerClassField() throws Exception {
|
||||||
Field f = getClass().getField("innerClass");
|
Field f = getClass().getField("innerClass");
|
||||||
assertTrue(strategy.shouldSkipField(new FieldAttributes(getClass(), f)));
|
assertTrue(strategy.shouldSkipField(new FieldAttributes(getClass(), f, getClass())));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testIncludeStaticNestedClassObject() throws Exception {
|
public void testIncludeStaticNestedClassObject() throws Exception {
|
||||||
@ -56,7 +56,7 @@ public class InnerClassExclusionStrategyTest extends TestCase {
|
|||||||
|
|
||||||
public void testIncludeStaticNestedClassField() throws Exception {
|
public void testIncludeStaticNestedClassField() throws Exception {
|
||||||
Field f = getClass().getField("staticNestedClass");
|
Field f = getClass().getField("staticNestedClass");
|
||||||
assertFalse(strategy.shouldSkipField(new FieldAttributes(getClass(), f)));
|
assertFalse(strategy.shouldSkipField(new FieldAttributes(getClass(), f, getClass())));
|
||||||
}
|
}
|
||||||
|
|
||||||
class InnerClass {
|
class InnerClass {
|
||||||
|
@ -34,7 +34,7 @@ public class JavaFieldNamingPolicyTest extends TestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void testFieldNamingPolicy() throws Exception {
|
public void testFieldNamingPolicy() throws Exception {
|
||||||
FieldAttributes f = new FieldAttributes(String.class, String.class.getFields()[0]);
|
FieldAttributes f = new FieldAttributes(String.class, String.class.getFields()[0], String.class);
|
||||||
assertEquals(f.getName(), namingPolicy.translateName(f));
|
assertEquals(f.getName(), namingPolicy.translateName(f));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,6 +38,6 @@ public class NullExclusionStrategyTest extends TestCase {
|
|||||||
|
|
||||||
public void testNeverSkipsField() throws Exception {
|
public void testNeverSkipsField() throws Exception {
|
||||||
assertFalse(strategy.shouldSkipField(
|
assertFalse(strategy.shouldSkipField(
|
||||||
new FieldAttributes(String.class, String.class.getFields()[0])));
|
new FieldAttributes(String.class, String.class.getFields()[0], String.class)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ public class SerializedNameAnnotationInterceptingNamingPolicyTest extends TestCa
|
|||||||
public void testFieldWithAnnotation() throws Exception {
|
public void testFieldWithAnnotation() throws Exception {
|
||||||
String fieldName = "fieldWithAnnotation";
|
String fieldName = "fieldWithAnnotation";
|
||||||
FieldAttributes f = new FieldAttributes(
|
FieldAttributes f = new FieldAttributes(
|
||||||
SomeObject.class, SomeObject.class.getField(fieldName));
|
SomeObject.class, SomeObject.class.getField(fieldName), SomeObject.class);
|
||||||
|
|
||||||
assertFalse(ANNOTATED_FIELD_NAME.equals(fieldName));
|
assertFalse(ANNOTATED_FIELD_NAME.equals(fieldName));
|
||||||
assertEquals(ANNOTATED_FIELD_NAME, policy.translateName(f));
|
assertEquals(ANNOTATED_FIELD_NAME, policy.translateName(f));
|
||||||
@ -48,7 +48,7 @@ public class SerializedNameAnnotationInterceptingNamingPolicyTest extends TestCa
|
|||||||
public void testFieldWithoutAnnotation() throws Exception {
|
public void testFieldWithoutAnnotation() throws Exception {
|
||||||
String fieldName = "fieldWithoutAnnotation";
|
String fieldName = "fieldWithoutAnnotation";
|
||||||
FieldAttributes f = new FieldAttributes(
|
FieldAttributes f = new FieldAttributes(
|
||||||
SomeObject.class, SomeObject.class.getField(fieldName));
|
SomeObject.class, SomeObject.class.getField(fieldName), SomeObject.class);
|
||||||
|
|
||||||
assertEquals(fieldName, policy.translateName(f));
|
assertEquals(fieldName, policy.translateName(f));
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ public class VersionExclusionStrategyTest extends TestCase {
|
|||||||
VersionExclusionStrategy strategy = new VersionExclusionStrategy(VERSION);
|
VersionExclusionStrategy strategy = new VersionExclusionStrategy(VERSION);
|
||||||
assertFalse(strategy.shouldSkipClass(clazz));
|
assertFalse(strategy.shouldSkipClass(clazz));
|
||||||
|
|
||||||
FieldAttributes fieldAttributes = new FieldAttributes(clazz, f);
|
FieldAttributes fieldAttributes = new FieldAttributes(clazz, f, clazz);
|
||||||
assertFalse(strategy.shouldSkipField(fieldAttributes));
|
assertFalse(strategy.shouldSkipField(fieldAttributes));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ public class VersionExclusionStrategyTest extends TestCase {
|
|||||||
VersionExclusionStrategy strategy = new VersionExclusionStrategy(VERSION + 1);
|
VersionExclusionStrategy strategy = new VersionExclusionStrategy(VERSION + 1);
|
||||||
assertFalse(strategy.shouldSkipClass(clazz));
|
assertFalse(strategy.shouldSkipClass(clazz));
|
||||||
|
|
||||||
FieldAttributes fieldAttributes = new FieldAttributes(clazz, f);
|
FieldAttributes fieldAttributes = new FieldAttributes(clazz, f, clazz);
|
||||||
assertFalse(strategy.shouldSkipField(fieldAttributes));
|
assertFalse(strategy.shouldSkipField(fieldAttributes));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,7 +63,7 @@ public class VersionExclusionStrategyTest extends TestCase {
|
|||||||
VersionExclusionStrategy strategy = new VersionExclusionStrategy(VERSION - 1);
|
VersionExclusionStrategy strategy = new VersionExclusionStrategy(VERSION - 1);
|
||||||
assertTrue(strategy.shouldSkipClass(clazz));
|
assertTrue(strategy.shouldSkipClass(clazz));
|
||||||
|
|
||||||
FieldAttributes fieldAttributes = new FieldAttributes(clazz, f);
|
FieldAttributes fieldAttributes = new FieldAttributes(clazz, f, clazz);
|
||||||
assertTrue(strategy.shouldSkipField(fieldAttributes));
|
assertTrue(strategy.shouldSkipField(fieldAttributes));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user