[nifi] branch analytics-framework updated: NIFI-6510 Fix formatting

[aichrist]

This is an automated email from the ASF dual-hosted git repository.

aichrist pushed a commit to branch analytics-framework
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/analytics-framework by this 
push:
     new 7345ee6  NIFI-6510 Fix formatting
7345ee6 is described below

commit 7345ee6b55752431e7d926c7bb831147543f9b14
Author: Andrew I. Christianson <a...@andyic.org>
AuthorDate: Thu Sep 5 13:53:45 2019 -0400

    NIFI-6510 Fix formatting
---
 .../org/apache/nifi/cluster/manager/StatusMerger.java     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
index 05c65b7..6c53d50 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
@@ -499,23 +499,27 @@ public class StatusMerger {
             if (targetPredictions.getPredictedMillisUntilBytesBackpressure() 
== null) {
                 
targetPredictions.setPredictedMillisUntilBytesBackpressure(toMergePredictions.getPredictedMillisUntilBytesBackpressure());
             } else if 
(toMergePredictions.getPredictedMillisUntilBytesBackpressure() != null) {
-                
targetPredictions.setPredictedMillisUntilBytesBackpressure(Math.min(targetPredictions.getPredictedMillisUntilBytesBackpressure(),
 toMergePredictions.getPredictedMillisUntilBytesBackpressure()));
+                
targetPredictions.setPredictedMillisUntilBytesBackpressure(Math.min(targetPredictions.getPredictedMillisUntilBytesBackpressure(),
+                        
toMergePredictions.getPredictedMillisUntilBytesBackpressure()));
             }
             if (targetPredictions.getPredictedMillisUntilCountBackpressure() 
== null) {
                 
targetPredictions.setPredictedMillisUntilCountBackpressure(toMergePredictions.getPredictedMillisUntilCountBackpressure());
             } else if 
(toMergePredictions.getPredictedMillisUntilCountBackpressure() != null) {
-                
targetPredictions.setPredictedMillisUntilCountBackpressure(Math.min(targetPredictions.getPredictedMillisUntilCountBackpressure(),
 toMergePredictions.getPredictedMillisUntilCountBackpressure()));
+                
targetPredictions.setPredictedMillisUntilCountBackpressure(Math.min(targetPredictions.getPredictedMillisUntilCountBackpressure(),
+                        
toMergePredictions.getPredictedMillisUntilCountBackpressure()));
             }
 
             if (targetPredictions.getPredictedPercentBytes() == null) {
                 
targetPredictions.setPredictedPercentBytes(toMergePredictions.getPredictedPercentBytes());
             } else if (toMerge.getPercentUseBytes() != null) {
-                
targetPredictions.setPredictedPercentBytes(Math.max(targetPredictions.getPredictedPercentBytes(),
 toMergePredictions.getPredictedPercentBytes()));
+                
targetPredictions.setPredictedPercentBytes(Math.max(targetPredictions.getPredictedPercentBytes(),
+                        toMergePredictions.getPredictedPercentBytes()));
             }
             if (targetPredictions.getPredictedPercentCount() == null) {
                 
targetPredictions.setPredictedPercentCount(toMergePredictions.getPredictedPercentCount());
             } else if (toMergePredictions.getPredictedPercentCount() != null) {
-                
targetPredictions.setPredictedPercentCount(Math.max(targetPredictions.getPredictedPercentCount(),
 toMergePredictions.getPredictedPercentCount()));
+                
targetPredictions.setPredictedPercentCount(Math.max(targetPredictions.getPredictedPercentCount(),
+                        toMergePredictions.getPredictedPercentCount()));
             }
         }
 
@@ -539,7 +543,8 @@ public class StatusMerger {
         merge(target.getRemoteProcessGroupStatusSnapshot(), 
target.getCanRead(), toMerge.getRemoteProcessGroupStatusSnapshot(), 
toMerge.getCanRead());
     }
 
-    public static void merge(final RemoteProcessGroupStatusSnapshotDTO target, 
final boolean targetReadablePermission, final 
RemoteProcessGroupStatusSnapshotDTO toMerge,
+    public static void merge(final RemoteProcessGroupStatusSnapshotDTO target, 
final boolean targetReadablePermission,
+                             final RemoteProcessGroupStatusSnapshotDTO toMerge,
                              final boolean toMergeReadablePermission) {
         if (target == null || toMerge == null) {
             return;