Merge branch 'master' into concurrent-reindex

Author: mbenson

checkstyle/src/main/resources/checkstyle.xml

@@ -78,7 +78,7 @@
         <module name="RegexpSinglelineJava">
             <property name="format" value=" StringBuffer" />
             <!-- The last sentence of the message is a keyword to trigger exclusion: see ExcludeTestPackages -->
-            <property name="message" value="Nobody should be using StringBuffer anymore" />
+            <property name="message" value="Nobody should be using StringBuffer anymore [not required for tests]" />
         </module>
         <module name="IllegalInstantiation">
             <property name="classes" value="java.lang.Boolean"/>
@@ -166,4 +166,4 @@
     <!-- Allow for some code sanity rules to be violated by test code -->
     <module name="org.modeshape.checkstyle.ExcludeTestPackages" />
 
-</module>
+</module>

modeshape-jcr/src/main/java/org/modeshape/jcr/JcrI18n.java

@@ -436,6 +436,8 @@ public final class JcrI18n {
     public static I18n upgrade4_0_0_Alpha1_Failed;
     public static I18n upgrade4_0_0_Beta3_Running;
     public static I18n upgrade4_0_0_Beta3_Failed;
+    public static I18n upgrade5_5_0_Running;
+    public static I18n upgrade5_5_0_Failed;
 
     public static I18n cannotStartJournal;
     public static I18n cannotStopJournal;

modeshape-jcr/src/main/java/org/modeshape/jcr/RepositoryConfiguration.java

@@ -437,6 +437,7 @@ public static class FieldName {
         public static final String PORT = "port";
         public static final String BUCKET_NAME = "bucketName";
         public static final String ENDPOINT_URL = "endPoint";
+        public static final String DELETE_UNUSED_NATIVELY = "deleteUnusedNatively";
 
         public static final String GARBAGE_COLLECTION = "garbageCollection";
         public static final String INITIAL_TIME = "initialTime";
@@ -1210,7 +1211,8 @@ public BinaryStore getBinaryStore() throws Exception {
                 String password = binaryStorage.getString(FieldName.USER_PASSWORD);
                 String bucketName = binaryStorage.getString(FieldName.BUCKET_NAME);
                 String endPoint = binaryStorage.getString(FieldName.ENDPOINT_URL);
-                store = new S3BinaryStore(username, password, bucketName, endPoint);
+                Boolean deleteUnusedNatively = binaryStorage.getBoolean(FieldName.DELETE_UNUSED_NATIVELY);
+                store = new S3BinaryStore(username, password, bucketName, endPoint, deleteUnusedNatively);
             }
 
             if (store == null) store = TransientBinaryStore.get();

modeshape-jcr/src/main/java/org/modeshape/jcr/Upgrades.java

@@ -35,6 +35,7 @@
 import org.modeshape.jcr.value.binary.BinaryStore;
 import org.modeshape.jcr.value.binary.BinaryStoreException;
 import org.modeshape.jcr.value.binary.FileSystemBinaryStore;
+import org.modeshape.jcr.value.binary.S3BinaryStore;
 
 /**
  * @author Randall Hauch ([email protected])
@@ -67,7 +68,8 @@ public static interface Context {
     public static final Upgrades STANDARD_UPGRADES;
 
     static {
-        STANDARD_UPGRADES = new Upgrades(ModeShape_3_6_0.INSTANCE, ModeShape_4_0_0_Alpha1.INSTANCE, ModeShape_4_0_0_Beta3.INSTANCE);
+        STANDARD_UPGRADES = new Upgrades(ModeShape_3_6_0.INSTANCE, ModeShape_4_0_0_Alpha1.INSTANCE,
+                                         ModeShape_4_0_0_Beta3.INSTANCE, ModeShape_5_5_0.INSTANCE);
     }
 
     private final List<UpgradeOperation> operations = new ArrayList<>();
@@ -309,4 +311,26 @@ public void apply( Context resources ) {
             }
         }
     }
+
+    protected static class ModeShape_5_5_0 extends UpgradeOperation {
+        protected static final UpgradeOperation INSTANCE = new ModeShape_5_5_0();
+
+        protected ModeShape_5_5_0() {
+            super(550);
+        }
+
+        @Override
+        public void apply( Context resources ) {
+            LOGGER.info(JcrI18n.upgrade5_5_0_Running);
+            RunningState runningState = resources.getRepository();
+            BinaryStore binaryStore = runningState.binaryStore();
+            try {
+                if (binaryStore instanceof S3BinaryStore) {
+                    ((S3BinaryStore)binaryStore).migrateUnusedMetadataToTags();
+                }
+            } catch (BinaryStoreException e) {
+                LOGGER.error(e, JcrI18n.upgrade5_5_0_Failed, e.getMessage());
+            }
+        }
+    }
 }