opendev/gerrit
Code Issues Proposed changes

Merge changes I08f22109,I0826549a

Browse Source 
* changes:
  JsonEnumMappingTest.TestData: Remove unused ctor
  EnumTypeAdapterFactor: Remove unnecessary cast
This commit is contained in:
David Pursehouse
2019-08-09 07:46:54 +00:00
committed by Gerrit Code Review
parent 381031f73f d2cb02bb49
commit 2abd2c1855
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/json/EnumTypeAdapterFactory.java
View File

@@ -34,7 +34,7 @@ import java.io.IOException;
public class EnumTypeAdapterFactory implements TypeAdapterFactory { public class EnumTypeAdapterFactory implements TypeAdapterFactory {
private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private static final FluentLogger logger = FluentLogger.forEnclosingClass();
@SuppressWarnings({"unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
@Override @Override
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) { public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
TypeAdapter<T> defaultEnumAdapter = TypeAdapters.ENUM_FACTORY.create(gson, typeToken); TypeAdapter<T> defaultEnumAdapter = TypeAdapters.ENUM_FACTORY.create(gson, typeToken);
@@ -43,7 +43,7 @@ public class EnumTypeAdapterFactory implements TypeAdapterFactory {
return null; return null;
} }
return (TypeAdapter<T>) new EnumTypeAdapter(defaultEnumAdapter, typeToken); return new EnumTypeAdapter(defaultEnumAdapter, typeToken);
} }
private static class EnumTypeAdapter<T extends Enum<T>> extends TypeAdapter<T> { private static class EnumTypeAdapter<T extends Enum<T>> extends TypeAdapter<T> {

4
javatests/com/google/gerrit/json/JsonEnumMappingTest.java
View File

@@ -71,10 +71,6 @@ public class JsonEnumMappingTest {
private static class TestData { private static class TestData {
TestEnum value; TestEnum value;
public TestData(TestEnum value) {
this.value = value;
}
} }
private enum TestEnum { private enum TestEnum {