OverloadMethodsDeclarationOrder fix and fixed Indentation in Hibernat…

…e-* classes
kaaproject · Sep 28, 2016 · 8cc9fe8 · 8cc9fe8
1 parent e9f06cb
commit 8cc9fe8
Show file tree

Hide file tree

Showing 20 changed files with 1,478 additions and 1,445 deletions.
diff --git a/...multi/client-java-android/src/main/java/org/kaaproject/kaa/client/util/AndroidBase64.java b/...multi/client-java-android/src/main/java/org/kaaproject/kaa/client/util/AndroidBase64.java
@@ -33,13 +33,15 @@ public byte[] decodeBase64(byte[] base64Data) {
   }
 
   @Override
-  public byte[] encodeBase64(byte[] binaryData) {
+  public byte[] decodeBase64(String base64String) {
-    return android.util.Base64.encode(binaryData, android.util.Base64.DEFAULT);
+    return android.util.Base64.decode(base64String, android.util.Base64.DEFAULT);
   }
 
   @Override
-  public byte[] decodeBase64(String base64String) {
+  public byte[] encodeBase64(byte[] binaryData) {
-    return android.util.Base64.decode(base64String, android.util.Base64.DEFAULT);
+    return android.util.Base64.encode(binaryData, android.util.Base64.DEFAULT);
   }
 
+
+
 }
diff --git a/...java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultChannelManager.java b/...java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultChannelManager.java
@@ -231,11 +231,33 @@ private KaaDataChannel getChannel(TransportType type) {
     return result;
   }
 
+  @Override
+  public synchronized KaaDataChannel getChannel(String id) {
+    for (KaaDataChannel channel : channels) {
+      if (channel.getId().equals(id)) {
+        return channel;
+      }
+    }
+    return null;
+  }
+
+
   @Override
   public void sync(TransportType type) {
     sync(type, false, false);
   }
 
+  private void sync(TransportType type, boolean ack, boolean all) {
+    LOG.debug("Lookup channel by type {}", type);
+    KaaDataChannel channel = getChannel(type);
+    BlockingQueue<SyncTask> queue = syncTaskQueueMap.get(channel.getId());
+    if (queue != null) {
+      queue.offer(new SyncTask(type, ack, all));
+    } else {
+      LOG.warn("Can't find queue for channel [{}]", channel.getId());
+    }
+  }
+
   @Override
   public void syncAck(TransportType type) {
     sync(type, true, false);
@@ -246,15 +268,7 @@ public void syncAll(TransportType type) {
     sync(type, false, true);
   }
 
-  @Override
+
-  public synchronized KaaDataChannel getChannel(String id) {
-    for (KaaDataChannel channel : channels) {
-      if (channel.getId().equals(id)) {
-        return channel;
-      }
-    }
-    return null;
-  }
 
   @Override
   public synchronized void onTransportConnectionInfoUpdated(TransportConnectionInfo newServer) {
@@ -270,8 +284,10 @@ public synchronized void onTransportConnectionInfoUpdated(TransportConnectionInf
     }
 
     for (KaaDataChannel channel : channels) {
-      if (channel.getServerType() == newServer.getServerType() && channel.getTransportProtocolId().equals(newServer.getTransportId())) {
+      if (channel.getServerType() == newServer.getServerType()
-        LOG.debug("Applying server {} for channel [{}] type {}", newServer, channel.getId(), channel.getTransportProtocolId());
+          && channel.getTransportProtocolId().equals(newServer.getTransportId())) {
+        LOG.debug("Applying server {} for channel [{}] type {}",
+            newServer, channel.getId(), channel.getTransportProtocolId());
         channel.setServer(newServer);
         if (failoverManager != null) {
           failoverManager.onServerChanged(newServer);
@@ -467,16 +483,6 @@ public void setBootstrapDemultiplexer(KaaDataDemultiplexer demultiplexer) {
     this.bootstrapDemultiplexer = demultiplexer;
   }
 
-  private void sync(TransportType type, boolean ack, boolean all) {
-    LOG.debug("Lookup channel by type {}", type);
-    KaaDataChannel channel = getChannel(type);
-    BlockingQueue<SyncTask> queue = syncTaskQueueMap.get(channel.getId());
-    if (queue != null) {
-      queue.offer(new SyncTask(type, ack, all));
-    } else {
-      LOG.warn("Can't find queue for channel [{}]", channel.getId());
-    }
-  }
 
   private void startWorker(KaaDataChannel channel) {
     stopWorker(channel);

diff --git a/...core/src/main/java/org/kaaproject/kaa/client/notification/DefaultNotificationManager.java b/...core/src/main/java/org/kaaproject/kaa/client/notification/DefaultNotificationManager.java
@@ -84,6 +84,28 @@ public void addNotificationListener(NotificationListener listener) {
     }
   }
 
+  @Override
+  public void addNotificationListener(Long topicId, NotificationListener listener)
+      throws UnavailableTopicException {
+    if (listener == null) {
+      LOG.warn("Failed to add listener: id={}, listener={}", topicId, null);
+      throw new IllegalArgumentException("Bad listener data");
+    }
+
+    findTopicById(topicId);
+
+    synchronized (optionalListeners) {
+      List<NotificationListener> listeners = optionalListeners.get(topicId);
+
+      if (listeners == null) {
+        listeners = new LinkedList<>();
+        optionalListeners.put(topicId, listeners);
+      }
+
+      listeners.add(listener);
+    }
+  }
+
   @Override
   public void removeNotificationListener(NotificationListener listener) {
     if (listener == null) {
@@ -96,6 +118,25 @@ public void removeNotificationListener(NotificationListener listener) {
     }
   }
 
+  @Override
+  public void removeNotificationListener(Long topicId, NotificationListener listener)
+      throws UnavailableTopicException {
+    if (topicId == null || listener == null) {
+      LOG.warn("Failed to remove listener: id={}, listener={}", topicId, listener);
+      throw new IllegalArgumentException("Bad listener data");
+    }
+
+    findTopicById(topicId);
+
+    synchronized (optionalListeners) {
+      List<NotificationListener> listeners = optionalListeners.get(topicId);
+
+      if (listeners != null) {
+        listeners.remove(listener);
+      }
+    }
+  }
+
   @Override
   public void addTopicListListener(NotificationTopicListListener listener) {
     if (listener == null) {
@@ -120,6 +161,8 @@ public void removeTopicListListener(NotificationTopicListListener listener) {
     }
   }
 
+
+
   @Override
   public List<Topic> getTopics() {
     List<Topic> topicList = new LinkedList<Topic>();
@@ -149,7 +192,8 @@ public void subscribeToTopic(Long topicId, boolean forceSync) throws Unavailable
   }
 
   @Override
-  public void subscribeToTopics(List<Long> topicIds, boolean forceSync) throws UnavailableTopicException {
+  public void subscribeToTopics(List<Long> topicIds, boolean forceSync)
+      throws UnavailableTopicException {
     List<SubscriptionCommand> subscriptionUpdate = new LinkedList<>();
 
     for (Long id : topicIds) {
@@ -170,7 +214,8 @@ public void subscribeToTopics(List<Long> topicIds, boolean forceSync) throws Una
   }
 
   @Override
-  public void unsubscribeFromTopic(Long topicId, boolean forceSync) throws UnavailableTopicException {
+  public void unsubscribeFromTopic(Long topicId, boolean forceSync)
+      throws UnavailableTopicException {
     Topic topic = findTopicById(topicId);
     if (topic.getSubscriptionType() != SubscriptionType.OPTIONAL_SUBSCRIPTION) {
       LOG.warn("Failed to unsubscribe: topic '{}' isn't optional", topicId);
@@ -185,7 +230,8 @@ public void unsubscribeFromTopic(Long topicId, boolean forceSync) throws Unavail
   }
 
   @Override
-  public void unsubscribeFromTopics(List<Long> topicIds, boolean forceSync) throws UnavailableTopicException {
+  public void unsubscribeFromTopics(List<Long> topicIds, boolean forceSync)
+      throws UnavailableTopicException {
     List<SubscriptionCommand> subscriptionUpdate = new LinkedList<>();
 
     for (Long id : topicIds) {
@@ -205,44 +251,7 @@ public void unsubscribeFromTopics(List<Long> topicIds, boolean forceSync) throws
     }
   }
 
-  @Override
-  public void addNotificationListener(Long topicId, NotificationListener listener) throws UnavailableTopicException {
-    if (listener == null) {
-      LOG.warn("Failed to add listener: id={}, listener={}", topicId, listener);
-      throw new IllegalArgumentException("Bad listener data");
-    }
-
-    findTopicById(topicId);
-
-    synchronized (optionalListeners) {
-      List<NotificationListener> listeners = optionalListeners.get(topicId);
-
-      if (listeners == null) {
-        listeners = new LinkedList<>();
-        optionalListeners.put(topicId, listeners);
-      }
-
-      listeners.add(listener);
-    }
-  }
-
-  @Override
-  public void removeNotificationListener(Long topicId, NotificationListener listener) throws UnavailableTopicException {
-    if (topicId == null || listener == null) {
-      LOG.warn("Failed to remove listener: id={}, listener={}", topicId, listener);
-      throw new IllegalArgumentException("Bad listener data");
-    }
-
-    findTopicById(topicId);
 
-    synchronized (optionalListeners) {
-      List<NotificationListener> listeners = optionalListeners.get(topicId);
-
-      if (listeners != null) {
-        listeners.remove(listener);
-      }
-    }
-  }
 
   @Override
   public void sync() {
@@ -301,22 +310,27 @@ public void notificationReceived(List<Notification> notifications) throws IOExce
             notifyListeners(mandatoryListeners, topic, notification);
           }
         }
-      } catch (UnavailableTopicException e) {
+      } catch (UnavailableTopicException ex) {
-        LOG.warn("Received notification for an unknown topic (id={}), exception catched: {}", notification.getTopicId(), e);
+        LOG.warn("Received notification for an unknown topic (id={}), exception catched: {}",
+            notification.getTopicId(), ex);
       }
     }
   }
 
-  private void notifyListeners(Collection<NotificationListener> listeners, final Topic topic, final Notification notification) {
+  private void notifyListeners(Collection<NotificationListener> listeners, final Topic topic,
+                               final Notification notification) {
     final Collection<NotificationListener> listenersCopy = new ArrayList<NotificationListener>(listeners);
     if (notification.getBody() != null) {
       executorContext.getCallbackExecutor().submit(new Runnable() {
         @Override
         public void run() {
           try {
-            deserializer.notify(Collections.unmodifiableCollection(listenersCopy), topic, notification.getBody().array());
+            deserializer.notify(
-          } catch (IOException e) {
+                Collections.unmodifiableCollection(listenersCopy),
-            LOG.error("Failed to process notification for topic {}", topic.getId(), e);
+                topic,
+                notification.getBody().array());
+          } catch (IOException ex) {
+            LOG.error("Failed to process notification for topic {}", topic.getId(), ex);
           }
         }
       });

diff --git a/...nt-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/util/CommonsBase64.java b/...nt-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/util/CommonsBase64.java
@@ -33,13 +33,15 @@ public byte[] decodeBase64(byte[] base64Data) {
   }
 
   @Override
-  public byte[] encodeBase64(byte[] binaryData) {
+  public byte[] decodeBase64(String base64String) {
-    return org.apache.commons.codec.binary.Base64.encodeBase64(binaryData);
+    return org.apache.commons.codec.binary.Base64.decodeBase64(base64String);
   }
 
   @Override
-  public byte[] decodeBase64(String base64String) {
+  public byte[] encodeBase64(byte[] binaryData) {
-    return org.apache.commons.codec.binary.Base64.decodeBase64(base64String);
+    return org.apache.commons.codec.binary.Base64.encodeBase64(binaryData);
   }
 
+
+
 }
diff --git a/...ared/src/main/java/org/kaaproject/kaa/common/endpoint/security/MessageEncoderDecoder.java b/...ared/src/main/java/org/kaaproject/kaa/common/endpoint/security/MessageEncoderDecoder.java
@@ -135,9 +135,9 @@ static Signature signatureForAlgorithm(String algorithm) {
   public static String bytesToHex(byte[] bytes) {
     char[] hexChars = new char[bytes.length * 3];
     for (int j = 0; j < bytes.length; j++) {
-      int v = bytes[j] & 0xFF;
+      int value = bytes[j] & 0xFF;
-      hexChars[j * 3] = HEX_ARRAY[v >>> 4];
+      hexChars[j * 3] = HEX_ARRAY[value >>> 4];
-      hexChars[j * 3 + 1] = HEX_ARRAY[v & 0x0F];
+      hexChars[j * 3 + 1] = HEX_ARRAY[value & 0x0F];
       hexChars[j * 3 + 2] = ' ';
     }
     return new String(hexChars);
@@ -170,21 +170,10 @@ public byte[] encodeData(byte[] message) throws GeneralSecurityException {
     return sessionCipherPair.encCipher.doFinal(message);
   }
 
-  /**
-   * Decode data using session key then is decoded using private key.
-   *
-   * @param message    the message
-   * @param encodedKey the encoded key
-   * @return the byte[]
-   * @throws GeneralSecurityException the general security exception
-   */
-  public byte[] decodeData(byte[] message, byte[] encodedKey) throws GeneralSecurityException {
-    sessionCipherPair = null;
-    decodeSessionKey(encodedKey);
-    return decodeData(message);
-  }
 
-  private void decodeSessionKey(byte[] encodedKey) throws InvalidKeyException, IllegalBlockSizeException,
+  private void decodeSessionKey(byte[] encodedKey) throws
+      InvalidKeyException,
+      IllegalBlockSizeException,
       BadPaddingException {
     Cipher sessionKeyCipher = RSA_CIPHER.get();
     sessionKeyCipher.init(Cipher.DECRYPT_MODE, privateKey);
@@ -206,6 +195,21 @@ public byte[] decodeData(byte[] message) throws GeneralSecurityException {
     return sessionCipherPair.decCipher.doFinal(message);
   }
 
+
+  /**
+   * Decode data using session key then is decoded using private key.
+   *
+   * @param message    the message
+   * @param encodedKey the encoded key
+   * @return the byte[]
+   * @throws GeneralSecurityException the general security exception
+   */
+  public byte[] decodeData(byte[] message, byte[] encodedKey) throws GeneralSecurityException {
+    sessionCipherPair = null;
+    decodeSessionKey(encodedKey);
+    return decodeData(message);
+  }
+
   /**
    * Sign message using private key.
    *