KAA-807: Changed sonar exclusions. Fixed major project issues.

avrogenc/src/main/java/org/kaaproject/kaa/avro/avrogenc/Compiler.java

@@ -236,13 +236,13 @@ private void processUnion(Schema schema, GenerationContext genContext) {
         context.put("TypeConverter", TypeConverter.class);
         context.put("namespacePrefix", namespacePrefix);
 
-        StringWriter headerWriter = new StringWriter();
-        engine.getTemplate("union.h.vm").merge(context, headerWriter);
-        appendResult(headerWriter.toString(), true);
+        StringWriter hdrWriter = new StringWriter();
+        engine.getTemplate("union.h.vm").merge(context, hdrWriter);
+        appendResult(hdrWriter.toString(), true);
 
-        StringWriter sourceWriter = new StringWriter();
-        engine.getTemplate("union.c.vm").merge(context, sourceWriter);
-        appendResult(sourceWriter.toString(), false);
+        StringWriter srcWriter = new StringWriter();
+        engine.getTemplate("union.c.vm").merge(context, srcWriter);
+        appendResult(srcWriter.toString(), false);
     }
 
     private void processRecord(Schema schema) {
@@ -253,13 +253,13 @@ private void processRecord(Schema schema) {
         context.put("TypeConverter", TypeConverter.class);
         context.put("namespacePrefix", namespacePrefix);
 
-        StringWriter headerWriter = new StringWriter();
-        engine.getTemplate("record.h.vm").merge(context, headerWriter);
-        appendResult(headerWriter.toString(), true);
+        StringWriter hdrWriter = new StringWriter();
+        engine.getTemplate("record.h.vm").merge(context, hdrWriter);
+        appendResult(hdrWriter.toString(), true);
 
-        StringWriter sourceWriter = new StringWriter();
-        engine.getTemplate("record.c.vm").merge(context, sourceWriter);
-        appendResult(sourceWriter.toString(), false);
+        StringWriter srcWriter = new StringWriter();
+        engine.getTemplate("record.c.vm").merge(context, srcWriter);
+        appendResult(srcWriter.toString(), false);
     }
 
     private void processEnum(Schema schema) {

avrogenc/src/main/java/org/kaaproject/kaa/avro/avrogenc/GenerationContext.java

@@ -58,14 +58,14 @@ public String getFieldName() {
     }
 
     public boolean isTypeOut() {
-        return (direction != DirectionType.IN);
+        return direction != DirectionType.IN;
     }
 
     public boolean isTypeIn() {
-        return (direction != DirectionType.OUT);
+        return direction != DirectionType.OUT;
     }
 
     public boolean isTypeInOut() {
-        return (direction == DirectionType.INOUT);
+        return direction == DirectionType.INOUT;
     }
 }

avrogenc/src/main/java/org/kaaproject/kaa/avro/avrogenc/StyleUtils.java

@@ -62,6 +62,6 @@ public static String toUpperUnderScore(String camelCaseName) {
 
     public static String removePackageName(String fullClassName) {
         int index = fullClassName.lastIndexOf('.');
-        return (index == -1 ? fullClassName : fullClassName.substring(index + 1));
+        return index == -1 ? fullClassName : fullClassName.substring(index + 1);
     }
 }

avrogenc/src/main/java/org/kaaproject/kaa/avro/avrogenc/TypeConverter.java

@@ -126,57 +126,57 @@ public static boolean isRecordNeedDeallocator(Schema schema) {
 
     public static boolean isAvroPrimitive(Schema schema) {
         Type type = schema.getType();
-        return (type == Type.BOOLEAN || type == Type.INT || type == Type.LONG ||
-                type == Type.ENUM || type == Type.FLOAT || type == Type.DOUBLE);
+        return type == Type.BOOLEAN || type == Type.INT || type == Type.LONG ||
+                type == Type.ENUM || type == Type.FLOAT || type == Type.DOUBLE;
     }
 
     public static boolean isAvroNull(Schema schema) {
-        return (schema.getType() == Type.NULL);
+        return schema.getType() == Type.NULL;
     }
 
     public static boolean isAvroFixed(Schema schema) {
-        return (schema.getType() == Type.FIXED);
+        return schema.getType() == Type.FIXED;
     }
 
     public static boolean isAvroRecord(Schema schema) {
-        return (schema.getType() == Type.RECORD);
+        return schema.getType() == Type.RECORD;
     }
 
     public static boolean isAvroUnion(Schema schema) {
-        return (schema.getType() == Type.UNION);
+        return schema.getType() == Type.UNION;
     }
 
     public static boolean isAvroArray(Schema schema) {
-        return (schema.getType() == Type.ARRAY);
+        return schema.getType() == Type.ARRAY;
     }
 
     public static boolean isAvroEnum(Schema schema) {
-        return (schema.getType() == Type.ENUM);
+        return schema.getType() == Type.ENUM;
     }
 
     public static boolean isAvroString(Schema schema) {
-        return (schema.getType() == Type.STRING);
+        return schema.getType() == Type.STRING;
     }
 
     public static boolean isAvroBytes(Schema schema) {
-        return (schema.getType() == Type.BYTES);
+        return schema.getType() == Type.BYTES;
     }
 
     public static boolean isAvroFloat(Schema schema) {
-        return (schema.getType() == Type.FLOAT);
+        return schema.getType() == Type.FLOAT;
     }
 
     public static boolean isAvroDouble(Schema schema) {
-        return (schema.getType() == Type.DOUBLE);
+        return schema.getType() == Type.DOUBLE;
     }
 
     public static boolean isTypeOut(Schema schema) {
         String prop = schema.getProp(DIRECTION_FIELD);
-        return (prop == null || prop.equalsIgnoreCase("out"));
+        return prop == null || prop.equalsIgnoreCase("out");
     }
 
     public static boolean isTypeIn(Schema schema) {
         String prop = schema.getProp(DIRECTION_FIELD);
-        return (prop == null || prop.equalsIgnoreCase("in"));
+        return prop == null || prop.equalsIgnoreCase("in");
     }
 }

client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/AbstractKaaClient.java

@@ -209,12 +209,12 @@ protected void setClientState(State state) {
         bootstrapManager.setChannelManager(channelManager);
         bootstrapManager.setFailoverManager(failoverManager);
 
-        profileManager = buildProfileManager(properties, kaaClientState, transportContext);
-        notificationManager = buildNotificationManager(properties, kaaClientState, transportContext);
-        eventManager = buildEventManager(properties, kaaClientState, transportContext);
-        endpointRegistrationManager = buildRegistrationManager(properties, kaaClientState, transportContext);
-        logCollector = buildLogCollector(properties, kaaClientState, transportContext);
-        configurationManager = buildConfigurationManager(properties, kaaClientState, transportContext, context.getExecutorContext());
+        profileManager = buildProfileManager(transportContext);
+        notificationManager = buildNotificationManager(kaaClientState, transportContext);
+        eventManager = buildEventManager(kaaClientState, transportContext);
+        endpointRegistrationManager = buildRegistrationManager(kaaClientState, transportContext);
+        logCollector = buildLogCollector(transportContext);
+        configurationManager = buildConfigurationManager(properties, kaaClientState, context.getExecutorContext());
 
         transportContext.getRedirectionTransport().setBootstrapManager(bootstrapManager);
         transportContext.getBootstrapTransport().setBootstrapManager(bootstrapManager);
@@ -583,13 +583,13 @@ public void setDetachedListener(DetachEndpointFromUserCallback listener) {
 
     protected TransportContext buildTransportContext(KaaClientProperties properties, KaaClientState kaaClientState) {
         BootstrapTransport bootstrapTransport = buildBootstrapTransport(properties, kaaClientState);
-        ProfileTransport profileTransport = buildProfileTransport(properties, kaaClientState);
-        EventTransport eventTransport = buildEventTransport(properties, kaaClientState);
-        NotificationTransport notificationTransport = buildNotificationTransport(properties, kaaClientState);
-        ConfigurationTransport configurationTransport = buildConfigurationTransport(properties, kaaClientState);
-        UserTransport userTransport = buildUserTransport(properties, kaaClientState);
-        RedirectionTransport redirectionTransport = buildRedirectionTransport(properties, kaaClientState);
-        LogTransport logTransport = buildLogTransport(properties, kaaClientState);
+        ProfileTransport profileTransport = buildProfileTransport();
+        EventTransport eventTransport = buildEventTransport(kaaClientState);
+        NotificationTransport notificationTransport = buildNotificationTransport();
+        ConfigurationTransport configurationTransport = buildConfigurationTransport();
+        UserTransport userTransport = buildUserTransport();
+        RedirectionTransport redirectionTransport = buildRedirectionTransport();
+        LogTransport logTransport = buildLogTransport();
 
 
         EndpointObjectHash publicKeyHash = EndpointObjectHash.fromSHA1(kaaClientState.getPublicKey().getEncoded());
@@ -604,9 +604,9 @@ protected TransportContext buildTransportContext(KaaClientProperties properties,
     }
 
     protected KaaInternalChannelManager buildChannelManager(BootstrapManager bootstrapManager, Map<TransportProtocolId, List<TransportConnectionInfo>> bootstrapServers) {
-        KaaInternalChannelManager channelManager = new DefaultChannelManager(bootstrapManager, bootstrapServers, context.getExecutorContext());
-        channelManager.setConnectivityChecker(context.createConnectivityChecker());
-        return channelManager;
+        KaaInternalChannelManager kaaInternalChannelManager = new DefaultChannelManager(bootstrapManager, bootstrapServers, context.getExecutorContext());
+        kaaInternalChannelManager.setConnectivityChecker(context.createConnectivityChecker());
+        return kaaInternalChannelManager;
     }
 
     protected void initializeChannels(KaaInternalChannelManager channelManager, TransportContext transportContext) {
@@ -639,28 +639,28 @@ protected FailoverManager buildFailoverManager(KaaChannelManager channelManager)
     }
 
     protected ResyncConfigurationManager buildConfigurationManager(KaaClientProperties properties, KaaClientState kaaClientState,
-                                                                   TransportContext transportContext, ExecutorContext executorContext) {
+                                                                   ExecutorContext executorContext) {
         return new ResyncConfigurationManager(properties, kaaClientState, executorContext);
     }
 
-    protected DefaultLogCollector buildLogCollector(KaaClientProperties properties, KaaClientState kaaClientState, TransportContext transportContext) {
+    protected DefaultLogCollector buildLogCollector(TransportContext transportContext) {
         return new DefaultLogCollector(transportContext.getLogTransport(), context.getExecutorContext(), channelManager, failoverManager);
     }
 
-    protected DefaultEndpointRegistrationManager buildRegistrationManager(KaaClientProperties properties, KaaClientState kaaClientState, TransportContext transportContext) {
+    protected DefaultEndpointRegistrationManager buildRegistrationManager(KaaClientState kaaClientState, TransportContext transportContext) {
         return new DefaultEndpointRegistrationManager(kaaClientState, context.getExecutorContext(),
                 transportContext.getUserTransport(), transportContext.getProfileTransport());
     }
 
-    protected DefaultEventManager buildEventManager(KaaClientProperties properties, KaaClientState kaaClientState, TransportContext transportContext) {
+    protected DefaultEventManager buildEventManager(KaaClientState kaaClientState, TransportContext transportContext) {
         return new DefaultEventManager(kaaClientState, context.getExecutorContext(), transportContext.getEventTransport());
     }
 
-    protected DefaultNotificationManager buildNotificationManager(KaaClientProperties properties, KaaClientState kaaClientState, TransportContext transportContext) {
+    protected DefaultNotificationManager buildNotificationManager(KaaClientState kaaClientState, TransportContext transportContext) {
         return new DefaultNotificationManager(kaaClientState, context.getExecutorContext(), transportContext.getNotificationTransport());
     }
 
-    protected ProfileManager buildProfileManager(KaaClientProperties properties, KaaClientState kaaClientState, TransportContext transportContext) {
+    protected ProfileManager buildProfileManager(TransportContext transportContext) {
         return new DefaultProfileManager(transportContext.getProfileTransport());
     }
 
@@ -676,37 +676,37 @@ protected BootstrapTransport buildBootstrapTransport(KaaClientProperties propert
         return new DefaultBootstrapTransport(properties.getSdkToken());
     }
 
-    protected ProfileTransport buildProfileTransport(KaaClientProperties properties, KaaClientState kaaClientState) {
+    protected ProfileTransport buildProfileTransport() {
         ProfileTransport transport = new DefaultProfileTransport();
         transport.setClientProperties(this.properties);
         return transport;
     }
 
-    protected ConfigurationTransport buildConfigurationTransport(KaaClientProperties properties, KaaClientState kaaClientState) {
+    protected ConfigurationTransport buildConfigurationTransport() {
         ConfigurationTransport transport = new DefaultConfigurationTransport();
         // TODO: this should be part of properties and provided by user during
         // SDK generation
         transport.setResyncOnly(true);
         return transport;
     }
 
-    protected NotificationTransport buildNotificationTransport(KaaClientProperties properties, KaaClientState kaaClientState) {
+    protected NotificationTransport buildNotificationTransport() {
         return new DefaultNotificationTransport();
     }
 
-    protected DefaultUserTransport buildUserTransport(KaaClientProperties properties, KaaClientState kaaClientState) {
+    protected DefaultUserTransport buildUserTransport() {
         return new DefaultUserTransport();
     }
 
-    protected EventTransport buildEventTransport(KaaClientProperties properties, KaaClientState kaaClientState) {
+    protected EventTransport buildEventTransport(KaaClientState kaaClientState) {
         return new DefaultEventTransport(kaaClientState);
     }
 
-    protected LogTransport buildLogTransport(KaaClientProperties properties, KaaClientState kaaClientState) {
+    protected LogTransport buildLogTransport() {
         return new DefaultLogTransport();
     }
 
-    protected RedirectionTransport buildRedirectionTransport(KaaClientProperties properties, KaaClientState kaaClientState) {
+    protected RedirectionTransport buildRedirectionTransport() {
         return new DefaultRedirectionTransport();
     }
 }

client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultBootstrapDataProcessor.java

@@ -63,9 +63,11 @@ public synchronized void processResponse(byte[] response) throws IOException {
 
     @Override
     public void preProcess() {
+        // Do nothing
     }
 
     @Override
     public void postProcess() {
+        // Do nothing
     }
 }

client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationsChannel.java

@@ -343,6 +343,7 @@ public TransportConnectionInfo getServer() {
 
     @Override
     public void setConnectivityChecker(ConnectivityChecker checker) {
+        // Do nothing
     }
 
     @Override

client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultConfigurationTransport.java

@@ -24,21 +24,6 @@
 import org.kaaproject.kaa.client.configuration.ConfigurationProcessor;
 import org.kaaproject.kaa.client.schema.SchemaProcessor;
 import org.kaaproject.kaa.common.TransportType;
-/*
- * Copyright 2014 CyberVision, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 import org.kaaproject.kaa.common.endpoint.gen.ConfigurationSyncRequest;
 import org.kaaproject.kaa.common.endpoint.gen.ConfigurationSyncResponse;
 import org.kaaproject.kaa.common.endpoint.gen.SyncResponseStatus;

client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/transports/DefaultEventTransport.java

@@ -102,7 +102,7 @@ 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);
+                int expectedSN = lastSN > 0 ? lastSN + 1 : lastSN;
 
                 if (startEventSN.get() != expectedSN) {
                     startEventSN.set(expectedSN);

client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/DefaultEventManager.java

@@ -131,7 +131,7 @@ public void produceEvent(String eventFqn, byte[] data, String target, Transactio
                 transport.sync();
             }
         } else {
-            LOG.info("Adding event [eventClassFQN: {}, target: {}] to transaction {}", eventFqn, (target != null ? target : "broadcast"),
+            LOG.info("Adding event [eventClassFQN: {}, target: {}] to transaction {}", eventFqn, target != null ? target : "broadcast",
                     trxId); // NOSONAR
             synchronized (trxGuard) {
                 List<Event> events = transactions.get(trxId);

client/client-multi/client-java-desktop/src/main/java/org/kaaproject/kaa/client/transport/DesktopHttpClient.java

@@ -110,15 +110,6 @@ private byte[] getResponseBody(HttpResponse response, boolean verifyResponse) th
                 } else {
                     signature = new byte[0];
                 }
-
-                // LOG.debug("Remote Public Key: {}" +
-                // messageEncDec.getRemotePublicKey().getEncoded().length);
-                // LOG.debug(MessageEncoderDecoder.bytesToHex(messageEncDec.getRemotePublicKey().getEncoded()));
-                // LOG.debug("Signature size: {}" + signature.length);
-                // LOG.debug(MessageEncoderDecoder.bytesToHex(signature));
-                // LOG.debug("Body size: {}" + body.length);
-                // LOG.debug(MessageEncoderDecoder.bytesToHex(body));
-
                 return verifyResponse(body, signature);
             } else {
                 return body;

common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Connect.java

@@ -325,8 +325,8 @@ private void decodeVariableHeader() throws KaaTcpProtocolException {
     }
 
     private void decodeKeepAlive() {
-        int msb = ((buffer.get() & 0xFF) << 8);
-        int lsb = (buffer.get() & 0xFF);
+        int msb = (buffer.get() & 0xFF) << 8;
+        int lsb = buffer.get() & 0xFF;
         keepAlive = (msb | lsb);
     }
 

common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/KaaSync.java

@@ -230,8 +230,8 @@ protected void decodeVariableHeader() throws KaaTcpProtocolException {
                 throw new KaaTcpProtocolException("Kaatcp protocol version missmatch");
             }
         }
-        int msb = ((buffer.get() & 0xFF) << 8);
-        int lsb = (buffer.get() & 0xFF);
+        int msb = (buffer.get() & 0xFF) << 8;
+        int lsb = buffer.get() & 0xFF;
         messageId = (msb | lsb);
         byte flag = buffer.get();
         if (((flag & 0xFF) & KAASYNC_REQUEST_FLAG) != 0) {

common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/PingRequest.java

@@ -41,14 +41,15 @@ public PingRequest() {
      */
     @Override
     protected void pack() {
+        // Do nothing
     }
 
     /* (non-Javadoc)
      * @see org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.mqttFrame#decode()
      */
     @Override
     protected void decode() throws KaaTcpProtocolException {
-
+        // Do nothing
     }
 
     /* (non-Javadoc)