diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index aae063214a..3cc353b428 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -54,7 +54,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java index a9112cb44f..c9d1710235 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java @@ -213,11 +213,11 @@ public class HashtagsIT extends AbstractDaemonTest { throws IOException { HashtagsInput input = new HashtagsInput(); if (toAdd != null) { - input.add = new HashSet( + input.add = new HashSet<>( Lists.newArrayList(Splitter.on(CharMatcher.anyOf(",")).split(toAdd))); } if (toRemove != null) { - input.remove = new HashSet( + input.remove = new HashSet<>( Lists.newArrayList(Splitter.on(CharMatcher.anyOf(",")).split(toRemove))); } return adminSession.post("/changes/" + changeId + "/hashtags/", input); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java index b7309a1632..f5a765f5c6 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java @@ -71,7 +71,7 @@ public class CommentsIT extends AbstractDaemonTest { ReviewInput input = new ReviewInput(); ReviewInput.CommentInput comment = newCommentInfo( file, Comment.Side.REVISION, 1, "comment 1"); - input.comments = new HashMap>(); + input.comments = new HashMap<>(); input.comments.put(comment.path, Lists.newArrayList(comment)); revision(r).review(input); Map> result = getPublishedComments(changeId, revId); diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java index 55a314a208..5870f91434 100644 --- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java +++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java @@ -163,7 +163,7 @@ class H2CacheFactory implements PersistentCacheFactory, LifecycleListener { SqlStore store = newSqlStore(def.name(), def.keyType(), limit, def.expireAfterWrite(TimeUnit.SECONDS)); - H2CacheImpl cache = new H2CacheImpl( + H2CacheImpl cache = new H2CacheImpl<>( executor, store, def.keyType(), (Cache>) defaultFactory.create(def, true).build()); synchronized (caches) { @@ -187,9 +187,9 @@ class H2CacheFactory implements PersistentCacheFactory, LifecycleListener { def.expireAfterWrite(TimeUnit.SECONDS)); Cache> mem = (Cache>) defaultFactory.create(def, true) - .build((CacheLoader) new H2CacheImpl.Loader( + .build((CacheLoader) new H2CacheImpl.Loader<>( executor, store, loader)); - H2CacheImpl cache = new H2CacheImpl( + H2CacheImpl cache = new H2CacheImpl<>( executor, store, def.keyType(), mem); caches.add(cache); return cache; diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java index 9a222ed231..f21f894fca 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java @@ -124,7 +124,7 @@ public class AccessSection extends RefConfigSection implements if (!super.equals(obj) || !(obj instanceof AccessSection)) { return false; } - return new HashSet(getPermissions()).equals(new HashSet<>( + return new HashSet<>(getPermissions()).equals(new HashSet<>( ((AccessSection) obj).getPermissions())); } } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java index 2d9965e688..a041dc632c 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java @@ -265,8 +265,7 @@ public class Permission implements Comparable { if (!name.equals(other.name) || exclusiveGroup != other.exclusiveGroup) { return false; } - return new HashSet(getRules()) - .equals(new HashSet(other.getRules())); + return new HashSet<>(getRules()).equals(new HashSet<>(other.getRules())); } @Override diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java index 380cfc67ec..82613c77f7 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java @@ -129,7 +129,7 @@ public class DynamicSet implements Iterable { } public static DynamicSet emptySet() { - return new DynamicSet( + return new DynamicSet<>( Collections.>> emptySet()); } diff --git a/gerrit-gwtdebug/src/main/java/com/google/gwt/dev/codeserver/WebServer.java b/gerrit-gwtdebug/src/main/java/com/google/gwt/dev/codeserver/WebServer.java index 53db8caa0f..66fc127f65 100644 --- a/gerrit-gwtdebug/src/main/java/com/google/gwt/dev/codeserver/WebServer.java +++ b/gerrit-gwtdebug/src/main/java/com/google/gwt/dev/codeserver/WebServer.java @@ -491,7 +491,7 @@ public class WebServer { * by dev_mode_on.js in a JSONP request to "/recompile".) */ private Map getBindingProperties(HttpServletRequest request) { - Map result = new HashMap(); + Map result = new HashMap<>(); for (Object key : request.getParameterMap().keySet()) { String propName = (String) key; if (!propName.equals("_callback")) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java index e25e2a8bcf..157748f8e2 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java @@ -93,7 +93,7 @@ public class AccessSectionEditor extends Composite implements public AccessSectionEditor(ProjectAccess access) { projectAccess = access; - permissionSelector = new ValueListBox( + permissionSelector = new ValueListBox<>( new PermissionNameRenderer(access.getCapabilities())); permissionSelector.addValueChangeHandler(new ValueChangeHandler() { @Override diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java index 0685cb77ae..5bf26492b2 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java @@ -90,7 +90,7 @@ public class GroupListScreen extends AccountScreen implements FilteredUserInterf // Retrieve one more group than page size to determine if there are more // groups to display GroupMap.match(subname, pageSize + 1, startPosition, - new IgnoreOutdatedFilterResultsCallbackWrapper(this, + new IgnoreOutdatedFilterResultsCallbackWrapper<>(this, new GerritCallback() { @Override public void onSuccess(GroupMap result) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java index fafe9671a5..e28e465892 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java @@ -104,7 +104,7 @@ public class ProjectListScreen extends Screen implements FilteredUserInterface { // Retrieve one more project than page size to determine if there are more // projects to display ProjectMap.match(subname, pageSize + 1, startPosition, - new IgnoreOutdatedFilterResultsCallbackWrapper(this, + new IgnoreOutdatedFilterResultsCallbackWrapper<>(this, new GerritCallback() { @Override public void onSuccess(ProjectMap result) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java index a6edb3befe..a7928d79de 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java @@ -185,7 +185,7 @@ public class ProjectListPopup implements FilteredUserInterface { protected void populateProjects() { ProjectMap.match(subname, - new IgnoreOutdatedFilterResultsCallbackWrapper(this, + new IgnoreOutdatedFilterResultsCallbackWrapper<>(this, new GerritCallback() { @Override public void onSuccess(final ProjectMap result) { diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java index 688835a34d..e024f769c5 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java @@ -108,7 +108,7 @@ class SubIndex { notDoneNrtFutures = Sets.newConcurrentHashSet(); - reopenThread = new ControlledRealTimeReopenThread( + reopenThread = new ControlledRealTimeReopenThread<>( writer, searcherManager, 0.500 /* maximum stale age (seconds) */, 0.010 /* minimum stale age (seconds) */); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java index e8420b9cbc..f67fa75ba9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java @@ -181,7 +181,7 @@ public class PatchLineCommentsUtil { db.patchComments().publishedByPatchSet(psId).toList()); } notes.load(); - List comments = new ArrayList(); + List comments = new ArrayList<>(); comments.addAll(notes.getPatchSetComments().get(psId)); comments.addAll(notes.getBaseComments().get(psId)); return sort(comments); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java index f7d7125d01..9c4372b936 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java @@ -135,6 +135,6 @@ public class HashtagsUtil { dbProvider.get()); } } - return new TreeSet(updatedHashtags); + return new TreeSet<>(updatedHashtags); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldType.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldType.java index 4c40769cd9..dce8a2059e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldType.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldType.java @@ -21,35 +21,35 @@ import java.sql.Timestamp; public class FieldType { /** A single integer-valued field. */ public static final FieldType INTEGER = - new FieldType("INTEGER"); + new FieldType<>("INTEGER"); /** A single-integer-valued field matched using range queries. */ public static final FieldType INTEGER_RANGE = - new FieldType("INTEGER_RANGE"); + new FieldType<>("INTEGER_RANGE"); /** A single integer-valued field. */ public static final FieldType LONG = - new FieldType("LONG"); + new FieldType<>("LONG"); /** A single date/time-valued field. */ public static final FieldType TIMESTAMP = - new FieldType("TIMESTAMP"); + new FieldType<>("TIMESTAMP"); /** A string field searched using exact-match semantics. */ public static final FieldType EXACT = - new FieldType("EXACT"); + new FieldType<>("EXACT"); /** A string field searched using prefix. */ public static final FieldType PREFIX = - new FieldType("PREFIX"); + new FieldType<>("PREFIX"); /** A string field searched using fuzzy-match semantics. */ public static final FieldType FULL_TEXT = - new FieldType("FULL_TEXT"); + new FieldType<>("FULL_TEXT"); /** A field that is only stored as raw bytes and cannot be queried. */ public static final FieldType STORED_ONLY = - new FieldType("STORED_ONLY"); + new FieldType<>("STORED_ONLY"); private final String name; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java index ea4b05486d..8b99286d2d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java @@ -405,7 +405,7 @@ public class PluginLoader implements LifecycleListener { Iterator> it = from.entrySet().iterator(); while (it.hasNext()) { Entry entry = it.next(); - to.add(new AbstractMap.SimpleImmutableEntry( + to.add(new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), entry.getValue())); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java index 63d2b35fa3..039ae65e46 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java @@ -109,7 +109,7 @@ public class PermissionCollection { List sections = Lists.newArrayList(sectionToProject.keySet()); sorter.sort(ref, sections); - Set seen = new HashSet(); + Set seen = new HashSet<>(); Set exclusiveGroupPermissions = new HashSet<>(); HashMap> permissions = new HashMap<>(); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java index 7b43572616..f4be013473 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java @@ -92,7 +92,7 @@ public abstract class Predicate { // return that.getChild(0); } - return new NotPredicate(that); + return new NotPredicate<>(that); } /** Get the children of this predicate, if any. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BasicChangeRewrites.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BasicChangeRewrites.java index e85365610d..4c5ca2792b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BasicChangeRewrites.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BasicChangeRewrites.java @@ -34,8 +34,7 @@ public class BasicChangeRewrites extends QueryRewriter { null); private static final QueryRewriter.Definition mydef = - new QueryRewriter.Definition( - BasicChangeRewrites.class, BUILDER); + new QueryRewriter.Definition<>(BasicChangeRewrites.class, BUILDER); @Inject public BasicChangeRewrites() { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index f180f4de56..64ba2e96e8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -117,8 +117,7 @@ public class ChangeQueryBuilder extends QueryBuilder { private static final QueryBuilder.Definition mydef = - new QueryBuilder.Definition( - ChangeQueryBuilder.class); + new QueryBuilder.Definition<>(ChangeQueryBuilder.class); @SuppressWarnings("unchecked") public static Integer getLimit(Predicate p) { diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/account/UniversalGroupBackendTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/account/UniversalGroupBackendTest.java index 00e6d01957..3cec25cd3f 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/account/UniversalGroupBackendTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/account/UniversalGroupBackendTest.java @@ -61,7 +61,7 @@ public class UniversalGroupBackendTest { public void setup() { user = createNiceMock(IdentifiedUser.class); replay(user); - backends = new DynamicSet(); + backends = new DynamicSet<>(); backends.add(new SystemGroupBackend()); backend = new UniversalGroupBackend(backends); } @@ -130,7 +130,7 @@ public class UniversalGroupBackendTest { }); replay(member, notMember, backend); - backends = new DynamicSet(); + backends = new DynamicSet<>(); backends.add(backend); backend = new UniversalGroupBackend(backends); diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/SubmoduleOpTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/git/SubmoduleOpTest.java index 5e10e66450..b5c03e73bd 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/git/SubmoduleOpTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/git/SubmoduleOpTest.java @@ -746,7 +746,7 @@ public class SubmoduleOpTest extends LocalDiskRepositoryTestCase { expect(schema.submoduleSubscriptions()).andReturn(subscriptions); final ResultSet incorrectSubscriptions = - new ListResultSet(Collections + new ListResultSet<>(Collections .singletonList(new SubmoduleSubscription(sourceBranchNameKey, targetBranchNameKey, "target-project"))); expect(subscriptions.bySubmodule(targetBranchNameKey)).andReturn( diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java index c2a46cec85..c356a19e92 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java @@ -343,7 +343,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { public void hashtagCommit() throws Exception { Change c = newChange(); ChangeUpdate update = newUpdate(c, changeOwner); - LinkedHashSet hashtags = new LinkedHashSet(); + LinkedHashSet hashtags = new LinkedHashSet<>(); hashtags.add("tag1"); hashtags.add("tag2"); update.setHashtags(hashtags); @@ -362,7 +362,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { public void hashtagChangeNotes() throws Exception { Change c = newChange(); ChangeUpdate update = newUpdate(c, changeOwner); - LinkedHashSet hashtags = new LinkedHashSet(); + LinkedHashSet hashtags = new LinkedHashSet<>(); hashtags.add("tag1"); hashtags.add("tag2"); update.setHashtags(hashtags); diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/project/ProjectControlTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/project/ProjectControlTest.java index c3fbccd4d9..b5b321ed49 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/project/ProjectControlTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/project/ProjectControlTest.java @@ -79,7 +79,7 @@ public class ProjectControlTest { InMemoryRepository inMemoryRepo = repoManager.createRepository(name); project = new ProjectConfig(name); project.load(inMemoryRepo); - repo = new TestRepository(inMemoryRepo); + repo = new TestRepository<>(inMemoryRepo); } @After diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 4d87471f9c..5ba1a9e84b 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -1060,7 +1060,7 @@ public abstract class AbstractQueryChangesTest { throws Exception { CreateProject create = projectFactory.create(name); create.apply(TLR, new ProjectInput()); - return new TestRepository( + return new TestRepository<>( repoManager.openRepository(new Project.NameKey(name))); }