Browse Source

Convert to lambda or member reference

Convert anonymous inner classes to lambda expressions or member
references

Bug: 545856
CQ: 19537
Change-Id: I621431c178e8b99316314602f7c66c9a36f9ae98
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-5.5
Carsten Hammer 6 years ago
parent
commit
84fc5c908d
  1. 13
      org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java
  2. 18
      org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AdvertiseErrorTest.java
  3. 40
      org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletResponseTests.java
  4. 32
      org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HookMessageTest.java
  5. 19
      org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java
  6. 29
      org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/MeasurePackSizeTest.java
  7. 19
      org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java
  8. 20
      org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java
  9. 17
      org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/SimpleHttpServer.java
  10. 30
      org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java
  11. 12
      org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/UploadTest.java
  12. 9
      org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/CleanFilter.java
  13. 8
      org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java
  14. 16
      org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java
  15. 9
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandCatalog.java
  16. 26
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
  17. 8
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java
  18. 10
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsRemote.java
  19. 14
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java
  20. 17
      org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/auth/BasicAuthentication.java
  21. 117
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java
  22. 16
      org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheBuilderTest.java
  23. 9
      org.eclipse.jgit.test/tst/org/eclipse/jgit/events/ConfigChangeEventTest.java
  24. 23
      org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java
  25. 52
      org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java
  26. 17
      org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java
  27. 9
      org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java
  28. 31
      org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java
  29. 34
      org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabaseTest.java
  30. 13
      org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectCheckerTest.java
  31. 43
      org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ThreadSafeProgressMonitorTest.java
  32. 34
      org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java
  33. 18
      org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushOptionsTest.java
  34. 35
      org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java
  35. 107
      org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
  36. 37
      org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java
  37. 8
      org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java
  38. 9
      org.eclipse.jgit/src/org/eclipse/jgit/api/ListBranchCommand.java
  39. 9
      org.eclipse.jgit/src/org/eclipse/jgit/api/ListTagCommand.java
  40. 14
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java
  41. 12
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEditor.java
  42. 35
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheTree.java
  43. 7
      org.eclipse.jgit/src/org/eclipse/jgit/internal/ketch/KetchLeader.java
  44. 25
      org.eclipse.jgit/src/org/eclipse/jgit/internal/ketch/LocalReplica.java
  45. 21
      org.eclipse.jgit/src/org/eclipse/jgit/internal/ketch/RemoteGitReplica.java
  46. 8
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java
  47. 23
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java
  48. 9
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java
  49. 8
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
  50. 97
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java
  51. 8
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java
  52. 9
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java
  53. 65
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
  54. 9
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java
  55. 7
      org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java
  56. 7
      org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
  57. 13
      org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
  58. 46
      org.eclipse.jgit/src/org/eclipse/jgit/transport/Daemon.java
  59. 9
      org.eclipse.jgit/src/org/eclipse/jgit/transport/PostReceiveHook.java
  60. 7
      org.eclipse.jgit/src/org/eclipse/jgit/transport/PostUploadHook.java
  61. 9
      org.eclipse.jgit/src/org/eclipse/jgit/transport/PreReceiveHook.java
  62. 135
      org.eclipse.jgit/src/org/eclipse/jgit/transport/PushCertificateStore.java
  63. 7
      org.eclipse.jgit/src/org/eclipse/jgit/transport/RefFilter.java
  64. 10
      org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java
  65. 16
      org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportLocal.java
  66. 8
      org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/ReceivePackFactory.java
  67. 8
      org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/RepositoryResolver.java
  68. 8
      org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/UploadPackFactory.java
  69. 12
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
  70. 10
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
  71. 19
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java
  72. 9
      org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java
  73. 36
      org.eclipse.jgit/src/org/eclipse/jgit/util/io/IsolatedOutputStream.java
  74. 10
      org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java

13
org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java

