This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
The following commit(s) were added to refs/heads/master by this push:
new fd1bc35 Use lambdas.
fd1bc35 is described below
commit fd1bc3595ad89765591606a2cc567b02d33e8d93
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Feb 20 09:25:34 2021 -0500
Use lambdas.
---
.../org/apache/commons/net/ftp/FTPFileFilters.java | 21 +++------------------
src/main/java/org/apache/commons/net/imap/IMAP.java | 8 +-------
.../net/ftp/FTPClientConfigFunctionalTest.java | 14 ++++----------
.../org/apache/commons/net/ftp/FTPClientTest.java | 9 +--------
.../commons/net/ftp/parser/MLSDComparison.java | 21 ++++++---------------
5 files changed, 15 insertions(+), 58 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
b/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
index 5e650b1..37494a4 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
@@ -27,31 +27,16 @@ public class FTPFileFilters {
/**
* Accepts all FTPFile entries, including null.
*/
- public static final FTPFileFilter ALL = new FTPFileFilter() {
- @Override
- public boolean accept(final FTPFile file) {
- return true;
- }
- };
+ public static final FTPFileFilter ALL = file -> true;
/**
* Accepts all non-null FTPFile entries.
*/
- public static final FTPFileFilter NON_NULL = new FTPFileFilter() {
- @Override
- public boolean accept(final FTPFile file) {
- return file != null;
- }
- };
+ public static final FTPFileFilter NON_NULL = file -> file != null;
/**
* Accepts all (non-null) FTPFile directory entries.
*/
- public static final FTPFileFilter DIRECTORIES = new FTPFileFilter() {
- @Override
- public boolean accept(final FTPFile file) {
- return file != null && file.isDirectory();
- }
- };
+ public static final FTPFileFilter DIRECTORIES = file -> file != null &&
file.isDirectory();
}
diff --git a/src/main/java/org/apache/commons/net/imap/IMAP.java
b/src/main/java/org/apache/commons/net/imap/IMAP.java
index a6d833e..ada213e 100644
--- a/src/main/java/org/apache/commons/net/imap/IMAP.java
+++ b/src/main/java/org/apache/commons/net/imap/IMAP.java
@@ -101,13 +101,7 @@ public class IMAP extends SocketClient
* @see #setChunkListener(IMAPChunkListener)
* @since 3.4
*/
- public static final IMAPChunkListener TRUE_CHUNK_LISTENER = new
IMAPChunkListener(){
- @Override
- public boolean chunkReceived(final IMAP imap) {
- return true;
- }
-
- };
+ public static final IMAPChunkListener TRUE_CHUNK_LISTENER = imap -> true;
private volatile IMAPChunkListener chunkListener;
private final char[] initialID = { 'A', 'A', 'A', 'A' };
diff --git
a/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
b/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
index cd5b925..041b3d9 100644
---
a/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
+++
b/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
@@ -18,7 +18,6 @@ package org.apache.commons.net.ftp;
import java.io.IOException;
import java.util.Calendar;
-import java.util.Comparator;
import java.util.TreeSet;
import junit.framework.TestCase;
@@ -93,15 +92,10 @@ public class FTPClientConfigFunctionalTest extends TestCase
{
private TreeSet<FTPFile> getSortedList(final FTPFile[] files) {
// create a TreeSet which will sort each element
// as it is added.
- final TreeSet<FTPFile> sorted = new TreeSet<>(new Comparator<Object>()
{
-
- @Override
- public int compare(final Object o1, final Object o2) {
- final FTPFile f1 = (FTPFile) o1;
- final FTPFile f2 = (FTPFile) o2;
- return
f1.getTimestamp().getTime().compareTo(f2.getTimestamp().getTime());
- }
-
+ final TreeSet<FTPFile> sorted = new TreeSet<>((o1, o2) -> {
+ final FTPFile f1 = (FTPFile) o1;
+ final FTPFile f2 = (FTPFile) o2;
+ return
f1.getTimestamp().getTime().compareTo(f2.getTimestamp().getTime());
});
diff --git a/src/test/java/org/apache/commons/net/ftp/FTPClientTest.java
b/src/test/java/org/apache/commons/net/ftp/FTPClientTest.java
index b0c3ad8..3b24358 100644
--- a/src/test/java/org/apache/commons/net/ftp/FTPClientTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/FTPClientTest.java
@@ -22,7 +22,6 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.InetAddress;
-import java.net.UnknownHostException;
import org.apache.commons.net.ftp.parser.UnixFTPEntryParser;
@@ -193,13 +192,7 @@ public class FTPClientTest extends TestCase {
public void
testParsePassiveModeReplyForLocalAddressWithSimpleNatWorkaroundStrategy()
throws Exception {
final FTPClient client = new
PassiveNatWorkAroundLocalClient("8.8.8.8");
- client.setPassiveNatWorkaroundStrategy(new
FTPClient.HostnameResolver() {
- @Override
- public String resolve(final String hostname) throws
UnknownHostException {
- return "4.4.4.4";
- }
-
- });
+ client.setPassiveNatWorkaroundStrategy(hostname -> "4.4.4.4");
client._parsePassiveModeReply("227 Entering Passive Mode
(172,16,204,138,192,22).");
assertEquals("4.4.4.4", client.getPassiveHost());
}
diff --git
a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
index 375e4ed..9cd36a1 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
@@ -41,25 +41,16 @@ import org.junit.Test;
*/
public class MLSDComparison {
- private final Comparator<FTPFile> cmp = new Comparator<FTPFile>() {
- @Override
- public int compare(final FTPFile o1, final FTPFile o2) {
- final String n1 = o1.getName();
- final String n2 = o2.getName();
- return n1.compareTo(n2);
- }
- };
+ private final Comparator<FTPFile> cmp = (o1, o2) -> {
+ final String n1 = o1.getName();
+ final String n2 = o2.getName();
+ return n1.compareTo(n2);
+ };
@Test
public void testFile() throws Exception {
final File path = new File(DownloadListings.DOWNLOAD_DIR);
- final FilenameFilter filter = new FilenameFilter() {
- @Override
- public boolean accept(final File dir, final String name) {
- return name.endsWith("_mlsd.txt");
- }
-
- };
+ final FilenameFilter filter = (dir, name) ->
name.endsWith("_mlsd.txt");
final File[] files = path.listFiles(filter);
if (files != null) {
for (final File mlsd : files) {
