Author: frm
Date: Tue Dec 8 11:05:13 2015
New Revision: 1718560
URL: http://svn.apache.org/viewvc?rev=1718560&view=rev
Log:
OAK-3741 - Revert r1718552
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentCheckpointMBean.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCheckpointMBean.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/AbstractCheckpointMBean.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/package-info.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentCheckpointMBean.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentCheckpointMBean.java?rev=1718560&r1=1718559&r2=1718560&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentCheckpointMBean.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentCheckpointMBean.java
Tue Dec 8 11:05:13 2015
@@ -42,11 +42,6 @@ public class DocumentCheckpointMBean ext
}
@Override
- protected String getTypeName() {
- return DocumentCheckpointMBean.class.getName();
- }
-
- @Override
protected void collectCheckpoints(TabularDataSupport tab) throws
OpenDataException {
Map<Revision, Info> checkpoints =
store.getCheckpoints().getCheckpoints();
if (checkpoints == null) {
@@ -58,7 +53,8 @@ public class DocumentCheckpointMBean ext
Info info = checkpoint.getValue();
Date created = new Date(checkpoint.getKey().getTimestamp());
Date expires = new Date(info.getExpiryTime());
- tab.put(id, toCompositeData(getTypeName(), id, created.toString(),
expires.toString(), info.get()));
+ tab.put(id, toCompositeData(
+ id, created.toString(), expires.toString(), info.get()));
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCheckpointMBean.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCheckpointMBean.java?rev=1718560&r1=1718559&r2=1718560&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCheckpointMBean.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCheckpointMBean.java
Tue Dec 8 11:05:13 2015
@@ -41,18 +41,13 @@ public class SegmentCheckpointMBean exte
}
@Override
- protected String getTypeName() {
- return SegmentCheckpointMBean.class.getName();
- }
-
- @Override
protected void collectCheckpoints(TabularDataSupport tab) throws
OpenDataException {
for (ChildNodeEntry cne :
store.getCheckpoints().getChildNodeEntries()) {
String id = cne.getName();
NodeState checkpoint = cne.getNodeState();
String created = getDate(checkpoint, "created");
String expires = getDate(checkpoint, "timestamp");
- tab.put(id, toCompositeData(getTypeName(), id, created, expires,
store.checkpointInfo(id)));
+ tab.put(id, toCompositeData(id, created, expires,
store.checkpointInfo(id)));
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/AbstractCheckpointMBean.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/AbstractCheckpointMBean.java?rev=1718560&r1=1718559&r2=1718560&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/AbstractCheckpointMBean.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/AbstractCheckpointMBean.java
Tue Dec 8 11:05:13 2015
@@ -34,6 +34,7 @@ import javax.management.openmbean.Tabula
import javax.management.openmbean.TabularType;
import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentCheckpointMBean;
/**
* Abstract base class for {@code CheckpointMBean} implementations.
@@ -48,6 +49,8 @@ public abstract class AbstractCheckpoint
private static final OpenType[] FIELD_TYPES = new OpenType[] {
STRING, STRING, STRING, createStringArrayType()};
+ private static final CompositeType TYPE = createCompositeType();
+
private static ArrayType<String> createStringArrayType() {
try {
return new ArrayType<String>(STRING, false);
@@ -56,9 +59,10 @@ public abstract class AbstractCheckpoint
}
}
- private static CompositeType createCompositeType(String name) {
+ private static CompositeType createCompositeType() {
try {
- return new CompositeType(name, "Checkpoints", FIELD_NAMES,
FIELD_DESCRIPTIONS, FIELD_TYPES);
+ return new CompositeType(SegmentCheckpointMBean.class.getName(),
+ "Checkpoints", FIELD_NAMES, FIELD_DESCRIPTIONS,
FIELD_TYPES);
} catch (OpenDataException e) {
throw new IllegalStateException(e);
}
@@ -76,19 +80,12 @@ public abstract class AbstractCheckpoint
*/
protected abstract void collectCheckpoints(TabularDataSupport tab) throws
OpenDataException;
- /**
- * Provides the name of the result type.
- *
- * @return A {@code String} representing the name of the result type.
- */
- protected abstract String getTypeName();
-
@Override
public TabularData listCheckpoints() {
try {
TabularDataSupport tab = new TabularDataSupport(
- new TabularType(getTypeName(),
- "Checkpoints", createCompositeType(getTypeName()),
new String[] { "id" }));
+ new TabularType(SegmentCheckpointMBean.class.getName(),
+ "Checkpoints", TYPE, new String[] { "id" }));
collectCheckpoints(tab);
return tab;
@@ -110,25 +107,8 @@ public abstract class AbstractCheckpoint
*/
protected static CompositeDataSupport toCompositeData(String id, String
created, String expires,
Map<String, String> properties) throws OpenDataException {
- return toCompositeData(CheckpointMBean.class.getName(), id, created,
expires, properties);
- }
-
- /**
- * Utility method for converting the fields associated with a checkpoint to
- * the composite data format.
- *
- * @param type name of the result type
- * @param id id of the checkpoint
- * @param created creation data of the checkpoint
- * @param expires expiry data of the checkpoint
- * @return composite data representation of the fields associated with the
- * checkpoint
- * @throws OpenDataException
- */
- protected static CompositeDataSupport toCompositeData(String type, String
id, String created, String expires,
- Map<String, String>
properties) throws OpenDataException {
- return new CompositeDataSupport(createCompositeType(type),
FIELD_NAMES, new Object[] {
- id, created, expires, toArray(properties) });
+ return new CompositeDataSupport(TYPE, FIELD_NAMES, new Object[] {
+ id, created, expires, toArray(properties) });
}
private static String[] toArray(Map<String, String> properties) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/package-info.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/package-info.java?rev=1718560&r1=1718559&r2=1718560&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/package-info.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/package-info.java
Tue Dec 8 11:05:13 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.4.0")
+@Version("1.3.1")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.util;
