Modernize codebase (#229)

Changes:
* adopt diamond `<>`
* replace `NOPMD` with `NOSONAR`
* collapse identical catch blocks with pipe `|`

Author: cstamas

leftovers/SisuGuice.java

@@ -35,7 +35,7 @@ public final class SisuGuice
     // Implementation fields
     // ----------------------------------------------------------------------
 
-    private static final ThreadLocal<BeanLocator> LOCATOR = new InheritableThreadLocal<BeanLocator>();
+    private static final ThreadLocal<BeanLocator> LOCATOR = new InheritableThreadLocal<>();
 
     private static volatile BeanLocator latest;
 

leftovers/peaberry.core/src/main/java/org/eclipse/sisu/peaberry/Peaberry.java

@@ -93,7 +93,7 @@ private Peaberry() {}
    * @return dynamic service builder
    */
   public static <T> DecoratedServiceBuilder<T> service(final Key<T> key) {
-    return new ServiceBuilderImpl<T>(key);
+    return new ServiceBuilderImpl<>(key);
   }
 
   /**
@@ -103,7 +103,7 @@ public static <T> DecoratedServiceBuilder<T> service(final Key<T> key) {
    * @return dynamic service builder
    */
   public static <T> DecoratedServiceBuilder<T> service(final TypeLiteral<T> type) {
-    return new ServiceBuilderImpl<T>(Key.get(type));
+    return new ServiceBuilderImpl<>(Key.get(type));
   }
 
   /**
@@ -113,7 +113,7 @@ public static <T> DecoratedServiceBuilder<T> service(final TypeLiteral<T> type)
    * @return dynamic service builder
    */
   public static <T> DecoratedServiceBuilder<T> service(final Class<T> clazz) {
-    return new ServiceBuilderImpl<T>(Key.get(clazz));
+    return new ServiceBuilderImpl<>(Key.get(clazz));
   }
 
   /**
@@ -123,7 +123,7 @@ public static <T> DecoratedServiceBuilder<T> service(final Class<T> clazz) {
    * @return dynamic service builder
    */
   public static <T> DecoratedServiceBuilder<T> service(final T instance) {
-    return new ServiceBuilderImpl<T>(instance);
+    return new ServiceBuilderImpl<>(instance);
   }
 
   /**

leftovers/peaberry.core/src/main/java/org/eclipse/sisu/peaberry/cache/AbstractServiceImport.java

@@ -55,7 +55,7 @@ protected AbstractServiceImport() {
     // need accurate usage count
     count = new AtomicInteger();
 
-    watchers = new ArrayList<Export<?>>(2);
+    watchers = new ArrayList<>(2);
   }
 
   public final T get() {
@@ -130,7 +130,7 @@ void flush(final int targetGeneration) {
         } else {
           try {
             releaseService(instance);
-          } catch (final RuntimeException re) {/* already gone */} // NOPMD
+          } catch (final RuntimeException re) {/* already gone */} // NOSONAR
           finally {
             instance = null;
           }

leftovers/peaberry.core/src/main/java/org/eclipse/sisu/peaberry/cache/AbstractServiceListener.java

