You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2018/12/05 12:40:50 UTC
[05/12] tomee git commit: usage diamond operator
usage diamond operator
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5744022f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5744022f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5744022f
Branch: refs/heads/master
Commit: 5744022f0e0544f1b4cd0845ccf504360b2059d5
Parents: f228013
Author: Hayri Cicek <ha...@kodnito.com>
Authored: Mon Dec 3 19:41:14 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
Committed: Mon Dec 3 19:41:14 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/server/admin/Stop.java | 6 +++---
.../apache/openejb/server/auth/ExactIPAddressPermission.java | 1 +
.../apache/openejb/server/auth/ExactIPv6AddressPermission.java | 1 +
.../openejb/server/auth/FactorizedIPAddressPermission.java | 1 +
.../apache/openejb/server/auth/IPAddressPermissionEditor.java | 2 ++
.../apache/openejb/server/auth/NetmaskIPAddressPermission.java | 1 +
.../openejb/server/auth/NetmaskIPv6AddressPermission.java | 1 +
.../org/apache/openejb/server/auth/PermitAllPermission.java | 1 +
.../openejb/server/auth/StartWithIPAddressPermission.java | 1 +
.../main/java/org/apache/openejb/server/osgi/Activator.java | 2 ++
.../org/apache/openejb/server/osgi/ServiceManagerExtender.java | 6 +++---
.../org/apache/openejb/server/stream/CountingOutputStream.java | 2 ++
12 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java b/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java
index 68f1c73..fda3b95 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java
@@ -30,7 +30,7 @@ import java.util.Properties;
@SuppressWarnings("UseOfSystemOutOrSystemErr")
public class Stop {
- private static final String helpBase = "META-INF/org.apache.openejb.cli/";
+ private static final String HELP_BASE = "META-INF/org.apache.openejb.cli/";
public static void stop(final String host, final int port) {
@@ -116,7 +116,7 @@ public class Stop {
InputStream in = null;
try {
- final URL resource = Thread.currentThread().getContextClassLoader().getResource(helpBase + "stop.help");
+ final URL resource = Thread.currentThread().getContextClassLoader().getResource(HELP_BASE + "stop.help");
if (resource != null) {
in = resource.openConnection().getInputStream();
@@ -151,7 +151,7 @@ public class Stop {
System.out.println(header);
InputStream in = null;
try {
- final URL resource = Thread.currentThread().getContextClassLoader().getResource(helpBase + "stop.examples");
+ final URL resource = Thread.currentThread().getContextClassLoader().getResource(HELP_BASE + "stop.examples");
if (resource != null) {
in = resource.openConnection().getInputStream();
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java
index dc226b1..5bb280b 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java
@@ -56,6 +56,7 @@ public class ExactIPAddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java
index ceb3fb0..f0a6aa2 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java
@@ -57,6 +57,7 @@ public class ExactIPv6AddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet6Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java
index 0c32605..95b41ed 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java
@@ -82,6 +82,7 @@ public class FactorizedIPAddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java
index 58d28d0..dce82a8 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java
@@ -25,10 +25,12 @@ import java.beans.PropertyEditorSupport;
public class IPAddressPermissionEditor extends PropertyEditorSupport {
private IPAddressPermission addressMask;
+ @Override
public void setAsText(final String text) throws IllegalArgumentException {
addressMask = IPAddressPermissionFactory.getIPAddressMask(text);
}
+ @Override
public Object getValue() {
return addressMask;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java
index 69b54e0..ba60942 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java
@@ -74,6 +74,7 @@ public class NetmaskIPAddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java
index 8d1f1e9..2854454 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java
@@ -75,6 +75,7 @@ public class NetmaskIPv6AddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet6Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java
index 18ca892..0a2c20b 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java
@@ -22,6 +22,7 @@ import java.net.InetAddress;
* @version $Rev$ $Date$
*/
public class PermitAllPermission implements IPAddressPermission {
+ @Override
public boolean implies(InetAddress address) {
return true;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
index af9d831..063cb0f 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
@@ -66,6 +66,7 @@ public class StartWithIPAddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java b/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
index 992f437..2871524 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
@@ -29,11 +29,13 @@ public class Activator implements BundleActivator {
private ServiceManagerExtender manager;
private ServiceRegistration registration;
+ @Override
public void start(final BundleContext bundleContext) throws Exception {
manager = new ServiceManagerExtender(bundleContext);
registration = bundleContext.registerService(ServiceManager.class.getName(), manager, null);
}
+ @Override
public void stop(final BundleContext bundleContext) throws Exception {
if (manager != null) {
manager.shutdown();
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java b/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
index 39549c6..3f18ab4 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
@@ -50,7 +50,7 @@ public class ServiceManagerExtender extends ServiceManager {
private final BundleContext bundleContext;
private BundleTracker tracker;
- private final Map<Bundle, List<Service>> serverMap = new HashMap<Bundle, List<Service>>();
+ private final Map<Bundle, List<Service>> serverMap = new HashMap<>();
private Boolean started;
private volatile boolean stopped = false;
@@ -105,7 +105,7 @@ public class ServiceManagerExtender extends ServiceManager {
}
protected void addedServers(final Bundle bundle, final Map<String, Properties> resources) {
- final List<Service> services = new ArrayList<Service>();
+ final List<Service> services = new ArrayList<>();
for (final Map.Entry<String, Properties> entry : resources.entrySet()) {
services.add(new Service(bundle, entry.getKey(), entry.getValue()));
}
@@ -225,7 +225,7 @@ public class ServiceManagerExtender extends ServiceManager {
final String basePath = "/META-INF/" + ServerService.class.getName() + "/";
final Enumeration<URL> entries = bundle.findEntries(basePath, "*", false);
if (entries != null) {
- final Map<String, Properties> resources = new HashMap<String, Properties>();
+ final Map<String, Properties> resources = new HashMap<>();
while (entries.hasMoreElements()) {
final URL entry = entries.nextElement();
final String name = entry.getPath().substring(basePath.length());
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java b/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java
index 2b63b5f..9b6da4a 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java
@@ -46,10 +46,12 @@ public class CountingOutputStream extends FilterOutputStream {
super.write(b, off, len);
}
+ @Override
public void flush() throws IOException {
out.flush();
}
+ @Override
public void close() throws IOException {
out.close();
}