svn commit: r1798559 - in /jackrabbit/oak/trunk: oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/

[ca...@apache.org]

Author: catholicon
Date: Tue Jun 13 04:35:44 2017
New Revision: 1798559

URL: http://svn.apache.org/viewvc?rev=1798559&view=rev
Log:
OAK-6337: Decide major version bump of o.a.j.o.api.jmx

Temporarily adding deprecated method which was removed earlier and hence
required major version bump in package.
Whatever we eventually decide - (1) OK to have major version bump OR (2) configure baseline with stable release .... This additional method should go away

Modified:
    jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java
    jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
    jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java

Modified: jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java?rev=1798559&r1=1798558&r2=1798559&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java (original)
+++ jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java Tue Jun 13 04:35:44 2017
@@ -19,6 +19,7 @@
 
 package org.apache.jackrabbit.oak.api.jmx;
 
+import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.TabularData;
 
 import aQute.bnd.annotation.ProviderType;
@@ -50,6 +51,12 @@ public interface CheckpointMBean {
     Date getOldestCheckpointCreationDate();
 
     /**
+     * @return creation information about oldest checkpoint.
+     */
+    @Deprecated
+    CompositeData getOldestCheckpointCreationTime();
+
+    /**
      * Create a new checkpoint with the given {@code lifetime}.
      * See {@code org.apache.jackrabbit.oak.spi.state.NodeStore#checkpoint}
      * @param lifetime

Modified: jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java?rev=1798559&r1=1798558&r2=1798559&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java Tue Jun 13 04:35:44 2017
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-@Version("5.0.0")
+@Version("4.6.0")
 @Export(optional = "provide:=true")
 package org.apache.jackrabbit.oak.api.jmx;
 

Modified: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java?rev=1798559&r1=1798558&r2=1798559&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java (original)
+++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java Tue Jun 13 04:35:44 2017
@@ -26,14 +26,17 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import javax.management.openmbean.ArrayType;
+import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.CompositeDataSupport;
 import javax.management.openmbean.CompositeType;
 import javax.management.openmbean.OpenDataException;
 import javax.management.openmbean.OpenType;
+import javax.management.openmbean.SimpleType;
 import javax.management.openmbean.TabularData;
 import javax.management.openmbean.TabularDataSupport;
 import javax.management.openmbean.TabularType;
 
+import com.google.common.collect.Maps;
 import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean;
 
 /**
@@ -99,6 +102,25 @@ public abstract class AbstractCheckpoint
         return new Date(getOldestCheckpointCreationTimestamp());
     }
 
+    @Override
+    public CompositeData getOldestCheckpointCreationTime() {
+        try {
+            Map<String, Object> values = Maps.newHashMap();
+            long timestamp = getOldestCheckpointCreationTimestamp();
+            Date date = getOldestCheckpointCreationDate();
+            values.put("timestamp", timestamp);
+            values.put("time", date);
+            CompositeDataSupport csd = new CompositeDataSupport(
+                    new CompositeType("OldestCheckpointTime", "Creation time of oldest checkpoint",
+                            new String[]{"timestamp", "time"}, new String[]{"epoch timestamp", "human readable date"},
+                            new OpenType[]{SimpleType.LONG, SimpleType.DATE}), values);
+
+            return csd;
+        } catch (OpenDataException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
     /**
      * Utility method for converting the fields associated with a checkpoint to
      * the composite data format.