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:19 UTC
[commons-daemon] branch master updated (8342a49 -> 93060f7)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git.
from 8342a49 Run dependabot once a week.
new b6666cc Fix IDE warnings triggered by switch to minimum Java version of Java 7
new 8892198 Remove out-dated comment
new 9c67034 Fix comment typos
new 9fd102e Remove empty Javadoc block
new 93060f7 Remove comments from code for Java 1.4, 1.5 & 1.6 now Java 7 is the min
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/commons/daemon/DaemonUserSignal.java | 2 +-
.../daemon/support/DaemonConfiguration.java | 4 +-
.../commons/daemon/support/DaemonLoader.java | 16 ++--
.../commons/daemon/support/DaemonWrapper.java | 2 +-
src/samples/ProcrunService.java | 94 +++++++++++-----------
src/samples/SimpleApplication.java | 14 ++--
src/samples/SimpleDaemon.java | 14 ++--
.../org/apache/commons/daemon/SimpleDaemon.java | 4 +-
8 files changed, 73 insertions(+), 77 deletions(-)
[commons-daemon] 01/05: Fix IDE warnings triggered by switch to minimum Java version of Java 7
Posted by ma...@apache.org.
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
[commons-daemon] 02/05: Remove out-dated comment
Posted by ma...@apache.org.
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 8892198668e75be0ff9f43dcc79d526baed94120
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 17 10:38:37 2022 +0000
Remove out-dated comment
---
.../java/org/apache/commons/daemon/support/DaemonConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 628c361..417d99e 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
@@ -139,7 +139,7 @@ public final class DaemonConfiguration
if (sysvalue == null) {
// Try with the environment if there was no
// property by that name.
- sysvalue = System.getenv(variable); // N.B. Deprecated in Java 1.3/1.4, but re-instated in Java 1.5+
+ sysvalue = System.getenv(variable);
}
if (sysvalue != null) {
final String strtoken = propValue.substring(ctoken, btoken);
[commons-daemon] 03/05: Fix comment typos
Posted by ma...@apache.org.
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 9c67034c4265485dbc88362b019e1e9b5b04d197
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 17 10:39:03 2022 +0000
Fix comment typos
---
src/main/java/org/apache/commons/daemon/DaemonUserSignal.java | 2 +-
src/main/java/org/apache/commons/daemon/support/DaemonLoader.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/daemon/DaemonUserSignal.java b/src/main/java/org/apache/commons/daemon/DaemonUserSignal.java
index eadb1b7..de93c3d 100644
--- a/src/main/java/org/apache/commons/daemon/DaemonUserSignal.java
+++ b/src/main/java/org/apache/commons/daemon/DaemonUserSignal.java
@@ -19,7 +19,7 @@ package org.apache.commons.daemon;
/**
* Tags a Daemon as supporting some kind of
- * signaling method that allows the java application to
+ * signalling method that allows the java application to
* perform a custom action.
* <p>
* User must implement a signal method that will be called from
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 0af338c..3b81eda 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
@@ -77,7 +77,7 @@ public final class DaemonLoader
/* Find the required class */
final Class<?> c = cl.loadClass(cn);
- /* This should _never_ happen, but doublechecking doesn't harm */
+ /* This should _never_ happen, but double-checking doesn't harm */
if (c == null) {
throw new ClassNotFoundException(cn);
}
[commons-daemon] 05/05: Remove comments from code for Java 1.4, 1.5 & 1.6 now Java 7 is the min
Posted by ma...@apache.org.
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 93060f7de65fd0faadf2fa8db22ed9125485f7fc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 17 10:43:56 2022 +0000
Remove comments from code for Java 1.4, 1.5 & 1.6 now Java 7 is the min
---
src/samples/ProcrunService.java | 92 +++++++++++++++++++-------------------
src/samples/SimpleApplication.java | 12 ++---
src/samples/SimpleDaemon.java | 12 ++---
3 files changed, 57 insertions(+), 59 deletions(-)
diff --git a/src/samples/ProcrunService.java b/src/samples/ProcrunService.java
index 4e2d972..13de4a0 100644
--- a/src/samples/ProcrunService.java
+++ b/src/samples/ProcrunService.java
@@ -3,15 +3,15 @@ import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-//import java.util.Enumeration;
+import java.util.Enumeration;
import java.util.Iterator;
-//import java.util.List;
-//import java.util.Map;
+import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.TreeSet;
-//import java.net.InterfaceAddress;
-//import java.net.NetworkInterface;
-//import java.net.SocketException;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
/*
@@ -92,13 +92,12 @@ public class ProcrunService implements Runnable {
log("Using context ClassLoader : " + cl.toString());
log("Program environment: ");
-// Java 1.5+ code
-// Map em = System.getenv();
-// TreeSet es = new TreeSet(em.keySet());
-// for (Iterator i = es.iterator(); i.hasNext();) {
-// String n = (String)i.next();
-// log(n + " -> " + em.get(n));
-// }
+ Map<String,String> em = System.getenv();
+ TreeSet<String> es = new TreeSet<>(em.keySet());
+ for (Iterator<String> i = es.iterator(); i.hasNext();) {
+ String n = i.next();
+ log(n + " -> " + em.get(n));
+ }
log("System properties: ");
Properties ps = System.getProperties();
@@ -108,40 +107,39 @@ public class ProcrunService implements Runnable {
log(n + " -> " + ps.get(n));
}
-// Java 1.6+ code
-// log("Network interfaces: ");
-// log("LVPMU (L)oopback (V)irtual (P)ointToPoint (M)multicastSupport (U)p");
-// try {
-// for (Enumeration e = NetworkInterface.getNetworkInterfaces(); e.hasMoreElements();) {
-// NetworkInterface n = (NetworkInterface)e.nextElement();
-// char [] flags = { '-', '-', '-', '-', '-'};
-// if (n.isLoopback())
-// flags[0] = 'x';
-// if (n.isVirtual())
-// flags[1] = 'x';
-// if (n.isPointToPoint())
-// flags[2] = 'x';
-// if (n.supportsMulticast())
-// flags[3] = 'x';
-// if (n.isUp())
-// flags[4] = 'x';
-// String neti = new String(flags) + " " + n.getName() + "\t";
-// for (Enumeration i = n.getSubInterfaces(); i.hasMoreElements();) {
-// NetworkInterface s = (NetworkInterface)i.nextElement();
-// neti += " [" + s.getName() + "]";
-// }
-// log(neti + " -> " + n.getDisplayName());
-// List i = n.getInterfaceAddresses();
-// if (!i.isEmpty()) {
-// for (int x = 0; x < i.size(); x++) {
-// InterfaceAddress a = (InterfaceAddress)i.get(x);
-// log(" " + a.toString());
-// }
-// }
-// }
-// } catch (SocketException e) {
-// // Ignore
-// }
+ log("Network interfaces: ");
+ log("LVPMU (L)oopback (V)irtual (P)ointToPoint (M)multicastSupport (U)p");
+ try {
+ for (Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces(); e.hasMoreElements();) {
+ NetworkInterface n = e.nextElement();
+ char [] flags = { '-', '-', '-', '-', '-'};
+ if (n.isLoopback())
+ flags[0] = 'x';
+ if (n.isVirtual())
+ flags[1] = 'x';
+ if (n.isPointToPoint())
+ flags[2] = 'x';
+ if (n.supportsMulticast())
+ flags[3] = 'x';
+ if (n.isUp())
+ flags[4] = 'x';
+ String neti = new String(flags) + " " + n.getName() + "\t";
+ for (Enumeration<NetworkInterface> i = n.getSubInterfaces(); i.hasMoreElements();) {
+ NetworkInterface s = i.nextElement();
+ neti += " [" + s.getName() + "]";
+ }
+ log(neti + " -> " + n.getDisplayName());
+ List<InterfaceAddress> i = n.getInterfaceAddresses();
+ if (!i.isEmpty()) {
+ for (int x = 0; x < i.size(); x++) {
+ InterfaceAddress a = i.get(x);
+ log(" " + a.toString());
+ }
+ }
+ }
+ } catch (SocketException e) {
+ // Ignore
+ }
}
/**
diff --git a/src/samples/SimpleApplication.java b/src/samples/SimpleApplication.java
index 71d7680..057dbc6 100644
--- a/src/samples/SimpleApplication.java
+++ b/src/samples/SimpleApplication.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintStream;
-//import java.io.UnsupportedEncodingException;
+import java.io.UnsupportedEncodingException;
import java.net.ServerSocket;
import java.net.Socket;
import java.text.SimpleDateFormat;
@@ -259,11 +259,11 @@ public class SimpleApplication implements Runnable {
public void handle(InputStream in, OutputStream os) {
PrintStream out=null;
-// try {
-// out=new PrintStream(os, true, "US-ASCII"); // Java 1.4+
-// } catch (UnsupportedEncodingException ex) {
- out=new PrintStream(os, true);
-// }
+ try {
+ out=new PrintStream(os, true, "US-ASCII");
+ } catch (UnsupportedEncodingException ex) {
+ out=new PrintStream(os, true);
+ }
while(true) {
try {
diff --git a/src/samples/SimpleDaemon.java b/src/samples/SimpleDaemon.java
index 9b4965c..2727e4f 100644
--- a/src/samples/SimpleDaemon.java
+++ b/src/samples/SimpleDaemon.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintStream;
-//import java.io.UnsupportedEncodingException;
+import java.io.UnsupportedEncodingException;
import java.net.ServerSocket;
import java.net.Socket;
import java.text.SimpleDateFormat;
@@ -241,11 +241,11 @@ public class SimpleDaemon implements Daemon, Runnable {
public void handle(InputStream in, OutputStream os) {
PrintStream out=null;
-// try {
-// out=new PrintStream(os, true, "US-ASCII"); // Java 1.4+
-// } catch (UnsupportedEncodingException ex) {
- out=new PrintStream(os, true);
-// }
+ try {
+ out=new PrintStream(os, true, "US-ASCII");
+ } catch (UnsupportedEncodingException ex) {
+ out=new PrintStream(os, true);
+ }
while(true) {
try {
[commons-daemon] 04/05: Remove empty Javadoc block
Posted by ma...@apache.org.
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 9fd102e88d8b18fb71c2b42fd4c46871d52fb0c0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 17 10:39:20 2022 +0000
Remove empty Javadoc block
---
src/test/java/org/apache/commons/daemon/SimpleDaemon.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
index 94f9b55..f1c3694 100644
--- a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
+++ b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
@@ -24,8 +24,6 @@ import java.util.Date;
import java.util.Enumeration;
import java.util.Vector;
-/**
- */
public class SimpleDaemon implements Daemon, Runnable, DaemonUserSignal {
private ServerSocket server;