Small lambda improvements and usage of method references
Change-Id: I43ae3ad2cc915ccb2bbeb381ce9103a4b8926d2c
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/ServiceSupplier.java b/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/ServiceSupplier.java
index e010b34..82be02e 100644
--- a/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/ServiceSupplier.java
+++ b/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/ServiceSupplier.java
@@ -204,8 +204,8 @@
}
private synchronized void trackService(BundleContext context, Class<?> serviceClass, IRequestor requestor) {
- Map<Class<?>, ServiceHandler> map = this.handlerList.computeIfAbsent(context, (k) -> new ConcurrentHashMap<>());
- ServiceHandler handler = map.computeIfAbsent(serviceClass, (cl) -> {
+ Map<Class<?>, ServiceHandler> map = this.handlerList.computeIfAbsent(context, k -> new ConcurrentHashMap<>());
+ ServiceHandler handler = map.computeIfAbsent(serviceClass, cl -> {
ServiceHandler h = new ServiceHandler(this,context, serviceClass);
context.addServiceListener(h);
return h;
diff --git a/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/TranslationObjectSupplier.java b/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/TranslationObjectSupplier.java
index c7f5615..1f4f984 100644
--- a/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/TranslationObjectSupplier.java
+++ b/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/TranslationObjectSupplier.java
@@ -131,9 +131,7 @@
* The {@link IRequestor} that requested the instance.
*/
private void addListener(Class<?> descriptorsClass, IRequestor requestor) {
- Set<IRequestor> registered = this.listeners.computeIfAbsent(descriptorsClass, (dc) -> {
- return ConcurrentHashMap.newKeySet();
- });
+ Set<IRequestor> registered = this.listeners.computeIfAbsent(descriptorsClass, dc -> ConcurrentHashMap.newKeySet());
registered.add(requestor);
}
diff --git a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/ServiceSupplierTestCase.java b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/ServiceSupplierTestCase.java
index 00d6733..8304d76 100644
--- a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/ServiceSupplierTestCase.java
+++ b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/ServiceSupplierTestCase.java
@@ -77,7 +77,7 @@
@After
public void cleanup() {
- this.registrations.forEach( r -> r.unregister());
+ this.registrations.forEach( ServiceRegistration::unregister);
}
@Test
