Merge "Use TypeToken from gson instead of google.common"

This commit is contained in:
Edwin Kempin
2013-03-08 14:47:24 +00:00
committed by Gerrit Code Review
7 changed files with 10 additions and 26 deletions

View File

@@ -17,11 +17,11 @@ package com.google.gerrit.acceptance;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.reflect.TypeToken;
import com.google.gerrit.acceptance.rest.group.GroupInfo; import com.google.gerrit.acceptance.rest.group.GroupInfo;
import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory; import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -75,7 +75,6 @@ public class SystemGroupsIT extends AbstractDaemonTest {
RestSession session = new RestSession(admin); RestSession session = new RestSession(admin);
RestResponse r = session.get("/groups/"); RestResponse r = session.get("/groups/");
Gson gson = new Gson(); Gson gson = new Gson();
@SuppressWarnings("serial")
Map<String, GroupInfo> result = Map<String, GroupInfo> result =
gson.fromJson(r.getReader(), new TypeToken<Map<String, GroupInfo>>() {}.getType()); gson.fromJson(r.getReader(), new TypeToken<Map<String, GroupInfo>>() {}.getType());
Set<String> names = result.keySet(); Set<String> names = result.keySet();

View File

@@ -15,10 +15,10 @@
package com.google.gerrit.acceptance.rest.group; package com.google.gerrit.acceptance.rest.group;
import static com.google.gerrit.acceptance.rest.group.GroupAssert.assertGroupInfo; import static com.google.gerrit.acceptance.rest.group.GroupAssert.assertGroupInfo;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import com.google.common.reflect.TypeToken;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.AccountCreator; import com.google.gerrit.acceptance.AccountCreator;
import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.RestResponse;
@@ -27,6 +27,7 @@ import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.account.GroupCache;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -60,7 +61,6 @@ public class CreateGroupIT extends AbstractDaemonTest {
public void testCreateGroup() throws IOException { public void testCreateGroup() throws IOException {
final String newGroupName = "newGroup"; final String newGroupName = "newGroup";
RestResponse r = session.put("/groups/" + newGroupName); RestResponse r = session.put("/groups/" + newGroupName);
@SuppressWarnings("serial")
GroupInfo g = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupInfo>() {}.getType()); GroupInfo g = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupInfo>() {}.getType());
assertEquals(newGroupName, g.name); assertEquals(newGroupName, g.name);
AccountGroup group = groupCache.get(new AccountGroup.NameKey(newGroupName)); AccountGroup group = groupCache.get(new AccountGroup.NameKey(newGroupName));
@@ -76,7 +76,6 @@ public class CreateGroupIT extends AbstractDaemonTest {
in.visible_to_all = true; in.visible_to_all = true;
in.owner_id = groupCache.get(new AccountGroup.NameKey("Administrators")).getGroupUUID().get(); in.owner_id = groupCache.get(new AccountGroup.NameKey("Administrators")).getGroupUUID().get();
RestResponse r = session.put("/groups/" + newGroupName, in); RestResponse r = session.put("/groups/" + newGroupName, in);
@SuppressWarnings("serial")
GroupInfo g = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupInfo>() {}.getType()); GroupInfo g = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupInfo>() {}.getType());
assertEquals(newGroupName, g.name); assertEquals(newGroupName, g.name);
AccountGroup group = groupCache.get(new AccountGroup.NameKey(newGroupName)); AccountGroup group = groupCache.get(new AccountGroup.NameKey(newGroupName));

View File

@@ -16,7 +16,6 @@ package com.google.gerrit.acceptance.rest.group;
import static com.google.gerrit.acceptance.rest.group.GroupAssert.assertGroupInfo; import static com.google.gerrit.acceptance.rest.group.GroupAssert.assertGroupInfo;
import com.google.common.reflect.TypeToken;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.AccountCreator; import com.google.gerrit.acceptance.AccountCreator;
import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.RestResponse;
@@ -25,6 +24,7 @@ import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.account.GroupCache;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject; import com.google.inject.Inject;
import org.junit.Before; import org.junit.Before;
@@ -66,7 +66,6 @@ public class GetGroupIT extends AbstractDaemonTest {
private void testGetGroup(String url, AccountGroup expectedGroup) throws IOException { private void testGetGroup(String url, AccountGroup expectedGroup) throws IOException {
RestResponse r = session.get(url); RestResponse r = session.get(url);
@SuppressWarnings("serial")
GroupInfo group = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupInfo>() {}.getType()); GroupInfo group = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupInfo>() {}.getType());
assertGroupInfo(expectedGroup, group); assertGroupInfo(expectedGroup, group);
} }

