You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by am...@apache.org on 2019/11/14 09:51:33 UTC
[aries-rsa] 06/09: Remove explicit type arguments
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit d895a7beb275c020f1da40749ab00dc7efd8b977
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Wed Nov 13 09:59:24 2019 +0200
Remove explicit type arguments
---
.../java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java | 2 +-
.../aries/rsa/discovery/local/EndpointDescriptionBundleParser.java | 2 +-
.../src/test/java/org/apache/aries/rsa/eapub/EventAdminHelperTest.java | 2 +-
.../test/java/org/apache/aries/rsa/provider/fastbin/InvocationTest.java | 2 +-
.../test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java | 2 +-
.../src/main/java/org/apache/aries/rsa/topologymanager/Activator.java | 2 +-
.../apache/aries/rsa/topologymanager/exporter/DefaultExportPolicy.java | 2 +-
.../aries/rsa/topologymanager/importer/TopologyManagerImport.java | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java
index 8e25032..3843dce 100644
--- a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java
+++ b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java
@@ -231,7 +231,7 @@ class PropertiesMapper {
}
public List<PropertyType> fromProps(Map<String, Object> m) {
- List<PropertyType> props = new ArrayList<PropertyType>();
+ List<PropertyType> props = new ArrayList<>();
for (Map.Entry<String, Object> entry : m.entrySet()) {
String key = entry.getKey();
Object val = entry.getValue();
diff --git a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/local/EndpointDescriptionBundleParser.java b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/local/EndpointDescriptionBundleParser.java
index ec5b2f7..084b8b2 100644
--- a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/local/EndpointDescriptionBundleParser.java
+++ b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/local/EndpointDescriptionBundleParser.java
@@ -77,7 +77,7 @@ public final class EndpointDescriptionBundleParser {
}
Enumeration<URL> urls = b.findEntries(dir, filePattern, false);
- return (urls == null) ? Collections.enumeration(new ArrayList<URL>()) : urls;
+ return (urls == null) ? Collections.enumeration(new ArrayList<>()) : urls;
}
private static String getRemoteServicesDir(Bundle b) {
diff --git a/eapub/src/test/java/org/apache/aries/rsa/eapub/EventAdminHelperTest.java b/eapub/src/test/java/org/apache/aries/rsa/eapub/EventAdminHelperTest.java
index 0cb5541..facb7d8 100644
--- a/eapub/src/test/java/org/apache/aries/rsa/eapub/EventAdminHelperTest.java
+++ b/eapub/src/test/java/org/apache/aries/rsa/eapub/EventAdminHelperTest.java
@@ -138,7 +138,7 @@ public class EventAdminHelperTest {
final Bundle bundle = EasyMock.createNiceMock(Bundle.class);
EasyMock.expect(bundle.getBundleId()).andReturn(42L).anyTimes();
EasyMock.expect(bundle.getSymbolicName()).andReturn("test.bundle").anyTimes();
- EasyMock.expect(bundle.getHeaders()).andReturn(new Hashtable<String, String>()).anyTimes();
+ EasyMock.expect(bundle.getHeaders()).andReturn(new Hashtable<>()).anyTimes();
EasyMock.replay(bundle);
final Exception exportException = new Exception();
diff --git a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/InvocationTest.java b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/InvocationTest.java
index 98fbd31..9574f79 100644
--- a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/InvocationTest.java
+++ b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/InvocationTest.java
@@ -102,7 +102,7 @@ public class InvocationTest {
assertEquals("Hello Hiram!", hello.protobuf(stringValue("Hiram")).getValue());
- AsyncCallbackFuture<StringValue.Getter> future2 = new AsyncCallbackFuture<StringValue.Getter>();
+ AsyncCallbackFuture<StringValue.Getter> future2 = new AsyncCallbackFuture<>();
hello.protobuf(stringValue("Hiram Async"), future2);
assertEquals("Hello Hiram Async!", future2.get(2, TimeUnit.SECONDS).getValue());
diff --git a/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java b/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java
index 52bb1d5..79c485e 100644
--- a/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java
+++ b/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java
@@ -342,7 +342,7 @@ public class RemoteServiceAdminCoreTest {
expect(b.getSymbolicName()).andReturn("rsabundle").anyTimes();
expect(b.getBundleId()).andReturn(10L).anyTimes();
expect(b.getVersion()).andReturn(new Version("1.0.0")).anyTimes();
- expect(b.getHeaders()).andReturn(new Hashtable<String, String>()).anyTimes();
+ expect(b.getHeaders()).andReturn(new Hashtable<>()).anyTimes();
return b;
}
diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
index 352a294..c353775 100644
--- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
+++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
@@ -119,7 +119,7 @@ public class Activator implements BundleActivator {
public void doStart(final BundleContext bc, ExportPolicy policy) {
LOG.debug("TopologyManager: start()");
notifier = new EndpointListenerNotifier();
- exportExecutor = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new NamedThreadFactory(TopologyManagerExport.class));
+ exportExecutor = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new NamedThreadFactory(TopologyManagerExport.class));
exportManager = new TopologyManagerExport(notifier, exportExecutor, policy);
epeListenerTracker = new EndpointEventListenerTracker(bc, exportManager);
importManager = new TopologyManagerImport(bc);
diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/DefaultExportPolicy.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/DefaultExportPolicy.java
index 541b81d..18ad297 100644
--- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/DefaultExportPolicy.java
+++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/DefaultExportPolicy.java
@@ -31,7 +31,7 @@ public class DefaultExportPolicy implements ExportPolicy {
@Override
public Map<String, ?> additionalParameters(ServiceReference<?> sref) {
- return new HashMap<String, Object>();
+ return new HashMap<>();
}
}
diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
index 1225a6e..97273ff 100644
--- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
+++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
@@ -67,7 +67,7 @@ public class TopologyManagerImport implements EndpointEventListener, RemoteServi
public TopologyManagerImport(BundleContext bc) {
this.rsaSet = new CopyOnWriteArraySet<>();
bctx = bc;
- execService = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new NamedThreadFactory(getClass()));
+ execService = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new NamedThreadFactory(getClass()));
}
public void start() {