This is an automated email from the ASF dual-hosted git repository.
sebb 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 36f4132a Use lambda and method reference Use primitive
new eb0de264 Merge pull request #76 from arturobernalg/feature/use_lambda
36f4132a is described below
commit 36f4132a4cf490fcab8f24935f885c9b3b7b32b1
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Tue Mar 23 07:57:42 2021 +0100
Use lambda and method reference
Use primitive
---
.../apache/commons/net/examples/util/IOUtil.java | 64 +++++++++-------------
.../java/org/apache/commons/net/ftp/FTPClient.java | 6 +-
.../org/apache/commons/net/ftp/FTPFileFilters.java | 4 +-
.../commons/net/ftp/parser/UnixFTPEntryParser.java | 10 +---
.../ftp/parser/VMSVersioningFTPEntryParser.java | 4 +-
5 files changed, 35 insertions(+), 53 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/examples/util/IOUtil.java
b/src/main/java/org/apache/commons/net/examples/util/IOUtil.java
index 1a8c0d77..e86ab958 100644
--- a/src/main/java/org/apache/commons/net/examples/util/IOUtil.java
+++ b/src/main/java/org/apache/commons/net/examples/util/IOUtil.java
@@ -45,46 +45,36 @@ public final class IOUtil
final Thread reader;
final Thread writer;
- reader = new Thread()
- {
- @Override
- public void run()
- {
- int ch;
-
- try
- {
- while (!interrupted() && (ch = localInput.read())
!= -1)
- {
- remoteOutput.write(ch);
- remoteOutput.flush();
- }
- }
- catch (final IOException e)
- {
- //e.printStackTrace();
- }
- }
- }
+ reader = new Thread(() -> {
+ int ch;
+
+ try
+ {
+ while (!Thread.interrupted() && (ch = localInput.read()) != -1)
+ {
+ remoteOutput.write(ch);
+ remoteOutput.flush();
+ }
+ }
+ catch (final IOException e)
+ {
+ //e.printStackTrace();
+ }
+ })
;
- writer = new Thread()
- {
- @Override
- public void run()
- {
- try
- {
- Util.copyStream(remoteInput, localOutput);
- }
- catch (final IOException e)
- {
- e.printStackTrace();
- System.exit(1);
- }
- }
- };
+ writer = new Thread(() -> {
+ try
+ {
+ Util.copyStream(remoteInput, localOutput);
+ }
+ catch (final IOException e)
+ {
+ e.printStackTrace();
+ System.exit(1);
+ }
+ });
writer.setPriority(Thread.currentThread().getPriority() + 1);
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
index f2184fe9..e4f6f73f 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -2228,11 +2228,7 @@ public class FTPClient extends FTP implements
Configurable {
key = line.substring(1);
}
key = key.toUpperCase(Locale.ENGLISH);
- Set<String> entries = featuresMap.get(key);
- if (entries == null) {
- entries = new HashSet<>();
- featuresMap.put(key, entries);
- }
+ Set<String> entries = featuresMap.computeIfAbsent(key, k
-> new HashSet<>());
entries.add(value);
}
}
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 37494a4c..e9e0bbce 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
@@ -18,6 +18,8 @@
package org.apache.commons.net.ftp;
+import java.util.Objects;
+
/**
* Implements some simple FTPFileFilter classes.
* @since 2.2
@@ -32,7 +34,7 @@ public class FTPFileFilters {
/**
* Accepts all non-null FTPFile entries.
*/
- public static final FTPFileFilter NON_NULL = file -> file != null;
+ public static final FTPFileFilter NON_NULL = Objects::nonNull;
/**
* Accepts all (non-null) FTPFile directory entries.
diff --git
a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
index 101632c7..2a0bd581 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
@@ -18,7 +18,6 @@
package org.apache.commons.net.ftp.parser;
import java.text.ParseException;
import java.util.List;
-import java.util.ListIterator;
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
@@ -365,13 +364,8 @@ public class UnixFTPEntryParser extends
ConfigurableFTPFileEntryParserImpl
*/
@Override
public List<String> preParse(final List<String> original) {
- final ListIterator<String> iter = original.listIterator();
- while (iter.hasNext()) {
- final String entry = iter.next();
- if (entry.matches("^total \\d+$")) { // NET-389
- iter.remove();
- }
- }
+ // NET-389
+ original.removeIf(entry -> entry.matches("^total \\d+$"));
return original;
}
diff --git
a/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
b/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
index e3e78d3e..1d3c9238 100644
---
a/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
+++
b/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
@@ -139,9 +139,9 @@ public class VMSVersioningFTPEntryParser extends
VMSFTPEntryParser
result = _preparse_matcher_.toMatchResult();
final String name = result.group(1);
final String version = result.group(2);
- final Integer nv = Integer.valueOf(version);
+ final int nv = Integer.parseInt(version);
final Integer existing = existingEntries.get(name);
- if ((null != existing) && (nv.intValue() <
existing.intValue())) {
+ if ((null != existing) && ((int) nv < existing.intValue())) {
iter.remove(); // removes older version from original list.
}
}