View File

@@ -16,11 +16,11 @@ package com.google.gerrit.acceptance.rest.group;
import static com.google.gerrit.acceptance.rest.group.GroupAssert.toBoolean; import static com.google.gerrit.acceptance.rest.group.GroupAssert.toBoolean;
import static com.google.gerrit.acceptance.rest.group.GroupAssert.assertGroupInfo; import static com.google.gerrit.acceptance.rest.group.GroupAssert.assertGroupInfo;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import com.google.common.reflect.TypeToken;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.AccountCreator; import com.google.gerrit.acceptance.AccountCreator;
import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.RestResponse;
@@ -29,6 +29,7 @@ import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.account.GroupCache;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject; import com.google.inject.Inject;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
@@ -62,7 +63,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest {
// get name // get name
RestResponse r = session.get(url); RestResponse r = session.get(url);
@SuppressWarnings("serial")
String name = (new Gson()).fromJson(r.getReader(), new TypeToken<String>() {}.getType()); String name = (new Gson()).fromJson(r.getReader(), new TypeToken<String>() {}.getType());
assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(HttpStatus.SC_OK, r.getStatusCode());
assertEquals("Administrators", name); assertEquals("Administrators", name);
@@ -86,7 +86,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest {
in = new GroupNameInput(); in = new GroupNameInput();
in.name = "Admins"; in.name = "Admins";
r = session.put(url, in); r = session.put(url, in);
@SuppressWarnings("serial")
String newName = (new Gson()).fromJson(r.getReader(), new TypeToken<String>() {}.getType()); String newName = (new Gson()).fromJson(r.getReader(), new TypeToken<String>() {}.getType());
assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(HttpStatus.SC_OK, r.getStatusCode());
assertNotNull(groupCache.get(new AccountGroup.NameKey(in.name))); assertNotNull(groupCache.get(new AccountGroup.NameKey(in.name)));
@@ -103,7 +102,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest {
// get description // get description
RestResponse r = session.get(url); RestResponse r = session.get(url);
@SuppressWarnings("serial")
String description = (new Gson()).fromJson(r.getReader(), new TypeToken<String>() {}.getType()); String description = (new Gson()).fromJson(r.getReader(), new TypeToken<String>() {}.getType());
assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(HttpStatus.SC_OK, r.getStatusCode());
assertEquals(adminGroup.getDescription(), description); assertEquals(adminGroup.getDescription(), description);
@@ -113,7 +111,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest {
GroupDescriptionInput in = new GroupDescriptionInput(); GroupDescriptionInput in = new GroupDescriptionInput();
in.description = "All users that can administrate the Gerrit Server."; in.description = "All users that can administrate the Gerrit Server.";
r = session.put(url, in); r = session.put(url, in);
@SuppressWarnings("serial")
String newDescription = (new Gson()).fromJson(r.getReader(), new TypeToken<String>() {}.getType()); String newDescription = (new Gson()).fromJson(r.getReader(), new TypeToken<String>() {}.getType());
assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(HttpStatus.SC_OK, r.getStatusCode());
assertEquals(in.description, newDescription); assertEquals(in.description, newDescription);
@@ -144,7 +141,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest {
// get options // get options
RestResponse r = session.get(url); RestResponse r = session.get(url);
@SuppressWarnings("serial")
GroupOptionsInfo options = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupOptionsInfo>() {}.getType()); GroupOptionsInfo options = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupOptionsInfo>() {}.getType());
assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(HttpStatus.SC_OK, r.getStatusCode());
assertEquals(adminGroup.isVisibleToAll(), toBoolean(options.visible_to_all)); assertEquals(adminGroup.isVisibleToAll(), toBoolean(options.visible_to_all));
@@ -154,7 +150,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest {
GroupOptionsInput in = new GroupOptionsInput(); GroupOptionsInput in = new GroupOptionsInput();
in.visible_to_all = !adminGroup.isVisibleToAll(); in.visible_to_all = !adminGroup.isVisibleToAll();
r = session.put(url, in); r = session.put(url, in);
@SuppressWarnings("serial")
GroupOptionsInfo newOptions = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupOptionsInfo>() {}.getType()); GroupOptionsInfo newOptions = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupOptionsInfo>() {}.getType());
assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(HttpStatus.SC_OK, r.getStatusCode());
assertEquals(in.visible_to_all, toBoolean(newOptions.visible_to_all)); assertEquals(in.visible_to_all, toBoolean(newOptions.visible_to_all));
@@ -171,7 +166,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest {
// get owner // get owner
RestResponse r = session.get(url); RestResponse r = session.get(url);
@SuppressWarnings("serial")
GroupInfo options = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupInfo>() {}.getType()); GroupInfo options = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupInfo>() {}.getType());
assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(HttpStatus.SC_OK, r.getStatusCode());
assertGroupInfo(groupCache.get(adminGroup.getOwnerGroupUUID()), options); assertGroupInfo(groupCache.get(adminGroup.getOwnerGroupUUID()), options);
@@ -181,7 +175,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest {
GroupOwnerInput in = new GroupOwnerInput(); GroupOwnerInput in = new GroupOwnerInput();
in.owner = "Registered Users"; in.owner = "Registered Users";
r = session.put(url, in); r = session.put(url, in);
@SuppressWarnings("serial")
GroupInfo newOwner = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupInfo>() {}.getType()); GroupInfo newOwner = (new Gson()).fromJson(r.getReader(), new TypeToken<GroupInfo>() {}.getType());
assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(HttpStatus.SC_OK, r.getStatusCode());
assertEquals(in.owner, newOwner.name); assertEquals(in.owner, newOwner.name);

View File

@@ -19,13 +19,13 @@ import static org.junit.Assert.assertTrue;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.Collections2; import com.google.common.collect.Collections2;
import com.google.common.reflect.TypeToken;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.AccountCreator; import com.google.gerrit.acceptance.AccountCreator;
import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.RestSession; import com.google.gerrit.acceptance.RestSession;
import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.TestAccount;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject; import com.google.inject.Inject;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
@@ -91,7 +91,6 @@ public class ListGroupMembersIT extends AbstractDaemonTest {
"admin", "ux", "uy"); "admin", "ux", "uy");
} }
@SuppressWarnings("serial")
private List<AccountInfo> GET(String endpoint) throws IOException { private List<AccountInfo> GET(String endpoint) throws IOException {
RestResponse r = session.get(endpoint); RestResponse r = session.get(endpoint);
assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(HttpStatus.SC_OK, r.getStatusCode());
@@ -99,7 +98,6 @@ public class ListGroupMembersIT extends AbstractDaemonTest {
new TypeToken<List<AccountInfo>>() {}.getType()); new TypeToken<List<AccountInfo>>() {}.getType());
} }
@SuppressWarnings("serial")
private AccountInfo GET_ONE(String endpoint) throws IOException { private AccountInfo GET_ONE(String endpoint) throws IOException {
RestResponse r = session.get(endpoint); RestResponse r = session.get(endpoint);
assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(HttpStatus.SC_OK, r.getStatusCode());

View File

@@ -20,7 +20,6 @@ import static com.google.gerrit.acceptance.rest.group.GroupAssert.assertGroups;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.reflect.TypeToken;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.AccountCreator; import com.google.gerrit.acceptance.AccountCreator;
import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.RestResponse;
@@ -29,6 +28,7 @@ import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.account.GroupCache;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -72,7 +72,6 @@ public class ListGroupsIT extends AbstractDaemonTest {
} }
}); });
RestResponse r = session.get("/groups/"); RestResponse r = session.get("/groups/");
@SuppressWarnings("serial")
Map<String, GroupInfo> result = Map<String, GroupInfo> result =
(new Gson()).fromJson(r.getReader(), new TypeToken<Map<String, GroupInfo>>() {}.getType()); (new Gson()).fromJson(r.getReader(), new TypeToken<Map<String, GroupInfo>>() {}.getType());
assertGroups(expectedGroups, result.keySet()); assertGroups(expectedGroups, result.keySet());
@@ -86,7 +85,6 @@ public class ListGroupsIT extends AbstractDaemonTest {
expectedGroups.add("Registered Users"); expectedGroups.add("Registered Users");
TestAccount user = accounts.create("user", "user@example.com", "User"); TestAccount user = accounts.create("user", "user@example.com", "User");
RestResponse r = (new RestSession(user)).get("/groups/"); RestResponse r = (new RestSession(user)).get("/groups/");
@SuppressWarnings("serial")
Map<String, GroupInfo> result = Map<String, GroupInfo> result =
(new Gson()).fromJson(r.getReader(), new TypeToken<Map<String, GroupInfo>>() {}.getType()); (new Gson()).fromJson(r.getReader(), new TypeToken<Map<String, GroupInfo>>() {}.getType());
assertGroups(expectedGroups, result.keySet()); assertGroups(expectedGroups, result.keySet());
@@ -97,7 +95,6 @@ public class ListGroupsIT extends AbstractDaemonTest {
OrmException { OrmException {
AccountGroup adminGroup = groupCache.get(new AccountGroup.NameKey("Administrators")); AccountGroup adminGroup = groupCache.get(new AccountGroup.NameKey("Administrators"));
RestResponse r = session.get("/groups/?q=" + adminGroup.getName()); RestResponse r = session.get("/groups/?q=" + adminGroup.getName());
@SuppressWarnings("serial")
Map<String, GroupInfo> result = Map<String, GroupInfo> result =
(new Gson()).fromJson(r.getReader(), new TypeToken<Map<String, GroupInfo>>() {}.getType()); (new Gson()).fromJson(r.getReader(), new TypeToken<Map<String, GroupInfo>>() {}.getType());
GroupInfo adminGroupInfo = result.get(adminGroup.getName()); GroupInfo adminGroupInfo = result.get(adminGroup.getName());

View File

@@ -16,13 +16,13 @@ package com.google.gerrit.acceptance.rest.project;
import static com.google.gerrit.acceptance.rest.project.ProjectAssert.assertProjectInfo; import static com.google.gerrit.acceptance.rest.project.ProjectAssert.assertProjectInfo;
import static com.google.gerrit.acceptance.rest.project.ProjectAssert.assertProjectOwners; import static com.google.gerrit.acceptance.rest.project.ProjectAssert.assertProjectOwners;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.reflect.TypeToken;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.AccountCreator; import com.google.gerrit.acceptance.AccountCreator;
import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.RestResponse;
@@ -37,6 +37,7 @@ import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectState;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -86,7 +87,6 @@ public class CreateProjectIT extends AbstractDaemonTest {
final String newProjectName = "newProject"; final String newProjectName = "newProject";
RestResponse r = session.put("/projects/" + newProjectName); RestResponse r = session.put("/projects/" + newProjectName);
assertEquals(HttpStatus.SC_CREATED, r.getStatusCode()); assertEquals(HttpStatus.SC_CREATED, r.getStatusCode());
@SuppressWarnings("serial")
ProjectInfo p = (new Gson()).fromJson(r.getReader(), new TypeToken<ProjectInfo>() {}.getType()); ProjectInfo p = (new Gson()).fromJson(r.getReader(), new TypeToken<ProjectInfo>() {}.getType());
assertEquals(newProjectName, p.name); assertEquals(newProjectName, p.name);
ProjectState projectState = projectCache.get(new Project.NameKey(newProjectName)); ProjectState projectState = projectCache.get(new Project.NameKey(newProjectName));
@@ -114,7 +114,6 @@ public class CreateProjectIT extends AbstractDaemonTest {
in.use_content_merge = InheritableBoolean.TRUE; in.use_content_merge = InheritableBoolean.TRUE;
in.require_change_id = InheritableBoolean.TRUE; in.require_change_id = InheritableBoolean.TRUE;
RestResponse r = session.put("/projects/" + newProjectName, in); RestResponse r = session.put("/projects/" + newProjectName, in);
@SuppressWarnings("serial")
ProjectInfo p = (new Gson()).fromJson(r.getReader(), new TypeToken<ProjectInfo>() {}.getType()); ProjectInfo p = (new Gson()).fromJson(r.getReader(), new TypeToken<ProjectInfo>() {}.getType());
assertEquals(newProjectName, p.name); assertEquals(newProjectName, p.name);
Project project = projectCache.get(new Project.NameKey(newProjectName)).getProject(); Project project = projectCache.get(new Project.NameKey(newProjectName)).getProject();