diff --git a/cluster-split-brain-protection/src/main/java/CustomSplitBrainProtectionFunction.java b/cluster-split-brain-protection/src/main/java/CustomSplitBrainProtectionFunction.java index 39e246774..9bf6a620b 100644 --- a/cluster-split-brain-protection/src/main/java/CustomSplitBrainProtectionFunction.java +++ b/cluster-split-brain-protection/src/main/java/CustomSplitBrainProtectionFunction.java @@ -23,7 +23,7 @@ public class CustomSplitBrainProtectionFunction implements SplitBrainProtectionF static final long HEARTBEAT_TOLERANCE_MILLIS = 3000; static final int SPLIT_BRAIN_PROTECTION_SIZE = 2; - private Map lastHeartbeatReceived = new HashMap(); + private Map lastHeartbeatReceived = new HashMap<>(); @Override public void memberAdded(MembershipEvent membershipEvent) { diff --git a/cluster-split-brain-protection/src/test/java/CustomSplitBrainProtectionFunctionTest.java b/cluster-split-brain-protection/src/test/java/CustomSplitBrainProtectionFunctionTest.java index d204c3efb..6c10c15e4 100644 --- a/cluster-split-brain-protection/src/test/java/CustomSplitBrainProtectionFunctionTest.java +++ b/cluster-split-brain-protection/src/test/java/CustomSplitBrainProtectionFunctionTest.java @@ -62,7 +62,7 @@ public void splitBrainProtectionAbsent_whenNotEnoughMembers() { splitBrainProtectionFunction.memberAdded(mockEvent(members.get(0))); splitBrainProtectionFunction.memberAdded(mockEvent(members.get(1))); - List splitCluster = new ArrayList(); + List splitCluster = new ArrayList<>(); splitCluster.add(members.get(0)); assertFalse(splitBrainProtectionFunction.apply(splitCluster)); } diff --git a/demo/src/main/java/com/hazelcast/demo/AllTest.java b/demo/src/main/java/com/hazelcast/demo/AllTest.java index fe9c1c8fe..19f886090 100644 --- a/demo/src/main/java/com/hazelcast/demo/AllTest.java +++ b/demo/src/main/java/com/hazelcast/demo/AllTest.java @@ -60,7 +60,7 @@ public final class AllTest { private final HazelcastInstance hazelcast; private final int nThreads; - private final List operations = new ArrayList(); + private final List operations = new ArrayList<>(); private final ExecutorService ex; private final Random random = new Random(); private final AtomicInteger messagesReceived = new AtomicInteger(0); @@ -256,9 +256,7 @@ private List loadMapOperations() { IMap map = hazelcast.getMap("myMap"); try { map.getAsync(random.nextInt(SIZE)).toCompletableFuture().get(); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } catch (ExecutionException e) { + } catch (InterruptedException | ExecutionException e) { throw new RuntimeException(e); } }, 1); @@ -344,9 +342,7 @@ private List loadMapOperations() { try { map.putAsync(random.nextInt(SIZE), new Customer(random.nextInt(100), String.valueOf(random.nextInt(10000))) ).toCompletableFuture().get(); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } catch (ExecutionException e) { + } catch (InterruptedException | ExecutionException e) { throw new RuntimeException(e); } }, 5); diff --git a/demo/src/main/java/com/hazelcast/demo/LongRunningTest.java b/demo/src/main/java/com/hazelcast/demo/LongRunningTest.java index 25a29e510..7cd0ebed3 100644 --- a/demo/src/main/java/com/hazelcast/demo/LongRunningTest.java +++ b/demo/src/main/java/com/hazelcast/demo/LongRunningTest.java @@ -41,7 +41,7 @@ public final class LongRunningTest { private static final int STATS_SECONDS = 10; private static final Logger LOGGER = Logger.getLogger(LongRunningTest.class.getName()); - private final List nodes = new CopyOnWriteArrayList(); + private final List nodes = new CopyOnWriteArrayList<>(); private final Random random; private int nodeIdGen; private int starts; @@ -85,7 +85,7 @@ private void run() { Runtime.getRuntime().addShutdownHook(new Thread() { public void run() { log("Shutting down " + nodes.size()); - while (nodes.size() > 0) { + while (!nodes.isEmpty()) { removeNode(); } } @@ -251,8 +251,6 @@ public void run() { Stats currentStats = stats.getAndReset(); logger.info("Cluster size: " + clusterSize + ", Operations per second: " + (currentStats.total() / STATS_SECONDS)); - } catch (HazelcastInstanceNotActiveException e) { - throw new RuntimeException(e); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/demo/src/main/java/com/hazelcast/demo/SimpleFunctionalMapTest.java b/demo/src/main/java/com/hazelcast/demo/SimpleFunctionalMapTest.java index 7c561d37c..a364b0385 100644 --- a/demo/src/main/java/com/hazelcast/demo/SimpleFunctionalMapTest.java +++ b/demo/src/main/java/com/hazelcast/demo/SimpleFunctionalMapTest.java @@ -78,7 +78,7 @@ private static Object createValue() { * Map statistics class */ private static class Stats { - Map mapStats = new ConcurrentHashMap(10); + Map mapStats = new ConcurrentHashMap<>(10); Stats() { mapStats.put("put", new AtomicLong(0)); diff --git a/demo/src/main/java/com/hazelcast/demo/SimpleMapTest.java b/demo/src/main/java/com/hazelcast/demo/SimpleMapTest.java index 03eed54cd..7f3a5b663 100644 --- a/demo/src/main/java/com/hazelcast/demo/SimpleMapTest.java +++ b/demo/src/main/java/com/hazelcast/demo/SimpleMapTest.java @@ -160,7 +160,7 @@ private void load(ExecutorService es) throws InterruptedException { final IMap map = instance.getMap(NAMESPACE); final Member thisMember = instance.getCluster().getLocalMember(); - List lsOwnedEntries = new LinkedList(); + List lsOwnedEntries = new LinkedList<>(); for (int i = 0; i < entryCount; i++) { final String key = String.valueOf(i); Partition partition = instance.getPartitionService().getPartition(key); diff --git a/distributed-collections/itemlisteners/src/main/java/ItemListenerMember.java b/distributed-collections/itemlisteners/src/main/java/ItemListenerMember.java index b1519c9a7..ba0650683 100644 --- a/distributed-collections/itemlisteners/src/main/java/ItemListenerMember.java +++ b/distributed-collections/itemlisteners/src/main/java/ItemListenerMember.java @@ -14,10 +14,12 @@ public static void main(String[] args) { } private static class ItemListenerImpl implements ItemListener { + @Override public void itemAdded(ItemEvent itemEvent) { System.out.println("Item added:" + itemEvent.getItem()); } + @Override public void itemRemoved(ItemEvent itemEvent) { System.out.println("Item removed:" + itemEvent.getItem()); } diff --git a/distributed-executor/basic-executor/src/main/java/EchoTask.java b/distributed-executor/basic-executor/src/main/java/EchoTask.java index ab5094405..1b7daed2c 100644 --- a/distributed-executor/basic-executor/src/main/java/EchoTask.java +++ b/distributed-executor/basic-executor/src/main/java/EchoTask.java @@ -8,6 +8,7 @@ public EchoTask(String msg) { this.msg = msg; } + @Override public void run() { try { Thread.sleep(5000); diff --git a/distributed-executor/durable-executor-service/src/main/java/configuration/EchoTask.java b/distributed-executor/durable-executor-service/src/main/java/configuration/EchoTask.java index 3a683b7b5..897dfbcbc 100644 --- a/distributed-executor/durable-executor-service/src/main/java/configuration/EchoTask.java +++ b/distributed-executor/durable-executor-service/src/main/java/configuration/EchoTask.java @@ -28,6 +28,7 @@ public class EchoTask implements Runnable, Serializable { this.msg = msg; } + @Override public void run() { sleepSeconds(5); diff --git a/distributed-executor/executing-on-all-members/src/main/java/SumTask.java b/distributed-executor/executing-on-all-members/src/main/java/SumTask.java index c45906b09..3a015038d 100644 --- a/distributed-executor/executing-on-all-members/src/main/java/SumTask.java +++ b/distributed-executor/executing-on-all-members/src/main/java/SumTask.java @@ -9,10 +9,12 @@ public class SumTask implements Callable, Serializable, HazelcastInstan private transient HazelcastInstance hz; + @Override public void setHazelcastInstance(HazelcastInstance hz) { this.hz = hz; } + @Override public Integer call() throws Exception { IMap map = hz.getMap("map"); int result = 0; diff --git a/distributed-executor/executing-on-key-owner/src/main/java/VerifyTask.java b/distributed-executor/executing-on-key-owner/src/main/java/VerifyTask.java index 79a6bcbe6..6f7bd0b28 100644 --- a/distributed-executor/executing-on-key-owner/src/main/java/VerifyTask.java +++ b/distributed-executor/executing-on-key-owner/src/main/java/VerifyTask.java @@ -13,10 +13,12 @@ public VerifyTask(String key) { this.key = key; } + @Override public void setHazelcastInstance(HazelcastInstance hz) { this.hz = hz; } + @Override public void run() { IMap map = hz.getMap("map"); boolean localKey = map.localKeySet().contains(key); diff --git a/distributed-executor/executing-on-lite-members/src/main/java/ComputationHeavyTask.java b/distributed-executor/executing-on-lite-members/src/main/java/ComputationHeavyTask.java index 6b77e0850..02c012897 100644 --- a/distributed-executor/executing-on-lite-members/src/main/java/ComputationHeavyTask.java +++ b/distributed-executor/executing-on-lite-members/src/main/java/ComputationHeavyTask.java @@ -8,10 +8,12 @@ public class ComputationHeavyTask implements Callable, Serializable, Ha private transient HazelcastInstance hz; + @Override public void setHazelcastInstance(HazelcastInstance hz) { this.hz = hz; } + @Override public Integer call() throws Exception { System.out.println("Running a computation heavy task on " + hz.getCluster().getLocalMember()); return 0; diff --git a/distributed-executor/execution-callback/src/main/java/FibonacciCallable.java b/distributed-executor/execution-callback/src/main/java/FibonacciCallable.java index 024b070ac..f70d93971 100644 --- a/distributed-executor/execution-callback/src/main/java/FibonacciCallable.java +++ b/distributed-executor/execution-callback/src/main/java/FibonacciCallable.java @@ -9,6 +9,7 @@ public FibonacciCallable(int input) { this.input = input; } + @Override public Long call() { return calculate(input); } diff --git a/distributed-executor/execution-callback/src/main/java/MasterMember.java b/distributed-executor/execution-callback/src/main/java/MasterMember.java index e817a9d5a..3a812dbc1 100644 --- a/distributed-executor/execution-callback/src/main/java/MasterMember.java +++ b/distributed-executor/execution-callback/src/main/java/MasterMember.java @@ -9,7 +9,7 @@ public static void main(String[] args) { HazelcastInstance hz = Hazelcast.newHazelcastInstance(); IExecutorService executor = hz.getExecutorService("executor"); - ExecutionCallback executionCallback = new ExecutionCallback() { + ExecutionCallback executionCallback = new ExecutionCallback<>() { public void onFailure(Throwable t) { t.printStackTrace(); } diff --git a/distributed-executor/futures/src/main/java/FibonacciCallable.java b/distributed-executor/futures/src/main/java/FibonacciCallable.java index b97de062f..370769788 100644 --- a/distributed-executor/futures/src/main/java/FibonacciCallable.java +++ b/distributed-executor/futures/src/main/java/FibonacciCallable.java @@ -9,6 +9,7 @@ public FibonacciCallable(int input) { this.input = input; } + @Override public Long call() { return calculate(input); } diff --git a/distributed-executor/scale-out/src/main/java/EchoTask.java b/distributed-executor/scale-out/src/main/java/EchoTask.java index ab5094405..1b7daed2c 100644 --- a/distributed-executor/scale-out/src/main/java/EchoTask.java +++ b/distributed-executor/scale-out/src/main/java/EchoTask.java @@ -8,6 +8,7 @@ public EchoTask(String msg) { this.msg = msg; } + @Override public void run() { try { Thread.sleep(5000); diff --git a/distributed-executor/scale-up/src/main/java/EchoTask.java b/distributed-executor/scale-up/src/main/java/EchoTask.java index ab5094405..1b7daed2c 100644 --- a/distributed-executor/scale-up/src/main/java/EchoTask.java +++ b/distributed-executor/scale-up/src/main/java/EchoTask.java @@ -8,6 +8,7 @@ public EchoTask(String msg) { this.msg = msg; } + @Override public void run() { try { Thread.sleep(5000); diff --git a/distributed-map/criteria-api/src/main/java/PredicateMember.java b/distributed-map/criteria-api/src/main/java/PredicateMember.java index 6f45f51b4..7203c25bd 100644 --- a/distributed-map/criteria-api/src/main/java/PredicateMember.java +++ b/distributed-map/criteria-api/src/main/java/PredicateMember.java @@ -48,11 +48,11 @@ private void run() { } System.out.println("Find name Peter and age 37, which doesn't exist"); - System.out.println("Did we find it? " + (getWithNameAndAge("Peter", 37).size() != 0)); + System.out.println("Did we find it? " + (!getWithNameAndAge("Peter", 37).isEmpty())); } private Set getWithNameNaive(String name) { - Set result = new HashSet(); + Set result = new HashSet<>(); for (Person person : personMap.values()) { if (person.getName().equals(name)) { result.add(person); diff --git a/distributed-map/custom-attributes/src/main/java/com/test/car/Car.java b/distributed-map/custom-attributes/src/main/java/com/test/car/Car.java index 90783f633..2d3d09926 100644 --- a/distributed-map/custom-attributes/src/main/java/com/test/car/Car.java +++ b/distributed-map/custom-attributes/src/main/java/com/test/car/Car.java @@ -9,7 +9,7 @@ public class Car implements Serializable { private Map attributes; public Car(String name) { - attributes = new HashMap(); + attributes = new HashMap<>(); attributes.put("name", name); attributes.put("tripStart", 0); attributes.put("tripStop", 0); diff --git a/distributed-map/mapstore/src/main/java/LoadAll.java b/distributed-map/mapstore/src/main/java/LoadAll.java index 3a83b2723..c1713c5fa 100644 --- a/distributed-map/mapstore/src/main/java/LoadAll.java +++ b/distributed-map/mapstore/src/main/java/LoadAll.java @@ -78,7 +78,7 @@ private static Config createNewConfig(String mapName) { private static class SimpleStore implements MapStore { - private ConcurrentMap store = new ConcurrentHashMap(); + private ConcurrentMap store = new ConcurrentHashMap<>(); @Override public void store(Integer key, Integer value) { @@ -117,7 +117,7 @@ public Integer load(Integer key) { @Override public Map loadAll(Collection keys) { - Map map = new HashMap(); + Map map = new HashMap<>(); for (Integer key : keys) { Integer value = load(key); map.put(key, value); diff --git a/enterprise/auditlog/src/main/java/auditlog/Event.java b/enterprise/auditlog/src/main/java/auditlog/Event.java index 69d41f64f..7c89b5eed 100644 --- a/enterprise/auditlog/src/main/java/auditlog/Event.java +++ b/enterprise/auditlog/src/main/java/auditlog/Event.java @@ -81,7 +81,7 @@ public static Builder builder(String typeId, AuditlogService els) { public static final class Builder implements EventBuilder { private String message; private String typeId; - private Map parameters = new HashMap(); + private Map parameters = new HashMap<>(); private Level level = Level.INFO; private Throwable cause; private long timestamp; diff --git a/enterprise/client-failover-cluster/src/main/java/sample/DeclarativeFailoverExample.java b/enterprise/client-failover-cluster/src/main/java/sample/DeclarativeFailoverExample.java index 03d9f1436..10d8ad4ab 100644 --- a/enterprise/client-failover-cluster/src/main/java/sample/DeclarativeFailoverExample.java +++ b/enterprise/client-failover-cluster/src/main/java/sample/DeclarativeFailoverExample.java @@ -30,7 +30,7 @@ public static void main(String[] args) { //INFO: hz.client_0 [cluster1] [3.12] HazelcastClient 3.12 (20190205 - 3af10e3) is CLIENT_CHANGED_CLUSTER // user can listen the cluster change and take action client.getLifecycleService().addLifecycleListener(event -> { - if (LifecycleEvent.LifecycleState.CLIENT_CHANGED_CLUSTER.equals(event.getState())) { + if (LifecycleEvent.LifecycleState.CLIENT_CHANGED_CLUSTER == event.getState()) { System.out.println("Client has switched to a new cluster"); } }); diff --git a/enterprise/client-failover-cluster/src/main/java/sample/ProgrammaticFailoverExample.java b/enterprise/client-failover-cluster/src/main/java/sample/ProgrammaticFailoverExample.java index 6c2ea6f7e..2c78e23b4 100644 --- a/enterprise/client-failover-cluster/src/main/java/sample/ProgrammaticFailoverExample.java +++ b/enterprise/client-failover-cluster/src/main/java/sample/ProgrammaticFailoverExample.java @@ -48,7 +48,7 @@ public static void main(String[] args) { //INFO: hz.client_0 [cluster1] [3.12] HazelcastClient 3.12 (20190205 - 3af10e3) is CLIENT_CHANGED_CLUSTER // user can listen the cluster change and take action client.getLifecycleService().addLifecycleListener(event -> { - if (LifecycleEvent.LifecycleState.CLIENT_CHANGED_CLUSTER.equals(event.getState())) { + if (LifecycleEvent.LifecycleState.CLIENT_CHANGED_CLUSTER == event.getState()) { System.out.println("Client has switched to a new cluster"); } }); diff --git a/enterprise/hidensity-cache/src/main/java/nearcache/ClientHiDensityNearCacheUsageSupport.java b/enterprise/hidensity-cache/src/main/java/nearcache/ClientHiDensityNearCacheUsageSupport.java index 3c5ae43c9..42a7ff098 100644 --- a/enterprise/hidensity-cache/src/main/java/nearcache/ClientHiDensityNearCacheUsageSupport.java +++ b/enterprise/hidensity-cache/src/main/java/nearcache/ClientHiDensityNearCacheUsageSupport.java @@ -114,7 +114,7 @@ HiDensityNearCacheSupportContext createHiDensityCacheWithHiDensityN EnterpriseSerializationService enterpriseSerializationService = (EnterpriseSerializationService) client.getSerializationService(); - return new HiDensityNearCacheSupportContext(cache, enterpriseSerializationService.getMemoryManager()); + return new HiDensityNearCacheSupportContext<>(cache, enterpriseSerializationService.getMemoryManager()); } class HiDensityNearCacheSupportContext { diff --git a/enterprise/ldap-authentication/src/main/java/simpleldap/SimpleLdapServer.java b/enterprise/ldap-authentication/src/main/java/simpleldap/SimpleLdapServer.java index c5ea4b419..a745fecb8 100644 --- a/enterprise/ldap-authentication/src/main/java/simpleldap/SimpleLdapServer.java +++ b/enterprise/ldap-authentication/src/main/java/simpleldap/SimpleLdapServer.java @@ -140,7 +140,6 @@ public void terminate() throws Exception { /** * Imports given LDIF files to the directory using given directory service and schema manager. * - * @param ldifFiles * @throws Exception */ public void importLdifFiles(String... ldifFiles) throws Exception { @@ -222,6 +221,7 @@ public InMemoryDirectoryServiceFactory(DirectoryService directoryService, Partit /** * {@inheritDoc} */ + @Override public void init(String name) throws Exception { if ((directoryService != null) && directoryService.isStarted()) { return; @@ -266,7 +266,7 @@ public void init(String name) throws Exception { schemaPartition.setWrappedPartition(inMemorySchemaPartition); directoryService.setSchemaPartition(schemaPartition); List errors = schemaManager.getErrors(); - if (errors.size() != 0) { + if (!errors.isEmpty()) { throw new Exception(I18n.err(I18n.ERR_317, Exceptions.printErrors(errors))); } @@ -284,6 +284,7 @@ public void init(String name) throws Exception { /** * {@inheritDoc} */ + @Override public DirectoryService getDirectoryService() throws Exception { return directoryService; } @@ -291,6 +292,7 @@ public DirectoryService getDirectoryService() throws Exception { /** * {@inheritDoc} */ + @Override public PartitionFactory getPartitionFactory() throws Exception { return partitionFactory; } diff --git a/enterprise/tls-custom-login-module/src/main/java/sample/ClientCertCheckingLoginModule.java b/enterprise/tls-custom-login-module/src/main/java/sample/ClientCertCheckingLoginModule.java index 79e5b718c..d4d117fc7 100644 --- a/enterprise/tls-custom-login-module/src/main/java/sample/ClientCertCheckingLoginModule.java +++ b/enterprise/tls-custom-login-module/src/main/java/sample/ClientCertCheckingLoginModule.java @@ -222,7 +222,7 @@ private static Collection getAttributeValues(X509Certificate cert, Strin return Collections.emptySet(); } LdapName ldapName = new LdapName(cert.getSubjectX500Principal().getName()); - Set values = new HashSet(); + Set values = new HashSet<>(); for (Rdn rdn : ldapName.getRdns()) { values.addAll(getAttributeValues(rdn.toAttributes(), attribute)); } @@ -230,7 +230,7 @@ private static Collection getAttributeValues(X509Certificate cert, Strin } private static Collection getAttributeValues(Attributes attributes, String attribute) throws NamingException { - Set names = new HashSet(); + Set names = new HashSet<>(); Attribute attr = attribute != null && attributes != null ? attributes.get(attribute) : null; if (attr != null) { NamingEnumeration values = attr.getAll(); @@ -248,7 +248,7 @@ private static Collection getAttributeValues(Attributes attributes, Stri protected String getStringOption(String optionName, String defaultValue) { String option = getOptionInternal(optionName); - return option != null ? option.toString() : defaultValue; + return option != null ? option : defaultValue; } private String getOptionInternal(String optionName) { diff --git a/enterprise/tls-custom-login-module/src/test/java/sample/ClientCertCheckingLoginModuleTest.java b/enterprise/tls-custom-login-module/src/test/java/sample/ClientCertCheckingLoginModuleTest.java index c82f9a978..b6adbca60 100644 --- a/enterprise/tls-custom-login-module/src/test/java/sample/ClientCertCheckingLoginModuleTest.java +++ b/enterprise/tls-custom-login-module/src/test/java/sample/ClientCertCheckingLoginModuleTest.java @@ -36,7 +36,7 @@ class ClientCertCheckingLoginModuleTest { @AfterEach - public void afterEach() { + void afterEach() { HazelcastClient.shutdownAll(); Hazelcast.shutdownAll(); } diff --git a/enterprise/wan-replication/simulating-max-idle/src/main/java/AbstractMaxIdleSimulator.java b/enterprise/wan-replication/simulating-max-idle/src/main/java/AbstractMaxIdleSimulator.java index ceaca530b..9421e8626 100644 --- a/enterprise/wan-replication/simulating-max-idle/src/main/java/AbstractMaxIdleSimulator.java +++ b/enterprise/wan-replication/simulating-max-idle/src/main/java/AbstractMaxIdleSimulator.java @@ -307,7 +307,7 @@ private void access(long now, Map keyToExpiryData, IMap mapA, IMap mapB) { - if (keyToExpiryData.keySet().size() < 1) { + if (keyToExpiryData.keySet().isEmpty()) { return; } diff --git a/hazelcast-integration/hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/entity/Item.java b/hazelcast-integration/hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/entity/Item.java index 0671742e0..0dd64b255 100644 --- a/hazelcast-integration/hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/entity/Item.java +++ b/hazelcast-integration/hibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/entity/Item.java @@ -24,7 +24,7 @@ public class Item { @OneToMany(cascade = CascadeType.ALL, mappedBy = "item") @Cache(region = "SubItems-Collection-Cache", usage = CacheConcurrencyStrategy.READ_WRITE) - private List subItems = new ArrayList(); + private List subItems = new ArrayList<>(); public Item() { } diff --git a/jcache-1.1/times-table/jcache-server/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java b/jcache-1.1/times-table/jcache-server/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java index 72ba73b0f..076ed3be6 100644 --- a/jcache-1.1/times-table/jcache-server/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java +++ b/jcache-1.1/times-table/jcache-server/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java @@ -51,7 +51,7 @@ public void clients() { log.info("Client => name '{}'", client); } - if (clients.size() > 0) { + if (!clients.isEmpty()) { log.info("-----------------------"); } log.info("[{} client{}]", @@ -81,7 +81,7 @@ public void list() { } } - if (distributedObjects.size() > 0) { + if (!distributedObjects.isEmpty()) { log.info("-----------------------"); } log.info("[{} distributed object{}]", diff --git a/jcache-1.1/times-table/jcache-spring/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java b/jcache-1.1/times-table/jcache-spring/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java index 412bdc8f5..163e519ad 100644 --- a/jcache-1.1/times-table/jcache-spring/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java +++ b/jcache-1.1/times-table/jcache-spring/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java @@ -97,7 +97,7 @@ public void cacheNames() { } } - if (cacheNames.size() > 0) { + if (!cacheNames.isEmpty()) { log.info("-----------------------"); } log.info("[{} cache{} visible]", diff --git a/jcache-1.1/times-table/jcache-standard/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java b/jcache-1.1/times-table/jcache-standard/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java index 94aabd438..2fe3c958e 100644 --- a/jcache-1.1/times-table/jcache-standard/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java +++ b/jcache-1.1/times-table/jcache-standard/src/main/java/com/hazelcast/samples/jcache/timestable/CLI.java @@ -135,7 +135,7 @@ private void cacheNames(CacheManager cacheManager) { } } - if (cacheNames.size() > 0) { + if (!cacheNames.isEmpty()) { log.info("-----------------------"); } log.info("[{} cache{} visible]", diff --git a/jcache/src/main/java/com/hazelcast/examples/AbstractApp.java b/jcache/src/main/java/com/hazelcast/examples/AbstractApp.java index 8d6a12914..fd0cdfe0c 100644 --- a/jcache/src/main/java/com/hazelcast/examples/AbstractApp.java +++ b/jcache/src/main/java/com/hazelcast/examples/AbstractApp.java @@ -65,7 +65,7 @@ protected CacheManager initCacheManager() { */ protected Cache initCache(String name, CacheManager cacheManager) { // configure the cache - MutableConfiguration config = new MutableConfiguration(); + MutableConfiguration config = new MutableConfiguration<>(); config.setStoreByValue(true) .setTypes(String.class, Integer.class) .setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(TEN_SEC)) @@ -80,7 +80,7 @@ protected Cache initCache(String name, CacheManager cacheManage */ protected Cache initCache(String name, CacheManager cacheManager, Duration duration) { // configure the cache - MutableConfiguration config = new MutableConfiguration(); + MutableConfiguration config = new MutableConfiguration<>(); config.setStoreByValue(true) .setTypes(String.class, Integer.class) .setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(duration)) diff --git a/jcache/src/main/java/com/hazelcast/examples/SimpleCacheTest.java b/jcache/src/main/java/com/hazelcast/examples/SimpleCacheTest.java index 71af1092c..3e42a1fc2 100644 --- a/jcache/src/main/java/com/hazelcast/examples/SimpleCacheTest.java +++ b/jcache/src/main/java/com/hazelcast/examples/SimpleCacheTest.java @@ -146,7 +146,7 @@ private void run(ExecutorService es) { propertiesByInstanceItself(instance)); // configure the cache - MutableConfiguration config = new MutableConfiguration(); + MutableConfiguration config = new MutableConfiguration<>(); config.setStoreByValue(true) .setTypes(String.class, Object.class) .setStatisticsEnabled(false); diff --git a/jcache/src/main/java/com/hazelcast/examples/application/Main.java b/jcache/src/main/java/com/hazelcast/examples/application/Main.java index 38b3d765d..e9bfdd6f3 100644 --- a/jcache/src/main/java/com/hazelcast/examples/application/Main.java +++ b/jcache/src/main/java/com/hazelcast/examples/application/Main.java @@ -51,7 +51,7 @@ public static void main(String[] args) throws Exception { Cache userCache = configureCache(userDao); // configure command mapping - Map commands = new LinkedHashMap(); + Map commands = new LinkedHashMap<>(); // general command mappings commands.put("help", new HelpCommand()); diff --git a/jcache/src/main/java/com/hazelcast/examples/application/cache/UserCacheLoader.java b/jcache/src/main/java/com/hazelcast/examples/application/cache/UserCacheLoader.java index 4cbd275ba..2efa2b1d1 100644 --- a/jcache/src/main/java/com/hazelcast/examples/application/cache/UserCacheLoader.java +++ b/jcache/src/main/java/com/hazelcast/examples/application/cache/UserCacheLoader.java @@ -27,7 +27,7 @@ public User load(Integer key) throws CacheLoaderException { @Override public Map loadAll(Iterable keys) throws CacheLoaderException { // create the resulting map - Map loaded = new HashMap(); + Map loaded = new HashMap<>(); // for every key in the given set of keys for (Integer key : keys) { // try to retrieve the user diff --git a/jcache/src/main/java/com/hazelcast/examples/declarative/DummyCacheLoader.java b/jcache/src/main/java/com/hazelcast/examples/declarative/DummyCacheLoader.java index acab2e54e..06921e811 100644 --- a/jcache/src/main/java/com/hazelcast/examples/declarative/DummyCacheLoader.java +++ b/jcache/src/main/java/com/hazelcast/examples/declarative/DummyCacheLoader.java @@ -14,7 +14,7 @@ public String load(String key) throws CacheLoaderException { @Override public Map loadAll(Iterable keys) throws CacheLoaderException { - HashMap map = new HashMap(); + HashMap map = new HashMap<>(); for (String key : keys) { map.put(key, load(key)); } diff --git a/jcache/src/main/java/com/hazelcast/examples/declarative/DummyCacheWriter.java b/jcache/src/main/java/com/hazelcast/examples/declarative/DummyCacheWriter.java index ff4fc76e9..cd829632a 100644 --- a/jcache/src/main/java/com/hazelcast/examples/declarative/DummyCacheWriter.java +++ b/jcache/src/main/java/com/hazelcast/examples/declarative/DummyCacheWriter.java @@ -9,7 +9,7 @@ public class DummyCacheWriter implements CacheWriter { - private final Map map = new HashMap(); + private final Map map = new HashMap<>(); @Override public void write(Cache.Entry entry) throws CacheWriterException { diff --git a/jcache/src/main/java/com/hazelcast/examples/eviction/CustomExpiryPolicy.java b/jcache/src/main/java/com/hazelcast/examples/eviction/CustomExpiryPolicy.java index 3600d0b70..38a9668be 100644 --- a/jcache/src/main/java/com/hazelcast/examples/eviction/CustomExpiryPolicy.java +++ b/jcache/src/main/java/com/hazelcast/examples/eviction/CustomExpiryPolicy.java @@ -83,7 +83,6 @@ static class MyExpiryPolicy implements ExpiryPolicy { /** * By default, new entries live for only two seconds - * @return */ @Override public Duration getExpiryForCreation() { @@ -92,7 +91,6 @@ public Duration getExpiryForCreation() { /** * Access operations do not change expiry time - * @return */ @Override public Duration getExpiryForAccess() { @@ -101,7 +99,6 @@ public Duration getExpiryForAccess() { /** * Update operations make the entry eternal - * @return */ @Override public Duration getExpiryForUpdate() { diff --git a/jcache/src/main/java/com/hazelcast/examples/jcache/client/ClusterGroup.java b/jcache/src/main/java/com/hazelcast/examples/jcache/client/ClusterGroup.java index b893b0a7e..ef1f08919 100644 --- a/jcache/src/main/java/com/hazelcast/examples/jcache/client/ClusterGroup.java +++ b/jcache/src/main/java/com/hazelcast/examples/jcache/client/ClusterGroup.java @@ -37,6 +37,7 @@ private void runApp() { init(); } + @Override public void shutdown() { Hazelcast.shutdownAll(); } diff --git a/jcache/src/main/java/com/hazelcast/examples/jcache/client/PortableDomainObjectExample.java b/jcache/src/main/java/com/hazelcast/examples/jcache/client/PortableDomainObjectExample.java index 0874e70ae..cf8b8ac63 100644 --- a/jcache/src/main/java/com/hazelcast/examples/jcache/client/PortableDomainObjectExample.java +++ b/jcache/src/main/java/com/hazelcast/examples/jcache/client/PortableDomainObjectExample.java @@ -37,7 +37,7 @@ private void cleanUp(ClusterGroup server, CacheManager cacheManager1) { } private Cache getCache(CacheManager cacheManager1) { - MutableConfiguration config = new MutableConfiguration(); + MutableConfiguration config = new MutableConfiguration<>(); config.setStoreByValue(true) .setTypes(String.class, DomainObject.class) .setStatisticsEnabled(false); diff --git a/jcache/src/main/java/com/hazelcast/examples/nearcache/ClientNearCacheUsageSupport.java b/jcache/src/main/java/com/hazelcast/examples/nearcache/ClientNearCacheUsageSupport.java index 68a24f0cc..949dfde7b 100644 --- a/jcache/src/main/java/com/hazelcast/examples/nearcache/ClientNearCacheUsageSupport.java +++ b/jcache/src/main/java/com/hazelcast/examples/nearcache/ClientNearCacheUsageSupport.java @@ -36,7 +36,7 @@ public abstract class ClientNearCacheUsageSupport { private static final int INVALIDATION_DELAY_SECONDS = 2 * parseInt(CACHE_INVALIDATION_MESSAGE_BATCH_FREQUENCY_SECONDS.getDefaultValue()); - protected final List clients = new LinkedList(); + protected final List clients = new LinkedList<>(); private final InMemoryFormat inMemoryFormat; private final HazelcastInstance serverInstance; diff --git a/jet/files/src/main/java/com/hazelcast/samples/jet/files/AccessLogAnalyzer.java b/jet/files/src/main/java/com/hazelcast/samples/jet/files/AccessLogAnalyzer.java index bef7965fe..fb9bf9cad 100644 --- a/jet/files/src/main/java/com/hazelcast/samples/jet/files/AccessLogAnalyzer.java +++ b/jet/files/src/main/java/com/hazelcast/samples/jet/files/AccessLogAnalyzer.java @@ -106,7 +106,7 @@ private static Traverser explodeSubPaths(LogLine logLine) { int qmarkPos = logLine.getEndpoint().indexOf('?'); String endpoint = qmarkPos < 0 ? logLine.getEndpoint() : logLine.getEndpoint().substring(0, qmarkPos); - return new Traverser() { + return new Traverser<>() { private int indexOfSlash; @Override diff --git a/jet/files/src/main/java/com/hazelcast/samples/jet/files/unifiedapi/generated/AvroTrade.java b/jet/files/src/main/java/com/hazelcast/samples/jet/files/unifiedapi/generated/AvroTrade.java index cf14d2490..c8734d0d6 100644 --- a/jet/files/src/main/java/com/hazelcast/samples/jet/files/unifiedapi/generated/AvroTrade.java +++ b/jet/files/src/main/java/com/hazelcast/samples/jet/files/unifiedapi/generated/AvroTrade.java @@ -20,10 +20,10 @@ public class AvroTrade extends org.apache.avro.specific.SpecificRecordBase imple private static SpecificData MODEL$ = new SpecificData(); private static final BinaryMessageEncoder ENCODER = - new BinaryMessageEncoder(MODEL$, SCHEMA$); + new BinaryMessageEncoder<>(MODEL$, SCHEMA$); private static final BinaryMessageDecoder DECODER = - new BinaryMessageDecoder(MODEL$, SCHEMA$); + new BinaryMessageDecoder<>(MODEL$, SCHEMA$); /** * Return the BinaryMessageDecoder instance used by this class. @@ -37,7 +37,7 @@ public static BinaryMessageDecoder getDecoder() { * @param resolver a {@link SchemaStore} used to find schemas by fingerprint */ public static BinaryMessageDecoder createDecoder(SchemaStore resolver) { - return new BinaryMessageDecoder(MODEL$, SCHEMA$, resolver); + return new BinaryMessageDecoder<>(MODEL$, SCHEMA$, resolver); } /** Serializes this AvroTrade to a ByteBuffer. */ @@ -77,9 +77,12 @@ public AvroTrade(java.lang.Long time, java.lang.CharSequence ticker, java.lang.L this.price = price; } - public org.apache.avro.Schema getSchema() { return SCHEMA$; } - // Used by DatumWriter. Applications should not call. - public java.lang.Object get(int field$) { + @Override + public org.apache.avro.Schema getSchema() { return SCHEMA$; } + + // Used by DatumWriter. Applications should not call. + @Override + public java.lang.Object get(int field$) { switch (field$) { case 0: return time; case 1: return ticker; @@ -89,9 +92,10 @@ public java.lang.Object get(int field$) { } } - // Used by DatumReader. Applications should not call. - @SuppressWarnings(value="unchecked") - public void put(int field$, java.lang.Object value$) { + // Used by DatumReader. Applications should not call. + @Override + @SuppressWarnings(value = "unchecked") + public void put(int field$, java.lang.Object value$) { switch (field$) { case 0: time = (java.lang.Long)value$; break; case 1: ticker = (java.lang.CharSequence)value$; break; diff --git a/jet/grpc/src/main/java/com/hazelcast/samples/jet/grpc/BrokerServiceImpl.java b/jet/grpc/src/main/java/com/hazelcast/samples/jet/grpc/BrokerServiceImpl.java index 2e37f9fea..a72e06332 100644 --- a/jet/grpc/src/main/java/com/hazelcast/samples/jet/grpc/BrokerServiceImpl.java +++ b/jet/grpc/src/main/java/com/hazelcast/samples/jet/grpc/BrokerServiceImpl.java @@ -37,7 +37,7 @@ public BrokerServiceImpl(Map brokers) { @Override public StreamObserver brokerInfo(StreamObserver responseObserver) { - return new StreamObserver() { + return new StreamObserver<>() { @Override public void onNext(BrokerInfoRequest request) { String brokerName = brokers.get(request.getId()).name(); diff --git a/jet/hadoop/src/main/java/com/hazelcast/samples/jet/hadoop/generated/User.java b/jet/hadoop/src/main/java/com/hazelcast/samples/jet/hadoop/generated/User.java index 4f9f2bc4f..55f463a29 100644 --- a/jet/hadoop/src/main/java/com/hazelcast/samples/jet/hadoop/generated/User.java +++ b/jet/hadoop/src/main/java/com/hazelcast/samples/jet/hadoop/generated/User.java @@ -21,10 +21,10 @@ public class User extends org.apache.avro.specific.SpecificRecordBase implements private static SpecificData MODEL$ = new SpecificData(); private static final BinaryMessageEncoder ENCODER = - new BinaryMessageEncoder(MODEL$, SCHEMA$); + new BinaryMessageEncoder<>(MODEL$, SCHEMA$); private static final BinaryMessageDecoder DECODER = - new BinaryMessageDecoder(MODEL$, SCHEMA$); + new BinaryMessageDecoder<>(MODEL$, SCHEMA$); /** * Return the BinaryMessageEncoder instance used by this class. @@ -48,7 +48,7 @@ public static BinaryMessageDecoder getDecoder() { * @return a BinaryMessageDecoder instance for this class backed by the given SchemaStore */ public static BinaryMessageDecoder createDecoder(SchemaStore resolver) { - return new BinaryMessageDecoder(MODEL$, SCHEMA$, resolver); + return new BinaryMessageDecoder<>(MODEL$, SCHEMA$, resolver); } /** @@ -97,10 +97,15 @@ public User(java.lang.CharSequence name, java.lang.CharSequence password, java.l this.status = status; } - public org.apache.avro.specific.SpecificData getSpecificData() { return MODEL$; } - public org.apache.avro.Schema getSchema() { return SCHEMA$; } - // Used by DatumWriter. Applications should not call. - public java.lang.Object get(int field$) { + @Override + public org.apache.avro.specific.SpecificData getSpecificData() { return MODEL$; } + + @Override + public org.apache.avro.Schema getSchema() { return SCHEMA$; } + + // Used by DatumWriter. Applications should not call. + @Override + public java.lang.Object get(int field$) { switch (field$) { case 0: return name; case 1: return password; @@ -110,9 +115,10 @@ public java.lang.Object get(int field$) { } } - // Used by DatumReader. Applications should not call. - @SuppressWarnings(value="unchecked") - public void put(int field$, java.lang.Object value$) { + // Used by DatumReader. Applications should not call. + @Override + @SuppressWarnings(value = "unchecked") + public void put(int field$, java.lang.Object value$) { switch (field$) { case 0: name = (java.lang.CharSequence)value$; break; case 1: password = (java.lang.CharSequence)value$; break; diff --git a/jmx/src/main/java/ConnectToJMXBeans.java b/jmx/src/main/java/ConnectToJMXBeans.java index 79db80ff1..e037a9917 100644 --- a/jmx/src/main/java/ConnectToJMXBeans.java +++ b/jmx/src/main/java/ConnectToJMXBeans.java @@ -38,7 +38,7 @@ public static void main(String[] args) throws Exception { MBeanServerConnection mbsc = jmxConnector.getMBeanServerConnection(); // See all Beans available - Set names = new TreeSet(mbsc.queryNames(null, null)); + Set names = new TreeSet<>(mbsc.queryNames(null, null)); for (ObjectName name : names) { System.out.println("\tBean name: " + name); } diff --git a/json/jsongrid/jsongrid-client-java/src/main/java/com/hazelcast/samples/json/jsongrid/ApplicationRunner.java b/json/jsongrid/jsongrid-client-java/src/main/java/com/hazelcast/samples/json/jsongrid/ApplicationRunner.java index bcdf6ac0f..936592ced 100644 --- a/json/jsongrid/jsongrid-client-java/src/main/java/com/hazelcast/samples/json/jsongrid/ApplicationRunner.java +++ b/json/jsongrid/jsongrid-client-java/src/main/java/com/hazelcast/samples/json/jsongrid/ApplicationRunner.java @@ -90,7 +90,6 @@ private void confirmDataLoaded() { * test for a named {@link com.hazelcast.core.IMap IMap}. *

* - * @param iMapName * @return Yes if there, but doesn't force created */ private boolean testIfIMapExists(String iMapName) { @@ -158,7 +157,7 @@ private void runQuery(String sql, String iMapName) { System.out.println(result); } - if (results.size() == 0) { + if (results.isEmpty()) { System.out.println("*** No results ***"); } else { System.out.printf("[ %d result%s]%n", results.size(), (results.size() == 1 ? "" : "s")); diff --git a/json/jsongrid/jsongrid-server/src/main/java/com/hazelcast/samples/json/jsongrid/ApplicationInitializer.java b/json/jsongrid/jsongrid-server/src/main/java/com/hazelcast/samples/json/jsongrid/ApplicationInitializer.java index a723657c1..d1f9a6fba 100644 --- a/json/jsongrid/jsongrid-server/src/main/java/com/hazelcast/samples/json/jsongrid/ApplicationInitializer.java +++ b/json/jsongrid/jsongrid-server/src/main/java/com/hazelcast/samples/json/jsongrid/ApplicationInitializer.java @@ -65,7 +65,7 @@ public void run(String... args) throws Exception { TreeSet keys = new TreeSet<>(iMap.keySet()); - if (keys.size() == 0) { + if (keys.isEmpty()) { log.error("Map '{}' empty", name); } else { Object key = keys.first(); @@ -104,7 +104,7 @@ private Set findTableNames() throws Exception { log.error(sql, e); } - if (names.size() == 0) { + if (names.isEmpty()) { throw new RuntimeException("No results for: " + sql); } diff --git a/learning-basics/configure-datastructures-at-runtime/src/main/java/EchoMapLoader.java b/learning-basics/configure-datastructures-at-runtime/src/main/java/EchoMapLoader.java index 48f4fc1cd..ffee3024c 100644 --- a/learning-basics/configure-datastructures-at-runtime/src/main/java/EchoMapLoader.java +++ b/learning-basics/configure-datastructures-at-runtime/src/main/java/EchoMapLoader.java @@ -31,7 +31,7 @@ public String load(String key) { @Override public Map loadAll(Collection keys) { - Map result = new HashMap(); + Map result = new HashMap<>(); for (String key : keys) { result.put(key, key); } diff --git a/org-website-samples/src/main/java/client/JCacheSample.java b/org-website-samples/src/main/java/client/JCacheSample.java index 267199b9d..10f7a4aa5 100644 --- a/org-website-samples/src/main/java/client/JCacheSample.java +++ b/org-website-samples/src/main/java/client/JCacheSample.java @@ -17,7 +17,7 @@ public static void main(String[] args) { System.setProperty("hazelcast.jcache.provider.type", "client"); // Create the JCache CacheManager CacheManager manager = Caching.getCachingProvider().getCacheManager(); - MutableConfiguration configuration = new MutableConfiguration(); + MutableConfiguration configuration = new MutableConfiguration<>(); // Expire entries after 1 minute configuration.setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(Duration.ONE_MINUTE)); // Get a Cache called "myCache" and configure with 1 minute expiry diff --git a/org-website-samples/src/main/java/member/JCacheSample.java b/org-website-samples/src/main/java/member/JCacheSample.java index d32e3c4bb..90380fb04 100644 --- a/org-website-samples/src/main/java/member/JCacheSample.java +++ b/org-website-samples/src/main/java/member/JCacheSample.java @@ -17,7 +17,7 @@ public static void main(String[] args) { System.setProperty("hazelcast.jcache.provider.type", "server"); // Create the JCache CacheManager CacheManager manager = Caching.getCachingProvider().getCacheManager(); - MutableConfiguration configuration = new MutableConfiguration(); + MutableConfiguration configuration = new MutableConfiguration<>(); // Expire entries after 1 minute configuration.setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(Duration.ONE_MINUTE)); // Get a Cache called "myCache" and configure with 1 minute expiry diff --git a/osgi/src/main/java/com/hazelcast/osgi/examples/OSGiSample.java b/osgi/src/main/java/com/hazelcast/osgi/examples/OSGiSample.java index 6e43f8477..e460c4e08 100644 --- a/osgi/src/main/java/com/hazelcast/osgi/examples/OSGiSample.java +++ b/osgi/src/main/java/com/hazelcast/osgi/examples/OSGiSample.java @@ -30,7 +30,7 @@ public static void main(String[] args) throws Exception { Bundle sampleBundle = null; try { FrameworkFactory frameworkFactory = ServiceLoader.load(FrameworkFactory.class).iterator().next(); - Map frameworkConfigs = new HashMap(); + Map frameworkConfigs = new HashMap<>(); frameworkConfigs.put(Constants.FRAMEWORK_BOOTDELEGATION, "*"); frameworkConfigs.put(Constants.FRAMEWORK_STORAGE_CLEAN, Constants.FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT); frameworkConfigs.put(Constants.FRAMEWORK_BUNDLE_PARENT, Constants.FRAMEWORK_BUNDLE_PARENT_APP); @@ -40,7 +40,7 @@ public static void main(String[] args) throws Exception { framework.start(); bundleContext = framework.getBundleContext(); - List installedBundles = new LinkedList(); + List installedBundles = new LinkedList<>(); // Find the Hazelcast jar which is OSGI bundle also String bundleLocation = Hazelcast.class.getProtectionDomain().getCodeSource().getLocation().toString(); diff --git a/pipeline/src/main/java/PipeliningDemo.java b/pipeline/src/main/java/PipeliningDemo.java index 92c9db77c..34bbbde78 100644 --- a/pipeline/src/main/java/PipeliningDemo.java +++ b/pipeline/src/main/java/PipeliningDemo.java @@ -66,7 +66,7 @@ private void pipelined(int depth) throws Exception { long startMs = System.currentTimeMillis(); Random random = new Random(); for (int i = 0; i < iterations; i++) { - Pipelining pipelining = new Pipelining(depth); + Pipelining pipelining = new Pipelining<>(depth); for (long k = 0; k < getsPerIteration; k++) { int key = random.nextInt(keyDomain); pipelining.add(map.getAsync(key)); diff --git a/serialization/benchmarks/avro/src/main/java/com/hazelcast/samples/serialization/benchmarks/PersonAvroSerializer.java b/serialization/benchmarks/avro/src/main/java/com/hazelcast/samples/serialization/benchmarks/PersonAvroSerializer.java index cf1e249d5..2edda2e97 100644 --- a/serialization/benchmarks/avro/src/main/java/com/hazelcast/samples/serialization/benchmarks/PersonAvroSerializer.java +++ b/serialization/benchmarks/avro/src/main/java/com/hazelcast/samples/serialization/benchmarks/PersonAvroSerializer.java @@ -25,8 +25,8 @@ public class PersonAvroSerializer implements StreamSerializer { private DatumWriter personDatumWriter; public PersonAvroSerializer() { - this.personDataReader = new SpecificDatumReader(PersonAvro.class); - this.personDatumWriter = new SpecificDatumWriter(PersonAvro.class); + this.personDataReader = new SpecificDatumReader<>(PersonAvro.class); + this.personDatumWriter = new SpecificDatumWriter<>(PersonAvro.class); } @Override diff --git a/serialization/benchmarks/kryo/src/main/java/com/hazelcast/samples/serialization/benchmarks/PersonKryoSerializer.java b/serialization/benchmarks/kryo/src/main/java/com/hazelcast/samples/serialization/benchmarks/PersonKryoSerializer.java index 87c64adca..7bd40b683 100644 --- a/serialization/benchmarks/kryo/src/main/java/com/hazelcast/samples/serialization/benchmarks/PersonKryoSerializer.java +++ b/serialization/benchmarks/kryo/src/main/java/com/hazelcast/samples/serialization/benchmarks/PersonKryoSerializer.java @@ -20,7 +20,7 @@ public class PersonKryoSerializer implements StreamSerializer { // Kryo instance is not threadsafe, but expensive, so that is why it is placed in a ThreadLocal. - private static final ThreadLocal KRYO_THREAD_LOCAL = new ThreadLocal() { + private static final ThreadLocal KRYO_THREAD_LOCAL = new ThreadLocal<>() { @Override protected Kryo initialValue() { Kryo kryo = new Kryo(); diff --git a/serialization/benchmarks/runner/src/main/java/com/hazelcast/samples/serialization/benchmarks/Util.java b/serialization/benchmarks/runner/src/main/java/com/hazelcast/samples/serialization/benchmarks/Util.java index 35a3c7b3d..292acac72 100644 --- a/serialization/benchmarks/runner/src/main/java/com/hazelcast/samples/serialization/benchmarks/Util.java +++ b/serialization/benchmarks/runner/src/main/java/com/hazelcast/samples/serialization/benchmarks/Util.java @@ -20,8 +20,6 @@ public class Util { *

A serialization service to serialize and deserialize * Hazelcast format objects. *

- * - * @return */ private static SerializationService createSerializationService() { diff --git a/serialization/hazelcast-airlines/grid-node/src/main/java/com/hazelcast/samples/serialization/hazelcast/airlines/CLI.java b/serialization/hazelcast-airlines/grid-node/src/main/java/com/hazelcast/samples/serialization/hazelcast/airlines/CLI.java index f1fe8f6b2..46df94a39 100644 --- a/serialization/hazelcast-airlines/grid-node/src/main/java/com/hazelcast/samples/serialization/hazelcast/airlines/CLI.java +++ b/serialization/hazelcast-airlines/grid-node/src/main/java/com/hazelcast/samples/serialization/hazelcast/airlines/CLI.java @@ -73,7 +73,7 @@ public String loading( if (flightsMap.containsKey(myKey)) { SeatReservationEntryProcessor seatReservationEntryProcessor = new SeatReservationEntryProcessor(name); - String seat = flightsMap.executeOnKey(myKey, seatReservationEntryProcessor).toString(); + String seat = flightsMap.executeOnKey(myKey, seatReservationEntryProcessor); if (seat == null) { return String.format("Flight '%s' is full, sorry.%n", myKey); diff --git a/serialization/hazelcast-airlines/the-code/src/main/java/com/hazelcast/samples/serialization/hazelcast/airlines/V5FlightSerializer.java b/serialization/hazelcast-airlines/the-code/src/main/java/com/hazelcast/samples/serialization/hazelcast/airlines/V5FlightSerializer.java index da29a3803..554a657af 100644 --- a/serialization/hazelcast-airlines/the-code/src/main/java/com/hazelcast/samples/serialization/hazelcast/airlines/V5FlightSerializer.java +++ b/serialization/hazelcast-airlines/the-code/src/main/java/com/hazelcast/samples/serialization/hazelcast/airlines/V5FlightSerializer.java @@ -30,7 +30,7 @@ public class V5FlightSerializer implements StreamSerializer { * serialize it. *

*/ - private static final ThreadLocal KRYO_THREAD_LOCAL = new ThreadLocal() { + private static final ThreadLocal KRYO_THREAD_LOCAL = new ThreadLocal<>() { @Override protected Kryo initialValue() { Kryo kryo = new Kryo(); diff --git a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/SeatReservationEntryProcessorTest.java b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/SeatReservationEntryProcessorTest.java index c1cde642f..97d9fb314 100644 --- a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/SeatReservationEntryProcessorTest.java +++ b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/SeatReservationEntryProcessorTest.java @@ -27,10 +27,10 @@ *

*/ @Slf4j -public class SeatReservationEntryProcessorTest { +class SeatReservationEntryProcessorTest { @Test - public void test_serialization() throws Exception { + void test_serialization() throws Exception { SeatReservationEntryProcessor objectSent = new SeatReservationEntryProcessor("junit"); Object objectReceived = null; byte[] bytes; @@ -65,7 +65,7 @@ public void test_serialization() throws Exception { @SuppressWarnings({"unchecked", "rawtypes"}) @Test - public void test_business_logic_empty_plane() throws Exception { + void test_business_logic_empty_plane() throws Exception { SeatReservationEntryProcessor seatReservationEntryProcessor = new SeatReservationEntryProcessor("junit"); AbstractFlight v1Flight = new V1Flight(); @@ -82,7 +82,7 @@ public void test_business_logic_empty_plane() throws Exception { @SuppressWarnings({"unchecked", "rawtypes"}) @Test - public void test_business_logic_full_plane() throws Exception { + void test_business_logic_full_plane() throws Exception { SeatReservationEntryProcessor seatReservationEntryProcessor = new SeatReservationEntryProcessor("junit"); AbstractFlight v1Flight = new V1Flight(); @@ -105,7 +105,7 @@ public void test_business_logic_full_plane() throws Exception { @SuppressWarnings({"unchecked", "rawtypes"}) @Test - public void test_business_logic_plane_with_spare_seats() throws Exception { + void test_business_logic_plane_with_spare_seats() throws Exception { SeatReservationEntryProcessor seatReservationEntryProcessor = new SeatReservationEntryProcessor("junit"); AbstractFlight v1Flight = FlightBuilder.buildV1(); diff --git a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V1FlightTest.java b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V1FlightTest.java index 237010518..20c50d433 100644 --- a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V1FlightTest.java +++ b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V1FlightTest.java @@ -21,10 +21,10 @@ *

*/ @Slf4j -public class V1FlightTest { +class V1FlightTest { - @Test - public void test_serialization() throws Exception { + @Test + void test_serialization() throws Exception { V1Flight objectSent = FlightBuilder.buildV1(); Object objectReceived = null; byte[] bytes; diff --git a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V2FlightTest.java b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V2FlightTest.java index f3e26dac5..9d6b12e1b 100644 --- a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V2FlightTest.java +++ b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V2FlightTest.java @@ -21,10 +21,10 @@ *

*/ @Slf4j -public class V2FlightTest { +class V2FlightTest { - @Test - public void test_serialization() throws Exception { + @Test + void test_serialization() throws Exception { V2Flight objectSent = FlightBuilder.buildV2(); Object objectReceived = null; byte[] bytes; diff --git a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V3FlightTest.java b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V3FlightTest.java index da0c64c1f..0589b4d31 100644 --- a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V3FlightTest.java +++ b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V3FlightTest.java @@ -19,10 +19,10 @@ *

*/ @Slf4j -public class V3FlightTest { +class V3FlightTest { @Test - public void test_serialization() throws Exception { + void test_serialization() throws Exception { V3Flight objectSent = FlightBuilder.buildV3(); Object objectReceived = null; byte[] bytes; diff --git a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V4FlightTest.java b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V4FlightTest.java index 273b5c648..810419893 100644 --- a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V4FlightTest.java +++ b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V4FlightTest.java @@ -21,10 +21,10 @@ *

*/ @Slf4j -public class V4FlightTest { +class V4FlightTest { - @Test - public void test_serialization() { + @Test + void test_serialization() { V4Flight objectSent = FlightBuilder.buildV4(); Object objectReceived = null; byte[] bytes; diff --git a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V5FlightTest.java b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V5FlightTest.java index 50e4388c1..49852c0aa 100644 --- a/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V5FlightTest.java +++ b/serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V5FlightTest.java @@ -21,10 +21,10 @@ *

*/ @Slf4j -public class V5FlightTest { +class V5FlightTest { - @Test - public void test_serialization() { + @Test + void test_serialization() { V5Flight objectSent = FlightBuilder.buildV5(); Object objectReceived; byte[] bytes; diff --git a/serialization/kryo-serializer/src/main/java/PersonKryoSerializer.java b/serialization/kryo-serializer/src/main/java/PersonKryoSerializer.java index e017baa83..745113e64 100644 --- a/serialization/kryo-serializer/src/main/java/PersonKryoSerializer.java +++ b/serialization/kryo-serializer/src/main/java/PersonKryoSerializer.java @@ -12,7 +12,7 @@ public class PersonKryoSerializer implements StreamSerializer { // Kryo instance is not threadsafe, but expensive, so that is why it is placed in a ThreadLocal. - private static final ThreadLocal KRYO_THREAD_LOCAL = new ThreadLocal() { + private static final ThreadLocal KRYO_THREAD_LOCAL = new ThreadLocal<>() { @Override protected Kryo initialValue() { Kryo kryo = new Kryo(); @@ -21,10 +21,12 @@ protected Kryo initialValue() { } }; + @Override public int getTypeId() { return 2; } + @Override public void write(ObjectDataOutput objectDataOutput, Person product) throws IOException { Kryo kryo = KRYO_THREAD_LOCAL.get(); @@ -33,6 +35,7 @@ public void write(ObjectDataOutput objectDataOutput, Person product) throws IOEx output.flush(); } + @Override public Person read(ObjectDataInput objectDataInput) throws IOException { InputStream in = (InputStream) objectDataInput; Input input = new Input(in); @@ -40,6 +43,7 @@ public Person read(ObjectDataInput objectDataInput) throws IOException { return kryo.readObject(input, Person.class); } + @Override public void destroy() { } } diff --git a/serialization/portable/src/main/java/PortableFactoryImpl.java b/serialization/portable/src/main/java/PortableFactoryImpl.java index 0a571af7c..ad2aa4cde 100644 --- a/serialization/portable/src/main/java/PortableFactoryImpl.java +++ b/serialization/portable/src/main/java/PortableFactoryImpl.java @@ -6,6 +6,7 @@ public class PortableFactoryImpl implements PortableFactory { static final int PERSON_CLASS_ID = 1; static final int FACTORY_ID = 1; + @Override public Portable create(int classId) { switch (classId) { case PERSON_CLASS_ID: diff --git a/spi/discovery/src/main/java/com/hazelcast/examples/spi/discovery/HostsDiscoveryStrategy.java b/spi/discovery/src/main/java/com/hazelcast/examples/spi/discovery/HostsDiscoveryStrategy.java index dccf7d89d..aea11e0d3 100644 --- a/spi/discovery/src/main/java/com/hazelcast/examples/spi/discovery/HostsDiscoveryStrategy.java +++ b/spi/discovery/src/main/java/com/hazelcast/examples/spi/discovery/HostsDiscoveryStrategy.java @@ -74,7 +74,7 @@ private List filterHosts() { // read all lines List lines = readLines(hosts); - List assignments = new ArrayList(); + List assignments = new ArrayList<>(); for (String line : lines) { // example: // 192.168.0.1 host1.cluster.local @@ -86,7 +86,7 @@ private List filterHosts() { } private Iterable mapToDiscoveryNodes(List assignments) { - Collection discoveredNodes = new ArrayList(); + Collection discoveredNodes = new ArrayList<>(); for (String assignment : assignments) { String address = sliceAddress(assignment); @@ -104,7 +104,7 @@ private Iterable mapToDiscoveryNodes(List assignments) { private List readLines(File hosts) { try { - List lines = new ArrayList(); + List lines = new ArrayList<>(); BufferedReader reader = new BufferedReader(new FileReader(hosts)); String line; diff --git a/spring/spring-boot-caching-hazelcast-cache-manager/src/test/java/com/hazelcast/springboot/caching/ApplicationTest.java b/spring/spring-boot-caching-hazelcast-cache-manager/src/test/java/com/hazelcast/springboot/caching/ApplicationTest.java index ee1de2193..7304977b5 100644 --- a/spring/spring-boot-caching-hazelcast-cache-manager/src/test/java/com/hazelcast/springboot/caching/ApplicationTest.java +++ b/spring/spring-boot-caching-hazelcast-cache-manager/src/test/java/com/hazelcast/springboot/caching/ApplicationTest.java @@ -11,7 +11,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -public class ApplicationTest { +class ApplicationTest { @LocalServerPort private int port; @@ -23,7 +23,7 @@ public class ApplicationTest { private HazelcastInstance hazelcastInstance; @Test - public void useCachedValue() { + void useCachedValue() { // given String isbn = "12345"; String cachedValue = "cached-value"; diff --git a/spring/spring-boot-caching-jcache/src/test/java/com/hazelcast/springboot/caching/ApplicationClientServerTest.java b/spring/spring-boot-caching-jcache/src/test/java/com/hazelcast/springboot/caching/ApplicationClientServerTest.java index f7acf4133..14076998e 100644 --- a/spring/spring-boot-caching-jcache/src/test/java/com/hazelcast/springboot/caching/ApplicationClientServerTest.java +++ b/spring/spring-boot-caching-jcache/src/test/java/com/hazelcast/springboot/caching/ApplicationClientServerTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -public class ApplicationClientServerTest { +class ApplicationClientServerTest { @LocalServerPort private int port; @@ -25,12 +25,12 @@ public class ApplicationClientServerTest { private HazelcastInstance hazelcastInstance; @BeforeAll - public static void setUp() { + static void setUp() { Hazelcast.newHazelcastInstance(); } @Test - public void useCachedValue() { + void useCachedValue() { // given String isbn = "12345"; String cachedValue = "cached-value"; diff --git a/spring/spring-boot-caching-jcache/src/test/java/com/hazelcast/springboot/caching/ApplicationEmbeddedTest.java b/spring/spring-boot-caching-jcache/src/test/java/com/hazelcast/springboot/caching/ApplicationEmbeddedTest.java index c490812c5..67d8c6ddc 100644 --- a/spring/spring-boot-caching-jcache/src/test/java/com/hazelcast/springboot/caching/ApplicationEmbeddedTest.java +++ b/spring/spring-boot-caching-jcache/src/test/java/com/hazelcast/springboot/caching/ApplicationEmbeddedTest.java @@ -13,7 +13,7 @@ @ActiveProfiles("embedded") @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -public class ApplicationEmbeddedTest { +class ApplicationEmbeddedTest { @LocalServerPort private int port; @@ -25,7 +25,7 @@ public class ApplicationEmbeddedTest { private HazelcastInstance hazelcastInstance; @Test - public void useCachedValue() { + void useCachedValue() { // given String isbn = "12345"; String cachedValue = "cached-value"; diff --git a/spring/spring-boot-embedded/src/test/java/guides/hazelcast/springboot/CommandControllerIT.java b/spring/spring-boot-embedded/src/test/java/guides/hazelcast/springboot/CommandControllerIT.java index cab5c2e6a..6cefe9056 100755 --- a/spring/spring-boot-embedded/src/test/java/guides/hazelcast/springboot/CommandControllerIT.java +++ b/spring/spring-boot-embedded/src/test/java/guides/hazelcast/springboot/CommandControllerIT.java @@ -18,7 +18,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = HazelcastApplication.class) -public class CommandControllerIT { +class CommandControllerIT { @Autowired private WebTestClient webTestClient; @@ -30,7 +30,7 @@ public class CommandControllerIT { private Map keyValueMap; @Test - public void testPutRequest() { + void testPutRequest() { //when WebTestClient.ResponseSpec responseSpec = makePutRequest("key1", "value1"); @@ -46,7 +46,7 @@ public void testPutRequest() { } @Test - public void testGetRequest() { + void testGetRequest() { //given makePutRequest("key1", "value1"); @@ -75,7 +75,7 @@ private WebTestClient.ResponseSpec makePutRequest(Object... parameters) { } @Test - public void testHazelcastCluster() { + void testHazelcastCluster() { //given Config config = Config.load(); var hz = Hazelcast.newHazelcastInstance(config); diff --git a/spring/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientController.java b/spring/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientController.java index 433dea1ca..88fdbe753 100644 --- a/spring/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientController.java +++ b/spring/spring-data-hazelcast-chemistry-sample/client/src/main/java/com/hazelcast/samples/spring/data/chemistry/ClientController.java @@ -48,7 +48,7 @@ public ClientController(ChemistryService chemistryService) { @GetMapping("/") public List index() throws MalformedURLException { - List urls = new ArrayList(); + List urls = new ArrayList<>(); urls.add(new URL("http://localhost:8080/halogens")); urls.add(new URL("http://localhost:8080/neutrons")); diff --git a/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Element.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Element.java index c575661c3..f211720b0 100644 --- a/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Element.java +++ b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Element.java @@ -29,6 +29,7 @@ public class Element implements Comparable, Serializable { @Id private String symbol; + @Override public int compareTo(Element that) { return this.symbol.compareTo(that.getSymbol()); } diff --git a/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Isotope.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Isotope.java index bc3fe37be..c25fea5d9 100644 --- a/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Isotope.java +++ b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/Isotope.java @@ -28,6 +28,7 @@ public class Isotope implements Comparable, Serializable { @Id private IsotopeKey isotopeKey; + @Override public int compareTo(Isotope that) { return this.compareTo(that); } diff --git a/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/IsotopeKey.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/IsotopeKey.java index 17c8ac3db..dbab40a47 100644 --- a/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/IsotopeKey.java +++ b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/domain/IsotopeKey.java @@ -16,6 +16,7 @@ public class IsotopeKey implements Comparable, Serializable { private String symbol; private int atomicWeight; + @Override public int compareTo(IsotopeKey that) { int symbolCompare = this.symbol.compareTo(that.getSymbol()); return (symbolCompare != 0 ? symbolCompare : (this.atomicWeight - that.getAtomicWeight())); diff --git a/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/service/ChemistryService.java b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/service/ChemistryService.java index 98c330473..87f3bce48 100644 --- a/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/service/ChemistryService.java +++ b/spring/spring-data-hazelcast-chemistry-sample/common/src/main/java/com/hazelcast/samples/spring/data/chemistry/service/ChemistryService.java @@ -40,7 +40,7 @@ public class ChemistryService { * @return Entry counts for each type */ public Map count() { - Map result = new HashMap(); + Map result = new HashMap<>(); result.put(Constants.KEYSPACE_ELEMENT, this.elementRepository.count()); result.put(Constants.KEYSPACE_ISOTOPE, this.isotopeRepository.count()); @@ -55,7 +55,7 @@ public Map count() { * @return Unique atomic weights, in ascending sequence */ public Set findAtomicWeights() { - Set result = new TreeSet(); + Set result = new TreeSet<>(); for (Isotope isotope : this.isotopeRepository.findAll()) { result.add(isotope.getIsotopeKey().getAtomicWeight()); @@ -88,7 +88,7 @@ public List findElementsByGroupSorted(final int group) { * @return A possibly empty list of elements */ public List findElementsByAtomicWeight(final int weight) { - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); for (Isotope isotope : this.isotopeRepository.findByIsotopeKeyAtomicWeight(weight)) { this.elementRepository.findById(isotope.getIsotopeKey().getSymbol()).ifPresent(result::add); @@ -104,13 +104,13 @@ public List findElementsByAtomicWeight(final int weight) { * @return For each symbol, the variants in the number of neutrons */ public Map> neutrons() { - Map> result = new HashMap>(); + Map> result = new HashMap<>(); for (Element element : this.elementRepository.findAll()) { log.trace("neutrons(): {}", element); String symbol = element.getSymbol(); - Set neutrons = new TreeSet(); + Set neutrons = new TreeSet<>(); // Search isotopeRepository on part of the isotope key for (Isotope isotope : this.isotopeRepository.findByIsotopeKeySymbol(symbol)) { log.trace("neutrons(): {}", isotope); diff --git a/spring/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAwareTask.java b/spring/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAwareTask.java index d70090848..0eddb4d7c 100644 --- a/spring/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAwareTask.java +++ b/spring/springaware-annotation/src/main/java/com/hazelcast/spring/springaware/SpringAwareAwareTask.java @@ -19,6 +19,7 @@ public void setApplicationContext(ApplicationContext applicationContext) this.applicationContext = applicationContext; } + @Override public String call() throws Exception { System.out.println("Getting bean definition names from Spring Context"); return String.join(",", applicationContext.getBeanDefinitionNames()); diff --git a/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationConfig.java b/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationConfig.java index fb545f1e1..97da6cd73 100644 --- a/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationConfig.java +++ b/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationConfig.java @@ -43,7 +43,6 @@ public class ApplicationConfig { * object, used to create a client. There is a similar counterpart for servers. *

* - * @return * @throws IOException */ @Bean diff --git a/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationInitializer.java b/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationInitializer.java index 3720d68db..ea6e93725 100644 --- a/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationInitializer.java +++ b/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationInitializer.java @@ -70,8 +70,6 @@ public CommandLineRunner commandLineRunner() { /** *

Add CDC

- * - * @return */ private boolean createCDCJobs() { // Destination needs to match Cdc.js @@ -125,9 +123,6 @@ private boolean createCDCJobs() { *

* Check for running jobs with similar name *

- * - * @param prefix - * @param jobName */ private void checkJob(String prefix, String jobName) { for (Job job : this.hazelcastInstance.getJet().getJobs()) { diff --git a/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/MyRestController.java b/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/MyRestController.java index 5fa18737e..d5d3f9e24 100644 --- a/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/MyRestController.java +++ b/sql/hazdb/client/src/main/java/com/hazelcast/samples/sql/hazdb/MyRestController.java @@ -52,9 +52,6 @@ public class MyRestController { *

* Use the {@link JdbcTemplate} to execute an SQL query. *

- * - * @param sql - * @return */ @GetMapping(value = "/jdbcNoParam", produces = MediaType.APPLICATION_JSON_VALUE) public String jdbcNoParam(@RequestParam("sql") String sql) { @@ -85,9 +82,6 @@ public String jdbcNoParam(@RequestParam("sql") String sql) { * Use the {@link JdbcTemplate} to execute an SQL query with one {@code String} * parameter. *

- * - * @param sql - * @return */ @GetMapping(value = "/jdbc1StringParam", produces = MediaType.APPLICATION_JSON_VALUE) public String jdbc1StringParam(@RequestParam("sql") String sql, @RequestParam("param") String param) { @@ -118,9 +112,6 @@ public String jdbc1StringParam(@RequestParam("sql") String sql, @RequestParam("p * Use the {@link JdbcTemplate} to execute an SQL query with one {@code Integer} * parameter. *

- * - * @param sql - * @return */ @GetMapping(value = "/jdbc1IntegerParam", produces = MediaType.APPLICATION_JSON_VALUE) public String jdbc1IntegerParam(@RequestParam("sql") String sql, @RequestParam("param") int param) { @@ -151,9 +142,6 @@ public String jdbc1IntegerParam(@RequestParam("sql") String sql, @RequestParam(" * Directly passes SQL query to Hazelcast, and wraps the result as JSON for web * display. *

- * - * @param sql - * @return */ @GetMapping(value = "/sqlQuery", produces = MediaType.APPLICATION_JSON_VALUE) public String sqlQuery(@RequestParam("sql") String sql) { @@ -195,9 +183,6 @@ public String sqlQuery(@RequestParam("sql") String sql) { * Object[] args = new String[] { "Bayern Munich" }; * this.jdbcTemplate.update(sql, args); * - * - * @param sql - * @return */ @GetMapping(value = "/sqlUpdate", produces = MediaType.APPLICATION_JSON_VALUE) public String sqlUpdate(@RequestParam("sql") String sql) { @@ -228,7 +213,6 @@ public String sqlUpdate(@RequestParam("sql") String sql) { * * @param iterator Iterator on something, don't need the class as using * "{@code toString()}" - * @param stringBuilder */ private static void formatResult(Iterator iterator, StringBuilder stringBuilder) { // Worked, even if no rows found @@ -258,8 +242,6 @@ private static void formatResult(Iterator iterator, StringBuilder stringBuild *

* For Kubernetes readiness/liveness probe *

- * - * @return */ @GetMapping("/k8s") public String k8s() { diff --git a/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/CdcPipeline.java b/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/CdcPipeline.java index 735b68f21..3fbb4f348 100644 --- a/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/CdcPipeline.java +++ b/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/CdcPipeline.java @@ -42,9 +42,7 @@ public class CdcPipeline { * value (not used) may be null if create. Both present for create. *

* - * @param mapName * @param observable Null allowed, if no clientside logging needed - * @return */ @SuppressWarnings("rawtypes") public static Pipeline build(String mapName, Observable> observable) { diff --git a/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/Monitor.java b/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/Monitor.java index a581a66af..92a10c579 100644 --- a/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/Monitor.java +++ b/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/Monitor.java @@ -80,7 +80,7 @@ private void logSizes() { .filter(distributedObject -> !distributedObject.getName().startsWith("__")) .map(distributedObject -> distributedObject.getName()).collect(Collectors.toCollection(TreeSet::new)); - if (mapNames.size() == 0) { + if (mapNames.isEmpty()) { LOGGER.info("No maps"); } else { mapNames.forEach(name -> { diff --git a/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/Utils.java b/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/Utils.java index 0a1a311ca..7d375e41c 100644 --- a/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/Utils.java +++ b/sql/hazdb/common/src/main/java/com/hazelcast/samples/sql/hazdb/Utils.java @@ -30,7 +30,6 @@ public class Utils { *

* * @param input May be null - * @return */ public static String makeText(Object json) { String[] tokens = Objects.toString(json) diff --git a/sql/hazdb/server/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationConfig.java b/sql/hazdb/server/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationConfig.java index e9d2438c1..c621ed565 100644 --- a/sql/hazdb/server/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationConfig.java +++ b/sql/hazdb/server/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationConfig.java @@ -41,8 +41,6 @@ public class ApplicationConfig { * This is a {@link com.hazelcast.config.Config Config} object, used to create a * server. There is a similar counterpart for clients. *

- * - * @return */ @Bean public Config config() { diff --git a/sql/hazdb/server/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationInitializer.java b/sql/hazdb/server/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationInitializer.java index 564c39e3c..763b18b6a 100644 --- a/sql/hazdb/server/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationInitializer.java +++ b/sql/hazdb/server/src/main/java/com/hazelcast/samples/sql/hazdb/ApplicationInitializer.java @@ -88,8 +88,6 @@ public CommandLineRunner commandLineRunner() { *

* Mappings define the data structure for querying. *

- * - * @return */ public boolean createMappings() { String bundesligaBody = "(" @@ -155,10 +153,6 @@ public boolean createMappings() { *

* Apply a mapping, catch errors *

- * - * @param mapName - * @param mappingBody - * @return */ private boolean defineMapping(String mapName, String mappingBody) { String mapping = "CREATE OR REPLACE MAPPING \"" + mapName + "\" " + mappingBody; @@ -191,8 +185,6 @@ private boolean createMaps() { * Define views onto the mappings. View name is base map name with "{@code _v}" * suffix. *

- * - * @return */ private boolean createViews() { String view1 = "CREATE OR REPLACE VIEW " + MyConstants.IMAP_NAME_LEADER + MyConstants.VIEW_SUFFIX @@ -209,9 +201,6 @@ private boolean createViews() { *

* Apply a view onto a single map, catch errors. *

- * - * @param view - * @return */ private boolean defineMapView(String view) { try { @@ -228,8 +217,6 @@ private boolean defineMapView(String view) { *

* Insert teams and stadiums, derive the leader of the league. *

- * - * @return */ private boolean createTestData() { IMap bundesligaMap = this.hazelcastInstance @@ -303,8 +290,6 @@ private void deriveLeader(IMap leaderMap) throws Ex *

* Run some SQL to confirm everything is working. *

- * - * @return */ private boolean queryTestData() { String sql1 = "SELECT * FROM " + MyConstants.IMAP_NAME_BUNDESLIGA + " ORDER BY points DESC LIMIT 3"; diff --git a/variable-replacers/src/main/java/com/hazelcast/sample/replacer/ExecReplacer.java b/variable-replacers/src/main/java/com/hazelcast/sample/replacer/ExecReplacer.java index 1ed0c1a05..b10d42ede 100644 --- a/variable-replacers/src/main/java/com/hazelcast/sample/replacer/ExecReplacer.java +++ b/variable-replacers/src/main/java/com/hazelcast/sample/replacer/ExecReplacer.java @@ -64,6 +64,7 @@ public class ExecReplacer implements ConfigReplacer { private String argumentSeparator; private boolean requiresZeroExitCode; + @Override public void init(Properties properties) { argumentSeparator = properties.getProperty(PROPERTY_ARGUMENT_SEPARATOR, "\\s+"); String property = properties.getProperty(PROPERTY_REQUIRES_ZERO_EXIT);