@@ -37,8 +37,8 @@ public abstract class AbstractServiceListener<T> {
   private final List<ServiceWatcher<T>> watchers;
 
   protected AbstractServiceListener() {
-    imports = new ArrayList<AbstractServiceImport<T>>(4);
-    watchers = new ArrayList<ServiceWatcher<T>>(2);
+    imports = new ArrayList<>(4);
+    watchers = new ArrayList<>(2);
   }
 
   @SuppressWarnings("unchecked")

leftovers/peaberry.core/src/main/java/org/eclipse/sisu/peaberry/cache/AbstractServiceRegistry.java

@@ -33,7 +33,7 @@ public abstract class AbstractServiceRegistry
 
   // per-class/filter map of service listeners (much faster than polling)
   private final ConcurrentMap<String, AbstractServiceListener<?>> listenerMap =
-      new ConcurrentHashMap<String, AbstractServiceListener<?>>(16, 0.75f, 2);
+      new ConcurrentHashMap<>(16, 0.75f, 2);
 
   protected AbstractServiceRegistry(final boolean useNativeFilter) {
     this.useNativeFilter = useNativeFilter;
@@ -91,7 +91,7 @@ private AbstractServiceListener<?> registerListener(final String ldapFilter) {
   private String getLdapFilter(final Class<?> clazz, final AttributeFilter[] filterRef) {
     final String clazzFilter;
 
-    if (null != clazz && Object.class != clazz) { // NOPMD
+    if (null != clazz && Object.class != clazz) { // NOSONAR
       clazzFilter = "(objectClass=" + clazz.getName() + ')';
     } else {
       clazzFilter = null;
@@ -104,7 +104,7 @@ private String getLdapFilter(final Class<?> clazz, final AttributeFilter[] filte
         filterRef[0] = null; // yes, so we don't need object anymore
 
         return null == clazzFilter ? ldapFilter : "(&" + clazzFilter + ldapFilter + ')';
-      } catch (final IllegalArgumentException e) {/* not native LDAP */} // NOPMD
+      } catch (final IllegalArgumentException e) {/* not native LDAP */} // NOSONAR
     }
 
     return clazzFilter;

leftovers/peaberry.core/src/main/java/org/eclipse/sisu/peaberry/cache/FilteredIterableService.java

@@ -38,7 +38,7 @@ final class FilteredIterableService<T>
   }
 
   public Iterator<Import<T>> iterator() {
-    return new Iterator<Import<T>>() {
+    return new Iterator<>() {
 
       // track where we've been...
       private Import<T> prevImport;

leftovers/peaberry.core/src/main/java/org/eclipse/sisu/peaberry/cache/FilteredServiceWatcher.java

@@ -37,7 +37,7 @@ public FilteredServiceWatcher(final AttributeFilter filter, final ServiceWatcher
 
   public <T extends S> Export<T> add(final Import<T> service) {
     // service metadata can change, so must be able to re-check
-    return new FilteredExport<T>(service);
+    return new FilteredExport<>(service);
   }
 
   private final class FilteredExport<T extends S>

leftovers/peaberry.core/src/main/java/org/eclipse/sisu/peaberry/cache/RegistryChain.java

@@ -50,7 +50,7 @@ public final <T> Iterable<Import<T>> lookup(final Class<T> clazz, final Attribut
     // support lazy lookup from multiple registries
     for (int i = 0; i < registries.length; i++) {
       final ServiceRegistry reg = registries[i];
-      lazyIterables[i] = new Iterable<Import<T>>() { // NOPMD
+      lazyIterables[i] = new Iterable<>() { // NOSONAR
             private volatile Iterable<Import<T>> iterable;
 
             // delay lookup until absolutely necessary
@@ -70,7 +70,7 @@ public Iterator<Import<T>> iterator() {
     // chain the iterators together
     return new Iterable<Import<T>>() {
       public Iterator<Import<T>> iterator() {
-        return new IteratorChain<Import<T>>(lazyIterables);
+        return new IteratorChain<>(lazyIterables);
       }
     };
   }
@@ -81,7 +81,7 @@ public final <T> void watch(final Class<T> clazz, final AttributeFilter filter,
     for (final ServiceRegistry r : registries) {
       try {
         r.watch(clazz, filter, watcher); // attempt to watch all of them
-      } catch (final UnsupportedOperationException e) {/* unable to watch */} // NOPMD
+      } catch (final UnsupportedOperationException e) {/* unable to watch */} // NOSONAR
     }
   }
 

leftovers/peaberry.core/src/main/java/org/eclipse/sisu/peaberry/internal/ComputedMapFactory.java

@@ -46,7 +46,7 @@ interface Function<K, V> {
    */
   static <K, V> ConcurrentMap<K, V> computedMap(final ReferenceType keyType,
       final ReferenceType valType, final int capacity, final Function<K, V> function) {
-    return new ComputedMap<K, V>(keyType, valType, capacity, function);
+    return new ComputedMap<>(keyType, valType, capacity, function);
   }
 
   private static final class ComputedMap<K, V>

leftovers/peaberry.core/src/main/java/org/eclipse/sisu/peaberry/internal/ConcurrentServiceWatcher.java

@@ -89,7 +89,7 @@ public synchronized <T extends S> Export<T> add(final Import<T> service) {
     updateBestService();
 
     // every new service has a tracker
-    return new TrackingExport<T>(service);
+    return new TrackingExport<>(service);
   }
 
   void updateBestService() {