Fix warning "Redundant specification of type arguments <Object>"

Use a lambda to fix this and make the code easier to read.

Change-Id: I082ffb2073f86d21deb4b51a24e53de9371b765e

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java
index c47e5914454c32b461147bd7f6733ba880f6e6a8..0ba8926a7fffcbed63621e6281f28b249a1f0068 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java
@@ -25,10 +25,6 @@ import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.lib.NullProgressMonitor;
 import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
-import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
-import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,16 +42,8 @@ public class AtomicPushTest {
        public void setUp() throws Exception {
                server = newRepo("server");
                client = newRepo("client");
-               testProtocol = new TestProtocol<>(
-                               null,
-                               new ReceivePackFactory<Object>() {
-                                       @Override
-                                       public ReceivePack create(Object req, Repository db)
-                                                       throws ServiceNotEnabledException,
-                                                       ServiceNotAuthorizedException {
-                                               return new ReceivePack(db);
-                                       }
-                               });
+               testProtocol = new TestProtocol<>(null,
+                               (req, db) -> new ReceivePack(db));
                uri = testProtocol.register(ctx, server);
 
                try (TestRepository<?> clientRepo = new TestRepository<>(client)) {

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java
index 271176264083504d5ed5180c001665d8f720bab5..a5507c8f81ab6ae753db54111d2d53c868a066b2 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java
@@ -27,9 +27,6 @@ import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevBlob;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.transport.UploadPack.RequestPolicy;
-import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
-import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
-import org.eclipse.jgit.transport.resolver.UploadPackFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -264,15 +261,10 @@ public class UploadPackReachabilityTest {
        }
 
        private static TestProtocol<Object> generateReachableCommitUploadPackProtocol() {
-               return new TestProtocol<>(new UploadPackFactory<Object>() {
-                       @Override
-                       public UploadPack create(Object req, Repository db)
-                                       throws ServiceNotEnabledException,
-                                       ServiceNotAuthorizedException {
-                               UploadPack up = new UploadPack(db);
-                               up.setRequestPolicy(RequestPolicy.REACHABLE_COMMIT);
-                               return up;
-                       }
+               return new TestProtocol<>((req, db) -> {
+                       UploadPack up = new UploadPack(db);
+                       up.setRequestPolicy(RequestPolicy.REACHABLE_COMMIT);
+                       return up;
                }, null);
        }
 }