Remove redundant type arguments
In Java 11 type arguments for anonymous subclasses can be inferred and don't need to be specified. This resolves a number of compiler warnings. Change-Id: I55eff3babb7628aa0627085e65a1b45eb12c2cd3 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
parent
3d86d3e810
commit
bdba9edd5f
|
@ -116,7 +116,8 @@ public void destroy() {
|
||||||
|
|
||||||
private static Set<Object> newIdentitySet() {
|
private static Set<Object> newIdentitySet() {
|
||||||
final Map<Object, Object> m = new IdentityHashMap<>();
|
final Map<Object, Object> m = new IdentityHashMap<>();
|
||||||
return new AbstractSet<Object>() {
|
return new AbstractSet<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean add(Object o) {
|
public boolean add(Object o) {
|
||||||
return m.put(o, o) == null;
|
return m.put(o, o) == null;
|
||||||
|
|
|
@ -35,7 +35,8 @@ public String getInitParameter(String name) {
|
||||||
/** {@inheritDoc} */
|
/** {@inheritDoc} */
|
||||||
@Override
|
@Override
|
||||||
public Enumeration<String> getInitParameterNames() {
|
public Enumeration<String> getInitParameterNames() {
|
||||||
return new Enumeration<String>() {
|
return new Enumeration<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasMoreElements() {
|
public boolean hasMoreElements() {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -95,7 +95,8 @@ public String getInitParameter(String name) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Enumeration<String> getInitParameterNames() {
|
public Enumeration<String> getInitParameterNames() {
|
||||||
return new Enumeration<String>() {
|
return new Enumeration<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasMoreElements() {
|
public boolean hasMoreElements() {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -44,7 +44,8 @@ public String getInitParameter(String name) {
|
||||||
@Override
|
@Override
|
||||||
public Enumeration<String> getInitParameterNames() {
|
public Enumeration<String> getInitParameterNames() {
|
||||||
final Iterator<String> i = parameters.keySet().iterator();
|
final Iterator<String> i = parameters.keySet().iterator();
|
||||||
return new Enumeration<String>() {
|
return new Enumeration<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasMoreElements() {
|
public boolean hasMoreElements() {
|
||||||
return i.hasNext();
|
return i.hasNext();
|
||||||
|
|
|
@ -223,7 +223,7 @@ private InetSocketAddress configureProxy(ProxyData proxyData,
|
||||||
private SshFutureListener<IoConnectFuture> createConnectCompletionListener(
|
private SshFutureListener<IoConnectFuture> createConnectCompletionListener(
|
||||||
ConnectFuture connectFuture, String username,
|
ConnectFuture connectFuture, String username,
|
||||||
InetSocketAddress address, HostConfigEntry hostConfig) {
|
InetSocketAddress address, HostConfigEntry hostConfig) {
|
||||||
return new SshFutureListener<IoConnectFuture>() {
|
return new SshFutureListener<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void operationComplete(IoConnectFuture future) {
|
public void operationComplete(IoConnectFuture future) {
|
||||||
|
@ -406,7 +406,7 @@ public CombinedKeyIdentityProvider(
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterable<KeyPair> loadKeys(SessionContext context) {
|
public Iterable<KeyPair> loadKeys(SessionContext context) {
|
||||||
return () -> new Iterator<KeyPair>() {
|
return () -> new Iterator<>() {
|
||||||
|
|
||||||
private Iterator<KeyIdentityProvider> factories = providers
|
private Iterator<KeyIdentityProvider> factories = providers
|
||||||
.iterator();
|
.iterator();
|
||||||
|
|
|
@ -61,7 +61,8 @@ public void testExceedsChainLength_DuringScanOfA() {
|
||||||
hd.setFallbackAlgorithm(null);
|
hd.setFallbackAlgorithm(null);
|
||||||
hd.setMaxChainLength(3);
|
hd.setMaxChainLength(3);
|
||||||
|
|
||||||
SequenceComparator<RawText> cmp = new SequenceComparator<RawText>() {
|
SequenceComparator<RawText> cmp = new SequenceComparator<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(RawText a, int ai, RawText b, int bi) {
|
public boolean equals(RawText a, int ai, RawText b, int bi) {
|
||||||
return RawTextComparator.DEFAULT.equals(a, ai, b, bi);
|
return RawTextComparator.DEFAULT.equals(a, ai, b, bi);
|
||||||
|
|
|
@ -235,7 +235,7 @@ public DescribeCommand setMatch(String... patterns) throws InvalidPatternExcepti
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final Comparator<Ref> TAG_TIE_BREAKER = new Comparator<Ref>() {
|
private final Comparator<Ref> TAG_TIE_BREAKER = new Comparator<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compare(Ref o1, Ref o2) {
|
public int compare(Ref o1, Ref o2) {
|
||||||
|
|
|
@ -40,7 +40,8 @@
|
||||||
public class RenameDetector {
|
public class RenameDetector {
|
||||||
private static final int EXACT_RENAME_SCORE = 100;
|
private static final int EXACT_RENAME_SCORE = 100;
|
||||||
|
|
||||||
private static final Comparator<DiffEntry> DIFF_COMPARATOR = new Comparator<DiffEntry>() {
|
private static final Comparator<DiffEntry> DIFF_COMPARATOR = new Comparator<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compare(DiffEntry a, DiffEntry b) {
|
public int compare(DiffEntry a, DiffEntry b) {
|
||||||
int cmp = nameOf(a).compareTo(nameOf(b));
|
int cmp = nameOf(a).compareTo(nameOf(b));
|
||||||
|
|
|
@ -371,7 +371,7 @@ public <T extends ObjectId> AsyncObjectLoaderQueue<T> open(
|
||||||
|
|
||||||
final Iterator<FoundObject<T>> idItr = order.iterator();
|
final Iterator<FoundObject<T>> idItr = order.iterator();
|
||||||
final IOException findAllError = error;
|
final IOException findAllError = error;
|
||||||
return new AsyncObjectLoaderQueue<T>() {
|
return new AsyncObjectLoaderQueue<>() {
|
||||||
private FoundObject<T> cur;
|
private FoundObject<T> cur;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -431,7 +431,7 @@ public <T extends ObjectId> AsyncObjectSizeQueue<T> getObjectSize(
|
||||||
|
|
||||||
final Iterator<FoundObject<T>> idItr = order.iterator();
|
final Iterator<FoundObject<T>> idItr = order.iterator();
|
||||||
final IOException findAllError = error;
|
final IOException findAllError = error;
|
||||||
return new AsyncObjectSizeQueue<T>() {
|
return new AsyncObjectSizeQueue<>() {
|
||||||
private FoundObject<T> cur;
|
private FoundObject<T> cur;
|
||||||
private long sz;
|
private long sz;
|
||||||
|
|
||||||
|
|
|
@ -325,7 +325,7 @@ public Iterator<BitmapObject> iterator() {
|
||||||
final IntIterator trees = ofObjectType(Constants.OBJ_TREE);
|
final IntIterator trees = ofObjectType(Constants.OBJ_TREE);
|
||||||
final IntIterator blobs = ofObjectType(Constants.OBJ_BLOB);
|
final IntIterator blobs = ofObjectType(Constants.OBJ_BLOB);
|
||||||
final IntIterator tags = ofObjectType(Constants.OBJ_TAG);
|
final IntIterator tags = ofObjectType(Constants.OBJ_TAG);
|
||||||
return new Iterator<BitmapObject>() {
|
return new Iterator<>() {
|
||||||
private final BitmapObjectImpl out = new BitmapObjectImpl();
|
private final BitmapObjectImpl out = new BitmapObjectImpl();
|
||||||
private int type;
|
private int type;
|
||||||
private IntIterator cached = dynamic;
|
private IntIterator cached = dynamic;
|
||||||
|
|
|
@ -111,7 +111,7 @@ public Iterator<Entry> iterator() {
|
||||||
return Collections.<Entry> emptyList().iterator();
|
return Collections.<Entry> emptyList().iterator();
|
||||||
|
|
||||||
final Iterator<StoredBitmap> it = oldPackIndex.getBitmaps().iterator();
|
final Iterator<StoredBitmap> it = oldPackIndex.getBitmaps().iterator();
|
||||||
return new Iterator<Entry>() {
|
return new Iterator<>() {
|
||||||
private Entry entry;
|
private Entry entry;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -144,7 +144,7 @@ public class PackWriter implements AutoCloseable {
|
||||||
private static final Map<WeakReference<PackWriter>, Boolean> instances =
|
private static final Map<WeakReference<PackWriter>, Boolean> instances =
|
||||||
new ConcurrentHashMap<>();
|
new ConcurrentHashMap<>();
|
||||||
|
|
||||||
private static final Iterable<PackWriter> instancesIterable = () -> new Iterator<PackWriter>() {
|
private static final Iterable<PackWriter> instancesIterable = () -> new Iterator<>() {
|
||||||
|
|
||||||
private final Iterator<WeakReference<PackWriter>> it = instances
|
private final Iterator<WeakReference<PackWriter>> it = instances
|
||||||
.keySet().iterator();
|
.keySet().iterator();
|
||||||
|
|
|
@ -518,7 +518,7 @@ private static final class CommitSelectionHelper implements Iterable<RevCommit>
|
||||||
public Iterator<RevCommit> iterator() {
|
public Iterator<RevCommit> iterator() {
|
||||||
// Member variables referenced by this iterator will have synthetic
|
// Member variables referenced by this iterator will have synthetic
|
||||||
// accessors generated for them if they are made private.
|
// accessors generated for them if they are made private.
|
||||||
return new Iterator<RevCommit>() {
|
return new Iterator<>() {
|
||||||
int pos = newCommitStartPos;
|
int pos = newCommitStartPos;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -253,7 +253,8 @@ public boolean contains(Object needle) {
|
||||||
@Override
|
@Override
|
||||||
public Iterator<String> iterator() {
|
public Iterator<String> iterator() {
|
||||||
final Iterator<String> i = names.values().iterator();
|
final Iterator<String> i = names.values().iterator();
|
||||||
return new Iterator<String>() {
|
return new Iterator<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasNext() {
|
public boolean hasNext() {
|
||||||
return i.hasNext();
|
return i.hasNext();
|
||||||
|
|
|
@ -202,7 +202,7 @@ public boolean isEmpty() {
|
||||||
/** {@inheritDoc} */
|
/** {@inheritDoc} */
|
||||||
@Override
|
@Override
|
||||||
public Iterator<V> iterator() {
|
public Iterator<V> iterator() {
|
||||||
return new Iterator<V>() {
|
return new Iterator<>() {
|
||||||
private int found;
|
private int found;
|
||||||
private int dirIdx;
|
private int dirIdx;
|
||||||
private int tblIdx;
|
private int tblIdx;
|
||||||
|
|
|
@ -165,7 +165,7 @@ public boolean isEmpty() {
|
||||||
/** {@inheritDoc} */
|
/** {@inheritDoc} */
|
||||||
@Override
|
@Override
|
||||||
public Iterator<V> iterator() {
|
public Iterator<V> iterator() {
|
||||||
return new Iterator<V>() {
|
return new Iterator<>() {
|
||||||
private int found;
|
private int found;
|
||||||
|
|
||||||
private int i;
|
private int i;
|
||||||
|
|
|
@ -261,7 +261,7 @@ public abstract ObjectLoader open(AnyObjectId objectId, int typeHint)
|
||||||
public <T extends ObjectId> AsyncObjectLoaderQueue<T> open(
|
public <T extends ObjectId> AsyncObjectLoaderQueue<T> open(
|
||||||
Iterable<T> objectIds, final boolean reportMissing) {
|
Iterable<T> objectIds, final boolean reportMissing) {
|
||||||
final Iterator<T> idItr = objectIds.iterator();
|
final Iterator<T> idItr = objectIds.iterator();
|
||||||
return new AsyncObjectLoaderQueue<T>() {
|
return new AsyncObjectLoaderQueue<>() {
|
||||||
private T cur;
|
private T cur;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -347,7 +347,7 @@ public long getObjectSize(AnyObjectId objectId, int typeHint)
|
||||||
public <T extends ObjectId> AsyncObjectSizeQueue<T> getObjectSize(
|
public <T extends ObjectId> AsyncObjectSizeQueue<T> getObjectSize(
|
||||||
Iterable<T> objectIds, final boolean reportMissing) {
|
Iterable<T> objectIds, final boolean reportMissing) {
|
||||||
final Iterator<T> idItr = objectIds.iterator();
|
final Iterator<T> idItr = objectIds.iterator();
|
||||||
return new AsyncObjectSizeQueue<T>() {
|
return new AsyncObjectSizeQueue<>() {
|
||||||
private T cur;
|
private T cur;
|
||||||
|
|
||||||
private long sz;
|
private long sz;
|
||||||
|
|
|
@ -100,7 +100,7 @@ public List<S> getSequences() {
|
||||||
/** {@inheritDoc} */
|
/** {@inheritDoc} */
|
||||||
@Override
|
@Override
|
||||||
public Iterator<MergeChunk> iterator() {
|
public Iterator<MergeChunk> iterator() {
|
||||||
return new Iterator<MergeChunk>() {
|
return new Iterator<>() {
|
||||||
int idx;
|
int idx;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -102,7 +102,7 @@ Iterator<Note> iterator(AnyObjectId objId, final ObjectReader reader)
|
||||||
final MutableObjectId id = new MutableObjectId();
|
final MutableObjectId id = new MutableObjectId();
|
||||||
id.fromObjectId(objId);
|
id.fromObjectId(objId);
|
||||||
|
|
||||||
return new Iterator<Note>() {
|
return new Iterator<>() {
|
||||||
private int cell;
|
private int cell;
|
||||||
|
|
||||||
private Iterator<Note> itr;
|
private Iterator<Note> itr;
|
||||||
|
|
|
@ -86,7 +86,7 @@ int size() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
Iterator<Note> iterator(AnyObjectId objId, ObjectReader reader) {
|
Iterator<Note> iterator(AnyObjectId objId, ObjectReader reader) {
|
||||||
return new Iterator<Note>() {
|
return new Iterator<>() {
|
||||||
private int idx;
|
private int idx;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -104,7 +104,7 @@ public boolean remove(Object o) {
|
||||||
@Override
|
@Override
|
||||||
public Iterator<RevFlag> iterator() {
|
public Iterator<RevFlag> iterator() {
|
||||||
final Iterator<RevFlag> i = active.iterator();
|
final Iterator<RevFlag> i = active.iterator();
|
||||||
return new Iterator<RevFlag>() {
|
return new Iterator<>() {
|
||||||
private RevFlag current;
|
private RevFlag current;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1552,7 +1552,7 @@ private RevCommit nextForIterator() {
|
||||||
public Iterator<RevCommit> iterator() {
|
public Iterator<RevCommit> iterator() {
|
||||||
RevCommit first = nextForIterator();
|
RevCommit first = nextForIterator();
|
||||||
|
|
||||||
return new Iterator<RevCommit>() {
|
return new Iterator<>() {
|
||||||
RevCommit next = first;
|
RevCommit next = first;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -131,7 +131,7 @@ boolean complete() {
|
||||||
|
|
||||||
private Map<String, NetRCEntry> hosts = new HashMap<>();
|
private Map<String, NetRCEntry> hosts = new HashMap<>();
|
||||||
|
|
||||||
private static final TreeMap<String, State> STATE = new TreeMap<String, NetRC.State>() {
|
private static final TreeMap<String, State> STATE = new TreeMap<>() {
|
||||||
private static final long serialVersionUID = -4285910831814853334L;
|
private static final long serialVersionUID = -4285910831814853334L;
|
||||||
{
|
{
|
||||||
put("machine", State.MACHINE); //$NON-NLS-1$
|
put("machine", State.MACHINE); //$NON-NLS-1$
|
||||||
|
|
|
@ -388,7 +388,8 @@ public static class PacketLineInIterator implements Iterable<String> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterator<String> iterator() {
|
public Iterator<String> iterator() {
|
||||||
return new Iterator<String>() {
|
return new Iterator<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasNext() {
|
public boolean hasNext() {
|
||||||
return !PacketLineIn.isEnd(current);
|
return !PacketLineIn.isEnd(current);
|
||||||
|
|
|
@ -158,7 +158,7 @@ private class TransportInternal extends Transport implements PackTransport {
|
||||||
public FetchConnection openFetch() throws NotSupportedException,
|
public FetchConnection openFetch() throws NotSupportedException,
|
||||||
TransportException {
|
TransportException {
|
||||||
handle.remote.incrementOpen();
|
handle.remote.incrementOpen();
|
||||||
return new InternalFetchConnection<C>(this, uploadPackFactory,
|
return new InternalFetchConnection<>(this, uploadPackFactory,
|
||||||
handle.req, handle.remote) {
|
handle.req, handle.remote) {
|
||||||
@Override
|
@Override
|
||||||
FetchConfig getFetchConfig() {
|
FetchConfig getFetchConfig() {
|
||||||
|
|
|
@ -40,7 +40,7 @@ public class GitDateParser {
|
||||||
// be cached. Since they are also not threadsafe they are cached using
|
// be cached. Since they are also not threadsafe they are cached using
|
||||||
// ThreadLocal.
|
// ThreadLocal.
|
||||||
private static ThreadLocal<Map<Locale, Map<ParseableSimpleDateFormat, SimpleDateFormat>>> formatCache =
|
private static ThreadLocal<Map<Locale, Map<ParseableSimpleDateFormat, SimpleDateFormat>>> formatCache =
|
||||||
new ThreadLocal<Map<Locale, Map<ParseableSimpleDateFormat, SimpleDateFormat>>>() {
|
new ThreadLocal<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Map<Locale, Map<ParseableSimpleDateFormat, SimpleDateFormat>> initialValue() {
|
protected Map<Locale, Map<ParseableSimpleDateFormat, SimpleDateFormat>> initialValue() {
|
||||||
|
|
|
@ -73,7 +73,7 @@ protected RefList(RefList<T> src) {
|
||||||
/** {@inheritDoc} */
|
/** {@inheritDoc} */
|
||||||
@Override
|
@Override
|
||||||
public Iterator<Ref> iterator() {
|
public Iterator<Ref> iterator() {
|
||||||
return new Iterator<Ref>() {
|
return new Iterator<>() {
|
||||||
private int idx;
|
private int idx;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -199,7 +199,8 @@ public boolean isEmpty() {
|
||||||
@Override
|
@Override
|
||||||
public Set<Entry<String, Ref>> entrySet() {
|
public Set<Entry<String, Ref>> entrySet() {
|
||||||
if (entrySet == null) {
|
if (entrySet == null) {
|
||||||
entrySet = new AbstractSet<Entry<String, Ref>>() {
|
entrySet = new AbstractSet<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterator<Entry<String, Ref>> iterator() {
|
public Iterator<Entry<String, Ref>> iterator() {
|
||||||
return new SetIterator();
|
return new SetIterator();
|
||||||
|
|
Loading…
Reference in New Issue