diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/event/ClientListenerNotifier.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/event/ClientListenerNotifier.java
index 7f248782aa39..ebd44a0c54dd 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/event/ClientListenerNotifier.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/event/ClientListenerNotifier.java
@@ -43,8 +43,7 @@ public class ClientListenerNotifier {
    private static final Log log = LogFactory.getLog(ClientListenerNotifier.class, Log.class);
    private static final boolean trace = log.isTraceEnabled();
 
-   private static final Map<Class<? extends Annotation>, Class<?>[]> allowedListeners =
-         new HashMap<Class<? extends Annotation>, Class<?>[]>(4);
+   private static final Map<Class<? extends Annotation>, Class<?>[]> allowedListeners = new HashMap<>(4);
 
    static {
       allowedListeners.put(ClientCacheEntryCreated.class, new Class[]{ClientCacheEntryCreatedEvent.class, ClientCacheEntryCustomEvent.class});
@@ -167,8 +166,7 @@ public Transport findTransport(byte[] listenerId) {
    }
 
    private Map<Class<? extends Annotation>, List<ClientListenerInvocation>> findMethods(Object listener) {
-      Map<Class<? extends Annotation>, List<ClientListenerInvocation>> listenerMethodMap =
-            new HashMap<Class<? extends Annotation>, List<ClientListenerInvocation>>(4, 0.99f);
+      Map<Class<? extends Annotation>, List<ClientListenerInvocation>> listenerMethodMap = new HashMap<>(4, 0.99f);
 
       for (Method m : listener.getClass().getMethods()) {
          // loop through all valid method annotations
@@ -181,7 +179,7 @@ private Map<Class<? extends Annotation>, List<ClientListenerInvocation>> findMet
                ClientListenerInvocation invocation = new ClientListenerInvocation(listener, m);
                List<ClientListenerInvocation> invocables = listenerMethodMap.get(annotationType);
                if (invocables == null) {
-                  invocables = new ArrayList<ClientListenerInvocation>();
+                  invocables = new ArrayList<>();
                   listenerMethodMap.put(annotationType, invocables);
                }
 
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/event/ContinuousQueryImpl.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/event/ContinuousQueryImpl.java
index 19c2ba3122f7..4378a5292f2b 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/event/ContinuousQueryImpl.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/event/ContinuousQueryImpl.java
@@ -34,7 +34,7 @@ public final class ContinuousQueryImpl<K, V> implements ContinuousQuery<K, V> {
 
    private final SerializationContext serializationContext;
 
-   private final List<ClientEntryListener> listeners = new ArrayList<ClientEntryListener>();
+   private final List<ClientEntryListener> listeners = new ArrayList<>();
 
    public ContinuousQueryImpl(RemoteCache<K, V> cache) {
       if (cache == null) {
@@ -70,7 +70,7 @@ public void removeContinuousQueryListener(ContinuousQueryListener<K, ?> listener
    }
 
    public List<ContinuousQueryListener<K, ?>> getListeners() {
-      List<ContinuousQueryListener<K, ?>> queryListeners = new ArrayList<ContinuousQueryListener<K, ?>>(listeners.size());
+      List<ContinuousQueryListener<K, ?>> queryListeners = new ArrayList<>(listeners.size());
       for (ClientEntryListener l : listeners) {
          queryListeners.add(l.listener);
       }
diff --git a/remote-query/remote-query-client/src/main/java/org/infinispan/query/remote/client/ContinuousQueryResult.java b/remote-query/remote-query-client/src/main/java/org/infinispan/query/remote/client/ContinuousQueryResult.java
index 7f046bf93fee..447f98da6014 100644
--- a/remote-query/remote-query-client/src/main/java/org/infinispan/query/remote/client/ContinuousQueryResult.java
+++ b/remote-query/remote-query-client/src/main/java/org/infinispan/query/remote/client/ContinuousQueryResult.java
@@ -62,7 +62,7 @@ public ContinuousQueryResult readFrom(ProtoStreamReader reader) throws IOExcepti
          boolean isJoining = reader.readBoolean("isJoining");
          byte[] key = reader.readBytes("key");
          byte[] value = reader.readBytes("value");
-         List<WrappedMessage> projection = reader.readCollection("projection", new ArrayList<WrappedMessage>(), WrappedMessage.class);
+         List<WrappedMessage> projection = reader.readCollection("projection", new ArrayList<>(), WrappedMessage.class);
          Object[] p = null;
          if (!projection.isEmpty()) {
             p = new Object[projection.size()];
diff --git a/remote-query/remote-query-client/src/main/java/org/infinispan/query/remote/client/FilterResult.java b/remote-query/remote-query-client/src/main/java/org/infinispan/query/remote/client/FilterResult.java
index fef6270c91a7..434d8b904785 100644
--- a/remote-query/remote-query-client/src/main/java/org/infinispan/query/remote/client/FilterResult.java
+++ b/remote-query/remote-query-client/src/main/java/org/infinispan/query/remote/client/FilterResult.java
@@ -56,8 +56,8 @@ public static final class Marshaller implements MessageMarshaller<FilterResult>
       @Override
       public FilterResult readFrom(ProtoStreamReader reader) throws IOException {
          byte[] instance = reader.readBytes("instance");
-         List<WrappedMessage> projection = reader.readCollection("projection", new ArrayList<WrappedMessage>(), WrappedMessage.class);
-         List<WrappedMessage> sortProjection = reader.readCollection("sortProjection", new ArrayList<WrappedMessage>(), WrappedMessage.class);
+         List<WrappedMessage> projection = reader.readCollection("projection", new ArrayList<>(), WrappedMessage.class);
+         List<WrappedMessage> sortProjection = reader.readCollection("sortProjection", new ArrayList<>(), WrappedMessage.class);
 
          Object i = null;
          if (instance != null) {
diff --git a/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/filter/JPAProtobufCacheEventFilterConverter.java b/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/filter/JPAProtobufCacheEventFilterConverter.java
index 3a2559102579..6fe8b20306e0 100644
--- a/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/filter/JPAProtobufCacheEventFilterConverter.java
+++ b/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/filter/JPAProtobufCacheEventFilterConverter.java
@@ -33,6 +33,7 @@ public JPAProtobufCacheEventFilterConverter(JPAFilterAndConverter<Object, Object
    }
 
    @Inject
+   @SuppressWarnings("unused")
    protected void injectDependencies(EmbeddedCacheManager cacheManager) {
       serCtx = ProtobufMetadataManagerImpl.getSerializationContextInternal(cacheManager);
    }
diff --git a/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/filter/JPAProtobufFilterAndConverter.java b/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/filter/JPAProtobufFilterAndConverter.java
index 92aaa9fd287f..a552b04a9dbb 100644
--- a/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/filter/JPAProtobufFilterAndConverter.java
+++ b/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/filter/JPAProtobufFilterAndConverter.java
@@ -34,6 +34,7 @@ public JPAProtobufFilterAndConverter(String jpaQuery, Map<String, Object> namedP
    }
 
    @Inject
+   @SuppressWarnings("unused")
    protected void injectDependencies(Configuration cfg) {
       usesValueWrapper = cfg.indexing().index().isEnabled() && !cfg.compatibility().enabled();
    }