@ -47,7 +47,6 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import java.io.IOException;
import javax.servlet.FilterChain;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@ -140,14 +139,10 @@ public class MetaServlet extends HttpServlet {
@Override
protected void service(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
filter.doFilter(req, res, new FilterChain() {
@Override
public void doFilter(ServletRequest request,
ServletResponse response) throws IOException,
ServletException {
((HttpServletResponse) response).sendError(SC_NOT_FOUND);
}
});
filter.doFilter(req, res,
(ServletRequest request, ServletResponse response) -> {
((HttpServletResponse) response).sendError(SC_NOT_FOUND);
});
}
/**

18
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AdvertiseErrorTest.java

@ -69,7 +69,6 @@ import org.eclipse.jgit.transport.ReceivePack;
import org.eclipse.jgit.transport.RemoteRefUpdate;
import org.eclipse.jgit.transport.Transport;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.resolver.RepositoryResolver;
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.junit.Before;
@ -90,18 +89,13 @@ public class AdvertiseErrorTest extends HttpTestCase {
ServletContextHandler app = server.addContext("/git");
GitServlet gs = new GitServlet();
gs.setRepositoryResolver(new RepositoryResolver<HttpServletRequest>() {
@Override
public Repository open(HttpServletRequest req, String name)
throws RepositoryNotFoundException,
ServiceNotEnabledException {
if (!name.equals(srcName))
throw new RepositoryNotFoundException(name);
final Repository db = src.getRepository();
db.incrementOpen();
return db;
gs.setRepositoryResolver((HttpServletRequest req, String name) -> {
if (!name.equals(srcName)) {
throw new RepositoryNotFoundException(name);
}
final Repository db = src.getRepository();
db.incrementOpen();
return db;
});
gs.setReceivePackFactory(new DefaultReceivePackFactory() {
@Override

40
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletResponseTests.java

@ -75,7 +75,6 @@ import org.eclipse.jgit.transport.ReceivePack;
import org.eclipse.jgit.transport.RemoteRefUpdate;
import org.eclipse.jgit.transport.Transport;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.resolver.RepositoryResolver;
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.junit.Before;
@ -117,18 +116,13 @@ public class GitServletResponseTests extends HttpTestCase {
ServletContextHandler app = server.addContext("/git");
gs = new GitServlet();
gs.setRepositoryResolver(new RepositoryResolver<HttpServletRequest>() {
@Override
public Repository open(HttpServletRequest req, String name)
throws RepositoryNotFoundException,
ServiceNotEnabledException {
if (!name.equals(repoName))
throw new RepositoryNotFoundException(name);
final Repository db = srv.getRepository();
db.incrementOpen();
return db;
gs.setRepositoryResolver((HttpServletRequest req, String name) -> {
if (!name.equals(repoName)) {
throw new RepositoryNotFoundException(name);
}
final Repository db = srv.getRepository();
db.incrementOpen();
return db;
});
gs.setReceivePackFactory(new DefaultReceivePackFactory() {
@Override
@ -179,12 +173,8 @@ public class GitServletResponseTests extends HttpTestCase {
maxPackSize = 0;
postHook = null;
preHook = new PreReceiveHook() {
@Override
public void onPreReceive(ReceivePack rp,
Collection<ReceiveCommand> commands) {
throw new IllegalStateException();
}
preHook = (ReceivePack rp, Collection<ReceiveCommand> commands) -> {
throw new IllegalStateException();
};
try (Transport t = Transport.open(clientRepo, srvURI)) {
@ -263,15 +253,11 @@ public class GitServletResponseTests extends HttpTestCase {
maxPackSize = 100;
// this PostReceiveHook when called after an unsuccesfull unpack will
// lead to an IllegalStateException
postHook = new PostReceiveHook() {
@Override
public void onPostReceive(ReceivePack rp,
Collection<ReceiveCommand> commands) {
// the maxPackSize setting caused that the packfile couldn't be
// saved to disk. Calling getPackSize() now will lead to a
// IllegalStateException.
rp.getPackSize();
}
postHook = (ReceivePack rp, Collection<ReceiveCommand> commands) -> {
// the maxPackSize setting caused that the packfile couldn't be
// saved to disk. Calling getPackSize() now will lead to a
// IllegalStateException.
rp.getPackSize();
};
try (Transport t = Transport.open(clientRepo, srvURI)) {

32
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HookMessageTest.java

@ -70,14 +70,12 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevBlob;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.PreReceiveHook;
import org.eclipse.jgit.transport.PushResult;
import org.eclipse.jgit.transport.ReceiveCommand;
import org.eclipse.jgit.transport.ReceivePack;
import org.eclipse.jgit.transport.RemoteRefUpdate;
import org.eclipse.jgit.transport.Transport;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.resolver.RepositoryResolver;
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.junit.Before;
@ -98,18 +96,13 @@ public class HookMessageTest extends HttpTestCase {
ServletContextHandler app = server.addContext("/git");
GitServlet gs = new GitServlet();
gs.setRepositoryResolver(new RepositoryResolver<HttpServletRequest>() {
@Override
public Repository open(HttpServletRequest req, String name)
throws RepositoryNotFoundException,
ServiceNotEnabledException {
if (!name.equals(srcName))
throw new RepositoryNotFoundException(name);
final Repository db = src.getRepository();
db.incrementOpen();
return db;
gs.setRepositoryResolver((HttpServletRequest req, String name) -> {
if (!name.equals(srcName)) {
throw new RepositoryNotFoundException(name);
}
final Repository db = src.getRepository();
db.incrementOpen();
return db;
});
gs.setReceivePackFactory(new DefaultReceivePackFactory() {
@Override
@ -117,14 +110,11 @@ public class HookMessageTest extends HttpTestCase {
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
ReceivePack recv = super.create(req, db);
recv.setPreReceiveHook(new PreReceiveHook() {
@Override
public void onPreReceive(ReceivePack rp,
Collection<ReceiveCommand> commands) {
rp.sendMessage("message line 1");
rp.sendError("no soup for you!");
rp.sendMessage("come back next year!");
}
recv.setPreReceiveHook((ReceivePack rp,
Collection<ReceiveCommand> commands) -> {
rp.sendMessage("message line 1");
rp.sendError("no soup for you!");
rp.sendMessage("come back next year!");
});
return recv;
}

19
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java

@ -87,8 +87,6 @@ import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.eclipse.jgit.transport.http.HttpConnection;
import org.eclipse.jgit.transport.http.JDKHttpConnectionFactory;
import org.eclipse.jgit.transport.resolver.RepositoryResolver;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.junit.Before;
import org.junit.Test;
@ -141,18 +139,13 @@ public class HttpClientTests extends HttpTestCase {
private ServletContextHandler smart(String path) {
GitServlet gs = new GitServlet();
gs.setRepositoryResolver(new RepositoryResolver<HttpServletRequest>() {
@Override
public Repository open(HttpServletRequest req, String name)
throws RepositoryNotFoundException,
ServiceNotEnabledException {
final Repository db = remoteRepository.getRepository();
if (!name.equals(nameOf(db)))
throw new RepositoryNotFoundException(name);
db.incrementOpen();
return db;
gs.setRepositoryResolver((HttpServletRequest req, String name) -> {
final Repository db = remoteRepository.getRepository();
if (!name.equals(nameOf(db))) {
throw new RepositoryNotFoundException(name);
}
db.incrementOpen();
return db;
});
ServletContextHandler ctx = server.addContext(path);

29
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/MeasurePackSizeTest.java

@ -63,14 +63,12 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevBlob;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.PostReceiveHook;
import org.eclipse.jgit.transport.PushResult;
import org.eclipse.jgit.transport.ReceiveCommand;
import org.eclipse.jgit.transport.ReceivePack;
import org.eclipse.jgit.transport.RemoteRefUpdate;
import org.eclipse.jgit.transport.Transport;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.resolver.RepositoryResolver;
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.junit.Before;
@ -93,18 +91,13 @@ public class MeasurePackSizeTest extends HttpTestCase {
ServletContextHandler app = server.addContext("/git");
GitServlet gs = new GitServlet();
gs.setRepositoryResolver(new RepositoryResolver<HttpServletRequest>() {
@Override
public Repository open(HttpServletRequest req, String name)
throws RepositoryNotFoundException,
ServiceNotEnabledException {
if (!name.equals(srcName))
throw new RepositoryNotFoundException(name);
final Repository db = src.getRepository();
db.incrementOpen();
return db;
gs.setRepositoryResolver((HttpServletRequest req, String name) -> {
if (!name.equals(srcName)) {
throw new RepositoryNotFoundException(name);
}
final Repository db = src.getRepository();
db.incrementOpen();
return db;
});
gs.setReceivePackFactory(new DefaultReceivePackFactory() {
@Override
@ -112,13 +105,9 @@ public class MeasurePackSizeTest extends HttpTestCase {
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
ReceivePack recv = super.create(req, db);
recv.setPostReceiveHook(new PostReceiveHook() {
@Override
public void onPostReceive(ReceivePack rp,
Collection<ReceiveCommand> commands) {
packSize = rp.getPackSize();
}
recv.setPostReceiveHook((ReceivePack rp,
Collection<ReceiveCommand> commands) -> {
packSize = rp.getPackSize();
});
return recv;
}

19
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java

@ -71,8 +71,6 @@ import org.eclipse.jgit.revwalk.RevBlob;
import org.eclipse.jgit.transport.PacketLineIn;
import org.eclipse.jgit.transport.PacketLineOut;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.resolver.RepositoryResolver;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.eclipse.jgit.util.NB;
import org.junit.Before;
import org.junit.Test;
@ -94,18 +92,13 @@ public class ProtocolErrorTest extends HttpTestCase {
ServletContextHandler app = server.addContext("/git");
GitServlet gs = new GitServlet();
gs.setRepositoryResolver(new RepositoryResolver<HttpServletRequest>() {
@Override
public Repository open(HttpServletRequest req, String name)
throws RepositoryNotFoundException,
ServiceNotEnabledException {
if (!name.equals(srcName))
throw new RepositoryNotFoundException(name);
final Repository db = src.getRepository();
db.incrementOpen();
return db;
gs.setRepositoryResolver((HttpServletRequest req, String name) -> {
if (!name.equals(srcName)) {
throw new RepositoryNotFoundException(name);
}
final Repository db = src.getRepository();
db.incrementOpen();
return db;
});
app.addServlet(new ServletHolder(gs), "/*");

20
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java

@ -124,9 +124,6 @@ import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.eclipse.jgit.transport.http.HttpConnectionFactory;
import org.eclipse.jgit.transport.http.JDKHttpConnectionFactory;
import org.eclipse.jgit.transport.http.apache.HttpClientConnectionFactory;
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.eclipse.jgit.transport.resolver.UploadPackFactory;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.HttpSupport;
import org.eclipse.jgit.util.SystemReader;
@ -192,18 +189,13 @@ public class SmartClientSmartServerTest extends HttpTestCase {
ConfigConstants.CONFIG_KEY_LOGALLREFUPDATES, true);
GitServlet gs = new GitServlet();
gs.setUploadPackFactory(new UploadPackFactory<HttpServletRequest>() {
@Override
public UploadPack create(HttpServletRequest req, Repository db)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
DefaultUploadPackFactory f = new DefaultUploadPackFactory();
UploadPack up = f.create(req, db);
if (advertiseRefsHook != null) {
up.setAdvertiseRefsHook(advertiseRefsHook);
}
return up;
gs.setUploadPackFactory((HttpServletRequest req, Repository db) -> {
DefaultUploadPackFactory f = new DefaultUploadPackFactory();
UploadPack up = f.create(req, db);
if (advertiseRefsHook != null) {
up.setAdvertiseRefsHook(advertiseRefsHook);
}
return up;
});
ServletContextHandler app = addNormalContext(gs, src, srcName);

17
org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/SimpleHttpServer.java

@ -54,8 +54,6 @@ import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.http.server.GitServlet;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.resolver.RepositoryResolver;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
/**
* Simple http server for testing http access to Git repositories.
@ -136,17 +134,12 @@ public class SimpleHttpServer {
private ServletContextHandler smart(String path) {
GitServlet gs = new GitServlet();
gs.setRepositoryResolver(new RepositoryResolver<HttpServletRequest>() {
@Override
public Repository open(HttpServletRequest req, String name)
throws RepositoryNotFoundException,
ServiceNotEnabledException {
if (!name.equals(nameOf(db)))
throw new RepositoryNotFoundException(name);
db.incrementOpen();
return db;
gs.setRepositoryResolver((HttpServletRequest req, String name) -> {
if (!name.equals(nameOf(db))) {
throw new RepositoryNotFoundException(name);
}
db.incrementOpen();
return db;
});
ServletContextHandler ctx = server.addContext(path);

30
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java

@ -171,22 +171,20 @@ public class MockSystemReader extends SystemReader {
/** {@inheritDoc} */
@Override
public MonotonicClock getClock() {
return new MonotonicClock() {
@Override
public ProposedTimestamp propose() {
long t = getCurrentTime();
return new ProposedTimestamp() {
@Override
public long read(TimeUnit unit) {
return unit.convert(t, TimeUnit.MILLISECONDS);
}
@Override
public void blockUntil(Duration maxWait) {
// Do not wait.
}
};
}
return () -> {
long t = getCurrentTime();
return new ProposedTimestamp() {
@Override
public long read(TimeUnit unit) {
return unit.convert(t, TimeUnit.MILLISECONDS);
}
@Override
public void blockUntil(Duration maxWait) {
// Do not wait.
}
};
};
}

12
org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/UploadTest.java

@ -53,7 +53,6 @@ import java.nio.file.Paths;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@ -123,13 +122,10 @@ public class UploadTest extends LfsServerTest {
ExecutorService e = Executors.newFixedThreadPool(count);
try {
for (Path p : paths) {
e.submit(new Callable<Void>() {
@Override
public Void call() throws Exception {
barrier.await();
putContent(p);
return null;
}
e.submit(() -> {
barrier.await();
putContent(p);
return null;
});
}
} finally {

9
org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/CleanFilter.java

@ -78,14 +78,7 @@ public class CleanFilter extends FilterCommand {
* The factory is responsible for creating instances of
* {@link org.eclipse.jgit.lfs.CleanFilter}
*/
public final static FilterCommandFactory FACTORY = new FilterCommandFactory() {
@Override
public FilterCommand create(Repository db, InputStream in,
OutputStream out) throws IOException {
return new CleanFilter(db, in, out);
}
};
public final static FilterCommandFactory FACTORY = CleanFilter::new;
/**
* Registers this filter by calling

8
org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java

@ -92,13 +92,7 @@ public class SmudgeFilter extends FilterCommand {
* The factory is responsible for creating instances of
* {@link org.eclipse.jgit.lfs.SmudgeFilter}
*/
public final static FilterCommandFactory FACTORY = new FilterCommandFactory() {
@Override
public FilterCommand create(Repository db, InputStream in,
OutputStream out) throws IOException {
return new SmudgeFilter(db, in, out);
}
};
public final static FilterCommandFactory FACTORY = SmudgeFilter::new;
/**
* Register this filter in JGit

16
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java

@ -60,7 +60,6 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@ -703,15 +702,12 @@ public class ArchiveTest extends CLIRepositoryTestCase {
private static Future<Object> writeAsync(OutputStream stream, byte[] data) {
ExecutorService executor = Executors.newSingleThreadExecutor();
return executor.submit(new Callable<Object>() {
@Override
public Object call() throws IOException {
try {
stream.write(data);
return null;
} finally {
stream.close();
}
return executor.submit(() -> {
try {
stream.write(data);
return null;
} finally {
stream.close();
}
});
}

9
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandCatalog.java

@ -52,7 +52,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@ -115,12 +114,8 @@ public class CommandCatalog {
private static CommandRef[] toSortedArray(Collection<CommandRef> c) {
final CommandRef[] r = c.toArray(new CommandRef[0]);
Arrays.sort(r, new Comparator<CommandRef>() {
@Override
public int compare(CommandRef o1, CommandRef o2) {
return o1.getName().compareTo(o2.getName());
}
});
Arrays.sort(r, (CommandRef o1, CommandRef o2) -> o1.getName()
.compareTo(o2.getName()));
return r;
}

26
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java

@ -66,7 +66,6 @@ import org.eclipse.jgit.transport.DaemonService;
import org.eclipse.jgit.transport.ReceivePack;
import org.eclipse.jgit.transport.resolver.FileResolver;
import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.eclipse.jgit.util.FS;
import org.kohsuke.args4j.Argument;
@ -188,22 +187,17 @@ class Daemon extends TextBuiltin {
final ReceivePackFactory<DaemonClient> factory;
factory = daemon.getReceivePackFactory();
daemon.setReceivePackFactory(new ReceivePackFactory<DaemonClient>() {
@Override
public ReceivePack create(DaemonClient req, Repository repo)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
ReceivePack rp = factory.create(req, repo);
KetchLeader leader;
try {
leader = leaders.get(repo);
} catch (URISyntaxException err) {
throw new ServiceNotEnabledException(
KetchText.get().invalidFollowerUri, err);
}
rp.setPreReceiveHook(new KetchPreReceive(leader));
return rp;
daemon.setReceivePackFactory((DaemonClient req, Repository repo) -> {
ReceivePack rp = factory.create(req, repo);
KetchLeader leader;
try {
leader = leaders.get(repo);
} catch (URISyntaxException err) {
throw new ServiceNotEnabledException(
KetchText.get().invalidFollowerUri, err);
}
rp.setPreReceiveHook(new KetchPreReceive(leader));
return rp;
});
}
}

8
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java

@ -47,7 +47,6 @@ package org.eclipse.jgit.pgm;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
@ -87,11 +86,8 @@ class Glog extends RevWalkTextBuiltin {
final JPanel buttons = new JPanel(new FlowLayout());
final JButton repaint = new JButton();
repaint.setText(CLIText.get().repaint);
repaint.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
graphPane.repaint();
}
repaint.addActionListener((ActionEvent e) -> {
graphPane.repaint();
});
buttons.add(repaint);

10
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsRemote.java

@ -46,7 +46,6 @@
package org.eclipse.jgit.pgm;
import java.io.IOException;
import java.util.Comparator;
import java.util.TreeSet;
import org.eclipse.jgit.api.Git;
@ -76,13 +75,8 @@ class LsRemote extends TextBuiltin {
protected void run() {
LsRemoteCommand command = Git.lsRemoteRepository().setRemote(remote)
.setTimeout(timeout).setHeads(heads).setTags(tags);
TreeSet<Ref> refs = new TreeSet<>(new Comparator<Ref>() {
@Override
public int compare(Ref r1, Ref r2) {
return r1.getName().compareTo(r2.getName());
}
});
TreeSet<Ref> refs = new TreeSet<>(
(Ref r1, Ref r2) -> r1.getName().compareTo(r2.getName()));
try {
refs.addAll(command.call());
for (Ref r : refs) {

14
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java

@ -52,7 +52,6 @@ import java.lang.management.ThreadMXBean;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.eclipse.jgit.diff.DiffAlgorithm;
@ -235,15 +234,12 @@ class DiffAlgorithms extends TextBuiltin {
}
}
Collections.sort(all, new Comparator<Test>() {
@Override
public int compare(Test a, Test b) {
int result = Long.signum(a.runningTimeNanos - b.runningTimeNanos);
if (result == 0) {
result = a.algorithm.name.compareTo(b.algorithm.name);
}
return result;
Collections.sort(all, (Test a, Test b) -> {
int result = Long.signum(a.runningTimeNanos - b.runningTimeNanos);
if (result == 0) {
result = a.algorithm.name.compareTo(b.algorithm.name);
}
return result;
});
File directory = repo.getDirectory();

17
org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/auth/BasicAuthentication.java

@ -145,18 +145,13 @@ public abstract class BasicAuthentication<ParameterType, TokenType>
*/
protected void askCredentials() {
clearPassword();
PasswordAuthentication auth = AccessController
.doPrivileged(new PrivilegedAction<PasswordAuthentication>() {
@Override
public PasswordAuthentication run() {
return Authenticator.requestPasswordAuthentication(
proxy.getHostString(), proxy.getAddress(),
proxy.getPort(), SshConstants.SSH_SCHEME,
PasswordAuthentication auth = AccessController.doPrivileged(
(PrivilegedAction<PasswordAuthentication>) () -> Authenticator
.requestPasswordAuthentication(proxy.getHostString(),
proxy.getAddress(), proxy.getPort(),
SshConstants.SSH_SCHEME,
SshdText.get().proxyPasswordPrompt, "Basic", //$NON-NLS-1$
null, RequestorType.PROXY);
}
});
null, RequestorType.PROXY));
if (auth == null) {
user = ""; //$NON-NLS-1$
throw new CancellationException(

117
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java

@ -346,14 +346,11 @@ public class PullCommandTest extends RepositoryTestCase {
@Test
/** global rebase config should be respected */
public void testPullWithRebasePreserve1Config() throws Exception {
Callable<PullResult> setup = new Callable<PullResult>() {
@Override
public PullResult call() throws Exception {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "preserve");
config.save();
return target.pull().call();
}
Callable<PullResult> setup = () -> {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "preserve");
config.save();
return target.pull().call();
};
doTestPullWithRebase(setup, TestPullMode.REBASE_PREASERVE);
}
@ -361,15 +358,12 @@ public class PullCommandTest extends RepositoryTestCase {
@Test
/** the branch-local config should win over the global config */
public void testPullWithRebasePreserveConfig2() throws Exception {
Callable<PullResult> setup = new Callable<PullResult>() {
@Override
public PullResult call() throws Exception {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "false");
config.setString("branch", "master", "rebase", "preserve");
config.save();
return target.pull().call();
}
Callable<PullResult> setup = () -> {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "false");
config.setString("branch", "master", "rebase", "preserve");
config.save();
return target.pull().call();
};
doTestPullWithRebase(setup, TestPullMode.REBASE_PREASERVE);
}
@ -377,14 +371,11 @@ public class PullCommandTest extends RepositoryTestCase {
@Test
/** the branch-local config should be respected */
public void testPullWithRebasePreserveConfig3() throws Exception {
Callable<PullResult> setup = new Callable<PullResult>() {
@Override
public PullResult call() throws Exception {
StoredConfig config = dbTarget.getConfig();
config.setString("branch", "master", "rebase", "preserve");
config.save();
return target.pull().call();
}
Callable<PullResult> setup = () -> {
StoredConfig config = dbTarget.getConfig();
config.setString("branch", "master", "rebase", "preserve");
config.save();
return target.pull().call();
};
doTestPullWithRebase(setup, TestPullMode.REBASE_PREASERVE);
}
@ -392,14 +383,11 @@ public class PullCommandTest extends RepositoryTestCase {
@Test
/** global rebase config should be respected */
public void testPullWithRebaseConfig1() throws Exception {
Callable<PullResult> setup = new Callable<PullResult>() {
@Override
public PullResult call() throws Exception {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "true");
config.save();
return target.pull().call();
}
Callable<PullResult> setup = () -> {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "true");
config.save();
return target.pull().call();
};
doTestPullWithRebase(setup, TestPullMode.REBASE);
}
@ -407,15 +395,12 @@ public class PullCommandTest extends RepositoryTestCase {
@Test
/** the branch-local config should win over the global config */
public void testPullWithRebaseConfig2() throws Exception {
Callable<PullResult> setup = new Callable<PullResult>() {
@Override
public PullResult call() throws Exception {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "preserve");
config.setString("branch", "master", "rebase", "true");
config.save();
return target.pull().call();
}
Callable<PullResult> setup = () -> {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "preserve");
config.setString("branch", "master", "rebase", "true");
config.save();
return target.pull().call();
};
doTestPullWithRebase(setup, TestPullMode.REBASE);
}
@ -423,14 +408,11 @@ public class PullCommandTest extends RepositoryTestCase {
@Test
/** the branch-local config should be respected */
public void testPullWithRebaseConfig3() throws Exception {
Callable<PullResult> setup = new Callable<PullResult>() {
@Override
public PullResult call() throws Exception {
StoredConfig config = dbTarget.getConfig();
config.setString("branch", "master", "rebase", "true");
config.save();
return target.pull().call();
}
Callable<PullResult> setup = () -> {
StoredConfig config = dbTarget.getConfig();
config.setString("branch", "master", "rebase", "true");
config.save();
return target.pull().call();
};
doTestPullWithRebase(setup, TestPullMode.REBASE);
}
@ -438,27 +420,19 @@ public class PullCommandTest extends RepositoryTestCase {
@Test
/** without config it should merge */
public void testPullWithoutConfig() throws Exception {
Callable<PullResult> setup = new Callable<PullResult>() {
@Override
public PullResult call() throws Exception {
return target.pull().call();
}
};
Callable<PullResult> setup = target.pull()::call;
doTestPullWithRebase(setup, TestPullMode.MERGE);
}
@Test
/** the branch local config should win over the global config */
public void testPullWithMergeConfig() throws Exception {
Callable<PullResult> setup = new Callable<PullResult>() {
@Override
public PullResult call() throws Exception {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "true");
config.setString("branch", "master", "rebase", "false");
config.save();
return target.pull().call();
}
Callable<PullResult> setup = () -> {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "true");
config.setString("branch", "master", "rebase", "false");
config.save();
return target.pull().call();
};
doTestPullWithRebase(setup, TestPullMode.MERGE);
}
@ -466,14 +440,11 @@ public class PullCommandTest extends RepositoryTestCase {
@Test
/** the branch local config should win over the global config */
public void testPullWithMergeConfig2() throws Exception {
Callable<PullResult> setup = new Callable<PullResult>() {
@Override
public PullResult call() throws Exception {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "false");
config.save();
return target.pull().call();
}
Callable<PullResult> setup = () -> {
StoredConfig config = dbTarget.getConfig();
config.setString("pull", null, "rebase", "false");
config.save();
return target.pull().call();
};
doTestPullWithRebase(setup, TestPullMode.MERGE);
}

16
org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheBuilderTest.java vendored

@ -210,12 +210,8 @@ public class DirCacheBuilderTest extends RepositoryTestCase {
boolean receivedEvent = false;
DirCache dc = db.lockDirCache();
IndexChangedListener listener = new IndexChangedListener() {
@Override
public void onIndexChanged(IndexChangedEvent event) {
throw new ReceivedEventMarkerException();
}
IndexChangedListener listener = (IndexChangedEvent event) -> {
throw new ReceivedEventMarkerException();
};
ListenerList l = db.getListenerList();
@ -238,12 +234,8 @@ public class DirCacheBuilderTest extends RepositoryTestCase {
// do the same again, as this doesn't change index compared to first
// round we should get no event this time
dc = db.lockDirCache();
listener = new IndexChangedListener() {
@Override
public void onIndexChanged(IndexChangedEvent event) {
throw new ReceivedEventMarkerException();
}
listener = (IndexChangedEvent event) -> {
throw new ReceivedEventMarkerException();
};
l = db.getListenerList();

9
org.eclipse.jgit.test/tst/org/eclipse/jgit/events/ConfigChangeEventTest.java

@ -54,12 +54,9 @@ public class ConfigChangeEventTest extends RepositoryTestCase {
@Test
public void testFileRepository_ChangeEventsOnlyOnSave() throws Exception {
final ConfigChangedEvent[] events = new ConfigChangedEvent[1];
db.getListenerList().addConfigChangedListener(
new ConfigChangedListener() {
@Override
public void onConfigChanged(ConfigChangedEvent event) {
events[0] = event;
}
db.getListenerList()
.addConfigChangedListener((ConfigChangedEvent event) -> {
events[0] = event;
});
FileBasedConfig config = db.getConfig();
assertNull(events[0]);

23
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java

@ -239,20 +239,15 @@ public class GcConcurrentTest extends GcTestCase {
SampleDataRepositoryTestCase.copyCGitTestPacks(repo);
ExecutorService executor = Executors.newSingleThreadExecutor();
final CountDownLatch latch = new CountDownLatch(1);
Future<Collection<PackFile>> result = executor
.submit(new Callable<Collection<PackFile>>() {
@Override
public Collection<PackFile> call() throws Exception {
long start = System.currentTimeMillis();
System.out.println("starting gc");
latch.countDown();
Collection<PackFile> r = gc.gc();
System.out.println("gc took "
+ (System.currentTimeMillis() - start) + " ms");
return r;
}
});
Future<Collection<PackFile>> result = executor.submit(() -> {
long start = System.currentTimeMillis();
System.out.println("starting gc");
latch.countDown();
Collection<PackFile> r = gc.gc();
System.out.println(
"gc took " + (System.currentTimeMillis() - start) + " ms");
return r;
});
try {
latch.await();
Thread.sleep(5);

52
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java

@ -155,38 +155,32 @@ public class GcPackRefsTest extends GcTestCase {
final CyclicBarrier packRefsDone = new CyclicBarrier(2);
ExecutorService pool = Executors.newFixedThreadPool(2);
try {
Future<Result> result = pool.submit(new Callable<Result>() {
@Override
public Result call() throws Exception {
RefUpdate update = new RefDirectoryUpdate(
(RefDirectory) repo.getRefDatabase(),
repo.exactRef("refs/tags/t")) {
@Override
public boolean isForceUpdate() {
try {
refUpdateLockedRef.await();
packRefsDone.await();
} catch (InterruptedException | BrokenBarrierException e) {
Thread.currentThread().interrupt();
}
return super.isForceUpdate();
Future<Result> result = pool.submit(() -> {
RefUpdate update = new RefDirectoryUpdate(
(RefDirectory) repo.getRefDatabase(),
repo.exactRef("refs/tags/t")) {
@Override
public boolean isForceUpdate() {
try {
refUpdateLockedRef.await();
packRefsDone.await();
} catch (InterruptedException
| BrokenBarrierException e) {
Thread.currentThread().interrupt();
}
};
update.setForceUpdate(true);
update.setNewObjectId(b);
return update.update();
}
return super.isForceUpdate();
}
};
update.setForceUpdate(true);
update.setNewObjectId(b);
return update.update();
});
pool.submit(new Callable<Void>() {
@Override
public Void call() throws Exception {
refUpdateLockedRef.await();
gc.packRefs();
packRefsDone.await();
return null;
}
pool.submit(() -> {
refUpdateLockedRef.await();
gc.packRefs();
packRefsDone.await();
return null;
});
assertSame(result.get(), Result.FORCED);

17
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java

@ -47,7 +47,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.PrintWriter;
import java.text.MessageFormat;
@ -167,12 +166,8 @@ public class ObjectDirectoryTest extends RepositoryTestCase {
// Bug. To show the bug we sleep for more than 2500ms
Thread.sleep(2600);
File[] ret = packsFolder.listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return name.endsWith(".pack");
}
});
File[] ret = packsFolder.listFiles(
(File dir, String name) -> name.endsWith(".pack"));
assertTrue(ret != null && ret.length == 1);
Assume.assumeTrue(tmpFile.lastModified() == ret[0].lastModified());
@ -220,12 +215,8 @@ public class ObjectDirectoryTest extends RepositoryTestCase {
private Collection<Callable<ObjectId>> blobInsertersForTheSameFanOutDir(
final ObjectDirectory dir) {
Callable<ObjectId> callable = new Callable<ObjectId>() {
@Override
public ObjectId call() throws Exception {
return dir.newInserter().insert(Constants.OBJ_BLOB, new byte[0]);
}
};
Callable<ObjectId> callable = () -> dir.newInserter()
.insert(Constants.OBJ_BLOB, new byte[0]);
return Collections.nCopies(4, callable);
}

9
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java

@ -60,7 +60,6 @@ import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@ -881,12 +880,8 @@ public class PackWriterTest extends SampleDataRepositoryTestCase {
for (MutableEntry me : pack) {
entries.add(me.cloneEntry());
}
Collections.sort(entries, new Comparator<PackIndex.MutableEntry>() {
@Override
public int compare(MutableEntry o1, MutableEntry o2) {
return Long.signum(o1.getOffset() - o2.getOffset());
}
});
Collections.sort(entries, (MutableEntry o1, MutableEntry o2) -> Long
.signum(o1.getOffset() - o2.getOffset()));
int i = 0;
for (MutableEntry me : entries) {

31
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java

@ -70,7 +70,6 @@ import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.jgit.errors.LockFailedException;
import org.eclipse.jgit.events.ListenerHandle;
import org.eclipse.jgit.events.RefsChangedEvent;
import org.eclipse.jgit.events.RefsChangedListener;
import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.AnyObjectId;
@ -570,12 +569,8 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase {
final int[] count = new int[1];
ListenerHandle listener = Repository.getGlobalListenerList()
.addRefsChangedListener(new RefsChangedListener() {
@Override
public void onRefsChanged(RefsChangedEvent event) {
count[0]++;
}
.addRefsChangedListener((RefsChangedEvent event) -> {
count[0]++;
});
refs = refdir.getRefs(RefDatabase.ALL);
@ -1316,19 +1311,15 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase {
final AtomicReference<StackOverflowError> error = new AtomicReference<>();
final AtomicReference<IOException> exception = new AtomicReference<>();
final AtomicInteger changeCount = new AtomicInteger();
newRepo.getListenerList().addRefsChangedListener(
new RefsChangedListener() {
@Override
public void onRefsChanged(RefsChangedEvent event) {
try {
refDb.getRefsByPrefix("ref");
changeCount.incrementAndGet();
} catch (StackOverflowError soe) {
error.set(soe);
} catch (IOException ioe) {
exception.set(ioe);
}
newRepo.getListenerList()
.addRefsChangedListener((RefsChangedEvent event) -> {
try {
refDb.getRefsByPrefix("ref");
changeCount.incrementAndGet();
} catch (StackOverflowError soe) {
error.set(soe);
} catch (IOException ioe) {
exception.set(ioe);
}
});
refDb.getRefsByPrefix("ref");

34
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabaseTest.java

@ -633,35 +633,23 @@ public class RefTreeDatabaseTest {
private void symref(String name, String dst)
throws IOException {
commit(new Function() {
@Override
public boolean apply(ObjectReader reader, RefTree tree)
throws IOException {
Ref old = tree.exactRef(reader, name);
Command n = new Command(
old,
new SymbolicRef(
name,
new ObjectIdRef.Unpeeled(Ref.Storage.NEW, dst, null)));
return tree.apply(Collections.singleton(n));
}
commit((ObjectReader reader, RefTree tree) -> {
Ref old = tree.exactRef(reader, name);
Command n = new Command(old, new SymbolicRef(name,
new ObjectIdRef.Unpeeled(Ref.Storage.NEW, dst, null)));
return tree.apply(Collections.singleton(n));
});
}
private void update(String name, ObjectId id)
throws IOException {
commit(new Function() {
@Override
public boolean apply(ObjectReader reader, RefTree tree)
throws IOException {
Ref old = tree.exactRef(reader, name);
Command n;
try (RevWalk rw = new RevWalk(repo)) {
n = new Command(old,
Command.toRef(rw, id, null, name, true));
}
return tree.apply(Collections.singleton(n));
commit((ObjectReader reader, RefTree tree) -> {
Ref old = tree.exactRef(reader, name);
Command n;
try (RevWalk rw = new RevWalk(repo)) {
n = new Command(old, Command.toRef(rw, id, null, name, true));
}
return tree.apply(Collections.singleton(n));
});
}

13
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectCheckerTest.java

@ -1775,16 +1775,13 @@ public class ObjectCheckerTest {
}
private static ObjectIdSet set(ObjectId... ids) {
return new ObjectIdSet() {
@Override
public boolean contains(AnyObjectId objectId) {
for (ObjectId id : ids) {
if (id.equals(objectId)) {
return true;
}
return (AnyObjectId objectId) -> {
for (ObjectId id : ids) {
if (id.equals(objectId)) {
return true;
}
return false;
}
return false;
};
}

43
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ThreadSafeProgressMonitorTest.java

@ -61,29 +61,26 @@ public class ThreadSafeProgressMonitorTest {
final MockProgressMonitor mock = new MockProgressMonitor();
final ThreadSafeProgressMonitor pm = new ThreadSafeProgressMonitor(mock);
runOnThread(new Runnable() {
@Override
public void run() {
try {
pm.start(1);
fail("start did not fail on background thread");
} catch (IllegalStateException notMainThread) {
// Expected result
}
try {
pm.beginTask("title", 1);
fail("beginTask did not fail on background thread");
} catch (IllegalStateException notMainThread) {
// Expected result
}
try {
pm.endTask();
fail("endTask did not fail on background thread");
} catch (IllegalStateException notMainThread) {
// Expected result
}
runOnThread(() -> {
try {
pm.start(1);
fail("start did not fail on background thread");
} catch (IllegalStateException notMainThread) {
// Expected result
}
try {
pm.beginTask("title", 1);
fail("beginTask did not fail on background thread");
} catch (IllegalStateException notMainThread) {
// Expected result
}
try {
pm.endTask();
fail("endTask did not fail on background thread");
} catch (IllegalStateException notMainThread) {
// Expected result
}
});

34
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java

@ -67,9 +67,6 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.RefUpdate;
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;
@ -91,27 +88,16 @@ public class PushConnectionTest {
server = newRepo("server");
client = newRepo("client");
processedRefs = new ArrayList<>();
testProtocol = new TestProtocol<>(
null,
new ReceivePackFactory<Object>() {
@Override
public ReceivePack create(Object req, Repository db)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
ReceivePack rp = new ReceivePack(db);
rp.setPreReceiveHook(
new PreReceiveHook() {
@Override
public void onPreReceive(ReceivePack receivePack,
Collection<ReceiveCommand> cmds) {
for (ReceiveCommand cmd : cmds) {
processedRefs.add(cmd.getRefName());
}
}
});
return rp;
}
});
testProtocol = new TestProtocol<>(null, (Object req, Repository db) -> {
ReceivePack rp = new ReceivePack(db);
rp.setPreReceiveHook((ReceivePack receivePack,
Collection<ReceiveCommand> cmds) -> {
for (ReceiveCommand cmd : cmds) {
processedRefs.add(cmd.getRefName());
}
});
return rp;
});
uri = testProtocol.register(ctx, server);
try (ObjectInserter ins = server.newObjectInserter()) {

18
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushOptionsTest.java

@ -69,9 +69,6 @@ import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevCommit;
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;
@ -95,16 +92,11 @@ public class PushOptionsTest extends RepositoryTestCase {
client = newRepo("client");
testProtocol = new TestProtocol<>(null,
new ReceivePackFactory<Object>() {
@Override
public ReceivePack create(Object req, Repository git)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
receivePack = new ReceivePack(git);
receivePack.setAllowPushOptions(true);
receivePack.setAtomic(true);
return receivePack;
}
(Object req, Repository git) -> {
receivePack = new ReceivePack(git);
receivePack.setAllowPushOptions(true);
receivePack.setAtomic(true);
return receivePack;
});
uri = testProtocol.register(ctx, server);

35
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java

@ -92,11 +92,8 @@ public class TestProtocolTest {
@Override
public UploadPack create(User req, Repository db) {
UploadPack up = new UploadPack(db);
up.setPostUploadHook(new PostUploadHook() {
@Override
public void onPostUpload(PackStatistics stats) {
havesCount = stats.getHaves();
}
up.setPostUploadHook((PackStatistics stats) -> {
havesCount = stats.getHaves();
});
return up;
}
@ -217,16 +214,12 @@ public class TestProtocolTest {
ObjectId master = remote.branch("master").commit().create();
final AtomicInteger rejected = new AtomicInteger();
TestProtocol<User> proto = registerProto(new UploadPackFactory<User>() {
@Override
public UploadPack create(User req, Repository db)
throws ServiceNotAuthorizedException {
if (!"user2".equals(req.name)) {
rejected.incrementAndGet();
throw new ServiceNotAuthorizedException();
}
return new UploadPack(db);
TestProtocol<User> proto = registerProto((User req, Repository db) -> {
if (!"user2".equals(req.name)) {
rejected.incrementAndGet();
throw new ServiceNotAuthorizedException();
}
return new UploadPack(db);
}, new DefaultReceive());
// Same repository, different users.
@ -262,16 +255,12 @@ public class TestProtocolTest {
final AtomicInteger rejected = new AtomicInteger();
TestProtocol<User> proto = registerProto(new DefaultUpload(),
new ReceivePackFactory<User>() {
@Override
public ReceivePack create(User req, Repository db)
throws ServiceNotAuthorizedException {
if (!"user2".equals(req.name)) {
rejected.incrementAndGet();
throw new ServiceNotAuthorizedException();
}
return new ReceivePack(db);
(User req, Repository db) -> {
if (!"user2".equals(req.name)) {
rejected.incrementAndGet();
throw new ServiceNotAuthorizedException();
}
return new ReceivePack(db);
});
// Same repository, different users.

107
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java

@ -47,9 +47,6 @@ import org.eclipse.jgit.revwalk.RevTag;
import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.storage.pack.PackStatistics;
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.eclipse.jgit.util.io.NullOutputStream;
import org.hamcrest.Matchers;
import org.junit.After;
@ -102,17 +99,11 @@ public class UploadPackTest {
}
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;
}
}, null);
return new TestProtocol<>((Object req, Repository db) -> {
UploadPack up = new UploadPack(db);
up.setRequestPolicy(RequestPolicy.REACHABLE_COMMIT);
return up;
}, null);
}
@Test
@ -122,20 +113,14 @@ public class UploadPackTest {
RevCommit tip = remote.commit().message("2").parent(commit1).create();
remote.update("master", tip);
testProtocol = 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);
// assume client has a shallow commit
up.getRevWalk().assumeShallow(
Collections.singleton(commit1.getId()));
return up;
}
}, null);
testProtocol = new TestProtocol<>((Object req, Repository db) -> {
UploadPack up = new UploadPack(db);
up.setRequestPolicy(RequestPolicy.REACHABLE_COMMIT);
// assume client has a shallow commit
up.getRevWalk()
.assumeShallow(Collections.singleton(commit1.getId()));
return up;
}, null);
uri = testProtocol.register(ctx, server);
assertFalse(client.getObjectDatabase().has(commit0.toObjectId()));
@ -222,14 +207,9 @@ public class UploadPackTest {
server2.getConfig().setBoolean("uploadpack", null, "allowfilter",
true);
testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
@Override
public UploadPack create(Object req, Repository db)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
UploadPack up = new UploadPack(db);
return up;
}
testProtocol = new TestProtocol<>((Object req, Repository db) -> {
UploadPack up = new UploadPack(db);
return up;
}, null);
uri = testProtocol.register(ctx, server2);
@ -260,14 +240,9 @@ public class UploadPackTest {
server2.getConfig().setBoolean("uploadpack", null, "allowfilter",
true);
testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
@Override
public UploadPack create(Object req, Repository db)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
UploadPack up = new UploadPack(db);
return up;
}
testProtocol = new TestProtocol<>((Object req, Repository db) -> {
UploadPack up = new UploadPack(db);
return up;
}, null);
uri = testProtocol.register(ctx, server2);
@ -297,14 +272,9 @@ public class UploadPackTest {
server2.getConfig().setBoolean("uploadpack", null, "allowfilter",
true);
testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
@Override
public UploadPack create(Object req, Repository db)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
UploadPack up = new UploadPack(db);
return up;
}
testProtocol = new TestProtocol<>((Object req, Repository db) -> {
UploadPack up = new UploadPack(db);
return up;
}, null);
uri = testProtocol.register(ctx, server2);
@ -340,14 +310,9 @@ public class UploadPackTest {
new DfsGarbageCollector(server2).pack(null);
server2.scanForRepoChanges();
testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
@Override
public UploadPack create(Object req, Repository db)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
UploadPack up = new UploadPack(db);
return up;
}
testProtocol = new TestProtocol<>((Object req, Repository db) -> {
UploadPack up = new UploadPack(db);
return up;
}, null);
uri = testProtocol.register(ctx, server2);
@ -380,14 +345,9 @@ public class UploadPackTest {
new DfsGarbageCollector(server2).pack(null);
server2.scanForRepoChanges();
testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
@Override
public UploadPack create(Object req, Repository db)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
UploadPack up = new UploadPack(db);
return up;
}
testProtocol = new TestProtocol<>((Object req, Repository db) -> {
UploadPack up = new UploadPack(db);
return up;
}, null);
uri = testProtocol.register(ctx, server2);
@ -416,14 +376,9 @@ public class UploadPackTest {
server2.getConfig().setBoolean("uploadpack", null, "allowfilter",
false);
testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
@Override
public UploadPack create(Object req, Repository db)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
UploadPack up = new UploadPack(db);
return up;
}
testProtocol = new TestProtocol<>((Object req, Repository db) -> {
UploadPack up = new UploadPack(db);
return up;
}, null);
uri = testProtocol.register(ctx, server2);

37
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java

@ -582,26 +582,23 @@ public class FileTreeIteratorTest extends RepositoryTestCase {
}
}
private final FileTreeIterator.FileModeStrategy NO_GITLINKS_STRATEGY =
new FileTreeIterator.FileModeStrategy() {
@Override
public FileMode getMode(File f, FS.Attributes attributes) {
if (attributes.isSymbolicLink()) {
return FileMode.SYMLINK;
} else if (attributes.isDirectory()) {
// NOTE: in the production DefaultFileModeStrategy, there is
// a check here for a subdirectory called '.git', and if it
// exists, we create a GITLINK instead of recursing into the
// tree. In this custom strategy, we ignore nested git dirs
// and treat all directories the same.
return FileMode.TREE;
} else if (attributes.isExecutable()) {
return FileMode.EXECUTABLE_FILE;
} else {
return FileMode.REGULAR_FILE;
}
}
};
private final FileTreeIterator.FileModeStrategy NO_GITLINKS_STRATEGY = (
File f, FS.Attributes attributes) -> {
if (attributes.isSymbolicLink()) {
return FileMode.SYMLINK;
} else if (attributes.isDirectory()) {
// NOTE: in the production DefaultFileModeStrategy, there is
// a check here for a subdirectory called '.git', and if it
// exists, we create a GITLINK instead of recursing into the
// tree. In this custom strategy, we ignore nested git dirs
// and treat all directories the same.
return FileMode.TREE;
} else if (attributes.isExecutable()) {
return FileMode.EXECUTABLE_FILE;
} else {
return FileMode.REGULAR_FILE;
}
};
private Repository createNestedRepo() throws IOException {
File gitdir = createUniqueTestGitDir(false);

8
org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java

@ -402,12 +402,8 @@ public class DescribeCommand extends GitCommand<String> {
if (candidates.isEmpty())
return null;
Candidate best = Collections.min(candidates, new Comparator<Candidate>() {
@Override
public int compare(Candidate o1, Candidate o2) {
return o1.depth - o2.depth;
}
});
Candidate best = Collections.min(candidates,
(Candidate o1, Candidate o2) -> o1.depth - o2.depth);
return best.describe(target);
} catch (IOException e) {

9
org.eclipse.jgit/src/org/eclipse/jgit/api/ListBranchCommand.java

@ -53,7 +53,6 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.eclipse.jgit.api.errors.GitAPIException;
@ -134,12 +133,8 @@ public class ListBranchCommand extends GitCommand<List<Ref>> {
throw new JGitInternalException(e.getMessage(), e);
}
Collections.sort(resultRefs, new Comparator<Ref>() {
@Override
public int compare(Ref o1, Ref o2) {
return o1.getName().compareTo(o2.getName());
}
});
Collections.sort(resultRefs,
(Ref o1, Ref o2) -> o1.getName().compareTo(o2.getName()));
setCallable(false);
return resultRefs;
}

9
org.eclipse.jgit/src/org/eclipse/jgit/api/ListTagCommand.java

@ -45,7 +45,6 @@ package org.eclipse.jgit.api;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.eclipse.jgit.api.errors.GitAPIException;
@ -87,12 +86,8 @@ public class ListTagCommand extends GitCommand<List<Ref>> {
} catch (IOException e) {
throw new JGitInternalException(e.getMessage(), e);
}
Collections.sort(tags, new Comparator<Ref>() {
@Override
public int compare(Ref o1, Ref o2) {
return o1.getName().compareTo(o2.getName());
}
});
Collections.sort(tags,
(Ref o1, Ref o2) -> o1.getName().compareTo(o2.getName()));
setCallable(false);
return tags;
}

14
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java vendored

@ -111,14 +111,12 @@ public class DirCache {
private static final byte[] NO_CHECKSUM = {};
static final Comparator<DirCacheEntry> ENT_CMP = new Comparator<DirCacheEntry>() {
@Override
public int compare(DirCacheEntry o1, DirCacheEntry o2) {
final int cr = cmp(o1, o2);
if (cr != 0)
return cr;
return o1.getStage() - o2.getStage();
}
static final Comparator<DirCacheEntry> ENT_CMP = (DirCacheEntry o1,
DirCacheEntry o2) -> {
final int cr = cmp(o1, o2);
if (cr != 0)
return cr;
return o1.getStage() - o2.getStage();
};
static int cmp(DirCacheEntry a, DirCacheEntry b) {

12
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEditor.java vendored

@ -75,13 +75,11 @@ import org.eclipse.jgit.util.Paths;
* @see DirCacheBuilder
*/
public class DirCacheEditor extends BaseDirCacheEditor {
private static final Comparator<PathEdit> EDIT_CMP = new Comparator<PathEdit>() {
@Override
public int compare(PathEdit o1, PathEdit o2) {
final byte[] a = o1.path;
final byte[] b = o2.path;
return cmp(a, a.length, b, b.length);
}
private static final Comparator<PathEdit> EDIT_CMP = (PathEdit o1,
PathEdit o2) -> {
final byte[] a = o1.path;
final byte[] b = o2.path;
return cmp(a, a.length, b, b.length);
};
private final List<PathEdit> edits;

35
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheTree.java vendored

@ -81,25 +81,26 @@ public class DirCacheTree {
private static final DirCacheTree[] NO_CHILDREN = {};
private static final Comparator<DirCacheTree> TREE_CMP = new Comparator<DirCacheTree>() {
@Override
public int compare(DirCacheTree o1, DirCacheTree o2) {
final byte[] a = o1.encodedName;
final byte[] b = o2.encodedName;
final int aLen = a.length;
final int bLen = b.length;
int cPos;
for (cPos = 0; cPos < aLen && cPos < bLen; cPos++) {
final int cmp = (a[cPos] & 0xff) - (b[cPos] & 0xff);
if (cmp != 0)
return cmp;
private static final Comparator<DirCacheTree> TREE_CMP = (DirCacheTree o1,
DirCacheTree o2) -> {
final byte[] a = o1.encodedName;
final byte[] b = o2.encodedName;
final int aLen = a.length;
final int bLen = b.length;
int cPos;
for (cPos = 0; cPos < aLen && cPos < bLen; cPos++) {
final int cmp = (a[cPos] & 0xff) - (b[cPos] & 0xff);
if (cmp != 0) {
return cmp;
}
if (aLen == bLen)
return 0;
if (aLen < bLen)
return '/' - (b[cPos] & 0xff);
return (a[cPos] & 0xff) - '/';
}
if (aLen == bLen) {
return 0;
}
if (aLen < bLen) {
return '/' - (b[cPos] & 0xff);
}
return (a[cPos] & 0xff) - '/';
};
/** Tree this tree resides in; null if we are the root. */

7
org.eclipse.jgit/src/org/eclipse/jgit/internal/ketch/KetchLeader.java

@ -385,12 +385,7 @@ public abstract class KetchLeader {
private void scheduleLeader() {
idle = false;
system.getExecutor().execute(new Runnable() {
@Override
public void run() {
runLeader();
}
});
system.getExecutor().execute(this::runLeader);
}
private void runLeader() {

25
org.eclipse.jgit/src/org/eclipse/jgit/internal/ketch/LocalReplica.java

@ -123,21 +123,18 @@ public class LocalReplica extends KetchReplica {
/** {@inheritDoc} */
@Override
protected void startPush(ReplicaPushRequest req) {
getSystem().getExecutor().execute(new Runnable() {
@Override
public void run() {
MonotonicClock clk = getSystem().getClock();
try (Repository git = getLeader().openRepository();
ProposedTimestamp ts = clk.propose()) {
try {
update(git, req, ts);
req.done(git);
} catch (Throwable err) {
req.setException(git, err);
}
} catch (IOException err) {
req.setException(null, err);
getSystem().getExecutor().execute(() -> {
MonotonicClock clk = getSystem().getClock();
try (Repository git = getLeader().openRepository();
ProposedTimestamp ts = clk.propose()) {
try {
update(git, req, ts);
req.done(git);
} catch (Throwable err) {
req.setException(git, err);
}
} catch (IOException err) {
req.setException(null, err);
}
});
}

21
org.eclipse.jgit/src/org/eclipse/jgit/internal/ketch/RemoteGitReplica.java

@ -139,19 +139,16 @@ public class RemoteGitReplica extends KetchReplica {
/** {@inheritDoc} */
@Override
protected void startPush(ReplicaPushRequest req) {
getSystem().getExecutor().execute(new Runnable() {
@Override
public void run() {
try (Repository git = getLeader().openRepository()) {
try {
push(git, req);
req.done(git);
} catch (Throwable err) {
req.setException(git, err);
}
} catch (IOException err) {
req.setException(null, err);
getSystem().getExecutor().execute(() -> {
try (Repository git = getLeader().openRepository()) {
try {
push(git, req);
req.done(git);
} catch (Throwable err) {
req.setException(git, err);
}
} catch (IOException err) {
req.setException(null, err);
}
});
}

8
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java

@ -469,12 +469,8 @@ public class DfsPackCompactor {
continue SCAN;
want.add(new ObjectIdWithOffset(id, ent.getOffset()));
}
Collections.sort(want, new Comparator<ObjectIdWithOffset>() {
@Override
public int compare(ObjectIdWithOffset a, ObjectIdWithOffset b) {
return Long.signum(a.offset - b.offset);
}
});
Collections.sort(want, (ObjectIdWithOffset a,
ObjectIdWithOffset b) -> Long.signum(a.offset - b.offset));
return want;
}

23
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java

@ -287,14 +287,12 @@ public class DfsReader extends ObjectReader implements ObjectReuseAsIs {
return Collections.emptySet();
}
private static final Comparator<FoundObject<?>> FOUND_OBJECT_SORT = new Comparator<FoundObject<?>>() {
@Override
public int compare(FoundObject<?> a, FoundObject<?> b) {
int cmp = a.packIndex - b.packIndex;
if (cmp == 0)
cmp = Long.signum(a.offset - b.offset);
return cmp;
}
private static final Comparator<FoundObject<?>> FOUND_OBJECT_SORT = (
FoundObject<?> a, FoundObject<?> b) -> {
int cmp = a.packIndex - b.packIndex;
if (cmp == 0)
cmp = Long.signum(a.offset - b.offset);
return cmp;
};
private static class FoundObject<T extends ObjectId> {
@ -565,12 +563,9 @@ public class DfsReader extends ObjectReader implements ObjectReuseAsIs {
return new DfsObjectToPack(objectId, type);
}
private static final Comparator<DfsObjectToPack> OFFSET_SORT = new Comparator<DfsObjectToPack>() {
@Override
public int compare(DfsObjectToPack a, DfsObjectToPack b) {
return Long.signum(a.getOffset() - b.getOffset());
}
};
private static final Comparator<DfsObjectToPack> OFFSET_SORT = (
DfsObjectToPack a,
DfsObjectToPack b) -> Long.signum(a.getOffset() - b.getOffset());
@Override
public void selectObjectRepresentation(PackWriter packer,

9
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java

@ -62,8 +62,6 @@ import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.attributes.AttributesNode;
import org.eclipse.jgit.attributes.AttributesNodeProvider;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.events.ConfigChangedEvent;
import org.eclipse.jgit.events.ConfigChangedListener;
import org.eclipse.jgit.events.IndexChangedEvent;
import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.internal.storage.file.ObjectDirectory.AlternateHandle;
@ -206,12 +204,7 @@ public class FileRepository extends Repository {
loadUserConfig();
loadRepoConfig();
repoConfig.addChangeListener(new ConfigChangedListener() {
@Override
public void onConfigChanged(ConfigChangedEvent event) {
fireEvent(event);
}
});
repoConfig.addChangeListener(this::fireEvent);
final long repositoryFormatVersion = getConfig().getLong(
ConfigConstants.CONFIG_CORE_SECTION, null,

8
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java

@ -116,12 +116,8 @@ public class LockFile {
}
/** Filter to skip over active lock files when listing a directory. */
static final FilenameFilter FILTER = new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return !name.endsWith(LOCK_SUFFIX);
}
};
static final FilenameFilter FILTER = (File dir,
String name) -> !name.endsWith(LOCK_SUFFIX);
private final File ref;

97
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java

@ -45,7 +45,6 @@ package org.eclipse.jgit.internal.storage.file;
import java.text.MessageFormat;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
@ -133,12 +132,8 @@ public class PackBitmapIndexBuilder extends BasePackBitmapIndex {
for (int i = 0; i < entries.size(); i++) {
positionEntries.add(new PositionEntry(entries.get(i), i));
}
Collections.sort(entries, new Comparator<ObjectToPack>() {
@Override
public int compare(ObjectToPack a, ObjectToPack b) {
return Long.signum(a.getOffset() - b.getOffset());
}
});
Collections.sort(entries, (ObjectToPack a, ObjectToPack b) -> Long
.signum(a.getOffset() - b.getOffset()));
for (int i = 0; i < entries.size(); i++) {
PositionEntry e = positionEntries.get(entries.get(i));
e.offsetPosition = i;
@ -310,57 +305,55 @@ public class PackBitmapIndexBuilder extends BasePackBitmapIndex {
public Iterable<StoredEntry> getCompressedBitmaps() {
// Add order is from oldest to newest. The reverse add order is the
// output order.
return new Iterable<StoredEntry>() {
return () -> new Iterator<StoredEntry>() {
private int index = byAddOrder.size() - 1;
@Override
public Iterator<StoredEntry> iterator() {
return new Iterator<StoredEntry>() {
private int index = byAddOrder.size() - 1;
public boolean hasNext() {
return index >= 0;
}
@Override
public boolean hasNext() {
return index >= 0;
@Override
public StoredEntry next() {
if (!hasNext()) {
throw new NoSuchElementException();
}
StoredBitmap item = byAddOrder.get(index);
int bestXorOffset = 0;
EWAHCompressedBitmap bestBitmap = item.getBitmap();
// Attempt to compress the bitmap with an XOR of the
// previously written entries.
for (int i = 1; i <= MAX_XOR_OFFSET_SEARCH; i++) {
int curr = i + index;
if (curr >= byAddOrder.size()) {
break;
}
@Override
public StoredEntry next() {
if (!hasNext())
throw new NoSuchElementException();
StoredBitmap item = byAddOrder.get(index);
int bestXorOffset = 0;
EWAHCompressedBitmap bestBitmap = item.getBitmap();
// Attempt to compress the bitmap with an XOR of the
// previously written entries.
for (int i = 1; i <= MAX_XOR_OFFSET_SEARCH; i++) {
int curr = i + index;
if (curr >= byAddOrder.size())
break;
StoredBitmap other = byAddOrder.get(curr);
EWAHCompressedBitmap bitmap = other.getBitmap()
.xor(item.getBitmap());
if (bitmap.sizeInBytes()
< bestBitmap.sizeInBytes()) {
bestBitmap = bitmap;
bestXorOffset = i;
}
}
index--;
PositionEntry entry = positionEntries.get(item);
if (entry == null)
throw new IllegalStateException();
bestBitmap.trim();
return new StoredEntry(entry.namePosition, bestBitmap,
bestXorOffset, item.getFlags());
}
StoredBitmap other = byAddOrder.get(curr);
EWAHCompressedBitmap bitmap = other.getBitmap()
.xor(item.getBitmap());
@Override
public void remove() {
throw new UnsupportedOperationException();
if (bitmap.sizeInBytes() < bestBitmap.sizeInBytes()) {
bestBitmap = bitmap;
bestXorOffset = i;
}
};
}
index--;
PositionEntry entry = positionEntries.get(item);
if (entry == null) {
throw new IllegalStateException();
}
bestBitmap.trim();
return new StoredEntry(entry.namePosition, bestBitmap,
bestXorOffset, item.getFlags());
}
@Override
public void remove() {
throw new UnsupportedOperationException();
}
};
}

8
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java

@ -101,12 +101,8 @@ import org.eclipse.jgit.util.RawParseUtils;
*/
public class PackFile implements Iterable<PackIndex.MutableEntry> {
/** Sorts PackFiles to be most recently created to least recently created. */
public static final Comparator<PackFile> SORT = new Comparator<PackFile>() {
@Override
public int compare(PackFile a, PackFile b) {
return b.packLastModified - a.packLastModified;
}
};
public static final Comparator<PackFile> SORT = (PackFile a,
PackFile b) -> b.packLastModified - a.packLastModified;
private final File packFile;

9
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java

@ -46,7 +46,6 @@ package org.eclipse.jgit.internal.storage.pack;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@ -212,12 +211,8 @@ final class DeltaTask implements Callable<Object> {
}
// Sort by starting index to identify gaps later.
Collections.sort(topPaths, new Comparator<WeightedPath>() {
@Override
public int compare(WeightedPath a, WeightedPath b) {
return a.slice.beginIndex - b.slice.beginIndex;
}
});
Collections.sort(topPaths, (WeightedPath a,
WeightedPath b) -> a.slice.beginIndex - b.slice.beginIndex);
bytesPerUnit = 1;
while (MAX_METER <= (totalWeight / bytesPerUnit)) {

65
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java

@ -62,7 +62,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@ -1418,32 +1417,33 @@ public class PackWriter implements AutoCloseable {
// applies "Linus' Law" which states that newer files tend to be the
// bigger ones, because source files grow and hardly ever shrink.
//
Arrays.sort(list, 0, cnt, new Comparator<ObjectToPack>() {
@Override
public int compare(ObjectToPack a, ObjectToPack b) {
int cmp = (a.isDoNotDelta() ? 1 : 0)
- (b.isDoNotDelta() ? 1 : 0);
if (cmp != 0)
return cmp;
cmp = a.getType() - b.getType();
if (cmp != 0)
return cmp;
cmp = (a.getPathHash() >>> 1) - (b.getPathHash() >>> 1);
if (cmp != 0)
return cmp;
cmp = (a.getPathHash() & 1) - (b.getPathHash() & 1);
if (cmp != 0)
return cmp;
cmp = (a.isEdge() ? 0 : 1) - (b.isEdge() ? 0 : 1);
if (cmp != 0)
return cmp;
return b.getWeight() - a.getWeight();
Arrays.sort(list, 0, cnt, (ObjectToPack a, ObjectToPack b) -> {
int cmp = (a.isDoNotDelta() ? 1 : 0) - (b.isDoNotDelta() ? 1 : 0);
if (cmp != 0) {
return cmp;
}
cmp = a.getType() - b.getType();
if (cmp != 0) {
return cmp;
}
cmp = (a.getPathHash() >>> 1) - (b.getPathHash() >>> 1);
if (cmp != 0) {
return cmp;
}
cmp = (a.getPathHash() & 1) - (b.getPathHash() & 1);
if (cmp != 0) {
return cmp;
}
cmp = (a.isEdge() ? 0 : 1) - (b.isEdge() ? 0 : 1);
if (cmp != 0) {
return cmp;
}
return b.getWeight() - a.getWeight();
});
// Above we stored the objects we cannot delta onto the end.
@ -1564,14 +1564,11 @@ public class PackWriter implements AutoCloseable {
// asynchronous execution. Wrap everything and hope it
// can schedule these for us.
for (DeltaTask task : taskBlock.tasks) {
executor.execute(new Runnable() {
@Override
public void run() {
try {
task.call();
} catch (Throwable failure) {
errors.add(failure);
}
executor.execute(() -> {
try {
task.call();
} catch (Throwable failure) {
errors.add(failure);
}
});
}

9
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java

@ -91,12 +91,9 @@ class PackWriterBitmapPreparer {
private static final int DAY_IN_SECONDS = 24 * 60 * 60;
private static final Comparator<RevCommit> ORDER_BY_REVERSE_TIMESTAMP = new Comparator<RevCommit>() {
@Override
public int compare(RevCommit a, RevCommit b) {
return Integer.signum(b.getCommitTime() - a.getCommitTime());
}
};
private static final Comparator<RevCommit> ORDER_BY_REVERSE_TIMESTAMP = (
RevCommit a, RevCommit b) -> Integer
.signum(b.getCommitTime() - a.getCommitTime());
private final ObjectReader reader;
private final ProgressMonitor pm;

7
org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java

@ -352,12 +352,7 @@ public class IndexDiff {
public WorkingTreeIterator getWorkingTreeIterator(Repository repo);
}
private WorkingTreeIteratorFactory wTreeIt = new WorkingTreeIteratorFactory() {
@Override
public WorkingTreeIterator getWorkingTreeIterator(Repository repo) {
return new FileTreeIterator(repo);
}
};
private WorkingTreeIteratorFactory wTreeIt = FileTreeIterator::new;
/**
* Allows higher layers to set the factory for WorkingTreeIterators.

7
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java

@ -1277,11 +1277,8 @@ public abstract class Repository implements AutoCloseable {
CorruptObjectException, IOException {
// we want DirCache to inform us so that we can inform registered
// listeners about index changes
IndexChangedListener l = new IndexChangedListener() {
@Override
public void onIndexChanged(IndexChangedEvent event) {
notifyIndexChanged(true);
}
IndexChangedListener l = (IndexChangedEvent event) -> {
notifyIndexChanged(true);
};
return DirCache.lock(this, l);
}

13
org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java

@ -255,14 +255,11 @@ public class RepositoryCache {
if (delay == RepositoryCacheConfig.NO_CLEANUP) {
return;
}
cleanupTask = scheduler.scheduleWithFixedDelay(new Runnable() {
@Override
public void run() {
try {
cache.clearAllExpired();
} catch (Throwable e) {
LOG.error(e.getMessage(), e);
}
cleanupTask = scheduler.scheduleWithFixedDelay(() -> {
try {
cache.clearAllExpired();
} catch (Throwable e) {
LOG.error(e.getMessage(), e);
}
}, delay, delay, TimeUnit.MILLISECONDS);
}

46
org.eclipse.jgit/src/org/eclipse/jgit/transport/Daemon.java

@ -115,36 +115,26 @@ public class Daemon {
repositoryResolver = (RepositoryResolver<DaemonClient>) RepositoryResolver.NONE;
uploadPackFactory = new UploadPackFactory<DaemonClient>() {
@Override
public UploadPack create(DaemonClient req, Repository db)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
UploadPack up = new UploadPack(db);
up.setTimeout(getTimeout());
up.setPackConfig(getPackConfig());
return up;
}
uploadPackFactory = (DaemonClient req, Repository db) -> {
UploadPack up = new UploadPack(db);
up.setTimeout(getTimeout());
up.setPackConfig(getPackConfig());
return up;
};
receivePackFactory = new ReceivePackFactory<DaemonClient>() {
@Override
public ReceivePack create(DaemonClient req, Repository db)
throws ServiceNotEnabledException,
ServiceNotAuthorizedException {
ReceivePack rp = new ReceivePack(db);
InetAddress peer = req.getRemoteAddress();
String host = peer.getCanonicalHostName();
if (host == null)
host = peer.getHostAddress();
String name = "anonymous"; //$NON-NLS-1$
String email = name + "@" + host; //$NON-NLS-1$
rp.setRefLogIdent(new PersonIdent(name, email));
rp.setTimeout(getTimeout());
return rp;
}
receivePackFactory = (DaemonClient req, Repository db) -> {
ReceivePack rp = new ReceivePack(db);
InetAddress peer = req.getRemoteAddress();
String host = peer.getCanonicalHostName();
if (host == null)
host = peer.getHostAddress();
String name = "anonymous"; //$NON-NLS-1$
String email = name + "@" + host; //$NON-NLS-1$
rp.setRefLogIdent(new PersonIdent(name, email));
rp.setTimeout(getTimeout());
return rp;
};
services = new DaemonService[] {

9
org.eclipse.jgit/src/org/eclipse/jgit/transport/PostReceiveHook.java

@ -63,12 +63,9 @@ import java.util.Collection;
*/
public interface PostReceiveHook {
/** A simple no-op hook. */
PostReceiveHook NULL = new PostReceiveHook() {
@Override
public void onPostReceive(final ReceivePack rp,
final Collection<ReceiveCommand> commands) {
// Do nothing.
}
PostReceiveHook NULL = (final ReceivePack rp,
final Collection<ReceiveCommand> commands) -> {
// Do nothing.
};
/**

7
org.eclipse.jgit/src/org/eclipse/jgit/transport/PostUploadHook.java

@ -57,11 +57,8 @@ import org.eclipse.jgit.storage.pack.PackStatistics;
*/
public interface PostUploadHook {
/** A simple no-op hook. */
PostUploadHook NULL = new PostUploadHook() {
@Override
public void onPostUpload(PackStatistics stats) {
// Do nothing.
}
PostUploadHook NULL = (PackStatistics stats) -> {
// Do nothing.
};
/**

9
org.eclipse.jgit/src/org/eclipse/jgit/transport/PreReceiveHook.java

@ -79,12 +79,9 @@ import java.util.Collection;
*/
public interface PreReceiveHook {
/** A simple no-op hook. */
PreReceiveHook NULL = new PreReceiveHook() {
@Override
public void onPreReceive(final ReceivePack rp,
final Collection<ReceiveCommand> commands) {
// Do nothing.
}
PreReceiveHook NULL = (final ReceivePack rp,
final Collection<ReceiveCommand> commands) -> {
// Do nothing.
};
/**

135
org.eclipse.jgit/src/org/eclipse/jgit/transport/PushCertificateStore.java

@ -57,7 +57,6 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@ -193,81 +192,78 @@ public class PushCertificateStore implements AutoCloseable {
* close resources.
*/
public Iterable<PushCertificate> getAll(String refName) {
return new Iterable<PushCertificate>() {
@Override
public Iterator<PushCertificate> iterator() {
return new Iterator<PushCertificate>() {
private final String path = pathName(refName);
private PushCertificate next;
return () -> new Iterator<PushCertificate>() {
private final String path = pathName(refName);
private PushCertificate next;
private RevWalk rw;
{
try {
if (reader == null) {
load();
}
if (commit != null) {
rw = new RevWalk(reader);
rw.setTreeFilter(AndTreeFilter.create(
PathFilterGroup.create(Collections
.singleton(PathFilter.create(path))),
TreeFilter.ANY_DIFF));
rw.setRewriteParents(false);
rw.markStart(rw.parseCommit(commit));
} else {
rw = null;
}
} catch (IOException e) {
throw new RuntimeException(e);
}
}
private RevWalk rw;
{
@Override
public boolean hasNext() {
try {
if (next == null) {
if (rw == null) {
return false;
}
try {
if (reader == null) {
load();
}
if (commit != null) {
rw = new RevWalk(reader);
rw.setTreeFilter(AndTreeFilter.create(
PathFilterGroup.create(
Collections.singleton(PathFilter.create(path))),
TreeFilter.ANY_DIFF));
rw.setRewriteParents(false);
rw.markStart(rw.parseCommit(commit));
RevCommit c = rw.next();
if (c != null) {
try (TreeWalk tw = TreeWalk.forPath(
rw.getObjectReader(), path,
c.getTree())) {
next = read(tw);
}
} else {
rw = null;
next = null;
}
} catch (IOException e) {
throw new RuntimeException(e);
}
}
@Override
public boolean hasNext() {
try {
if (next == null) {
if (rw == null) {
return false;
}
try {
RevCommit c = rw.next();
if (c != null) {
try (TreeWalk tw = TreeWalk.forPath(
rw.getObjectReader(), path, c.getTree())) {
next = read(tw);
}
} else {
next = null;
}
} catch (IOException e) {
throw new RuntimeException(e);
}
}
return next != null;
} finally {
if (next == null && rw != null) {
rw.close();
rw = null;
}
}
return next != null;
} finally {
if (next == null && rw != null) {
rw.close();
rw = null;
}
}
}
@Override
public PushCertificate next() {
hasNext();
PushCertificate n = next;
if (n == null) {
throw new NoSuchElementException();
}
next = null;
return n;
}
@Override
public PushCertificate next() {
hasNext();
PushCertificate n = next;
if (n == null) {
throw new NoSuchElementException();
}
next = null;
return n;
}
@Override
public void remove() {
throw new UnsupportedOperationException();
}
};
@Override
public void remove() {
throw new UnsupportedOperationException();
}
};
}
@ -442,13 +438,8 @@ public class PushCertificateStore implements AutoCloseable {
}
private static void sortPending(List<PendingCert> pending) {
Collections.sort(pending, new Comparator<PendingCert>() {
@Override
public int compare(PendingCert a, PendingCert b) {
return Long.signum(
a.ident.getWhen().getTime() - b.ident.getWhen().getTime());
}
});
Collections.sort(pending, (PendingCert a, PendingCert b) -> Long.signum(
a.ident.getWhen().getTime() - b.ident.getWhen().getTime()));
}
private DirCache newDirCache() throws IOException {

7
org.eclipse.jgit/src/org/eclipse/jgit/transport/RefFilter.java

@ -61,12 +61,7 @@ public interface RefFilter {
/**
* The default filter, allows all refs to be shown.
*/
RefFilter DEFAULT = new RefFilter() {
@Override
public Map<String, Ref> filter (Map<String, Ref> refs) {
return refs;
}
};
RefFilter DEFAULT = (Map<String, Ref> refs) -> refs;
/**
* Filters a {@code Map} of refs before it is advertised to the client.

10
org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java

@ -100,13 +100,9 @@ public abstract class SshSessionFactory {
* @since 5.2
*/
public static String getLocalUserName() {
return AccessController.doPrivileged(new PrivilegedAction<String>() {
@Override
public String run() {
return SystemReader.getInstance()
.getProperty(Constants.OS_USER_NAME_KEY);
}
});
return AccessController
.doPrivileged((PrivilegedAction<String>) () -> SystemReader
.getInstance().getProperty(Constants.OS_USER_NAME_KEY));
}
/**

16
org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportLocal.java

@ -188,12 +188,8 @@ class TransportLocal extends Transport implements PackTransport {
&& !"git upload-pack".equals(up)) //$NON-NLS-1$
return new ForkLocalFetchConnection();
UploadPackFactory<Void> upf = new UploadPackFactory<Void>() {
@Override
public UploadPack create(Void req, Repository db) {
return createUploadPack(db);
}
};
UploadPackFactory<Void> upf = (Void req,
Repository db) -> createUploadPack(db);
return new InternalFetchConnection<>(this, upf, null, openRepo());
}
@ -205,12 +201,8 @@ class TransportLocal extends Transport implements PackTransport {
&& !"git receive-pack".equals(rp)) //$NON-NLS-1$
return new ForkLocalPushConnection();
ReceivePackFactory<Void> rpf = new ReceivePackFactory<Void>() {
@Override
public ReceivePack create(Void req, Repository db) {
return createReceivePack(db);
}
};
ReceivePackFactory<Void> rpf = (Void req,
Repository db) -> createReceivePack(db);
return new InternalPushConnection<>(this, rpf, null, openRepo());
}

8
org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/ReceivePackFactory.java

@ -57,12 +57,8 @@ public interface ReceivePackFactory<C> {
/**
* A factory disabling the ReceivePack service for all repositories
*/
ReceivePackFactory<?> DISABLED = new ReceivePackFactory<Object>() {
@Override
public ReceivePack create(Object req, Repository db)
throws ServiceNotEnabledException {
throw new ServiceNotEnabledException();
}
ReceivePackFactory<?> DISABLED = (Object req, Repository db) -> {
throw new ServiceNotEnabledException();
};
/**

8
org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/RepositoryResolver.java

@ -57,12 +57,8 @@ public interface RepositoryResolver<C> {
/**
* Resolver configured to open nothing.
*/
RepositoryResolver<?> NONE = new RepositoryResolver<Object>() {
@Override
public Repository open(Object req, String name)
throws RepositoryNotFoundException {
throw new RepositoryNotFoundException(name);
}
RepositoryResolver<?> NONE = (Object req, String name) -> {
throw new RepositoryNotFoundException(name);
};
/**

8
org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/UploadPackFactory.java

@ -57,12 +57,8 @@ public interface UploadPackFactory<C> {
/**
* A factory disabling the UploadPack service for all repositories.
*/
UploadPackFactory<?> DISABLED = new UploadPackFactory<Object>() {
@Override
public UploadPack create(Object req, Repository db)
throws ServiceNotEnabledException {
throw new ServiceNotEnabledException();
}
UploadPackFactory<?> DISABLED = (Object req, Repository db) -> {
throw new ServiceNotEnabledException();
};
/**

12
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

@ -774,14 +774,10 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
return attributesNode;
}
private static final Comparator<Entry> ENTRY_CMP = new Comparator<Entry>() {
@Override
public int compare(Entry a, Entry b) {
return Paths.compare(
a.encodedName, 0, a.encodedNameLen, a.getMode().getBits(),
b.encodedName, 0, b.encodedNameLen, b.getMode().getBits());
}
};
private static final Comparator<Entry> ENTRY_CMP = (Entry a,
Entry b) -> Paths.compare(a.encodedName, 0, a.encodedNameLen,
a.getMode().getBits(), b.encodedName, 0, b.encodedNameLen,
b.getMode().getBits());
/**
* Constructor helper.

10
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java

@ -463,13 +463,9 @@ public abstract class FS {
* @return the user's home directory; null if the user does not have one.
*/
protected File userHomeImpl() {
final String home = AccessController
.doPrivileged(new PrivilegedAction<String>() {
@Override
public String run() {
return System.getProperty("user.home"); //$NON-NLS-1$
}
});
final String home = AccessController.doPrivileged(
(PrivilegedAction<String>) () -> System.getProperty("user.home") //$NON-NLS-1$
);
if (home == null || home.length() == 0)
return null;
return new File(home).getAbsoluteFile();

19
org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java

@ -80,12 +80,9 @@ public class FS_Win32_Cygwin extends FS_Win32 {
*/
public static boolean isCygwin() {
final String path = AccessController
.doPrivileged(new PrivilegedAction<String>() {
@Override
public String run() {
return System.getProperty("java.library.path"); //$NON-NLS-1$
}
});
.doPrivileged((PrivilegedAction<String>) () -> System
.getProperty("java.library.path") //$NON-NLS-1$
);
if (path == null)
return false;
File found = FS.searchPath(path, "cygpath.exe"); //$NON-NLS-1$
@ -141,13 +138,9 @@ public class FS_Win32_Cygwin extends FS_Win32 {
/** {@inheritDoc} */
@Override
protected File userHomeImpl() {
final String home = AccessController
.doPrivileged(new PrivilegedAction<String>() {
@Override
public String run() {
return System.getenv("HOME"); //$NON-NLS-1$
}
});
final String home = AccessController.doPrivileged(
(PrivilegedAction<String>) () -> System.getenv("HOME") //$NON-NLS-1$
);
if (home == null || home.length() == 0)
return super.userHomeImpl();
return resolve(new File("."), home); //$NON-NLS-1$

9
org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java

@ -368,12 +368,9 @@ public abstract class SystemReader {
}
private String getOsName() {
return AccessController.doPrivileged(new PrivilegedAction<String>() {
@Override
public String run() {
return getProperty("os.name"); //$NON-NLS-1$
}
});
return AccessController.doPrivileged(
(PrivilegedAction<String>) () -> getProperty("os.name") //$NON-NLS-1$
);
}
/**

36
org.eclipse.jgit/src/org/eclipse/jgit/util/io/IsolatedOutputStream.java

@ -102,12 +102,9 @@ public class IsolatedOutputStream extends OutputStream {
public void write(byte[] buf, int pos, int cnt)
throws IOException {
checkClosed();
execute(new Callable<Void>() {
@Override
public Void call() throws IOException {
dst.write(buf, pos, cnt);
return null;
}
execute(() -> {
dst.write(buf, pos, cnt);
return null;
});
}
@ -115,12 +112,9 @@ public class IsolatedOutputStream extends OutputStream {
@Override
public void flush() throws IOException {
checkClosed();
execute(new Callable<Void>() {
@Override
public Void call() throws IOException {
dst.flush();
return null;
}
execute(() -> {
dst.flush();
return null;
});
}
@ -159,12 +153,9 @@ public class IsolatedOutputStream extends OutputStream {
}
private void cleanClose() throws IOException {
execute(new Callable<Void>() {
@Override
public Void call() throws IOException {
dst.close();
return null;
}
execute(() -> {
dst.close();
return null;
});
}
@ -178,12 +169,9 @@ public class IsolatedOutputStream extends OutputStream {
Future<Void> close;
try {
close = copier.submit(new Callable<Void>() {
@Override
public Void call() throws IOException {
dst.close();
return null;
}
close = copier.submit(() -> {
dst.close();
return null;
});
} catch (RejectedExecutionException e) {
throw new IOException(e);

10
org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java

@ -68,12 +68,10 @@ public class ThrowingPrintWriter extends Writer {
*/
public ThrowingPrintWriter(Writer out) {
this.out = out;
LF = AccessController.doPrivileged(new PrivilegedAction<String>() {
@Override
public String run() {
return SystemReader.getInstance().getProperty("line.separator"); //$NON-NLS-1$
}
});
LF = AccessController
.doPrivileged((PrivilegedAction<String>) () -> SystemReader
.getInstance().getProperty("line.separator") //$NON-NLS-1$
);
}
/** {@inheritDoc} */

Loading…
Cancel
Save