If applied, this commit will fix multilayer validation.

Author: UellingtonDamasceno

src/main/java/dlt/load/balancer/model/AbstractBalancerState.java

@@ -27,11 +27,6 @@ protected AbstractBalancerState(Balancer balancer) {
     @Override
     public abstract void onEnter();
 
-    @Override
-    public boolean isBalancing(){
-        return true;
-    }
-    
     protected abstract boolean isValidTransaction(Transaction transaction);
 
     protected abstract void handleInvalidTransaction(Transaction trans);
@@ -61,9 +56,7 @@ public final void handle(Transaction transaction) {
             return;
         }
 
-        if (isLoopback 
-                && (!transaction.is(TransactionType.LB_ENTRY) 
-                || !transaction.is(TransactionType.LB_MULTI_REQUEST))){
+        if (isLoopback && !this.canProcessLoopback(transaction)){
             return;
         }
 
@@ -84,4 +77,9 @@ public void onTimeout() {
 
         balancer.transitionTo(new IdleState(balancer));
     }
+
+    @Override
+    public boolean canProcessLoopback(Transaction transaction) {
+        return false;
+    }
 }

src/main/java/dlt/load/balancer/model/AbstractProcessSendDeviceState.java

@@ -47,8 +47,10 @@ protected void handleValidTransaction(Transaction transaction) {
             logger.log(Level.INFO, "Device selecionado para envio: {0}", deviceJson);
             logger.info("LB_REQUEST enviado com sucesso.");
             this.transiteToNextState();
-        } catch (IOException | NoSuchElementException ex) {
+        } catch (IOException ex) {
             logger.log(Level.SEVERE, null, ex);
+        } catch (NoSuchElementException ex){
+            logger.warning("AbstractProcessSendDeviceState - Device list is empty.");
         }
         this.updateQtyResendTransaction();
     }
@@ -77,4 +79,5 @@ private void updateQtyResendTransaction() {
     }
 
     protected abstract Transaction buildTransaction(String deviceJson, String sender);
+
 }

src/main/java/dlt/load/balancer/model/Balancer.java

@@ -169,20 +169,25 @@ public void receiveNewDevice(String deviceJSON) {
 
     public void updateInternalStatus(Status transaction) {
         this.internalStatus = transaction;
-        double currentDeviceCount = transaction.getLastLoad();
-        Long maxDeviceCount = this.configs.getLoadLimit();
+
+        double currentDeviceLoad = transaction.getLastLoad();
+        double deviceLoadLimit = this.configs.getLoadLimit().doubleValue();
+
         boolean isMultiLayerBalancer = this.isMultiLayerBalancer();
+        boolean isBalanced = currentDeviceLoad <= deviceLoadLimit;
 
-        if (this.state.isBalancing() || currentDeviceCount == maxDeviceCount){
-            return;
-        }
-        
-        if (currentDeviceCount < maxDeviceCount) {
+        if (isBalanced) {
             if (isMultiLayerBalancer) {
                 this.messageMultiLayerSentCounter = 0;
-                return;
+            } else {
+                this.messageSingleLayerSentCounter = 0;
             }
-            this.messageSingleLayerSentCounter = 0;
+            return;
+        }
+
+        boolean isCurrentlyIdle = this.state instanceof IdleState;
+
+        if (!isCurrentlyIdle) {
             return;
         }
 
@@ -197,8 +202,8 @@ public void updateInternalStatus(Status transaction) {
 
         if (this.messageSingleLayerSentCounter < MAX_ATTEMPTS_SEND_START_BALANCE) {
             logger.log(Level.INFO, "Solicitação interna de balanceamento de camada unica nº {0} iniciada.", messageSingleLayerSentCounter);
-            
-            startBalanceTransactionSignal = new Status(sourceIdentifier, targetGroup, true, currentDeviceCount, transaction.getAvgLoad(), false);
+
+            startBalanceTransactionSignal = new Status(sourceIdentifier, targetGroup, true, currentDeviceLoad, transaction.getAvgLoad(), false);
             this.sendTransaction(startBalanceTransactionSignal);
             this.transitionTo(new WaitingLBReplyState(this));
             this.messageSingleLayerSentCounter++;

src/main/java/dlt/load/balancer/model/BalancerState.java

@@ -10,9 +10,9 @@ public interface BalancerState {
 
     void onEnter();
 
-    boolean isBalancing();
-
     void handle(Transaction transaction);
 
     void onTimeout();
+    
+    boolean canProcessLoopback(Transaction transaction);
 }

src/main/java/dlt/load/balancer/model/IdleState.java

@@ -24,10 +24,6 @@ public void onEnter() {
         this.balancer.cancelTimeout();
     }
 
-    @Override
-    public boolean isBalancing() {
-        return false;
-    }
 
     @Override
     protected boolean isValidTransaction(Transaction transaction) {
@@ -42,13 +38,12 @@ protected void handleInvalidTransaction(Transaction trans) {
 
     @Override
     public void handleValidTransaction(Transaction transaction) {
-
         if (!this.balancer.canReciveNewDevice()) {
             logger.info("This gateway is not avaliable to recive new devices.");
             return;
         }
 
-        boolean isMultiLayer = this.balancer.isMultiLayerBalancer();
+        boolean isMultiLayer = transaction.isMultiLayerTransaction();
 
         String transactionSender = transaction.getSource();
 
@@ -59,5 +54,10 @@ public void handleValidTransaction(Transaction transaction) {
         this.balancer.sendTransaction(reply);
         this.balancer.transitionTo(new WaitingLBRequestState(balancer, isMultiLayer));
     }
+    
+    @Override
+    public boolean canProcessLoopback(Transaction transaction){
+        return this.isValidTransaction(transaction);
+    }
 
 }