You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2022/01/17 10:46:20 UTC
[commons-daemon] 01/05: Fix IDE warnings triggered by switch to minimum Java version of Java 7
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit b6666cc7ec4ae80e3fd3d6d4adc04784ad932f6a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 17 10:24:49 2022 +0000
Fix IDE warnings triggered by switch to minimum Java version of Java 7
---
.../apache/commons/daemon/support/DaemonConfiguration.java | 2 +-
.../org/apache/commons/daemon/support/DaemonLoader.java | 14 +++++++-------
.../org/apache/commons/daemon/support/DaemonWrapper.java | 2 +-
src/samples/ProcrunService.java | 2 +-
src/samples/SimpleApplication.java | 2 +-
src/samples/SimpleDaemon.java | 2 +-
src/test/java/org/apache/commons/daemon/SimpleDaemon.java | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
index 41bea33..628c361 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
@@ -192,7 +192,7 @@ public final class DaemonConfiguration
public String[] getPropertyArray(final String name)
throws ParseException
{
- final ArrayList<String> list = new ArrayList<String>();
+ final ArrayList<String> list = new ArrayList<>();
String args;
// Load daemon.arg[0] ... daemon.arg[n] into the String array.
diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
index 07ab19f..0af338c 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
@@ -173,12 +173,12 @@ public final class DaemonLoader
init = c.getMethod("init", myclass);
- start = c.getMethod("start", null);
- stop = c.getMethod("stop", null);
- destroy = c.getMethod("destroy", null);
+ start = c.getMethod("start");
+ stop = c.getMethod("stop");
+ destroy = c.getMethod("destroy");
try {
- signal = c.getMethod("signal", null);
+ signal = c.getMethod("signal");
} catch (final NoSuchMethodException e) {
// Signalling will be disabled.
}
@@ -236,7 +236,7 @@ public final class DaemonLoader
{
try {
/* Attempt to start the daemon */
- start.invoke(daemon, null);
+ start.invoke(daemon);
/* Set the availability flag in the controller */
if (controller != null) {
@@ -262,7 +262,7 @@ public final class DaemonLoader
}
/* Attempt to stop the daemon */
- stop.invoke(daemon, null);
+ stop.invoke(daemon);
}
catch (final Throwable t) {
/* In case we encounter ANY error, we dump the stack trace and
@@ -278,7 +278,7 @@ public final class DaemonLoader
{
try {
/* Attempt to stop the daemon */
- destroy.invoke(daemon, null);
+ destroy.invoke(daemon);
daemon = null;
controller = null;
diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
index 036bcef..f478b0e 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
@@ -216,7 +216,7 @@ public class DaemonWrapper implements Daemon
protected void addArguments(final String[] args)
{
if (args != null) {
- final ArrayList<String> aa = new ArrayList<String>();
+ final ArrayList<String> aa = new ArrayList<>();
if (this.args != null) {
aa.addAll(Arrays.asList(this.args));
}
diff --git a/src/samples/ProcrunService.java b/src/samples/ProcrunService.java
index 0e60c02..4e2d972 100644
--- a/src/samples/ProcrunService.java
+++ b/src/samples/ProcrunService.java
@@ -102,7 +102,7 @@ public class ProcrunService implements Runnable {
log("System properties: ");
Properties ps = System.getProperties();
- TreeSet<Object> ts = new TreeSet<Object>(ps.keySet());
+ TreeSet<Object> ts = new TreeSet<>(ps.keySet());
for (Iterator<Object> i = ts.iterator(); i.hasNext();) {
String n = (String)i.next();
log(n + " -> " + ps.get(n));
diff --git a/src/samples/SimpleApplication.java b/src/samples/SimpleApplication.java
index c1c65e0..71d7680 100644
--- a/src/samples/SimpleApplication.java
+++ b/src/samples/SimpleApplication.java
@@ -44,7 +44,7 @@ public class SimpleApplication implements Runnable {
super();
System.err.println("SimpleApplication: instance "+this.hashCode()+
" created");
- this.handlers = new Vector<Handler>();
+ this.handlers = new Vector<>();
}
@Override
diff --git a/src/samples/SimpleDaemon.java b/src/samples/SimpleDaemon.java
index 8eea844..9b4965c 100644
--- a/src/samples/SimpleDaemon.java
+++ b/src/samples/SimpleDaemon.java
@@ -49,7 +49,7 @@ public class SimpleDaemon implements Daemon, Runnable {
super();
System.err.println("SimpleDaemon: instance "+this.hashCode()+
" created");
- this.handlers = new Vector<Handler>();
+ this.handlers = new Vector<>();
}
@Override
diff --git a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
index 4bd37bf..94f9b55 100644
--- a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
+++ b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
@@ -39,7 +39,7 @@ public class SimpleDaemon implements Daemon, Runnable, DaemonUserSignal {
public SimpleDaemon() {
System.err.println("SimpleDaemon: instance "+this.hashCode()+
" created");
- this.handlers = new Vector<Handler>();
+ this.handlers = new Vector<>();
}
@Override