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:30 UTC
[aries-rsa] 03/09: Remove redundant casts
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 8ba1f6c30c600263ccd8cd5e9ecf3ddcb4f55032
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Wed Nov 13 09:39:12 2019 +0200
Remove redundant casts
---
.../apache/aries/rsa/discovery/config/PropertyValidatorTest.java | 8 ++++----
.../org/apache/aries/rsa/discovery/local/LocalDiscoveryTest.java | 8 ++++----
.../java/org/apache/aries/rsa/eapub/EventAdminHelperTest.java | 4 ++--
.../aries/rsa/provider/fastbin/tcp/LengthPrefixedCodecTest.java | 4 ++--
.../org/apache/aries/rsa/core/RemoteServiceAdminInstance.java | 2 +-
.../org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java | 6 +++---
.../java/org/apache/aries/rsa/core/event/EventProducerTest.java | 2 +-
.../topologymanager/exporter/EndpointListenerNotifierTest.java | 2 +-
.../rsa/topologymanager/exporter/TopologyManagerExportTest.java | 2 +-
.../topologymanager/importer/local/EndpointListenerImplTest.java | 2 +-
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java b/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java
index de63d4b..414090f 100644
--- a/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java
+++ b/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java
@@ -46,7 +46,7 @@ public class PropertyValidatorTest {
assertThat(toMap(dic).size(), is(1));
assertThat(toMap(dic).keySet().contains("key"), is(true));
- assertThat(toMap(dic).get("key"), Is.<Object>is("value"));
+ assertThat(toMap(dic).get("key"), Is.is("value"));
assertThat(toMap(null), notNullValue());
assertThat(toMap(null).size(), is(0));
@@ -76,17 +76,17 @@ public class PropertyValidatorTest {
map.put(Constants.OBJECTCLASS, "test");
Map<String, Object> config = validatePropertyTypes(map);
assertThat(config.containsKey(Constants.OBJECTCLASS), is(true));
- assertThat(config.get(Constants.OBJECTCLASS), Is.<Object>is(new String[]{"test"}));
+ assertThat(config.get(Constants.OBJECTCLASS), Is.is(new String[]{"test"}));
map = new HashMap<>();
map.put(Constants.OBJECTCLASS, new String[]{"test"});
config = validatePropertyTypes(map);
- assertThat(config.get(Constants.OBJECTCLASS), Is.<Object>is(new String[]{"test"}));
+ assertThat(config.get(Constants.OBJECTCLASS), Is.is(new String[]{"test"}));
map = new HashMap<>();
map.put(Constants.OBJECTCLASS, singletonList("test"));
config = validatePropertyTypes(map);
- assertThat(config.get(Constants.OBJECTCLASS), Is.<Object>is(new String[]{"test"}));
+ assertThat(config.get(Constants.OBJECTCLASS), Is.is(new String[]{"test"}));
}
@Test
diff --git a/discovery/local/src/test/java/org/apache/aries/rsa/discovery/local/LocalDiscoveryTest.java b/discovery/local/src/test/java/org/apache/aries/rsa/discovery/local/LocalDiscoveryTest.java
index b4e53b5..c2e4a82 100644
--- a/discovery/local/src/test/java/org/apache/aries/rsa/discovery/local/LocalDiscoveryTest.java
+++ b/discovery/local/src/test/java/org/apache/aries/rsa/discovery/local/LocalDiscoveryTest.java
@@ -203,7 +203,7 @@ public class LocalDiscoveryTest {
@SuppressWarnings("unchecked")
ServiceReference<EndpointEventListener> sr = EasyMock.createMock(ServiceReference.class);
EasyMock.expect(sr.getPropertyKeys()).andReturn(props.keySet().toArray(new String[] {})).anyTimes();
- EasyMock.expect(sr.getProperty((String) EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
+ EasyMock.expect(sr.getProperty(EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
public Object answer() throws Throwable {
return props.get(EasyMock.getCurrentArguments()[0]);
}
@@ -226,7 +226,7 @@ public class LocalDiscoveryTest {
@SuppressWarnings("unchecked")
ServiceReference<EndpointEventListener> sr2 = EasyMock.createMock(ServiceReference.class);
EasyMock.expect(sr2.getPropertyKeys()).andReturn(props.keySet().toArray(new String[] {})).anyTimes();
- EasyMock.expect(sr2.getProperty((String) EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
+ EasyMock.expect(sr2.getProperty(EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
public Object answer() throws Throwable {
return props.get(EasyMock.getCurrentArguments()[0]);
}
@@ -251,7 +251,7 @@ public class LocalDiscoveryTest {
@SuppressWarnings("unchecked")
ServiceReference<EndpointEventListener> sr3 = EasyMock.createMock(ServiceReference.class);
EasyMock.expect(sr3.getPropertyKeys()).andReturn(props2.keySet().toArray(new String[] {})).anyTimes();
- EasyMock.expect(sr3.getProperty((String) EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
+ EasyMock.expect(sr3.getProperty(EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
public Object answer() throws Throwable {
return props2.get(EasyMock.getCurrentArguments()[0]);
}
@@ -306,7 +306,7 @@ public class LocalDiscoveryTest {
@SuppressWarnings("unchecked")
ServiceReference<EndpointEventListener> sr = EasyMock.createMock(ServiceReference.class);
EasyMock.expect(sr.getPropertyKeys()).andReturn(props.keySet().toArray(new String[] {})).anyTimes();
- EasyMock.expect(sr.getProperty((String) EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
+ EasyMock.expect(sr.getProperty(EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
public Object answer() throws Throwable {
return props.get(EasyMock.getCurrentArguments()[0]);
}
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 fbbbfea..0cb5541 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
@@ -68,7 +68,7 @@ public class EventAdminHelperTest {
EasyMock.replay(bundle);
EventAdmin ea = EasyMock.createNiceMock(EventAdmin.class);
- ea.postEvent((Event) EasyMock.anyObject());
+ ea.postEvent(EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
@Override
public Object answer() throws Throwable {
@@ -144,7 +144,7 @@ public class EventAdminHelperTest {
final Exception exportException = new Exception();
EventAdmin ea = EasyMock.createNiceMock(EventAdmin.class);
- ea.postEvent((Event) EasyMock.anyObject());
+ ea.postEvent(EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
@Override
public Object answer() throws Throwable {
diff --git a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/tcp/LengthPrefixedCodecTest.java b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/tcp/LengthPrefixedCodecTest.java
index 282411e..3e6d202 100644
--- a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/tcp/LengthPrefixedCodecTest.java
+++ b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/tcp/LengthPrefixedCodecTest.java
@@ -111,7 +111,7 @@ public class LengthPrefixedCodecTest {
final Buffer value = Buffer.ascii("TESTDATA");
codec.write(value);
final int bytesThatWillBeWritten = value.length();
- expect(writableByteChannel.write((ByteBuffer) anyObject())).andAnswer(createWriteAnswer(bytesThatWillBeWritten));
+ expect(writableByteChannel.write(anyObject())).andAnswer(createWriteAnswer(bytesThatWillBeWritten));
replay(writableByteChannel);
final BufferState state = codec.flush();
@@ -129,7 +129,7 @@ public class LengthPrefixedCodecTest {
final Buffer value = Buffer.ascii("TESTDATA");
codec.write(value);
final int bytesThatWillBeWritten = value.length() / 2;
- expect(writableByteChannel.write((ByteBuffer) anyObject())).andAnswer(createWriteAnswer(bytesThatWillBeWritten));
+ expect(writableByteChannel.write(anyObject())).andAnswer(createWriteAnswer(bytesThatWillBeWritten));
replay(writableByteChannel);
final BufferState state = codec.flush();
diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminInstance.java b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminInstance.java
index 17f6978..27aef96 100644
--- a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminInstance.java
+++ b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminInstance.java
@@ -53,7 +53,7 @@ public class RemoteServiceAdminInstance implements RemoteServiceAdmin {
@Override
@SuppressWarnings("rawtypes")
public List<ExportRegistration> exportService(final ServiceReference ref, final Map properties) {
- return closed ? Collections.<ExportRegistration>emptyList() : rsaCore.exportService(ref, properties);
+ return closed ? Collections.emptyList() : rsaCore.exportService(ref, properties);
}
@Override
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 c4d7123..52bb1d5 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
@@ -133,7 +133,7 @@ public class RemoteServiceAdminCoreTest {
@Test
public void testImport() {
- expect(apiContext.registerService(EasyMock.aryEq(new String[]{"es.schaaf.my.class"}), anyObject(), (Dictionary<String, ? >)anyObject())).andReturn(null);
+ expect(apiContext.registerService(EasyMock.aryEq(new String[]{"es.schaaf.my.class"}), anyObject(), anyObject())).andReturn(null);
c.replay();
EndpointDescription endpoint2 = createEndpointDesc(MYCONFIG);
@@ -168,7 +168,7 @@ public class RemoteServiceAdminCoreTest {
@Test
public void testImportWithMultipleInterfaces() {
- expect(apiContext.registerService(EasyMock.aryEq(new String[]{"es.schaaf.my.class", "java.lang.Runnable"}), anyObject(), (Dictionary<String, ? >)anyObject())).andReturn(null);
+ expect(apiContext.registerService(EasyMock.aryEq(new String[]{"es.schaaf.my.class", "java.lang.Runnable"}), anyObject(), anyObject())).andReturn(null);
c.replay();
@@ -356,7 +356,7 @@ public class RemoteServiceAdminCoreTest {
ServiceReference sref = c.createMock(ServiceReference.class);
expect(sref.getBundle()).andReturn(sb).anyTimes();
expect(sref.getPropertyKeys()).andReturn(propKeys).anyTimes();
- expect(sref.getProperty((String) EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
+ expect(sref.getProperty(EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
@Override
public Object answer() throws Throwable {
return sProps.get(EasyMock.getCurrentArguments()[0]);
diff --git a/rsa/src/test/java/org/apache/aries/rsa/core/event/EventProducerTest.java b/rsa/src/test/java/org/apache/aries/rsa/core/event/EventProducerTest.java
index 47a7fb9..ac09c78 100644
--- a/rsa/src/test/java/org/apache/aries/rsa/core/event/EventProducerTest.java
+++ b/rsa/src/test/java/org/apache/aries/rsa/core/event/EventProducerTest.java
@@ -99,7 +99,7 @@ public class EventProducerTest {
EventProducer eventProducer = new EventProducer(bc);
final Exception exportException = new Exception();
ExportRegistrationImpl ereg = new ExportRegistrationImpl(exportException, closeHandler, eventProducer);
- eventProducer.publishNotification(Arrays.<ExportRegistration>asList(ereg));
+ eventProducer.publishNotification(Arrays.asList(ereg));
RemoteServiceAdminEvent rsae = capturedEvent.getValue();
Assert.assertSame(exportException, rsae.getException());
diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/EndpointListenerNotifierTest.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/EndpointListenerNotifierTest.java
index eb8d276..95bc7f3 100644
--- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/EndpointListenerNotifierTest.java
+++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/EndpointListenerNotifierTest.java
@@ -81,7 +81,7 @@ public class EndpointListenerNotifierTest {
EndpointListenerNotifier notifier = new EndpointListenerNotifier();
Filter filter = FrameworkUtil.createFilter("(objectClass=myClass)");
- notifier.add(epl, new HashSet(asList(filter)), Collections.<EndpointDescription>emptyList());
+ notifier.add(epl, new HashSet(asList(filter)), Collections.emptyList());
notifier.sendEvent(new EndpointEvent(EndpointEvent.ADDED, endpoint1));
notifier.sendEvent(new EndpointEvent(EndpointEvent.ADDED, endpoint2));
notifier.sendEvent(new EndpointEvent(EndpointEvent.REMOVED, endpoint1));
diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExportTest.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExportTest.java
index ddc2aec..6d2639a 100644
--- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExportTest.java
+++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExportTest.java
@@ -135,7 +135,7 @@ public class TopologyManagerExportTest {
final ServiceReference sref,
EndpointDescription epd) {
ExportRegistration exportRegistration = createExportRegistration(c, epd);
- expect(rsa.exportService(EasyMock.same(sref), (Map<String, Object>)EasyMock.anyObject()))
+ expect(rsa.exportService(EasyMock.same(sref), EasyMock.anyObject()))
.andReturn(Collections.singletonList(exportRegistration)).once();
}
diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerImplTest.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerImplTest.java
index af1e357..e92b6aa 100644
--- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerImplTest.java
+++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerImplTest.java
@@ -54,7 +54,7 @@ public class EndpointListenerImplTest extends Assert {
EasyMock.anyObject(),
(Dictionary)EasyMock.anyObject())).andReturn(sr).atLeastOnce();
- sr.setProperties((Dictionary)EasyMock.anyObject());
+ sr.setProperties(EasyMock.anyObject());
// expect property changes based on later calls
EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {