apache · ghost · Oct 14, 2017 · Oct 14, 2017 · Oct 14, 2017 · Oct 14, 2017
diff --git a/changes.patch b/changes.patch
diff --git a/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java b/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
@@ -82,7 +82,7 @@ private Utils() {
     public static AmazonS3Client openService(final Properties prop) {
         String accessKey = prop.getProperty(S3Constants.ACCESS_KEY);
         String secretKey = prop.getProperty(S3Constants.SECRET_KEY);
-        AmazonS3Client s3service = null;
+        AmazonS3Client s3service;
         if (StringUtils.isNullOrEmpty(accessKey)
             || StringUtils.isNullOrEmpty(secretKey)) {
             LOG.info("Configuring Amazon Client from environment");
@@ -95,7 +95,7 @@ public static AmazonS3Client openService(final Properties prop) {
                 getClientConfiguration(prop));
         }
         String region = prop.getProperty(S3Constants.S3_REGION);
-        String endpoint = null;
+        String endpoint;
         String propEndPoint = prop.getProperty(S3Constants.S3_END_POINT);
         if ((propEndPoint != null) && !"".equals(propEndPoint)) {
             endpoint = propEndPoint;

diff --git a/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java b/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java
@@ -265,7 +265,7 @@ public boolean exists(DataIdentifier identifier, boolean touch)
             throws DataStoreException {
         long start = System.currentTimeMillis();
         String key = getKeyName(identifier);
-        ObjectMetadata objectMetaData = null;
+        ObjectMetadata objectMetaData;
         boolean retVal = false;
         ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
         try {
@@ -313,12 +313,11 @@ public boolean exists(DataIdentifier identifier, boolean touch)
     public void touchAsync(final DataIdentifier identifier,
             final long minModifiedDate, final AsyncTouchCallback callback)
             throws DataStoreException {
+        if (callback == null) {
+            throw new IllegalArgumentException("callback parameter cannot be null in touchAsync");
+        }
         ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
         try {
-            if (callback == null) {
-                throw new IllegalArgumentException(
-                    "callback parameter cannot be null in touchAsync");
-            }
             Thread.currentThread().setContextClassLoader(
                 getClass().getClassLoader());
 

diff --git a/jackrabbit-aws-ext/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSSES3.java b/jackrabbit-aws-ext/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSSES3.java
@@ -82,7 +82,7 @@ public void testDataMigration() {
             assertRecord(data, rec);
 
             randomGen.nextBytes(data);
-            rec = s3ds.addRecord(new ByteArrayInputStream(data));
+            s3ds.addRecord(new ByteArrayInputStream(data));
             s3ds.close();
 
         } catch (Exception e) {

diff --git a/jackrabbit-core/pom.xml b/jackrabbit-core/pom.xml
@@ -237,6 +237,10 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
       <artifactId>commons-dbcp</artifactId>
       <version>1.3</version>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.jcr</groupId>
       <artifactId>jcr</artifactId>

diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
@@ -1047,7 +1047,7 @@ public void itemDestroyed(ItemId id, ItemData data) {
      */
     public synchronized String toString() {
         StringBuilder builder = new StringBuilder();
-        builder.append("ItemManager (" + super.toString() + ")\n");
+        builder.append("ItemManager (").append(super.toString()).append(")\n");
         builder.append("Items in cache:\n");
         synchronized (itemCache) {
             for (ItemId id : itemCache.keySet()) {
@@ -1062,7 +1062,7 @@ public synchronized String toString() {
                 } else {
                     builder.append("          ");
                 }
-                builder.append(id + "\t" + safeGetJCRPath(id) + " (" + item + ")\n");
+                builder.append(id).append('\t').append(safeGetJCRPath(id)).append(" (").append(item).append(")\n");
             }
         }
         return builder.toString();

diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemSaveOperation.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemSaveOperation.java
@@ -102,7 +102,7 @@ public Object perform(SessionContext context) throws RepositoryException {
             context.getSessionImpl().logout();
             throw e;
         }
-        if (dirty.size() == 0) {
+        if (dirty.isEmpty()) {
             // no transient items, nothing to do here
             return this;
         }

diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/CacheManager.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/CacheManager.java
@@ -188,7 +188,7 @@ private void resizeAll() {
         synchronized (caches) {
             list.addAll(caches.keySet());
         }
-        if (list.size() == 0) {
+        if (list.isEmpty()) {
             // nothing to do
             return;
         }

diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java
@@ -728,8 +728,8 @@ public void close() throws IOException {
                                 conHelper.exec(updateDataSQL,
                                         new Object[]{
                                             new StreamWrapper(in, length),
-                                            new Long(System.currentTimeMillis()),
-                                            new Long(length),
+                                            System.currentTimeMillis(),
+                                            length,
                                             parentDir,
                                             name
                                         });
@@ -743,8 +743,8 @@ public void close() throws IOException {
                                             parentDir,
                                             name,
                                             new StreamWrapper(in, length),
-                                            new Long(System.currentTimeMillis()),
-                                            new Long(length)
+                                            System.currentTimeMillis(),
+                                            length
                                         });
                             }
                         }
@@ -921,7 +921,7 @@ protected void createDeepFolder(String folderPath)
                         new Object[]{
                                 parentDir,
                                 name,
-                                new Long(System.currentTimeMillis())});
+                                System.currentTimeMillis()});
             } catch (SQLException e) {
                 String msg = "failed to create folder entry: " + folderPath;
                 log.error(msg, e);

diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java
@@ -283,36 +283,36 @@ public Name[] getAllNodeTypes() {
     }
 
     public QItemDefinition[] getAllItemDefs() {
-        if (namedItemDefs.size() == 0 && unnamedItemDefs.size() == 0) {
+        if (namedItemDefs.isEmpty() && unnamedItemDefs.isEmpty()) {
             return QItemDefinition.EMPTY_ARRAY;
         }
         ArrayList<QItemDefinition> defs = new ArrayList<QItemDefinition>(namedItemDefs.size() + unnamedItemDefs.size());
         for (List<QItemDefinition> itemDefs : namedItemDefs.values()) {
             defs.addAll(itemDefs);
         }
         defs.addAll(unnamedItemDefs);
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QItemDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QItemDefinition[defs.size()]);
     }
 
     public QItemDefinition[] getNamedItemDefs() {
-        if (namedItemDefs.size() == 0) {
+        if (namedItemDefs.isEmpty()) {
             return QItemDefinition.EMPTY_ARRAY;
         }
         ArrayList<QItemDefinition> defs = new ArrayList<QItemDefinition>(namedItemDefs.size());
         for (List<QItemDefinition> itemDefs : namedItemDefs.values()) {
             defs.addAll(itemDefs);
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QItemDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QItemDefinition[defs.size()]);
     }
 
     public QItemDefinition[] getUnnamedItemDefs() {
-        if (unnamedItemDefs.size() == 0) {
+        if (unnamedItemDefs.isEmpty()) {
             return QItemDefinition.EMPTY_ARRAY;
         }
         return unnamedItemDefs.toArray(new QItemDefinition[unnamedItemDefs.size()]);
@@ -324,14 +324,14 @@ public boolean hasNamedItemDef(Name name) {
 
     public QItemDefinition[] getNamedItemDefs(Name name) {
         List<QItemDefinition> defs = namedItemDefs.get(name);
-        if (defs == null || defs.size() == 0) {
+        if (defs == null || defs.isEmpty()) {
             return QItemDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QItemDefinition[defs.size()]);
     }
 
     public QNodeDefinition[] getAllNodeDefs() {
-        if (namedItemDefs.size() == 0 && unnamedItemDefs.size() == 0) {
+        if (namedItemDefs.isEmpty() && unnamedItemDefs.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         ArrayList<QNodeDefinition> defs = new ArrayList<QNodeDefinition>(namedItemDefs.size() + unnamedItemDefs.size());
@@ -347,14 +347,14 @@ public QNodeDefinition[] getAllNodeDefs() {
                 }
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QNodeDefinition[defs.size()]);
     }
 
     public QNodeDefinition[] getNamedNodeDefs() {
-        if (namedItemDefs.size() == 0) {
+        if (namedItemDefs.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         ArrayList<QNodeDefinition> defs = new ArrayList<QNodeDefinition>(namedItemDefs.size());
@@ -365,15 +365,15 @@ public QNodeDefinition[] getNamedNodeDefs() {
                 }
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QNodeDefinition[defs.size()]);
     }
 
     public QNodeDefinition[] getNamedNodeDefs(Name name) {
         List<QItemDefinition> list = namedItemDefs.get(name);
-        if (list == null || list.size() == 0) {
+        if (list == null || list.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         ArrayList<QNodeDefinition> defs = new ArrayList<QNodeDefinition>(list.size());
@@ -382,14 +382,14 @@ public QNodeDefinition[] getNamedNodeDefs(Name name) {
                 defs.add((QNodeDefinition) def);
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QNodeDefinition[defs.size()]);
     }
 
     public QNodeDefinition[] getUnnamedNodeDefs() {
-        if (unnamedItemDefs.size() == 0) {
+        if (unnamedItemDefs.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         ArrayList<QNodeDefinition> defs = new ArrayList<QNodeDefinition>(unnamedItemDefs.size());
@@ -398,7 +398,7 @@ public QNodeDefinition[] getUnnamedNodeDefs() {
                 defs.add((QNodeDefinition) def);
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QNodeDefinition[defs.size()]);
@@ -407,7 +407,7 @@ public QNodeDefinition[] getUnnamedNodeDefs() {
     public QNodeDefinition[] getAutoCreateNodeDefs() {
         // since auto-create items must have a name,
         // we're only searching the named item definitions
-        if (namedItemDefs.size() == 0) {
+        if (namedItemDefs.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         ArrayList<QNodeDefinition> defs = new ArrayList<QNodeDefinition>(namedItemDefs.size());
@@ -418,14 +418,14 @@ public QNodeDefinition[] getAutoCreateNodeDefs() {
                 }
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QNodeDefinition[defs.size()]);
     }
 
     public QPropertyDefinition[] getAllPropDefs() {
-        if (namedItemDefs.size() == 0 && unnamedItemDefs.size() == 0) {
+        if (namedItemDefs.isEmpty() && unnamedItemDefs.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         ArrayList<QPropertyDefinition> defs = new ArrayList<QPropertyDefinition>(namedItemDefs.size() + unnamedItemDefs.size());
@@ -441,14 +441,14 @@ public QPropertyDefinition[] getAllPropDefs() {
                 }
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QPropertyDefinition[defs.size()]);
     }
 
     public QPropertyDefinition[] getNamedPropDefs() {
-        if (namedItemDefs.size() == 0) {
+        if (namedItemDefs.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         ArrayList<QPropertyDefinition> defs = new ArrayList<QPropertyDefinition>(namedItemDefs.size());
@@ -459,15 +459,15 @@ public QPropertyDefinition[] getNamedPropDefs() {
                 }
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QPropertyDefinition[defs.size()]);
     }
 
     public QPropertyDefinition[] getNamedPropDefs(Name name) {
         List<QItemDefinition> list = namedItemDefs.get(name);
-        if (list == null || list.size() == 0) {
+        if (list == null || list.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         ArrayList<QPropertyDefinition> defs = new ArrayList<QPropertyDefinition>(list.size());
@@ -476,14 +476,14 @@ public QPropertyDefinition[] getNamedPropDefs(Name name) {
                 defs.add((QPropertyDefinition) def);
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QPropertyDefinition[defs.size()]);
     }
 
     public QPropertyDefinition[] getUnnamedPropDefs() {
-        if (unnamedItemDefs.size() == 0) {
+        if (unnamedItemDefs.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         ArrayList<QPropertyDefinition> defs = new ArrayList<QPropertyDefinition>(unnamedItemDefs.size());
@@ -492,7 +492,7 @@ public QPropertyDefinition[] getUnnamedPropDefs() {
                 defs.add((QPropertyDefinition) def);
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QPropertyDefinition[defs.size()]);
@@ -501,7 +501,7 @@ public QPropertyDefinition[] getUnnamedPropDefs() {
     public QPropertyDefinition[] getAutoCreatePropDefs() {
         // since auto-create items must have a name,
         // we're only searching the named item definitions
-        if (namedItemDefs.size() == 0) {
+        if (namedItemDefs.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         ArrayList<QPropertyDefinition> defs = new ArrayList<QPropertyDefinition>(namedItemDefs.size());
@@ -512,7 +512,7 @@ public QPropertyDefinition[] getAutoCreatePropDefs() {
                 }
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QPropertyDefinition[defs.size()]);
@@ -521,7 +521,7 @@ public QPropertyDefinition[] getAutoCreatePropDefs() {
     public QPropertyDefinition[] getMandatoryPropDefs() {
         // since mandatory items must have a name,
         // we're only searching the named item definitions
-        if (namedItemDefs.size() == 0) {
+        if (namedItemDefs.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         ArrayList<QPropertyDefinition> defs = new ArrayList<QPropertyDefinition>(namedItemDefs.size());
@@ -532,7 +532,7 @@ public QPropertyDefinition[] getMandatoryPropDefs() {
                 }
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QPropertyDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QPropertyDefinition[defs.size()]);
@@ -541,7 +541,7 @@ public QPropertyDefinition[] getMandatoryPropDefs() {
     public QNodeDefinition[] getMandatoryNodeDefs() {
         // since mandatory items must have a name,
         // we're only searching the named item definitions
-        if (namedItemDefs.size() == 0) {
+        if (namedItemDefs.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         ArrayList<QNodeDefinition> defs = new ArrayList<QNodeDefinition>(namedItemDefs.size());
@@ -552,7 +552,7 @@ public QNodeDefinition[] getMandatoryNodeDefs() {
                 }
             }
         }
-        if (defs.size() == 0) {
+        if (defs.isEmpty()) {
             return QNodeDefinition.EMPTY_ARRAY;
         }
         return defs.toArray(new QNodeDefinition[defs.size()]);

diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractExcerpt.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractExcerpt.java
@@ -110,7 +110,7 @@ public String getExcerpt(NodeId id, int maxFragments, int maxFragmentSize)
                 exProvider.init(query, index);
                 return exProvider.getExcerpt(id, maxFragments, maxFragmentSize);
             }
-            StringBuffer text = new StringBuffer();
+            StringBuilder text = new StringBuilder();
             String separator = "";
             for (int i = 0; i < fields.length; i++) {
                 if (fields[i].stringValue().length() == 0) {