From 3948511f1bdf3b690374d30ed113eb82a2e76e92 Mon Sep 17 00:00:00 2001 From: Sasha Didukh Date: Fri, 30 Sep 2016 13:19:39 +0300 Subject: [PATCH] KAA-1279: Fixed about 200 warnings --- .../kaa/client/KaaClientProperties.java | 21 ++--- .../kaa/client/KaaClientStateListener.java | 2 +- .../client/channel/KaaDataDemultiplexer.java | 3 +- .../channel/KaaInternalChannelManager.java | 2 +- .../impl/DefaultBootstrapDataProcessor.java | 9 ++- .../channel/impl/DefaultChannelManager.java | 64 ++++++++------- .../impl/DefaultOperationDataProcessor.java | 30 +++++--- .../impl/channels/AbstractHttpChannel.java | 8 +- .../channels/DefaultBootstrapChannel.java | 17 ++-- .../channels/DefaultOperationHttpChannel.java | 20 ++--- .../channels/DefaultOperationTcpChannel.java | 77 +++++++++++-------- .../channels/DefaultOperationsChannel.java | 31 ++++---- .../impl/channels/HttpRequestCreator.java | 13 +++- .../polling/CancelableCommandRunnable.java | 2 +- .../polling/CancelableScheduledFuture.java | 4 +- .../impl/channels/polling/PollCommand.java | 7 +- .../client/channel/impl/sync/SyncTask.java | 16 ++-- .../impl/transports/AbstractKaaTransport.java | 18 ++--- .../transports/DefaultBootstrapTransport.java | 12 ++- .../DefaultConfigurationTransport.java | 6 +- .../transports/DefaultEventTransport.java | 51 ++++++------ .../impl/transports/DefaultLogTransport.java | 4 +- .../DefaultNotificationTransport.java | 11 ++- .../transports/DefaultProfileTransport.java | 3 +- .../impl/transports/DefaultUserTransport.java | 62 +++++++++------ .../kaa/client/event/DefaultEventManager.java | 28 ++++--- .../event/FindEventListenersCallback.java | 4 +- .../DefaultNotificationManager.java | 12 +-- .../NotificationDeserializer.java | 7 +- .../notification/NotificationManager.java | 9 ++- .../notification/TopicListHashCalculator.java | 3 +- .../kaa/client/notification/package-info.java | 7 +- .../client/profile/DefaultProfileManager.java | 2 +- .../kaa/client/profile/ProfileContainer.java | 2 +- .../kaa/client/profile/ProfileManager.java | 3 +- .../profile/ProfileRuntimeException.java | 2 +- .../kaa/client/profile/ProfileSerializer.java | 3 +- 37 files changed, 335 insertions(+), 240 deletions(-) diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientProperties.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientProperties.java index 7c35e6f394..5f6593eecf 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientProperties.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientProperties.java @@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit; /** - * Service class to store base endpoint configuration + * Service class to store base endpoint configuration. */ public class KaaClientProperties extends Properties { public static final String KAA_CLIENT_PROPERTIES_FILE = "kaaClientPropertiesFile"; @@ -118,8 +118,8 @@ public byte[] getPropertiesHash() { updateDigest(digest, SDK_TOKEN); propertiesHash = digest.digest(); - } catch (NoSuchAlgorithmException e) { - LOG.warn("Failed to calculate hash for SDK properties: {}", e); + } catch (NoSuchAlgorithmException ex) { + LOG.warn("Failed to calculate hash for SDK properties: {}", ex); } } @@ -141,8 +141,8 @@ public String getCommitHash() { return getProperty(BUILD_COMMIT_HASH); } - public Map> getBootstrapServers() throws InvalidKeySpecException, - NoSuchAlgorithmException { + public Map> getBootstrapServers() + throws InvalidKeySpecException, NoSuchAlgorithmException { return parseBootstrapServers(getProperty(KaaClientProperties.BOOTSTRAP_SERVERS)); } @@ -162,8 +162,8 @@ public TimeUnit getPollUnit() { return TimeUnit.valueOf(getProperty(KaaClientProperties.TRANSPORT_POLL_UNIT)); } - private Map> parseBootstrapServers(String serversStr) - throws InvalidKeySpecException, NoSuchAlgorithmException { + private Map> parseBootstrapServers( + String serversStr) throws InvalidKeySpecException, NoSuchAlgorithmException { Map> servers = new HashMap<>(); String[] serversSplit = serversStr.split(";"); @@ -172,10 +172,11 @@ private Map> parseBootstrapSe String[] tokens = server.split(":"); ProtocolMetaData md = new ProtocolMetaData(); md.setAccessPointId(Integer.valueOf(tokens[0])); - md.setProtocolVersionInfo(new ProtocolVersionPair(Integer.valueOf(tokens[1]), Integer.valueOf(tokens[2]))); + md.setProtocolVersionInfo(new ProtocolVersionPair(Integer.valueOf(tokens[1]), + Integer.valueOf(tokens[2]))); md.setConnectionInfo(ByteBuffer.wrap(getBase64().decodeBase64(tokens[3]))); - TransportProtocolId key = new TransportProtocolId(md.getProtocolVersionInfo().getId(), md.getProtocolVersionInfo() - .getVersion()); + TransportProtocolId key = new TransportProtocolId(md.getProtocolVersionInfo().getId(), + md.getProtocolVersionInfo().getVersion()); List serverList = servers.get(key); if (serverList == null) { serverList = new ArrayList(); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientStateListener.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientStateListener.java index 252684de6d..8e9842481e 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientStateListener.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientStateListener.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.client.exceptions.KaaException; /** - * Notifies about Kaa client state changes and errors + * Notifies about Kaa client state changes and errors. * * @author Andrew Shvayka */ diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/KaaDataDemultiplexer.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/KaaDataDemultiplexer.java index 4884a89e1b..6a28c29ef9 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/KaaDataDemultiplexer.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/KaaDataDemultiplexer.java @@ -19,7 +19,6 @@ /** * Demultiplexer is responsible for deserializing of response data and notifying * appropriate services. - * * Required in user implementation of any kind of data channel. * * @author Yaroslav Zeygerman @@ -35,7 +34,7 @@ public interface KaaDataDemultiplexer { void processResponse(byte[] response) throws Exception; /** - * Routines to be executed before response will be processed + * Routines to be executed before response will be processed. */ void preProcess(); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/KaaInternalChannelManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/KaaInternalChannelManager.java index 2ae610bd04..c1f0f96bd0 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/KaaInternalChannelManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/KaaInternalChannelManager.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.client.channel.connectivity.ConnectivityChecker; /** - * @author Yaroslav Zeygerman + * @author Yaroslav Zeygerman. * @see KaaDataChannel */ public interface KaaInternalChannelManager extends KaaChannelManager { diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultBootstrapDataProcessor.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultBootstrapDataProcessor.java index 240787f932..8b6959fc78 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultBootstrapDataProcessor.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultBootstrapDataProcessor.java @@ -34,8 +34,10 @@ public class DefaultBootstrapDataProcessor implements KaaDataMultiplexer, KaaDat private static final Logger LOG = LoggerFactory.getLogger(DefaultBootstrapDataProcessor.class); - private final AvroByteArrayConverter requestConverter = new AvroByteArrayConverter<>(SyncRequest.class); - private final AvroByteArrayConverter responseConverter = new AvroByteArrayConverter<>(SyncResponse.class); + private final AvroByteArrayConverter requestConverter = + new AvroByteArrayConverter<>(SyncRequest.class); + private final AvroByteArrayConverter responseConverter = + new AvroByteArrayConverter<>(SyncResponse.class); private BootstrapTransport transport; public void setBootstrapTransport(BootstrapTransport transport) { @@ -43,7 +45,8 @@ public void setBootstrapTransport(BootstrapTransport transport) { } @Override - public synchronized byte[] compileRequest(Map types) throws IOException { + public synchronized byte[] compileRequest(Map types) + throws IOException { if (transport != null) { SyncRequest request = transport.createResolveRequest(); LOG.trace("Created Resolve request {}", request); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultChannelManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultChannelManager.java index 66a48d8cd8..e78113b45d 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultChannelManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultChannelManager.java @@ -52,13 +52,13 @@ public class DefaultChannelManager implements KaaInternalChannelManager { public static final Logger LOG = LoggerFactory // NOSONAR .getLogger(DefaultChannelManager.class); private final List channels = new LinkedList<>(); - private final Map upChannels = new HashMap(); + private final Map upChannels = new HashMap<>(); private final BootstrapManager bootstrapManager; private final Map lastServers = new HashMap<>(); private final Map> bootststrapServers; - private final Map lastBSServers = new HashMap<>(); - private final Map> syncTaskQueueMap = new ConcurrentHashMap>(); - private final Map syncWorkers = new HashMap(); + private final Map lastBsServers = new HashMap<>(); + private final Map> syncTaskQueueMap = new ConcurrentHashMap<>(); + private final Map syncWorkers = new HashMap<>(); private FailureListener failureListener; private FailoverManager failoverManager; private ExecutorContext executorContext; @@ -73,7 +73,8 @@ public class DefaultChannelManager implements KaaInternalChannelManager { private KaaDataDemultiplexer bootstrapDemultiplexer; public DefaultChannelManager(BootstrapManager manager, Map> bootststrapServers, ExecutorContext executorContext, FailureListener failureListener) { + List> bootststrapServers, ExecutorContext executorContext, + FailureListener failureListener) { if (manager == null || bootststrapServers == null || bootststrapServers.isEmpty()) { throw new ChannelRuntimeException("Failed to create channel manager"); } @@ -85,7 +86,8 @@ public DefaultChannelManager(BootstrapManager manager, Map serverList = bootststrapServers.get(type); if (serverList != null && !serverList.isEmpty()) { bsi = serverList.get(0); - lastBSServers.put(type, bsi); + lastBsServers.put(type, bsi); } } @@ -395,7 +402,8 @@ private TransportConnectionInfo getCurrentBootstrapServer(TransportProtocolId ty private TransportConnectionInfo getNextBootstrapServer(TransportConnectionInfo currentServer) { TransportConnectionInfo bsi = null; - List serverList = bootststrapServers.get(currentServer.getTransportId()); + List serverList = bootststrapServers.get( + currentServer.getTransportId()); int serverIndex = serverList.indexOf(currentServer); if (serverIndex >= 0) { @@ -403,7 +411,7 @@ private TransportConnectionInfo getNextBootstrapServer(TransportConnectionInfo c serverIndex = 0; } bsi = serverList.get(serverIndex); - lastBSServers.put(currentServer.getTransportId(), bsi); + lastBsServers.put(currentServer.getTransportId(), bsi); } return bsi; @@ -531,20 +539,22 @@ public void run() { task = SyncTask.merge(task, additionalTasks); } if (task.isAll()) { - LOG.debug("[{}] Going to invoke syncAll method for types {}", channel.getId(), task.getTypes()); + LOG.debug("[{}] Going to invoke syncAll method for types {}", + channel.getId(), task.getTypes()); channel.syncAll(); } else if (task.isAckOnly()) { - LOG.debug("[{}] Going to invoke syncAck method for types {}", channel.getId(), task.getTypes()); + LOG.debug("[{}] Going to invoke syncAck method for types {}", + channel.getId(), task.getTypes()); channel.syncAck(task.getTypes()); } else { LOG.debug("[{}] Going to invoke sync method", channel.getId()); channel.sync(task.getTypes()); } - } catch (InterruptedException e) { + } catch (InterruptedException ex) { if (stop) { LOG.debug("[{}] Worker is interrupted.", channel.getId()); } else { - LOG.warn("[{}] Worker is interrupted.", channel.getId(), e); + LOG.warn("[{}] Worker is interrupted.", channel.getId(), ex); } } } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultOperationDataProcessor.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultOperationDataProcessor.java index 67abb3e1e0..2828e726f4 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultOperationDataProcessor.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultOperationDataProcessor.java @@ -46,8 +46,10 @@ public class DefaultOperationDataProcessor implements KaaDataMultiplexer, KaaDat private static final Logger LOG = LoggerFactory.getLogger(DefaultOperationDataProcessor.class); private final AtomicInteger requestsCounter = new AtomicInteger(0); - private final AvroByteArrayConverter requestConverter = new AvroByteArrayConverter<>(SyncRequest.class); - private final AvroByteArrayConverter responseConverter = new AvroByteArrayConverter<>(SyncResponse.class); + private final AvroByteArrayConverter requestConverter = + new AvroByteArrayConverter<>(SyncRequest.class); + private final AvroByteArrayConverter responseConverter = + new AvroByteArrayConverter<>(SyncResponse.class); private final KaaClientState state; private MetaDataTransport metaDataTransport; private ConfigurationTransport configurationTransport; @@ -71,7 +73,8 @@ public synchronized void setMetaDataTransport(MetaDataTransport metaDataTranspor this.metaDataTransport = metaDataTransport; } - public synchronized void setConfigurationTransport(ConfigurationTransport configurationTransport) { + public synchronized void setConfigurationTransport( + ConfigurationTransport configurationTransport) { this.configurationTransport = configurationTransport; } @@ -103,7 +106,8 @@ public synchronized void processResponse(byte[] response) throws Exception { LOG.info("Received Sync response: {}", syncResponse); if (syncResponse.getConfigurationSyncResponse() != null && configurationTransport != null) { - configurationTransport.onConfigurationResponse(syncResponse.getConfigurationSyncResponse()); + configurationTransport.onConfigurationResponse( + syncResponse.getConfigurationSyncResponse()); } if (eventTransport != null) { eventTransport.onSyncResposeIdReceived(syncResponse.getRequestId()); @@ -127,7 +131,8 @@ public synchronized void processResponse(byte[] response) throws Exception { logTransport.onLogResponse(syncResponse.getLogSyncResponse()); } - boolean needProfileResync = syncResponse.getStatus() == SyncResponseResultType.PROFILE_RESYNC; + boolean needProfileResync = syncResponse.getStatus() == SyncResponseResultType + .PROFILE_RESYNC; state.setIfNeedProfileResync(needProfileResync); if (needProfileResync) { LOG.info("Going to resync profile..."); @@ -140,7 +145,8 @@ public synchronized void processResponse(byte[] response) throws Exception { } @Override - public synchronized byte[] compileRequest(Map types) throws Exception { + public synchronized byte[] compileRequest(Map types) + throws Exception { if (types != null) { SyncRequest request = new SyncRequest(); request.setRequestId(requestsCounter.incrementAndGet()); @@ -153,22 +159,26 @@ public synchronized byte[] compileRequest(Map t switch (type.getKey()) { case CONFIGURATION: if (configurationTransport != null) { - request.setConfigurationSyncRequest(configurationTransport.createConfigurationRequest()); + request.setConfigurationSyncRequest( + configurationTransport.createConfigurationRequest()); } break; case EVENT: if (isDownDirection) { request.setEventSyncRequest(new EventSyncRequest()); } else if (eventTransport != null) { - request.setEventSyncRequest(eventTransport.createEventRequest(request.getRequestId())); + request.setEventSyncRequest( + eventTransport.createEventRequest(request.getRequestId())); } break; case NOTIFICATION: if (notificationTransport != null) { if (isDownDirection) { - request.setNotificationSyncRequest(notificationTransport.createEmptyNotificationRequest()); + request.setNotificationSyncRequest( + notificationTransport.createEmptyNotificationRequest()); } else { - request.setNotificationSyncRequest(notificationTransport.createNotificationRequest()); + request.setNotificationSyncRequest( + notificationTransport.createNotificationRequest()); } } break; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/AbstractHttpChannel.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/AbstractHttpChannel.java index 1e3f6600a7..18670a59ef 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/AbstractHttpChannel.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/AbstractHttpChannel.java @@ -61,7 +61,8 @@ public abstract class AbstractHttpChannel implements KaaDataChannel { private KaaDataDemultiplexer demultiplexer; private KaaDataMultiplexer multiplexer; - public AbstractHttpChannel(AbstractKaaClient client, KaaClientState state, FailoverManager failoverManager) { + public AbstractHttpChannel(AbstractKaaClient client, KaaClientState state, + FailoverManager failoverManager) { this.client = client; this.state = state; this.failoverManager = failoverManager; @@ -148,7 +149,7 @@ public void syncAck(Set types) { LOG.info("Sync ack message is ignored for Channel {}", getId()); } - protected abstract String getURLSufix(); + protected abstract String getUrlSufix(); @Override public TransportConnectionInfo getServer() { @@ -166,7 +167,8 @@ public synchronized void setServer(TransportConnectionInfo server) { } if (server != null) { this.currentServer = new IPTransportInfo(server); - this.httpClient = client.createHttpClient(currentServer.getURL() + getURLSufix(), state.getPrivateKey(), state.getPublicKey(), + this.httpClient = client.createHttpClient(currentServer.getURL() + getUrlSufix(), + state.getPrivateKey(), state.getPublicKey(), currentServer.getPublicKey()); if (lastConnectionFailed && !isPaused) { lastConnectionFailed = false; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultBootstrapChannel.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultBootstrapChannel.java index d6b82273a2..5680550c23 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultBootstrapChannel.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultBootstrapChannel.java @@ -34,14 +34,15 @@ public class DefaultBootstrapChannel extends AbstractHttpChannel { public static final Logger LOG = LoggerFactory // NOSONAR .getLogger(DefaultBootstrapChannel.class); - private static final Map SUPPORTED_TYPES = new HashMap(); + private static final Map SUPPORTED_TYPES = new HashMap<>(); private static final String CHANNEL_ID = "default_bootstrap_channel"; static { SUPPORTED_TYPES.put(TransportType.BOOTSTRAP, ChannelDirection.BIDIRECTIONAL); } - public DefaultBootstrapChannel(AbstractKaaClient client, KaaClientState state, FailoverManager failoverManager) { + public DefaultBootstrapChannel(AbstractKaaClient client, KaaClientState state, + FailoverManager failoverManager) { super(client, state, failoverManager); } @@ -50,8 +51,8 @@ private void processTypes(Map types) throws Exc byte[] requestBodyRaw = getMultiplexer().compileRequest(types); byte[] decodedResponse = null; synchronized (this) { - LinkedHashMap requestEntity = HttpRequestCreator.createBootstrapHttpRequest(requestBodyRaw, getHttpClient() - .getEncoderDecoder()); + LinkedHashMap requestEntity = HttpRequestCreator.createBootstrapHttpRequest( + requestBodyRaw, getHttpClient().getEncoderDecoder()); byte[] responseDataRaw = getHttpClient().executeHttpRequest("", requestEntity, false); decodedResponse = getHttpClient().getEncoderDecoder().decodeData(responseDataRaw); } @@ -79,7 +80,7 @@ protected Runnable createChannelRunnable(Map ty } @Override - protected String getURLSufix() { + protected String getUrlSufix() { return "/BS/Sync"; } @@ -90,12 +91,12 @@ public void run() { try { processTypes(SUPPORTED_TYPES); connectionFailed(false); - } catch (Exception e) { + } catch (Exception ex) { if (!isShutdown()) { - LOG.error("Failed to receive operation servers list {}", e); + LOG.error("Failed to receive operation servers list {}", ex); connectionFailed(true); } else { - LOG.debug("Failed to receive operation servers list {}", e); + LOG.debug("Failed to receive operation servers list {}", ex); } } } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationHttpChannel.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationHttpChannel.java index f1dd0deecf..6a47676b1c 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationHttpChannel.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationHttpChannel.java @@ -34,7 +34,7 @@ public class DefaultOperationHttpChannel extends AbstractHttpChannel { public static final Logger LOG = LoggerFactory //NOSONAR .getLogger(DefaultOperationsChannel.class); - private static final Map SUPPORTED_TYPES = new HashMap(); + private static final Map SUPPORTED_TYPES = new HashMap<>(); private static final String CHANNEL_ID = "default_operations_http_channel"; static { @@ -42,7 +42,8 @@ public class DefaultOperationHttpChannel extends AbstractHttpChannel { SUPPORTED_TYPES.put(TransportType.LOGGING, ChannelDirection.UP); } - public DefaultOperationHttpChannel(AbstractKaaClient client, KaaClientState state, FailoverManager failoverManager) { + public DefaultOperationHttpChannel(AbstractKaaClient client, KaaClientState state, + FailoverManager failoverManager) { super(client, state, failoverManager); } @@ -50,7 +51,8 @@ private void processTypes(Map types) throws Exc byte[] requestBodyRaw = getMultiplexer().compileRequest(types); byte[] decodedResponse = null; synchronized (this) { - LinkedHashMap requestEntity = HttpRequestCreator.createOperationHttpRequest(requestBodyRaw, getHttpClient().getEncoderDecoder()); + LinkedHashMap requestEntity = HttpRequestCreator.createOperationHttpRequest( + requestBodyRaw, getHttpClient().getEncoderDecoder()); byte[] responseDataRaw = getHttpClient().executeHttpRequest("", requestEntity, false); decodedResponse = getHttpClient().getEncoderDecoder().decodeData(responseDataRaw); } @@ -79,7 +81,7 @@ protected Runnable createChannelRunnable( } @Override - protected String getURLSufix() { + protected String getUrlSufix() { return "/EP/Sync"; } @@ -96,11 +98,11 @@ public void run() { try { processTypes(typesToProcess); connectionFailed(false); - } catch (TransportException e) { - LOG.error("Failed to receive response from the operation {}", e); - connectionFailed(true, e.getStatus()); - } catch (Exception e) { - LOG.error("Failed to receive response from the operation {}", e); + } catch (TransportException ex) { + LOG.error("Failed to receive response from the operation {}", ex); + connectionFailed(true, ex.getStatus()); + } catch (Exception ex) { + LOG.error("Failed to receive response from the operation {}", ex); connectionFailed(true); } } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationTcpChannel.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationTcpChannel.java index 0eede5d8ea..cf293315a7 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationTcpChannel.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationTcpChannel.java @@ -72,7 +72,7 @@ public class DefaultOperationTcpChannel implements KaaDataChannel { public static final Logger LOG = LoggerFactory // NOSONAR .getLogger(DefaultOperationTcpChannel.class); - private static final Map SUPPORTED_TYPES = new HashMap(); + private static final Map SUPPORTED_TYPES = new HashMap<>(); private static final int CHANNEL_TIMEOUT = 200; private static final int PING_TIMEOUT = CHANNEL_TIMEOUT / 2; private static final String CHANNEL_ID = "default_operation_tcp_channel"; @@ -109,16 +109,16 @@ public void onMessage(PingResponse message) { @Override public void onMessage(SyncResponse message) { - LOG.info("KaaSync message (zipped={}, encrypted={}) received for channel [{}]", message.isZipped(), message.isEncrypted(), - getId()); + LOG.info("KaaSync message (zipped={}, encrypted={}) received for channel [{}]", + message.isZipped(), message.isEncrypted(), getId()); byte[] resultBody = null; if (message.isEncrypted()) { synchronized (this) { try { resultBody = encDec.decodeData(message.getAvroObject()); - } catch (GeneralSecurityException e) { + } catch (GeneralSecurityException ex) { LOG.error("Failed to decrypt message body for channel [{}]: {}", getId()); - LOG.error("Stack Trace: ", e); + LOG.error("Stack Trace: ", ex); } } } else { @@ -129,8 +129,8 @@ public void onMessage(SyncResponse message) { demultiplexer.preProcess(); demultiplexer.processResponse(resultBody); demultiplexer.postProcess(); - } catch (Exception e) { - LOG.error("Failed to process response for channel [{}]", getId(), e); + } catch (Exception ex) { + LOG.error("Failed to process response for channel [{}]", getId(), ex); } synchronized (DefaultOperationTcpChannel.this) { @@ -175,7 +175,8 @@ public void onMessage(ConnAck message) { @Override public void onMessage(Disconnect message) { - LOG.info("Disconnect message (reason={}) received for channel [{}]", message.getReason(), getId()); + LOG.info("Disconnect message (reason={}) received for channel [{}]", + message.getReason(), getId()); switch (message.getReason()) { case NONE: closeConnection(); @@ -204,8 +205,8 @@ public void run() { } else { LOG.info("Can't schedule ping task for channel [{}]. Task was interrupted", getId()); } - } catch (IOException e) { - LOG.error("Failed to send ping request for channel [{}]. Stack trace: ", getId(), e); + } catch (IOException ex) { + LOG.error("Failed to send ping request for channel [{}]. Stack trace: ", getId(), ex); onServerFailed(); } } else { @@ -214,7 +215,8 @@ public void run() { } }; - public DefaultOperationTcpChannel(KaaClientState state, FailoverManager failoverManager, FailureListener failureListener) { + public DefaultOperationTcpChannel(KaaClientState state, FailoverManager failoverManager, + FailureListener failureListener) { this.state = state; this.failoverManager = failoverManager; this.failureListener = failureListener; @@ -255,7 +257,8 @@ private void sendConnect() throws Exception { byte[] requestBodyEncoded = encDec.encodeData(body); byte[] sessionKey = encDec.getEncodedSessionKey(); byte[] signature = encDec.sign(sessionKey); - sendFrame(new Connect(CHANNEL_TIMEOUT, Constants.KAA_PLATFORM_PROTOCOL_AVRO_ID_V2, sessionKey, requestBodyEncoded, signature)); + sendFrame(new Connect(CHANNEL_TIMEOUT, Constants.KAA_PLATFORM_PROTOCOL_AVRO_ID_V2, + sessionKey, requestBodyEncoded, signature)); } private synchronized void closeConnection() { @@ -271,13 +274,13 @@ private synchronized void closeConnection() { LOG.info("Channel \"{}\": closing current connection", getId()); try { sendDisconnect(); - } catch (IOException e) { - LOG.error("Failed to send Disconnect to server: {}", e); + } catch (IOException ex) { + LOG.error("Failed to send Disconnect to server: {}", ex); } finally { try { socket.close(); - } catch (IOException e) { - LOG.error("Failed to close socket: {}", e); + } catch (IOException ex) { + LOG.error("Failed to close socket: {}", ex); } socket = null; messageFactory.getFramer().flush(); @@ -304,8 +307,9 @@ private synchronized void openConnection() { sendConnect(); scheduleReadTask(socket); schedulePingTask(); - } catch (Exception e) { - LOG.error("Failed to create a socket for server {}:{}. Stack trace: ", currentServer.getHost(), currentServer.getPort(), e); + } catch (Exception ex) { + LOG.error("Failed to create a socket for server {}:{}. Stack trace: ", + currentServer.getHost(), currentServer.getPort(), ex); onServerFailed(); } } @@ -327,8 +331,8 @@ private void onServerFailed(FailoverStatus status) { break; case RETRY: long retryPeriod = decision.getRetryPeriod(); - LOG.warn("Attempt to reconnect will be made in {} ms " + - "according to failover strategy decision", retryPeriod); + LOG.warn("Attempt to reconnect will be made in {} ms " + + "according to failover strategy decision", retryPeriod); scheduleOpenConnectionTask(retryPeriod); break; case FAILURE: @@ -396,7 +400,8 @@ public synchronized void sync(Set types) { return; } if (channelState != State.OPENED) { - LOG.info("Can't sync. Channel [{}] is waiting for CONNACK message + KAASYNC message", getId()); + LOG.info("Can't sync. Channel [{}] is waiting for CONNACK message + KAASYNC message", + getId()); return; } if (multiplexer == null) { @@ -412,7 +417,8 @@ public synchronized void sync(Set types) { return; } - Map typeMap = new HashMap<>(getSupportedTransportTypes().size()); + Map typeMap = + new HashMap<>(getSupportedTransportTypes().size()); for (TransportType type : types) { LOG.info("Processing sync {} for channel [{}]", type, getId()); ChannelDirection direction = getSupportedTransportTypes().get(type); @@ -421,7 +427,8 @@ public synchronized void sync(Set types) { } else { LOG.error("Unsupported type {} for channel [{}]", type, getId()); } - for (Map.Entry typeIt : getSupportedTransportTypes().entrySet()) { + for (Map.Entry typeIt : getSupportedTransportTypes() + .entrySet()) { if (!typeIt.getKey().equals(type)) { typeMap.put(typeIt.getKey(), ChannelDirection.DOWN); } @@ -429,8 +436,8 @@ public synchronized void sync(Set types) { } try { sendKaaSyncRequest(typeMap); - } catch (Exception e) { - LOG.error("Failed to sync channel [{}]", getId(), e); + } catch (Exception ex) { + LOG.error("Failed to sync channel [{}]", getId(), ex); } } @@ -453,8 +460,8 @@ public synchronized void syncAll() { if (currentServer != null && socket != null) { try { sendKaaSyncRequest(getSupportedTransportTypes()); - } catch (Exception e) { - LOG.error("Failed to sync channel [{}]: {}", getId(), e); + } catch (Exception ex) { + LOG.error("Failed to sync channel [{}]: {}", getId(), ex); onServerFailed(); } } else { @@ -465,7 +472,8 @@ public synchronized void syncAll() { @Override public void syncAck(TransportType type) { - LOG.info("Adding sync acknowledgement for type {} as a regular sync for channel [{}]", type, getId()); + LOG.info("Adding sync acknowledgement for type {} as a regular sync for channel [{}]", + type, getId()); syncAck(Collections.singleton(type)); } @@ -521,7 +529,8 @@ public synchronized void setServer(TransportConnectionInfo server) { } IPTransportInfo oldServer = currentServer; this.currentServer = new IPTransportInfo(server); - this.encDec = new MessageEncoderDecoder(state.getPrivateKey(), state.getPublicKey(), currentServer.getPublicKey()); + this.encDec = new MessageEncoderDecoder(state.getPrivateKey(), state.getPublicKey(), + currentServer.getPublicKey()); if (channelState != State.PAUSE) { if (executor == null) { executor = createExecutor(); @@ -530,7 +539,8 @@ public synchronized void setServer(TransportConnectionInfo server) { || socket == null || !oldServer.getHost().equals(currentServer.getHost()) || oldServer.getPort() != currentServer.getPort()) { - LOG.info("New server's: {} host or ip is different from the old {}, reconnecting", currentServer, oldServer); + LOG.info("New server's: {} host or ip is different from the old {}, reconnecting", + currentServer, oldServer); closeConnection(); scheduleOpenConnectionTask(0); } @@ -619,7 +629,8 @@ public SocketReadTask(Socket readTaskSocket) { public void run() { while (!Thread.currentThread().isInterrupted()) { try { - LOG.info("Channel [{}] is reading data from stream using [{}] byte buffer", getId(), buffer.length); + LOG.info("Channel [{}] is reading data from stream using [{}] byte buffer", + getId(), buffer.length); int size = readTaskSocket.getInputStream().read(buffer); @@ -630,10 +641,10 @@ public void run() { onServerFailed(); } - } catch (IOException | KaaTcpProtocolException | RuntimeException e) { + } catch (IOException | KaaTcpProtocolException | RuntimeException ex) { if (Thread.currentThread().isInterrupted()) { if (channelState != State.SHUTDOWN) { - LOG.warn("Socket connection for channel [{}] was interrupted: ", getId(), e); + LOG.warn("Socket connection for channel [{}] was interrupted: ", getId(), ex); } else { LOG.debug("Socket connection for channel [{}] was interrupted.", getId()); } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationsChannel.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationsChannel.java index 60f1a6a164..638f5da11d 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationsChannel.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationsChannel.java @@ -56,7 +56,7 @@ public class DefaultOperationsChannel implements KaaDataChannel, RawDataProcesso public static final Logger LOG = LoggerFactory // NOSONAR .getLogger(DefaultOperationsChannel.class); - private static final Map SUPPORTED_TYPES = new HashMap(); + private static final Map SUPPORTED_TYPES = new HashMap<>(); private static final String CHANNEL_ID = "default_operations_long_poll_channel"; static { @@ -92,13 +92,14 @@ protected void executeCommand() { while (httpClient == null && !stopped && !Thread.currentThread().isInterrupted()) { try { httpClientSetLock.wait(); - } catch (InterruptedException e) { + } catch (InterruptedException ex) { break; } } } if (!stopped) { - currentCommand = new PollCommand(httpClient, DefaultOperationsChannel.this, getSupportedTransportTypes(), currentServer); + currentCommand = new PollCommand(httpClient, DefaultOperationsChannel.this, + getSupportedTransportTypes(), currentServer); if (!Thread.currentThread().isInterrupted()) { currentCommand.execute(); } @@ -114,7 +115,8 @@ protected void executeCommand() { private volatile boolean isShutdown = false; private volatile boolean isPaused = false; - public DefaultOperationsChannel(AbstractKaaClient client, KaaClientState state, FailoverManager failoverManager) { + public DefaultOperationsChannel(AbstractKaaClient client, KaaClientState state, + FailoverManager failoverManager) { this.client = client; this.state = state; this.failoverManager = failoverManager; @@ -124,7 +126,8 @@ protected ScheduledExecutorService createExecutor() { LOG.info("Creating a new executor for channel [{}]", getId()); return new ScheduledThreadPoolExecutor(1) { @Override - protected RunnableScheduledFuture decorateTask(Runnable runnable, RunnableScheduledFuture task) { + protected RunnableScheduledFuture decorateTask(Runnable runnable, + RunnableScheduledFuture task) { if (runnable instanceof CancelableRunnable) { return new CancelableScheduledFuture((CancelableRunnable) runnable, task); } @@ -166,15 +169,17 @@ private void stopPoll() { } @Override - public LinkedHashMap createRequest(Map types) {// NOSONAR + public LinkedHashMap createRequest( + Map types) { // NOSONAR LinkedHashMap request = null; try { byte[] requestBodyRaw = multiplexer.compileRequest(types); synchronized (httpClientLock) { - request = HttpRequestCreator.createOperationHttpRequest(requestBodyRaw, httpClient.getEncoderDecoder()); + request = HttpRequestCreator.createOperationHttpRequest(requestBodyRaw, + httpClient.getEncoderDecoder()); } - } catch (Exception e) { - LOG.error("Failed to create request {}", e); + } catch (Exception ex) { + LOG.error("Failed to create request {}", ex); } return request; } @@ -191,9 +196,9 @@ public void onResponse(byte[] response) { demultiplexer.processResponse(decodedResponse); processingResponse = false; failoverManager.onServerConnected(currentServer); - } catch (Exception e) { + } catch (Exception ex) { LOG.error("Failed to process response {}", Arrays.toString(response)); - LOG.error("Exception stack trace: ", e); + LOG.error("Exception stack trace: ", ex); } } @@ -326,8 +331,8 @@ public synchronized void setServer(TransportConnectionInfo server) { this.currentServer = new IPTransportInfo(server); synchronized (httpClientLock) { LOG.debug("Channel [{}]: creating HTTP client..", getId()); - this.httpClient = client.createHttpClient(currentServer.getURL() + "/EP/LongSync", state.getPrivateKey(), - state.getPublicKey(), currentServer.getPublicKey()); + this.httpClient = client.createHttpClient(currentServer.getURL() + "/EP/LongSync", + state.getPrivateKey(), state.getPublicKey(), currentServer.getPublicKey()); synchronized (httpClientSetLock) { httpClientSetLock.notifyAll(); } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/HttpRequestCreator.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/HttpRequestCreator.java index c756d4c786..bcea4cefec 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/HttpRequestCreator.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/HttpRequestCreator.java @@ -34,19 +34,22 @@ public class HttpRequestCreator { private HttpRequestCreator() { } - static LinkedHashMap createOperationHttpRequest(byte[] body, MessageEncoderDecoder messageEncDec) throws GeneralSecurityException { + static LinkedHashMap createOperationHttpRequest( + byte[] body, MessageEncoderDecoder messageEncDec) throws GeneralSecurityException { return createHttpRequest(body, messageEncDec, true); } - static LinkedHashMap createBootstrapHttpRequest(byte[] body, MessageEncoderDecoder messageEncDec) throws GeneralSecurityException { + static LinkedHashMap createBootstrapHttpRequest( + byte[] body, MessageEncoderDecoder messageEncDec) throws GeneralSecurityException { return createHttpRequest(body, messageEncDec, false); } - static LinkedHashMap createHttpRequest(byte[] body, MessageEncoderDecoder messageEncDec, boolean sign) throws GeneralSecurityException { + static LinkedHashMap createHttpRequest( + byte[] body, MessageEncoderDecoder messageEncDec, boolean sign) + throws GeneralSecurityException { if (body != null && messageEncDec != null) { byte[] requestKeyEncoded = messageEncDec.getEncodedSessionKey(); byte[] requestBodyEncoded = messageEncDec.encodeData(body); - byte[] nextProtocol = ByteBuffer.allocate(4).putInt(Constants.KAA_PLATFORM_PROTOCOL_AVRO_ID_V2).array(); byte[] signature = null; if (sign) { signature = messageEncDec.sign(requestKeyEncoded); @@ -66,6 +69,8 @@ static LinkedHashMap createHttpRequest(byte[] body, MessageEncod if (sign) { requestEntity.put(CommonEpConstans.REQUEST_SIGNATURE_ATTR_NAME, signature); } + byte[] nextProtocol = ByteBuffer.allocate(4).putInt( + Constants.KAA_PLATFORM_PROTOCOL_AVRO_ID_V2).array(); requestEntity.put(CommonEpConstans.REQUEST_KEY_ATTR_NAME, requestKeyEncoded); requestEntity.put(CommonEpConstans.REQUEST_DATA_ATTR_NAME, requestBodyEncoded); requestEntity.put(CommonEpConstans.NEXT_PROTOCOL_ATTR_NAME, nextProtocol); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableCommandRunnable.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableCommandRunnable.java index d714cfe345..6be5a70f14 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableCommandRunnable.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableCommandRunnable.java @@ -42,7 +42,7 @@ public void waitUntilExecuted() { synchronized (this) { try { this.wait(); - } catch (InterruptedException e) { //NOSONAR + } catch (InterruptedException ex) { //NOSONAR } } } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableScheduledFuture.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableScheduledFuture.java index 9882ab2fda..f74c2a79fd 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableScheduledFuture.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableScheduledFuture.java @@ -73,8 +73,8 @@ public long getDelay(TimeUnit unit) { } @Override - public int compareTo(Delayed o) { - return futureTask.compareTo(o); + public int compareTo(Delayed delayed) { + return futureTask.compareTo(delayed); } @Override diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/PollCommand.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/PollCommand.java index ba9a9f80ae..ad05eb7686 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/PollCommand.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/PollCommand.java @@ -37,7 +37,8 @@ public class PollCommand implements Command { private final IPTransportInfo serverInfo; private volatile boolean canceled = false; - public PollCommand(AbstractHttpClient client, RawDataProcessor processor, Map transportTypes, IPTransportInfo serverInfo) { + public PollCommand(AbstractHttpClient client, RawDataProcessor processor, Map transportTypes, IPTransportInfo serverInfo) { this.httpClient = client; this.serverInfo = serverInfo; this.processor = processor; @@ -56,9 +57,9 @@ public void execute() { } else { LOG.warn("Unable to execute http request, http client is null."); } - } catch (Exception e) { + } catch (Exception ex) { if (!canceled) { - LOG.error("Server failed {}", e); + LOG.error("Server failed {}", ex); } else { LOG.debug("PollCommand execution aborted"); } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/sync/SyncTask.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/sync/SyncTask.java index 938aedfd9f..0e9a82e3f0 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/sync/SyncTask.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/sync/SyncTask.java @@ -39,15 +39,15 @@ public SyncTask(Set types, boolean ackOnly, boolean all) { this.all = all; } - public static SyncTask merge(SyncTask task, List additionalTasks) { + public static SyncTask merge(SyncTask syncTask, List additionalTasks) { Set types = new HashSet(); - types.addAll(task.types); - boolean ack = task.ackOnly; - boolean all = task.all; - for (SyncTask aTask : additionalTasks) { - types.addAll(aTask.types); - ack = ack && aTask.ackOnly; - all = all || aTask.all; + types.addAll(syncTask.types); + boolean ack = syncTask.ackOnly; + boolean all = syncTask.all; + for (SyncTask task : additionalTasks) { + types.addAll(task.types); + ack = ack && task.ackOnly; + all = all || task.all; } return new SyncTask(types, ack, all); } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/AbstractKaaTransport.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/AbstractKaaTransport.java index 95d33cd854..789d53b520 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/AbstractKaaTransport.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/AbstractKaaTransport.java @@ -50,18 +50,10 @@ protected void syncByType(TransportType type) { syncByType(type, false); } - protected void syncAckByType(TransportType type) { - syncByType(type, true); - } - protected void syncByType(TransportType type, boolean ack) { syncByType(type, ack, false); } - protected void syncAll(TransportType type) { - syncByType(type, false, true); - } - protected void syncByType(TransportType type, boolean ack, boolean all) { if (channelManager == null) { LOG.error("Channel manager is not set during sync for type {}", type); @@ -76,6 +68,14 @@ protected void syncByType(TransportType type, boolean ack, boolean all) { } } + protected void syncAll(TransportType type) { + syncByType(type, false, true); + } + + protected void syncAckByType(TransportType type) { + syncByType(type, true); + } + @Override public void sync() { syncByType(getTransportType()); @@ -92,5 +92,5 @@ protected void syncAck(SyncResponseStatus status) { } } - abstract protected TransportType getTransportType(); + protected abstract TransportType getTransportType(); } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultBootstrapTransport.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultBootstrapTransport.java index f7730b2b65..1ee7829f29 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultBootstrapTransport.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultBootstrapTransport.java @@ -55,8 +55,10 @@ public SyncRequest createResolveRequest() { List pairs = new ArrayList(channels.size()); for (KaaDataChannel channel : channels) { TransportProtocolId channelTransportId = channel.getTransportProtocolId(); - pairs.add(new ProtocolVersionPair(channelTransportId.getProtocolId(), channelTransportId.getProtocolVersion())); - LOG.debug("Adding transport with id {} and version {} to resolve request", channelTransportId.getProtocolId(), channelTransportId.getProtocolVersion()); + pairs.add(new ProtocolVersionPair(channelTransportId.getProtocolId(), + channelTransportId.getProtocolVersion())); + LOG.debug("Adding transport with id {} and version {} to resolve request", + channelTransportId.getProtocolId(), channelTransportId.getProtocolVersion()); } resolveRequest.setSupportedProtocols(pairs); resolveRequest.setRequestId(increment.get()); @@ -69,8 +71,10 @@ public SyncRequest createResolveRequest() { @Override public void onResolveResponse(SyncResponse syncResponse) { - if (manager != null && syncResponse != null && syncResponse.getBootstrapSyncResponse() != null) { - manager.onProtocolListUpdated(syncResponse.getBootstrapSyncResponse().getSupportedProtocols()); + if (manager != null && syncResponse != null + && syncResponse.getBootstrapSyncResponse() != null) { + manager.onProtocolListUpdated( + syncResponse.getBootstrapSyncResponse().getSupportedProtocols()); } } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultConfigurationTransport.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultConfigurationTransport.java index 8748936b19..de2787be68 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultConfigurationTransport.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultConfigurationTransport.java @@ -36,7 +36,8 @@ * * @author Yaroslav Zeygerman */ -public class DefaultConfigurationTransport extends AbstractKaaTransport implements ConfigurationTransport { +public class DefaultConfigurationTransport extends AbstractKaaTransport + implements ConfigurationTransport { private static final Logger LOG = LoggerFactory.getLogger(DefaultConfigurationTransport.class); @@ -83,7 +84,8 @@ public void onConfigurationResponse(ConfigurationSyncResponse response) throws I } ByteBuffer confBody = response.getConfDeltaBody(); if (confBody != null) { - configProcessor.processConfigurationData(confBody, response.getResponseStatus().equals(SyncResponseStatus.RESYNC)); + configProcessor.processConfigurationData(confBody, + response.getResponseStatus().equals(SyncResponseStatus.RESYNC)); } syncAck(response.getResponseStatus()); LOG.info("Processed configuration response."); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultEventTransport.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultEventTransport.java index 4a56f94e8a..d272174038 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultEventTransport.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultEventTransport.java @@ -47,13 +47,13 @@ public class DefaultEventTransport extends AbstractKaaTransport implements Event private final EventComparator eventSeqNumberComparator = new EventComparator(); private final KaaClientState clientState; - private final AtomicInteger startEventSN; + private final AtomicInteger startEventSn; private EventManager eventManager; - private boolean isEventSNSynchronized = false; + private boolean isEventSnSynchronized = false; public DefaultEventTransport(KaaClientState state) { this.clientState = state; - this.startEventSN = new AtomicInteger(clientState.getEventSeqNum()); + this.startEventSn = new AtomicInteger(clientState.getEventSeqNum()); } @Override @@ -63,12 +63,13 @@ public EventSyncRequest createEventRequest(Integer requestId) { eventManager.fillEventListenersSyncRequest(request); - if (isEventSNSynchronized) { + if (isEventSnSynchronized) { Set eventsSet = new HashSet(); if (!pendingEvents.isEmpty()) { for (Map.Entry> pendingEntry : pendingEvents.entrySet()) { - LOG.debug("Have not received response for {} events sent with request id {}", pendingEntry.getValue().size(), + LOG.debug("Have not received response for {} events sent with request id {}", + pendingEntry.getValue().size(), pendingEntry.getKey()); eventsSet.addAll(pendingEntry.getValue()); } @@ -79,7 +80,8 @@ public EventSyncRequest createEventRequest(Integer requestId) { List events = new ArrayList(eventsSet); if (!events.isEmpty()) { Collections.sort(events, eventSeqNumberComparator); - LOG.debug("Going to send {} event{}", events.size(), (events.size() == 1 ? "" : "s")); // NOSONAR + LOG.debug("Going to send {} event{}", events.size(), + (events.size() == 1 ? "" : "s")); // NOSONAR request.setEvents(events); pendingEvents.put(requestId, eventsSet); } @@ -87,7 +89,7 @@ public EventSyncRequest createEventRequest(Integer requestId) { request.setEventSequenceNumberRequest(null); } else { request.setEventSequenceNumberRequest(new EventSequenceNumberRequest()); - LOG.trace("Sending event sequence number request: " + "restored_sn = {}", startEventSN); + LOG.trace("Sending event sequence number request: " + "restored_sn = {}", startEventSn); } return request; @@ -98,13 +100,13 @@ public EventSyncRequest createEventRequest(Integer requestId) { @Override public void onEventResponse(EventSyncResponse response) { if (eventManager != null) { - if (!isEventSNSynchronized && response.getEventSequenceNumberResponse() != null) { - int lastSN = response.getEventSequenceNumberResponse().getSeqNum(); - int expectedSN = lastSN > 0 ? lastSN + 1 : lastSN; + if (!isEventSnSynchronized && response.getEventSequenceNumberResponse() != null) { + int lastSn = response.getEventSequenceNumberResponse().getSeqNum(); + int expectedSn = lastSn > 0 ? lastSn + 1 : lastSn; - if (startEventSN.get() != expectedSN) { - startEventSN.set(expectedSN); - clientState.setEventSeqNum(startEventSN.get()); + if (startEventSn.get() != expectedSn) { + startEventSn.set(expectedSn); + clientState.setEventSeqNum(startEventSn.get()); Set eventsSet = new HashSet(); for (Set events : pendingEvents.values()) { @@ -116,33 +118,36 @@ public void onEventResponse(EventSyncResponse response) { List events = new ArrayList(eventsSet); Collections.sort(events, eventSeqNumberComparator); - clientState.setEventSeqNum(startEventSN.get() + events.size()); - if (!events.isEmpty() && events.get(0).getSeqNum() != startEventSN.get()) { - LOG.info("Put in order event sequence numbers (expected: {}, actual: {})", startEventSN, events.get(0).getSeqNum()); + clientState.setEventSeqNum(startEventSn.get() + events.size()); + if (!events.isEmpty() && events.get(0).getSeqNum() != startEventSn.get()) { + LOG.info("Put in order event sequence numbers (expected: {}, actual: {})", + startEventSn, events.get(0).getSeqNum()); for (Event e : events) { - e.setSeqNum(startEventSN.getAndIncrement()); + e.setSeqNum(startEventSn.getAndIncrement()); } } else { - startEventSN.getAndAdd(events.size()); + startEventSn.getAndAdd(events.size()); } - LOG.info("Event sequence number is unsynchronized. Set to {}", startEventSN); + LOG.info("Event sequence number is unsynchronized. Set to {}", startEventSn); } else { - LOG.info("Event sequence number is up to date: {}", startEventSN); + LOG.info("Event sequence number is up to date: {}", startEventSn); } - isEventSNSynchronized = true; + isEventSnSynchronized = true; } if (response.getEvents() != null && !response.getEvents().isEmpty()) { List events = new ArrayList<>(response.getEvents()); Collections.sort(events, eventSeqNumberComparator); for (Event event : events) { - eventManager.onGenericEvent(event.getEventClassFQN(), event.getEventData().array(), event.getSource()); + eventManager.onGenericEvent(event.getEventClassFQN(), event.getEventData().array(), + event.getSource()); } } - if (response.getEventListenersResponses() != null && !response.getEventListenersResponses().isEmpty()) { + if (response.getEventListenersResponses() != null + && !response.getEventListenersResponses().isEmpty()) { eventManager.eventListenersResponseReceived(response.getEventListenersResponses()); } } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultLogTransport.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultLogTransport.java index 4041100d2c..aa4501efd5 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultLogTransport.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultLogTransport.java @@ -54,8 +54,8 @@ public void onLogResponse(LogSyncResponse response) { if (processor != null) { try { processor.onLogResponse(response); - } catch (IOException e) { - LOG.error("Failed to process Log response: {}", e); + } catch (IOException ex) { + LOG.error("Failed to process Log response: {}", ex); } } else { LOG.error("Can't process response. LogProcessor is null"); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultNotificationTransport.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultNotificationTransport.java index 5612b7c81d..51a22770f4 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultNotificationTransport.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultNotificationTransport.java @@ -42,11 +42,12 @@ import java.util.Map.Entry; import java.util.Set; -public class DefaultNotificationTransport extends AbstractKaaTransport implements NotificationTransport { +public class DefaultNotificationTransport extends AbstractKaaTransport + implements NotificationTransport { private static final Logger LOG = LoggerFactory.getLogger(DefaultNotificationTransport.class); private final Set acceptedUnicastNotificationIds = new HashSet<>(); - private final List sentNotificationCommands = new LinkedList(); + private final List sentNotificationCommands = new LinkedList<>(); private NotificationProcessor processor; private List getTopicStates() { @@ -130,10 +131,12 @@ public void onNotificationResponse(NotificationSyncResponse response) throws IOE for (Notification notification : multicastNotifications) { LOG.info("Received {}", notification); - if (clientState.updateTopicSubscriptionInfo(notification.getTopicId(), notification.getSeqNumber())) { + if (clientState.updateTopicSubscriptionInfo(notification.getTopicId(), + notification.getSeqNumber())) { newNotifications.add(notification); } else { - LOG.info("Notification with seq number {} was already received", notification.getSeqNumber()); + LOG.info("Notification with seq number {} was already received", + notification.getSeqNumber()); } } processor.notificationReceived(newNotifications); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultProfileTransport.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultProfileTransport.java index ea3a0b5bd1..163aabd6f9 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultProfileTransport.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultProfileTransport.java @@ -68,7 +68,8 @@ public ProfileSyncRequest createProfileRequest() throws IOException { LOG.info("Profile is up to date"); } } else { - LOG.error("Failed to create ProfileSyncRequest clientState {}, manager {}, properties {}", clientState, manager, properties); + LOG.error("Failed to create ProfileSyncRequest clientState {}, manager {}, properties {}", + clientState, manager, properties); } return null; } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultUserTransport.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultUserTransport.java index 7c09495a47..d63537223d 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultUserTransport.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultUserTransport.java @@ -43,27 +43,32 @@ public class DefaultUserTransport extends AbstractKaaTransport implements private static final Logger LOG = LoggerFactory.getLogger(DefaultUserTransport.class); private EndpointRegistrationProcessor processor; - private Map attachedEndpoints = new HashMap(); + private Map attachedEndpoints = new HashMap<>(); @Override public UserSyncRequest createUserRequest() { if (processor != null) { UserSyncRequest request = new UserSyncRequest(); - Map attachEndpointRequests = processor.getAttachEndpointRequests(); - List attachEPRequestList = new LinkedList(); - for (Map.Entry attachEPRequest : attachEndpointRequests.entrySet()) { - attachEPRequestList.add(new EndpointAttachRequest(attachEPRequest.getKey(), attachEPRequest.getValue().getToken())); + Map attachEndpointRequests = + processor.getAttachEndpointRequests(); + List attachEpRequestList = new LinkedList(); + for (Map.Entry attachEpRequest : attachEndpointRequests + .entrySet()) { + attachEpRequestList.add(new EndpointAttachRequest(attachEpRequest.getKey(), + attachEpRequest.getValue().getToken())); } Map detachEndpointRequests = processor.getDetachEndpointRequests(); - List detachEPRequestList = new LinkedList(); - for (Map.Entry detachEPRequest : detachEndpointRequests.entrySet()) { - detachEPRequestList.add(new EndpointDetachRequest(detachEPRequest.getKey(), detachEPRequest.getValue().getKeyHash())); + List detachEpRequestList = new LinkedList<>(); + for (Map.Entry detachEpRequest : detachEndpointRequests + .entrySet()) { + detachEpRequestList.add(new EndpointDetachRequest(detachEpRequest.getKey(), + detachEpRequest.getValue().getKeyHash())); } - request.setEndpointAttachRequests(attachEPRequestList); - request.setEndpointDetachRequests(detachEPRequestList); + request.setEndpointAttachRequests(attachEpRequestList); + request.setEndpointDetachRequests(detachEpRequestList); request.setUserAttachRequest(processor.getUserAttachRequest()); return request; } @@ -77,30 +82,38 @@ public void onUserResponse(UserSyncResponse response) throws IOException { if (clientState != null) { attachedEndpoints = clientState.getAttachedEndpointsList(); } - Map attachEndpointRequests = processor.getAttachEndpointRequests(); - if (response.getEndpointAttachResponses() != null && !response.getEndpointAttachResponses().isEmpty()) { + Map attachEndpointRequests = + processor.getAttachEndpointRequests(); + if (response.getEndpointAttachResponses() != null + && !response.getEndpointAttachResponses().isEmpty()) { for (EndpointAttachResponse attached : response.getEndpointAttachResponses()) { - EndpointAccessToken attachedToken = attachEndpointRequests.remove(attached.getRequestId()); + EndpointAccessToken attachedToken = attachEndpointRequests.remove( + attached.getRequestId()); if (attached.getResult() == SyncResponseResultType.SUCCESS) { if (attachedToken != null) { LOG.info("Token {}", attachedToken); - attachedEndpoints.put(attachedToken, new EndpointKeyHash(attached.getEndpointKeyHash())); + attachedEndpoints.put(attachedToken, + new EndpointKeyHash(attached.getEndpointKeyHash())); hasChanges = true; } else { LOG.warn("Endpoint {} is already attached!", attached.getEndpointKeyHash()); } } else { - LOG.error("Failed to attach endpoint {}. Attach endpoint request id: {}", attached.getEndpointKeyHash(), attached.getRequestId()); + LOG.error("Failed to attach endpoint {}. Attach endpoint request id: {}", + attached.getEndpointKeyHash(), attached.getRequestId()); } } } Map detachEndpointRequests = processor.getDetachEndpointRequests(); - if (response.getEndpointDetachResponses() != null && !response.getEndpointDetachResponses().isEmpty()) { + if (response.getEndpointDetachResponses() != null + && !response.getEndpointDetachResponses().isEmpty()) { for (EndpointDetachResponse detached : response.getEndpointDetachResponses()) { - EndpointKeyHash detachedEndpointKeyHash = detachEndpointRequests.remove(detached.getRequestId()); + EndpointKeyHash detachedEndpointKeyHash = detachEndpointRequests.remove( + detached.getRequestId()); if (detached.getResult() == SyncResponseResultType.SUCCESS) { if (detachedEndpointKeyHash != null) { - for (Map.Entry entry : attachedEndpoints.entrySet()) { + for (Map.Entry entry : attachedEndpoints + .entrySet()) { if (detachedEndpointKeyHash.equals(entry.getValue())) { EndpointKeyHash removed = attachedEndpoints.remove(entry.getKey()); if (!hasChanges) { @@ -111,7 +124,8 @@ public void onUserResponse(UserSyncResponse response) throws IOException { } } } else { - LOG.error("Failed to detach endpoint. Detach endpoint request id: {}", detached.getRequestId()); + LOG.error("Failed to detach endpoint. Detach endpoint request id: {}", + detached.getRequestId()); } } } @@ -119,11 +133,11 @@ public void onUserResponse(UserSyncResponse response) throws IOException { if (hasChanges && clientState != null) { clientState.setAttachedEndpointsList(attachedEndpoints); } - processor.onUpdate(response.getEndpointAttachResponses() - , response.getEndpointDetachResponses() - , response.getUserAttachResponse() - , response.getUserAttachNotification() - , response.getUserDetachNotification()); + processor.onUpdate(response.getEndpointAttachResponses(), + response.getEndpointDetachResponses(), + response.getUserAttachResponse(), + response.getUserAttachNotification(), + response.getUserDetachNotification()); LOG.info("Processed user response"); } } diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/DefaultEventManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/DefaultEventManager.java index 6e4feff87f..e6bca47aca 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/DefaultEventManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/DefaultEventManager.java @@ -50,14 +50,16 @@ public class DefaultEventManager implements EventManager { private final List currentEvents = new LinkedList(); private final Object eventsGuard = new Object(); private final Object trxGuard = new Object(); - private final Map eventListenersRequests = new HashMap(); + private final Map eventListenersRequests = + new HashMap(); private final EventTransport transport; private final KaaClientState state; private final ExecutorContext executorContext; private final Map> transactions = new HashMap<>(); private Boolean isEngaged = false; - public DefaultEventManager(KaaClientState state, ExecutorContext executorContext, EventTransport transport) { + public DefaultEventManager(KaaClientState state, ExecutorContext executorContext, + EventTransport transport) { this.state = state; this.transport = transport; this.executorContext = executorContext; @@ -66,10 +68,12 @@ public DefaultEventManager(KaaClientState state, ExecutorContext executorContext @Override public void fillEventListenersSyncRequest(EventSyncRequest request) { if (!eventListenersRequests.isEmpty()) { - LOG.debug("There are {} unresolved eventListenersResolution request{}", eventListenersRequests.size(), + LOG.debug("There are {} unresolved eventListenersResolution request{}", + eventListenersRequests.size(), (eventListenersRequests.size() == 1 ? "" : "s")); // NOSONAR List requests = new ArrayList(); - for (Map.Entry entry : eventListenersRequests.entrySet()) { + for (Map.Entry entry : eventListenersRequests + .entrySet()) { if (!entry.getValue().isSent()) { requests.add(entry.getValue().getRequest()); entry.getValue().setSent(Boolean.TRUE); @@ -94,16 +98,18 @@ public void produceEvent(String eventFqn, byte[] data, String target) { @Override public void produceEvent(String eventFqn, byte[] data, String target, TransactionId trxId) { if (trxId == null) { - LOG.info("Producing event [eventClassFQN: {}, target: {}]", eventFqn, (target != null ? target : "broadcast")); // NOSONAR + LOG.info("Producing event [eventClassFQN: {}, target: {}]", eventFqn, + (target != null ? target : "broadcast")); // NOSONAR synchronized (eventsGuard) { - currentEvents.add(new Event(state.getAndIncrementEventSeqNum(), eventFqn, ByteBuffer.wrap(data), null, target)); + currentEvents.add(new Event(state.getAndIncrementEventSeqNum(), eventFqn, + ByteBuffer.wrap(data), null, target)); } if (!isEngaged) { transport.sync(); } } else { - LOG.info("Adding event [eventClassFQN: {}, target: {}] to transaction {}", eventFqn, target != null ? target : "broadcast", - trxId); // NOSONAR + LOG.info("Adding event [eventClassFQN: {}, target: {}] to transaction {}", + eventFqn, target != null ? target : "broadcast", trxId); // NOSONAR synchronized (trxGuard) { List events = transactions.get(trxId); if (events != null) { @@ -154,7 +160,8 @@ public int findEventListeners(List eventFqns, FindEventListenersCallback public void eventListenersResponseReceived(List response) { for (final EventListenersResponse singleResponse : response) { LOG.debug("Received event listener resolution response: {}", response); - final EventListenersRequestBinding bind = eventListenersRequests.remove(singleResponse.getRequestId()); + final EventListenersRequestBinding bind = eventListenersRequests.remove( + singleResponse.getRequestId()); executorContext.getCallbackExecutor().submit(new Runnable() { @Override public void run() { @@ -258,7 +265,8 @@ private class EventListenersRequestBinding { private final EventListenersRequest request; private Boolean sent; - public EventListenersRequestBinding(FindEventListenersCallback listener, EventListenersRequest request) { + public EventListenersRequestBinding( + FindEventListenersCallback listener, EventListenersRequest request) { this.listener = listener; this.request = request; this.sent = false; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/FindEventListenersCallback.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/FindEventListenersCallback.java index db0feaf434..77dc525903 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/FindEventListenersCallback.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/FindEventListenersCallback.java @@ -20,7 +20,7 @@ /** * Listener interface for retrieving endpoints list - * which supports requested event class FQNs + * which supports requested event class FQNs. * * @author Taras Lemkin * @see EventListenersResolver @@ -28,7 +28,7 @@ public interface FindEventListenersCallback { /** - * Called when resolve was successful + * Called when resolve was successful. * * @param eventListeners List of endpoints */ diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/DefaultNotificationManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/DefaultNotificationManager.java index 31d7a9e9a1..d8e768d190 100755 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/DefaultNotificationManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/DefaultNotificationManager.java @@ -47,15 +47,16 @@ public class DefaultNotificationManager implements NotificationManager, Notifica private static final Logger LOG = LoggerFactory.getLogger(DefaultNotificationManager.class); private final ExecutorContext executorContext; private final NotificationDeserializer deserializer; - private final Set mandatoryListeners = new HashSet(); + private final Set mandatoryListeners = new HashSet<>(); private final Map> optionalListeners = new HashMap<>(); - private final Set topicsListeners = new HashSet(); - private final List subscriptionInfo = new LinkedList(); + private final Set topicsListeners = new HashSet<>(); + private final List subscriptionInfo = new LinkedList<>(); private final KaaClientState state; private Map topics = new HashMap<>(); private volatile NotificationTransport transport; - public DefaultNotificationManager(KaaClientState state, ExecutorContext executorContext, NotificationTransport transport) { + public DefaultNotificationManager(KaaClientState state, ExecutorContext executorContext, + NotificationTransport transport) { this.state = state; this.transport = transport; this.executorContext = executorContext; @@ -317,7 +318,8 @@ public void notificationReceived(List notifications) throws IOExce private void notifyListeners(Collection listeners, final Topic topic, final Notification notification) { - final Collection listenersCopy = new ArrayList(listeners); + final Collection listenersCopy = + new ArrayList(listeners); if (notification.getBody() != null) { executorContext.getCallbackExecutor().submit(new Runnable() { @Override diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/NotificationDeserializer.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/NotificationDeserializer.java index c952a51e84..0e15afa95f 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/NotificationDeserializer.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/NotificationDeserializer.java @@ -28,7 +28,6 @@ /** * This class deserialize binary data to notification object. - * * This implementation is auto-generated. Please modify corresponding template file. * * @author Andrew Shvayka @@ -36,14 +35,16 @@ @Generated("NotificationDeserializer.java.template") class NotificationDeserializer { - private final AvroByteArrayConverter converter = new AvroByteArrayConverter(Notification.class); + private final AvroByteArrayConverter converter = + new AvroByteArrayConverter(Notification.class); private final ExecutorContext executorContext; public NotificationDeserializer(ExecutorContext executorContext) { this.executorContext = executorContext; } - void notify(Collection listeners, final Topic topic, byte[] notificationData) throws IOException { + void notify(Collection listeners, final Topic topic, + byte[] notificationData) throws IOException { final Notification notification = fromByteArray(notificationData); for (final NotificationListener listener : listeners) { executorContext.getCallbackExecutor().submit(new Runnable() { diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/NotificationManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/NotificationManager.java index e0b2712463..adc25257ed 100755 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/NotificationManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/NotificationManager.java @@ -90,7 +90,8 @@ public interface NotificationManager { * @param listener Listener to receive notifications. * @throws UnavailableTopicException Throw if unknown topic id is provided. */ - void addNotificationListener(Long topicId, NotificationListener listener) throws UnavailableTopicException; + void addNotificationListener(Long topicId, NotificationListener listener) + throws UnavailableTopicException; /** *

@@ -116,7 +117,8 @@ public interface NotificationManager { * @param listener Listener to receive notifications. * @throws UnavailableTopicException Throw if unknown topic id is provided. */ - void removeNotificationListener(Long topicId, NotificationListener listener) throws UnavailableTopicException; + void removeNotificationListener(Long topicId, NotificationListener listener) + throws UnavailableTopicException; /** *

@@ -182,7 +184,8 @@ public interface NotificationManager { * optional. * @see #sync() */ - void unsubscribeFromTopics(List topicIds, boolean forceSync) throws UnavailableTopicException; + void unsubscribeFromTopics(List topicIds, boolean forceSync) + throws UnavailableTopicException; /** *

Accept optional subscription changes.

diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/TopicListHashCalculator.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/TopicListHashCalculator.java index 2787694791..7bb14c9faf 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/TopicListHashCalculator.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/TopicListHashCalculator.java @@ -45,8 +45,9 @@ public class TopicListHashCalculator { * @return the integer */ public static Integer calculateTopicListHash(List topics) { - if (topics == null) + if (topics == null) { return NULL_LIST_HASH; + } int result = EMPTRY_LIST_HASH; if (!topics.isEmpty()) { diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/package-info.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/package-info.java index bd59fc402d..21411fc303 100755 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/package-info.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/package-info.java @@ -63,7 +63,8 @@ * } * * - *

To remove topic update listener, call {@link org.kaaproject.kaa.client.notification.NotificationManager#removeTopicListListener(NotificationTopicListListener)} + *

To remove topic update listener, call {@link org.kaaproject.kaa.client.notification + * .NotificationManager#removeTopicListListener(NotificationTopicListListener)} * with an appropriate listener.

* *

Notifications - usage examples

@@ -168,8 +169,8 @@ * *

There is a similar stuff to deal with a group of optional topics - {@link * org.kaaproject.kaa.client.notification.NotificationManager#subscribeToTopics(java.util.List, - * boolean)} and {@link org.kaaproject.kaa.client.notification.NotificationManager#unsubscribeFromTopics(java.util.List, - * boolean)}.

+ * boolean)} and {@link org.kaaproject.kaa.client.notification.NotificationManager# + * unsubscribeFromTopics(java.util.List,boolean)}.

* *

Performance

* diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/DefaultProfileManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/DefaultProfileManager.java index 888e2510f5..0a2e86d450 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/DefaultProfileManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/DefaultProfileManager.java @@ -21,7 +21,7 @@ import java.io.IOException; /** - * Default {@link ProfileManager} implementation + * Default {@link ProfileManager} implementation. * * @author Yaroslav Zeygerman * @author Andrew Shvayka diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileContainer.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileContainer.java index 7385a6ce1c..d95117c494 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileContainer.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileContainer.java @@ -27,7 +27,7 @@ public interface ProfileContainer { /** - * Retrieves serialized profile + * Retrieves serialized profile. * * @return byte array with serialized profile */ diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileManager.java index 32fd657366..358cd5d146 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileManager.java @@ -77,13 +77,12 @@ public interface ProfileManager { byte[] getSerializedProfile() throws IOException; /** - * Force sync of updated profile with server + * Force sync of updated profile with server. */ void updateProfile(); /** * Retrieves ready-to-use state. - * * A user should provide a profile container in case of a non-default profile schema. * * @return True if ready. diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileRuntimeException.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileRuntimeException.java index 727cd9ad94..eb7838b102 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileRuntimeException.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileRuntimeException.java @@ -17,7 +17,7 @@ package org.kaaproject.kaa.client.profile; /** - * Profile runtime exception + * Profile runtime exception. * * @author Yaroslav Zeygerman */ diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileSerializer.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileSerializer.java index 3375c7493b..25f4b5f30e 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileSerializer.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/profile/ProfileSerializer.java @@ -34,7 +34,8 @@ */ @Generated("ProfileSerializer.java.template") class ProfileSerializer { - private final AvroByteArrayConverter converter = new AvroByteArrayConverter(EmptyData.class); + private final AvroByteArrayConverter converter = + new AvroByteArrayConverter(EmptyData.class); byte[] toByteArray(ProfileContainer container) throws IOException { EmptyData profile;