diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/SystemGroupsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/SystemGroupsIT.java index 3596f3bea3..6ee2045d38 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/SystemGroupsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/SystemGroupsIT.java @@ -17,11 +17,11 @@ package com.google.gerrit.acceptance; import static org.junit.Assert.assertTrue; import com.google.common.collect.Sets; -import com.google.common.reflect.TypeToken; import com.google.gerrit.acceptance.rest.group.GroupInfo; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.SchemaFactory; import com.google.inject.Inject; @@ -75,7 +75,6 @@ public class SystemGroupsIT extends AbstractDaemonTest { RestSession session = new RestSession(admin); RestResponse r = session.get("/groups/"); Gson gson = new Gson(); - @SuppressWarnings("serial") Map result = gson.fromJson(r.getReader(), new TypeToken>() {}.getType()); Set names = result.keySet(); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/CreateGroupIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/CreateGroupIT.java index 80fb07e465..4641f09308 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/CreateGroupIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/CreateGroupIT.java @@ -15,10 +15,10 @@ package com.google.gerrit.acceptance.rest.group; import static com.google.gerrit.acceptance.rest.group.GroupAssert.assertGroupInfo; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import com.google.common.reflect.TypeToken; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AccountCreator; 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.server.account.GroupCache; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; @@ -60,7 +61,6 @@ public class CreateGroupIT extends AbstractDaemonTest { public void testCreateGroup() throws IOException { final String newGroupName = "newGroup"; RestResponse r = session.put("/groups/" + newGroupName); - @SuppressWarnings("serial") GroupInfo g = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(newGroupName, g.name); AccountGroup group = groupCache.get(new AccountGroup.NameKey(newGroupName)); @@ -76,7 +76,6 @@ public class CreateGroupIT extends AbstractDaemonTest { in.visible_to_all = true; in.owner_id = groupCache.get(new AccountGroup.NameKey("Administrators")).getGroupUUID().get(); RestResponse r = session.put("/groups/" + newGroupName, in); - @SuppressWarnings("serial") GroupInfo g = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(newGroupName, g.name); AccountGroup group = groupCache.get(new AccountGroup.NameKey(newGroupName)); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java index e76687e609..5fe386d23c 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java @@ -16,7 +16,6 @@ package com.google.gerrit.acceptance.rest.group; 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.AccountCreator; 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.server.account.GroupCache; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.google.inject.Inject; import org.junit.Before; @@ -66,7 +66,6 @@ public class GetGroupIT extends AbstractDaemonTest { private void testGetGroup(String url, AccountGroup expectedGroup) throws IOException { RestResponse r = session.get(url); - @SuppressWarnings("serial") GroupInfo group = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertGroupInfo(expectedGroup, group); } diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GroupPropertiesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GroupPropertiesIT.java index 634ca98d4a..dd1afe8557 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GroupPropertiesIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GroupPropertiesIT.java @@ -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.assertGroupInfo; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import com.google.common.reflect.TypeToken; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AccountCreator; 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.server.account.GroupCache; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.google.inject.Inject; import org.apache.http.HttpStatus; @@ -62,7 +63,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest { // get name RestResponse r = session.get(url); - @SuppressWarnings("serial") String name = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals("Administrators", name); @@ -86,7 +86,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest { in = new GroupNameInput(); in.name = "Admins"; r = session.put(url, in); - @SuppressWarnings("serial") String newName = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertNotNull(groupCache.get(new AccountGroup.NameKey(in.name))); @@ -103,7 +102,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest { // get description RestResponse r = session.get(url); - @SuppressWarnings("serial") String description = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(adminGroup.getDescription(), description); @@ -113,7 +111,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest { GroupDescriptionInput in = new GroupDescriptionInput(); in.description = "All users that can administrate the Gerrit Server."; r = session.put(url, in); - @SuppressWarnings("serial") String newDescription = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(in.description, newDescription); @@ -144,7 +141,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest { // get options RestResponse r = session.get(url); - @SuppressWarnings("serial") GroupOptionsInfo options = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(adminGroup.isVisibleToAll(), toBoolean(options.visible_to_all)); @@ -154,7 +150,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest { GroupOptionsInput in = new GroupOptionsInput(); in.visible_to_all = !adminGroup.isVisibleToAll(); r = session.put(url, in); - @SuppressWarnings("serial") GroupOptionsInfo newOptions = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(in.visible_to_all, toBoolean(newOptions.visible_to_all)); @@ -171,7 +166,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest { // get owner RestResponse r = session.get(url); - @SuppressWarnings("serial") GroupInfo options = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertGroupInfo(groupCache.get(adminGroup.getOwnerGroupUUID()), options); @@ -181,7 +175,6 @@ public class GroupPropertiesIT extends AbstractDaemonTest { GroupOwnerInput in = new GroupOwnerInput(); in.owner = "Registered Users"; r = session.put(url, in); - @SuppressWarnings("serial") GroupInfo newOwner = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertEquals(in.owner, newOwner.name); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupMembersIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupMembersIT.java index e68dd1cec9..26ecf6a1e3 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupMembersIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupMembersIT.java @@ -19,13 +19,13 @@ import static org.junit.Assert.assertTrue; import com.google.common.base.Function; import com.google.common.collect.Collections2; -import com.google.common.reflect.TypeToken; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AccountCreator; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.RestSession; import com.google.gerrit.acceptance.TestAccount; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.google.inject.Inject; import org.apache.http.HttpStatus; @@ -91,7 +91,6 @@ public class ListGroupMembersIT extends AbstractDaemonTest { "admin", "ux", "uy"); } - @SuppressWarnings("serial") private List GET(String endpoint) throws IOException { RestResponse r = session.get(endpoint); assertEquals(HttpStatus.SC_OK, r.getStatusCode()); @@ -99,7 +98,6 @@ public class ListGroupMembersIT extends AbstractDaemonTest { new TypeToken>() {}.getType()); } - @SuppressWarnings("serial") private AccountInfo GET_ONE(String endpoint) throws IOException { RestResponse r = session.get(endpoint); assertEquals(HttpStatus.SC_OK, r.getStatusCode()); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupsIT.java index 8657927abb..07c7c9396c 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupsIT.java @@ -20,7 +20,6 @@ import static com.google.gerrit.acceptance.rest.group.GroupAssert.assertGroups; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import com.google.common.reflect.TypeToken; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AccountCreator; 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.server.account.GroupCache; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; @@ -72,7 +72,6 @@ public class ListGroupsIT extends AbstractDaemonTest { } }); RestResponse r = session.get("/groups/"); - @SuppressWarnings("serial") Map result = (new Gson()).fromJson(r.getReader(), new TypeToken>() {}.getType()); assertGroups(expectedGroups, result.keySet()); @@ -86,7 +85,6 @@ public class ListGroupsIT extends AbstractDaemonTest { expectedGroups.add("Registered Users"); TestAccount user = accounts.create("user", "user@example.com", "User"); RestResponse r = (new RestSession(user)).get("/groups/"); - @SuppressWarnings("serial") Map result = (new Gson()).fromJson(r.getReader(), new TypeToken>() {}.getType()); assertGroups(expectedGroups, result.keySet()); @@ -97,7 +95,6 @@ public class ListGroupsIT extends AbstractDaemonTest { OrmException { AccountGroup adminGroup = groupCache.get(new AccountGroup.NameKey("Administrators")); RestResponse r = session.get("/groups/?q=" + adminGroup.getName()); - @SuppressWarnings("serial") Map result = (new Gson()).fromJson(r.getReader(), new TypeToken>() {}.getType()); GroupInfo adminGroupInfo = result.get(adminGroup.getName()); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java index 3b249f37f0..6afe8e60c0 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java @@ -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.assertProjectOwners; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.google.common.reflect.TypeToken; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AccountCreator; 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.ProjectState; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; @@ -86,7 +87,6 @@ public class CreateProjectIT extends AbstractDaemonTest { final String newProjectName = "newProject"; RestResponse r = session.put("/projects/" + newProjectName); assertEquals(HttpStatus.SC_CREATED, r.getStatusCode()); - @SuppressWarnings("serial") ProjectInfo p = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(newProjectName, p.name); ProjectState projectState = projectCache.get(new Project.NameKey(newProjectName)); @@ -114,7 +114,6 @@ public class CreateProjectIT extends AbstractDaemonTest { in.use_content_merge = InheritableBoolean.TRUE; in.require_change_id = InheritableBoolean.TRUE; RestResponse r = session.put("/projects/" + newProjectName, in); - @SuppressWarnings("serial") ProjectInfo p = (new Gson()).fromJson(r.getReader(), new TypeToken() {}.getType()); assertEquals(newProjectName, p.name); Project project = projectCache.get(new Project.NameKey(newProjectName)).getProject();