This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch 1.2.X
in repository https://gitbox.apache.org/repos/asf/mina-ftpserver.git
The following commit(s) were added to refs/heads/1.2.X by this push:
new fd1cf307 Use the diamond notation
fd1cf307 is described below
commit fd1cf3070dd9c918bd699d72a9db7f9b811be032
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jul 16 10:00:29 2023 -0400
Use the diamond notation
---
.../ftpserver/command/CommandFactoryFactory.java | 6 +--
.../command/impl/DefaultCommandFactory.java | 2 +-
.../org/apache/ftpserver/command/impl/OPTS.java | 2 +-
.../apache/ftpserver/command/impl/OPTS_MLST.java | 2 +-
.../command/impl/listing/DirectoryLister.java | 2 +-
.../apache/ftpserver/config/spring/SpringUtil.java | 2 +-
.../impl/DefaultFtpletContainer.java | 2 +-
.../apache/ftpserver/impl/DefaultFtpServer.java | 2 +-
.../ftpserver/impl/DefaultFtpServerContext.java | 6 +--
.../ftpserver/impl/DefaultFtpStatistics.java | 4 +-
.../org/apache/ftpserver/impl/PassivePorts.java | 10 ++---
.../apache/ftpserver/ipfilter/RemoteIpFilter.java | 2 +-
.../apache/ftpserver/listener/nio/NioListener.java | 2 +-
.../java/org/apache/ftpserver/main/AddUser.java | 2 +-
.../message/impl/DefaultMessageResource.java | 4 +-
.../apache/ftpserver/usermanager/UserFactory.java | 2 +-
.../ftpserver/usermanager/impl/BaseUser.java | 4 +-
.../ftpserver/usermanager/impl/DbUserManager.java | 16 +++----
.../usermanager/impl/PropertiesUserManager.java | 6 +--
.../apache/ftpserver/clienttests/FtpMd5Test.java | 2 +-
.../clienttests/InetAddressBlacklistTest.java | 2 +-
.../ftpserver/clienttests/SubnetBlacklistTest.java | 2 +-
.../nativefs/impl/NativeFtpFileTest.java | 2 +-
.../FtpLetContainerTestTemplate.java | 50 +++++++++++-----------
.../ftpletcontainer/FtpLetOnConnectTest.java | 2 +-
.../ftpletcontainer/FtpLetReturnDefaultTest.java | 4 +-
.../FtpLetReturnDisconnectTest.java | 2 +-
.../ftpletcontainer/FtpLetReturnSkipTest.java | 2 +-
.../apache/ftpserver/impl/PassivePortsTest.java | 2 +-
.../java/org/apache/ftpserver/test/TestUtil.java | 2 +-
.../ftpserver/usermanager/impl/BaseUserTest.java | 10 ++---
.../usermanager/impl/UserManagerTestTemplate.java | 4 +-
.../impl/VolatilePropertiesUserManagerTest.java | 2 +-
.../example/ftpletservice/impl/Activator.java | 2 +-
34 files changed, 84 insertions(+), 84 deletions(-)
diff --git
a/core/src/main/java/org/apache/ftpserver/command/CommandFactoryFactory.java
b/core/src/main/java/org/apache/ftpserver/command/CommandFactoryFactory.java
index 3291aaa9..4dfccf48 100644
--- a/core/src/main/java/org/apache/ftpserver/command/CommandFactoryFactory.java
+++ b/core/src/main/java/org/apache/ftpserver/command/CommandFactoryFactory.java
@@ -82,7 +82,7 @@ import org.apache.ftpserver.command.impl.USER;
*/
public class CommandFactoryFactory {
- private static final HashMap<String, Command> DEFAULT_COMMAND_MAP = new
HashMap<String, Command>();
+ private static final HashMap<String, Command> DEFAULT_COMMAND_MAP = new
HashMap<>();
static {
// first populate the default command list
@@ -159,7 +159,7 @@ public class CommandFactoryFactory {
}
/** The commands map */
- private Map<String, Command> commandMap = new HashMap<String, Command>();
+ private Map<String, Command> commandMap = new HashMap<>();
/** A flag indicating of we have non-default commands */
private boolean useDefaultCommands = true;
@@ -170,7 +170,7 @@ public class CommandFactoryFactory {
*/
public CommandFactory createCommandFactory() {
- Map<String, Command> mergedCommands = new HashMap<String, Command>();
+ Map<String, Command> mergedCommands = new HashMap<>();
if (useDefaultCommands) {
mergedCommands.putAll(DEFAULT_COMMAND_MAP);
diff --git
a/core/src/main/java/org/apache/ftpserver/command/impl/DefaultCommandFactory.java
b/core/src/main/java/org/apache/ftpserver/command/impl/DefaultCommandFactory.java
index 24bad29e..40df4d4c 100644
---
a/core/src/main/java/org/apache/ftpserver/command/impl/DefaultCommandFactory.java
+++
b/core/src/main/java/org/apache/ftpserver/command/impl/DefaultCommandFactory.java
@@ -42,7 +42,7 @@ public class DefaultCommandFactory implements CommandFactory {
/** Internal constructor, use {@link CommandFactoryFactory} instead */
public DefaultCommandFactory() {
- this(new HashMap<String, Command>());
+ this(new HashMap<>());
}
/**
diff --git a/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java
b/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java
index 9868f42b..a6a08c57 100644
--- a/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java
+++ b/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java
@@ -47,7 +47,7 @@ public class OPTS extends AbstractCommand {
private final Logger LOG = LoggerFactory.getLogger(OPTS.class);
- private static final HashMap<String, Command> COMMAND_MAP = new
HashMap<String, Command>(
+ private static final HashMap<String, Command> COMMAND_MAP = new HashMap<>(
16);
/**
diff --git
a/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java
b/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java
index 967b81ac..8056ac66 100644
--- a/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java
+++ b/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java
@@ -98,7 +98,7 @@ public class OPTS_MLST extends AbstractCommand {
return new String[0];
}
- List<String> selectedTypes = new ArrayList<String>();
+ List<String> selectedTypes = new ArrayList<>();
// check all the types
for (String type:types) {
diff --git
a/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java
b/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java
index 34b10c22..a87b2d92 100644
---
a/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java
+++
b/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java
@@ -96,7 +96,7 @@ public class DirectoryLister {
try {
FtpFile virtualFile = fileSystemView.getFile(file);
if (virtualFile.isFile()) {
- List<FtpFile> auxFiles = new ArrayList<FtpFile>();
+ List<FtpFile> auxFiles = new ArrayList<>();
auxFiles.add(virtualFile);
files = auxFiles;
} else {
diff --git
a/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java
b/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java
index 7ba57807..3f753039 100644
--- a/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java
+++ b/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java
@@ -49,7 +49,7 @@ public class SpringUtil {
* @return All children
*/
public static List<Element> getChildElements(final Element elm) {
- List<Element> elements = new ArrayList<Element>();
+ List<Element> elements = new ArrayList<>();
NodeList childs = elm.getChildNodes();
for (int i = 0; i < childs.getLength(); i++) {
Node child = childs.item(i);
diff --git
a/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
b/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
index a1051c2d..a4045003 100644
---
a/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
+++
b/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
@@ -52,7 +52,7 @@ public class DefaultFtpletContainer implements
FtpletContainer {
private final Map<String, Ftplet> ftplets ;
public DefaultFtpletContainer() {
- this(new ConcurrentHashMap<String, Ftplet>());
+ this(new ConcurrentHashMap<>());
}
public DefaultFtpletContainer(Map<String, Ftplet> ftplets) {
diff --git a/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java
b/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java
index d6197c7b..f259d8bb 100644
--- a/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java
+++ b/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java
@@ -72,7 +72,7 @@ public class DefaultFtpServer implements FtpServer {
throw new IllegalStateException("FtpServer has been stopped.
Restart is not supported");
}
- List<Listener> startedListeners = new ArrayList<Listener>();
+ List<Listener> startedListeners = new ArrayList<>();
try {
Map<String, Listener> listeners = serverContext.getListeners();
diff --git
a/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
b/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
index c9ee1270..9697dfc0 100644
--- a/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
+++ b/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
@@ -78,10 +78,10 @@ public class DefaultFtpServerContext implements
FtpServerContext {
private ConnectionConfig connectionConfig = new
ConnectionConfigFactory().createConnectionConfig();
- private Map<String, Listener> listeners = new HashMap<String, Listener>();
+ private Map<String, Listener> listeners = new HashMap<>();
- private static final List<Authority> ADMIN_AUTHORITIES = new
ArrayList<Authority>();
- private static final List<Authority> ANON_AUTHORITIES = new
ArrayList<Authority>();
+ private static final List<Authority> ADMIN_AUTHORITIES = new ArrayList<>();
+ private static final List<Authority> ANON_AUTHORITIES = new ArrayList<>();
/**
* The thread pool executor to be used by the server using this context
diff --git
a/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpStatistics.java
b/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpStatistics.java
index e8228e5a..f9808ced 100644
--- a/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpStatistics.java
+++ b/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpStatistics.java
@@ -77,7 +77,7 @@ public class DefaultFtpStatistics implements
ServerFtpStatistics {
private AtomicLong bytesDownload = new AtomicLong(0L);
private static class UserLogins {
- private Map<InetAddress, AtomicInteger> perAddress = new
ConcurrentHashMap<InetAddress, AtomicInteger>();
+ private Map<InetAddress, AtomicInteger> perAddress = new
ConcurrentHashMap<>();
public UserLogins(InetAddress address) {
// init with the first connection
@@ -100,7 +100,7 @@ public class DefaultFtpStatistics implements
ServerFtpStatistics {
/**
*The user login information.
*/
- private Map<String, UserLogins> userLoginTable = new
ConcurrentHashMap<String, UserLogins>();
+ private Map<String, UserLogins> userLoginTable = new ConcurrentHashMap<>();
public static final String LOGIN_NUMBER = "login_number";
diff --git a/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java
b/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java
index d812061b..b643a12c 100644
--- a/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java
+++ b/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java
@@ -72,7 +72,7 @@ public class PassivePorts {
* integer or too large for a port number)
*/
private static Set<Integer> parse(final String portsString) {
- Set<Integer> passivePortsList = new HashSet<Integer>();
+ Set<Integer> passivePortsList = new HashSet<>();
boolean inRange = false;
Integer lastPort = Integer.valueOf(1);
@@ -154,12 +154,12 @@ public class PassivePorts {
if (passivePorts == null) {
throw new NullPointerException("passivePorts can not be null");
} else if(passivePorts.isEmpty()) {
- passivePorts = new HashSet<Integer>();
+ passivePorts = new HashSet<>();
passivePorts.add(0);
}
- this.freeList = new ArrayList<Integer>(passivePorts);
- this.usedList = new HashSet<Integer>(passivePorts.size());
+ this.freeList = new ArrayList<>(passivePorts);
+ this.usedList = new HashSet<>(passivePorts.size());
this.checkIfBound = checkIfBound;
}
@@ -200,7 +200,7 @@ public class PassivePorts {
public synchronized int reserveNextPort() {
// create a copy of the free ports, so that we can keep track of the
tested ports
- List<Integer> freeCopy = new ArrayList<Integer>(freeList);
+ List<Integer> freeCopy = new ArrayList<>(freeList);
// Loop until we have found a port, or exhausted all available ports
while (freeCopy.size() > 0) {
diff --git
a/core/src/main/java/org/apache/ftpserver/ipfilter/RemoteIpFilter.java
b/core/src/main/java/org/apache/ftpserver/ipfilter/RemoteIpFilter.java
index 53d9cae0..5212d071 100644
--- a/core/src/main/java/org/apache/ftpserver/ipfilter/RemoteIpFilter.java
+++ b/core/src/main/java/org/apache/ftpserver/ipfilter/RemoteIpFilter.java
@@ -64,7 +64,7 @@ public class RemoteIpFilter extends
CopyOnWriteArraySet<Subnet> implements
* the filter type
*/
public RemoteIpFilter(IpFilterType type) {
- this(type, new HashSet<Subnet>(0));
+ this(type, new HashSet<>(0));
}
/**
diff --git
a/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
b/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
index 460970d7..98541751 100644
--- a/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
+++ b/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
@@ -249,7 +249,7 @@ public class NioListener extends AbstractListener {
public synchronized Set<FtpIoSession> getActiveSessions() {
Map<Long, IoSession> sessions = acceptor.getManagedSessions();
- Set<FtpIoSession> ftpSessions = new HashSet<FtpIoSession>();
+ Set<FtpIoSession> ftpSessions = new HashSet<>();
for (IoSession session : sessions.values()) {
ftpSessions.add(new FtpIoSession(session, context));
diff --git a/core/src/main/java/org/apache/ftpserver/main/AddUser.java
b/core/src/main/java/org/apache/ftpserver/main/AddUser.java
index a08d55d8..01183889 100644
--- a/core/src/main/java/org/apache/ftpserver/main/AddUser.java
+++ b/core/src/main/java/org/apache/ftpserver/main/AddUser.java
@@ -95,7 +95,7 @@ public class AddUser extends CommandLine {
user.setEnabled(askForBoolean(in, "Enabled (Y/N):"));
user.setMaxIdleTime(askForInt(in, "Max idle time in seconds (0 for
none):"));
- List<Authority> authorities = new ArrayList<Authority>();
+ List<Authority> authorities = new ArrayList<>();
if(askForBoolean(in, "Write permission (Y/N):")) {
authorities.add(new WritePermission());
diff --git
a/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java
b/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java
index c473b248..9d9cb766 100644
---
a/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java
+++
b/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java
@@ -72,7 +72,7 @@ public class DefaultMessageResource implements
MessageResource {
}
// populate different properties
- messages = new HashMap<String, PropertiesPair>();
+ messages = new HashMap<>();
if (languages != null) {
for (String language : languages) {
@@ -239,7 +239,7 @@ public class DefaultMessageResource implements
MessageResource {
}
}
- Map<String, String> result = new HashMap<String, String>();
+ Map<String, String> result = new HashMap<>();
for(Object key : messages.keySet()) {
result.put(key.toString(), messages.getProperty(key.toString()));
diff --git
a/core/src/main/java/org/apache/ftpserver/usermanager/UserFactory.java
b/core/src/main/java/org/apache/ftpserver/usermanager/UserFactory.java
index 79dc08a3..6766bc1b 100644
--- a/core/src/main/java/org/apache/ftpserver/usermanager/UserFactory.java
+++ b/core/src/main/java/org/apache/ftpserver/usermanager/UserFactory.java
@@ -43,7 +43,7 @@ public class UserFactory {
private boolean isEnabled = true;
- private List<Authority> authorities = new ArrayList<Authority>();
+ private List<Authority> authorities = new ArrayList<>();
/**
* Creates a user based on the configuration set on the factory
diff --git
a/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java
b/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java
index 8be3edc4..b2359794 100644
--- a/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java
+++ b/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java
@@ -57,7 +57,7 @@ public class BaseUser implements User {
private boolean isEnabled = true;
- private List<? extends Authority> authorities = new ArrayList<Authority>();
+ private List<? extends Authority> authorities = new ArrayList<>();
/**
* Default constructor.
@@ -196,7 +196,7 @@ public class BaseUser implements User {
* {@inheritDoc}
*/
public List<Authority> getAuthorities(Class<? extends Authority> clazz) {
- List<Authority> selected = new ArrayList<Authority>();
+ List<Authority> selected = new ArrayList<>();
for (Authority authority : authorities) {
if (authority.getClass().equals(clazz)) {
diff --git
a/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java
b/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java
index 7379945a..d0f6c47a 100644
---
a/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java
+++
b/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java
@@ -283,7 +283,7 @@ public class DbUserManager extends AbstractUserManager {
try {
// create the sql query
- HashMap<String, Object> map = new HashMap<String, Object>();
+ HashMap<String, Object> map = new HashMap<>();
map.put(ATTR_LOGIN, escapeString(login));
String sql = StringUtils.replaceString(isAdminStmt, map);
LOG.info(sql);
@@ -317,7 +317,7 @@ public class DbUserManager extends AbstractUserManager {
*/
public void delete(String name) throws FtpException {
// create sql query
- HashMap<String, Object> map = new HashMap<String, Object>();
+ HashMap<String, Object> map = new HashMap<>();
map.put(ATTR_LOGIN, escapeString(name));
String sql = StringUtils.replaceString(deleteUserStmt, map);
LOG.info(sql);
@@ -348,7 +348,7 @@ public class DbUserManager extends AbstractUserManager {
try {
// create sql query
- HashMap<String, Object> map = new HashMap<String, Object>();
+ HashMap<String, Object> map = new HashMap<>();
map.put(ATTR_LOGIN, escapeString(user.getName()));
String password = null;
@@ -472,7 +472,7 @@ public class DbUserManager extends AbstractUserManager {
private BaseUser selectUserByName(String name) throws SQLException {
// create sql query
- HashMap<String, Object> map = new HashMap<String, Object>();
+ HashMap<String, Object> map = new HashMap<>();
map.put(ATTR_LOGIN, escapeString(name));
String sql = StringUtils.replaceString(selectUserStmt, map);
LOG.info(sql);
@@ -494,7 +494,7 @@ public class DbUserManager extends AbstractUserManager {
thisUser.setEnabled(rs.getBoolean(ATTR_ENABLE));
thisUser.setMaxIdleTime(rs.getInt(ATTR_MAX_IDLE_TIME));
- List<Authority> authorities = new ArrayList<Authority>();
+ List<Authority> authorities = new ArrayList<>();
if (rs.getBoolean(ATTR_WRITE_PERM)) {
authorities.add(new WritePermission());
}
@@ -551,7 +551,7 @@ public class DbUserManager extends AbstractUserManager {
try {
// create the sql
- HashMap<String, Object> map = new HashMap<String, Object>();
+ HashMap<String, Object> map = new HashMap<>();
map.put(ATTR_LOGIN, escapeString(name));
String sql = StringUtils.replaceString(selectUserStmt, map);
LOG.info(sql);
@@ -587,7 +587,7 @@ public class DbUserManager extends AbstractUserManager {
rs = stmt.executeQuery(sql);
// populate list
- ArrayList<String> names = new ArrayList<String>();
+ ArrayList<String> names = new ArrayList<>();
while (rs.next()) {
names.add(rs.getString(ATTR_LOGIN));
}
@@ -625,7 +625,7 @@ public class DbUserManager extends AbstractUserManager {
try {
// create the sql query
- HashMap<String, Object> map = new HashMap<String, Object>();
+ HashMap<String, Object> map = new HashMap<>();
map.put(ATTR_LOGIN, escapeString(user));
String sql = StringUtils.replaceString(authenticateStmt, map);
LOG.info(sql);
diff --git
a/core/src/main/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManager.java
b/core/src/main/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManager.java
index 3da7b8f1..da547354 100644
---
a/core/src/main/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManager.java
+++
b/core/src/main/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManager.java
@@ -310,7 +310,7 @@ public class PropertiesUserManager extends
AbstractUserManager {
// remove entries from properties
String thisPrefix = PREFIX + usrName + '.';
Enumeration<?> propNames = userDataProp.propertyNames();
- ArrayList<String> remKeys = new ArrayList<String>();
+ ArrayList<String> remKeys = new ArrayList<>();
while (propNames.hasMoreElements()) {
String thisKey = propNames.nextElement().toString();
@@ -368,7 +368,7 @@ public class PropertiesUserManager extends
AbstractUserManager {
public String[] getAllUserNames() {
// get all user names
String suffix = '.' + ATTR_HOME;
- ArrayList<String> ulst = new ArrayList<String>();
+ ArrayList<String> ulst = new ArrayList<>();
Enumeration<?> allKeys = userDataProp.propertyNames();
int prefixlen = PREFIX.length();
int suffixlen = suffix.length();
@@ -403,7 +403,7 @@ public class PropertiesUserManager extends
AbstractUserManager {
user.setEnabled(userDataProp.getBoolean(baseKey + ATTR_ENABLE, true));
user.setHomeDirectory(userDataProp.getProperty(baseKey + ATTR_HOME,
"/"));
- List<Authority> authorities = new ArrayList<Authority>();
+ List<Authority> authorities = new ArrayList<>();
if (userDataProp.getBoolean(baseKey + ATTR_WRITE_PERM, false)) {
authorities.add(new WritePermission());
diff --git
a/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java
b/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java
index 8fcfb874..b121eb8b 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java
@@ -194,7 +194,7 @@ public class FtpMd5Test extends ClientTestTemplate {
String[] tokens = s.split(",");
- Map<String, String> result = new HashMap<String, String>();
+ Map<String, String> result = new HashMap<>();
for (int i = 0; i < tokens.length; i++) {
String token = tokens[i].trim();
int hashStart = token.lastIndexOf(' ');
diff --git
a/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java
b/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java
index ebcc32cd..7dcb3dff 100644
---
a/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java
+++
b/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java
@@ -39,7 +39,7 @@ public class InetAddressBlacklistTest extends
ClientTestTemplate {
ListenerFactory factory = new
ListenerFactory(server.getListener("default"));
- List<InetAddress> blockedAddresses = new ArrayList<InetAddress>();
+ List<InetAddress> blockedAddresses = new ArrayList<>();
blockedAddresses.add(InetAddress.getByName("localhost"));
factory.setBlockedAddresses(blockedAddresses);
diff --git
a/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java
b/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java
index 84834651..1dde59cb 100644
---
a/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java
+++
b/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java
@@ -40,7 +40,7 @@ public class SubnetBlacklistTest extends ClientTestTemplate {
ListenerFactory factory = new
ListenerFactory(server.getListener("default"));
- List<Subnet> blockedSubnets = new ArrayList<Subnet>();
+ List<Subnet> blockedSubnets = new ArrayList<>();
blockedSubnets.add(new Subnet(InetAddress.getByName("localhost"), 32));
factory.setBlockedSubnets(blockedSubnets);
diff --git
a/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFileTest.java
b/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFileTest.java
index 6e603d96..434c2f67 100644
---
a/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFileTest.java
+++
b/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFileTest.java
@@ -47,7 +47,7 @@ public class NativeFtpFileTest extends FtpFileTestTemplate {
private static final File TEST_FILE3 = new File(ROOT_DIR, "file3");
- private static final Map<String, File> FILE_MAPPINGS = new HashMap<String,
File>();
+ private static final Map<String, File> FILE_MAPPINGS = new HashMap<>();
static {
FILE_MAPPINGS.put("/", ROOT_DIR);
diff --git
a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
index 927efb80..30fb1d95 100644
---
a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
+++
b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
@@ -45,7 +45,7 @@ import org.apache.ftpserver.impl.DefaultFtpSession;
*/
public abstract class FtpLetContainerTestTemplate extends TestCase {
- private final List<String> calls = new ArrayList<String>();
+ private final List<String> calls = new ArrayList<>();
@Override
protected void setUp() throws Exception {
@@ -77,7 +77,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
MockFtplet ftplet1 = new MockFtplet();
MockFtplet ftplet2 = new MockFtplet();
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -90,7 +90,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
public void testFtpletLifecyclePreContainerInit() throws FtpException {
MockFtplet ftplet = new MockFtplet();
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet);
FtpletContainer container = createFtpletContainer(ftplets);
@@ -127,7 +127,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -158,7 +158,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -189,7 +189,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -221,7 +221,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -253,7 +253,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -285,7 +285,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -317,7 +317,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -349,7 +349,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -381,7 +381,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -413,7 +413,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -445,7 +445,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -477,7 +477,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -509,7 +509,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -541,7 +541,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -573,7 +573,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -605,7 +605,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -637,7 +637,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -669,7 +669,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -701,7 +701,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -733,7 +733,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -768,7 +768,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet1", ftplet1);
ftplets.put("ftplet2", ftplet2);
@@ -802,7 +802,7 @@ public abstract class FtpLetContainerTestTemplate extends
TestCase {
}
};
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("ftplet2", ftplet2);
ftplets.put("ftplet1", ftplet1);
diff --git
a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetOnConnectTest.java
b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetOnConnectTest.java
index e73bcdbd..cb7e003d 100644
---
a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetOnConnectTest.java
+++
b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetOnConnectTest.java
@@ -69,7 +69,7 @@ public class FtpLetOnConnectTest extends ClientTestTemplate {
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("f1", new MockFtplet());
server.setFtplets(ftplets);
diff --git
a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
index 3c9f3cbe..f9f5dc43 100644
---
a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
+++
b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
@@ -77,7 +77,7 @@ public class FtpLetReturnDefaultTest extends
ClientTestTemplate {
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
- Map<String, Ftplet> ftplets = new HashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new HashMap<>();
ftplets.put("f1", new MockFtplet());
server.setFtplets(ftplets);
@@ -86,7 +86,7 @@ public class FtpLetReturnDefaultTest extends
ClientTestTemplate {
}
public void testLogin() throws Exception {
- final LinkedBlockingQueue<User> loggedInUser = new
LinkedBlockingQueue<User>();
+ final LinkedBlockingQueue<User> loggedInUser = new
LinkedBlockingQueue<>();
MockFtplet.callback = new MockFtpletCallback() {
public FtpletResult onLogin(FtpSession session, FtpRequest request)
diff --git
a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java
b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java
index 50e09b88..13aa62f1 100644
---
a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java
+++
b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java
@@ -75,7 +75,7 @@ public class FtpLetReturnDisconnectTest extends
ClientTestTemplate {
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("f1", new MockFtplet());
server.setFtplets(ftplets);
diff --git
a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java
b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java
index de3a3ca1..9b0f914d 100644
---
a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java
+++
b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java
@@ -76,7 +76,7 @@ public class FtpLetReturnSkipTest extends ClientTestTemplate {
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
- Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ Map<String, Ftplet> ftplets = new LinkedHashMap<>();
ftplets.put("f1", new MockFtplet());
server.setFtplets(ftplets);
diff --git a/core/src/test/java/org/apache/ftpserver/impl/PassivePortsTest.java
b/core/src/test/java/org/apache/ftpserver/impl/PassivePortsTest.java
index 8b75d70c..4f514be8 100644
--- a/core/src/test/java/org/apache/ftpserver/impl/PassivePortsTest.java
+++ b/core/src/test/java/org/apache/ftpserver/impl/PassivePortsTest.java
@@ -97,7 +97,7 @@ public class PassivePortsTest extends TestCase {
}
private List<Integer> valid(int... ints) {
- List<Integer> valid = new ArrayList<Integer>();
+ List<Integer> valid = new ArrayList<>();
for(int i : ints) {
valid.add(i);
}
diff --git a/core/src/test/java/org/apache/ftpserver/test/TestUtil.java
b/core/src/test/java/org/apache/ftpserver/test/TestUtil.java
index 92483c34..9723c085 100644
--- a/core/src/test/java/org/apache/ftpserver/test/TestUtil.java
+++ b/core/src/test/java/org/apache/ftpserver/test/TestUtil.java
@@ -127,7 +127,7 @@ public class TestUtil {
Enumeration<NetworkInterface> nifs = NetworkInterface
.getNetworkInterfaces();
- List<String> hostIps = new ArrayList<String>();
+ List<String> hostIps = new ArrayList<>();
while (nifs.hasMoreElements()) {
NetworkInterface nif = nifs.nextElement();
Enumeration<InetAddress> ips = nif.getInetAddresses();
diff --git
a/core/src/test/java/org/apache/ftpserver/usermanager/impl/BaseUserTest.java
b/core/src/test/java/org/apache/ftpserver/usermanager/impl/BaseUserTest.java
index c0958771..84ba2890 100644
--- a/core/src/test/java/org/apache/ftpserver/usermanager/impl/BaseUserTest.java
+++ b/core/src/test/java/org/apache/ftpserver/usermanager/impl/BaseUserTest.java
@@ -70,7 +70,7 @@ public class BaseUserTest extends TestCase {
private BaseUser user = new BaseUser();
public void testAllow() {
- List<Authority> authorities = new ArrayList<Authority>();
+ List<Authority> authorities = new ArrayList<>();
authorities.add(ALWAYS_ALLOW_AUTHORITY);
user.setAuthorities(authorities);
@@ -79,7 +79,7 @@ public class BaseUserTest extends TestCase {
}
public void testDisallow() {
- List<Authority> authorities = new ArrayList<Authority>();
+ List<Authority> authorities = new ArrayList<>();
authorities.add(NEVER_ALLOW_AUTHORITY);
user.setAuthorities(authorities);
@@ -88,7 +88,7 @@ public class BaseUserTest extends TestCase {
}
public void testMultipleDisallowLast() {
- List<Authority> authorities = new ArrayList<Authority>();
+ List<Authority> authorities = new ArrayList<>();
authorities.add(ALWAYS_ALLOW_AUTHORITY);
authorities.add(NEVER_ALLOW_AUTHORITY);
@@ -98,7 +98,7 @@ public class BaseUserTest extends TestCase {
}
public void testMultipleAllowLast() {
- List<Authority> authorities = new ArrayList<Authority>();
+ List<Authority> authorities = new ArrayList<>();
authorities.add(NEVER_ALLOW_AUTHORITY);
authorities.add(ALWAYS_ALLOW_AUTHORITY);
@@ -108,7 +108,7 @@ public class BaseUserTest extends TestCase {
}
public void testNonCanAuthorize() {
- List<Authority> authorities = new ArrayList<Authority>();
+ List<Authority> authorities = new ArrayList<>();
authorities.add(CANT_AUTHORITY);
user.setAuthorities(authorities);
diff --git
a/core/src/test/java/org/apache/ftpserver/usermanager/impl/UserManagerTestTemplate.java
b/core/src/test/java/org/apache/ftpserver/usermanager/impl/UserManagerTestTemplate.java
index 7a27d6a4..689ea31e 100644
---
a/core/src/test/java/org/apache/ftpserver/usermanager/impl/UserManagerTestTemplate.java
+++
b/core/src/test/java/org/apache/ftpserver/usermanager/impl/UserManagerTestTemplate.java
@@ -234,7 +234,7 @@ public abstract class UserManagerTestTemplate extends
TestCase {
user.setEnabled(false);
user.setMaxIdleTime(2);
- List<Authority> authorities = new ArrayList<Authority>();
+ List<Authority> authorities = new ArrayList<>();
authorities.add(new WritePermission());
authorities.add(new ConcurrentLoginPermission(3, 4));
authorities.add(new TransferRatePermission(1, 5));
@@ -300,7 +300,7 @@ public abstract class UserManagerTestTemplate extends
TestCase {
user.setEnabled(false);
user.setMaxIdleTime(2);
- List<Authority> authorities = new ArrayList<Authority>();
+ List<Authority> authorities = new ArrayList<>();
authorities.add(new WritePermission());
authorities.add(new ConcurrentLoginPermission(3, 4));
authorities.add(new TransferRatePermission(1, 5));
diff --git
a/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java
b/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java
index 5d45abd4..5e53421e 100644
---
a/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java
+++
b/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java
@@ -64,7 +64,7 @@ public class VolatilePropertiesUserManagerTest extends
UserManagerTestTemplate {
user2.setEnabled(false);
user2.setMaxIdleTime(2);
- List<Authority> authorities = new ArrayList<Authority>();
+ List<Authority> authorities = new ArrayList<>();
authorities.add(new WritePermission());
authorities.add(new TransferRatePermission(1, 5));
authorities.add(new ConcurrentLoginPermission(3, 4));
diff --git
a/examples/ftpserver-osgi-ftplet-service/src/main/java/org/apache/ftpserver/example/ftpletservice/impl/Activator.java
b/examples/ftpserver-osgi-ftplet-service/src/main/java/org/apache/ftpserver/example/ftpletservice/impl/Activator.java
index 27349390..eea7d5c7 100644
---
a/examples/ftpserver-osgi-ftplet-service/src/main/java/org/apache/ftpserver/example/ftpletservice/impl/Activator.java
+++
b/examples/ftpserver-osgi-ftplet-service/src/main/java/org/apache/ftpserver/example/ftpletservice/impl/Activator.java
@@ -35,7 +35,7 @@ public class Activator implements BundleActivator {
* {@inheritDoc}
*/
public void start(BundleContext context) throws Exception {
- Dictionary<String, String> properties = new Hashtable<String,
String>();
+ Dictionary<String, String> properties = new Hashtable<>();
properties.put("name", "myftplet");
context.registerService(Ftplet.class.getName(),
