svn commit: r1774239 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment: file/ standby/client/ tool/

[md...@apache.org]

Author: mduerig
Date: Wed Dec 14 13:21:26 2016
New Revision: 1774239

URL: http://svn.apache.org/viewvc?rev=1774239&view=rev
Log:
OAK-5293: Static code analysis and code cleanup
Use isEmpty instead of size() == 0

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1774239&r1=1774238&r2=1774239&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Wed Dec 14 13:21:26 2016
@@ -191,7 +191,7 @@ public class FileStore extends AbstractF
 
         Manifest manifest = Manifest.empty();
 
-        if (map.size() > 0) {
+        if (!map.isEmpty()) {
             manifest = checkManifest(openManifest());
         }
 

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java?rev=1774239&r1=1774238&r2=1774239&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java Wed Dec 14 13:21:26 2016
@@ -75,7 +75,7 @@ public class ReadOnlyFileStore extends A
 
         Map<Integer, Map<Character, File>> map = collectFiles(directory);
 
-        if (map.size() > 0) {
+        if (!map.isEmpty()) {
             checkManifest(openManifest());
         }
 

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java?rev=1774239&r1=1774238&r2=1774239&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java Wed Dec 14 13:21:26 2016
@@ -91,7 +91,7 @@ public final class StandbyClientSync imp
         this.autoClean = autoClean;
         this.fileStore = store;
         String s = System.getProperty(CLIENT_ID_PROPERTY_NAME);
-        this.observer = new CommunicationObserver((s == null || s.length() == 0) ? UUID.randomUUID().toString() : s);
+        this.observer = new CommunicationObserver((s == null || s.isEmpty()) ? UUID.randomUUID().toString() : s);
         group = new NioEventLoopGroup();
 
         final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java?rev=1774239&r1=1774238&r2=1774239&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java Wed Dec 14 13:21:26 2016
@@ -119,7 +119,7 @@ class StandbyClientSyncExecution {
         Set<UUID> queued = new HashSet<>();
         Set<UUID> local = new HashSet<>();
 
-        while (batch.size() > 0) {
+        while (!batch.isEmpty()) {
             UUID current = batch.remove();
 
             log.debug("Inspecting segment {}", current);

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java?rev=1774239&r1=1774238&r2=1774239&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java Wed Dec 14 13:21:26 2016
@@ -114,7 +114,7 @@ public class DebugSegments implements Ru
          */
         public Runnable build() {
             checkNotNull(path);
-            checkArgument(segments.size() > 0);
+            checkArgument(!segments.isEmpty());
             return new DebugSegments(this);
         }
 

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java?rev=1774239&r1=1774238&r2=1774239&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java Wed Dec 14 13:21:26 2016
@@ -109,7 +109,7 @@ public class DebugTars implements Runnab
          */
         public Runnable build() {
             checkNotNull(path);
-            checkArgument(tars.size() > 0);
+            checkArgument(!tars.isEmpty());
             return new DebugTars(this);
         }