Skip to content

Commit 87f3857

Browse files
committed
Update ObjStoreBrowser usage according to JBTM-3973
singleton
1 parent c13c200 commit 87f3857

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

coordinator/src/main/java/io/narayana/lra/coordinator/management/BrowserCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ private static void setupStore(String storeDir) throws Exception {
222222
recoveryManager = new RecoveryManagerImple(false);
223223
recoveryManager.addModule(new LRARecoveryModule());
224224

225-
osb = new ObjStoreBrowser();
225+
osb = ObjStoreBrowser.getInstance();
226226
for(String[] typeAndBean: LRA_OSB_TYPES) {
227227
osb.addType(typeAndBean[0], typeAndBean[1], typeAndBean[2]);
228228
}

coordinator/src/test/java/io/narayana/lra/coordinator/tools/osb/mbean/ObjStoreBrowserLRATest.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.arjuna.ats.arjuna.common.recoveryPropertyManager;
99
import com.arjuna.ats.arjuna.tools.osb.mbean.ActionBean;
1010
import com.arjuna.ats.arjuna.tools.osb.mbean.LogRecordWrapper;
11+
import com.arjuna.ats.arjuna.tools.osb.mbean.OSBTypeHandler;
1112
import com.arjuna.ats.arjuna.tools.osb.mbean.OSEntryBean;
1213
import com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser;
1314
import com.arjuna.ats.arjuna.tools.osb.mbean.UidWrapper;
@@ -23,6 +24,7 @@
2324
import org.junit.Before;
2425
import org.junit.Test;
2526

27+
import java.io.File;
2628
import java.net.URI;
2729

2830
import static org.junit.Assert.assertEquals;
@@ -35,7 +37,7 @@ public class ObjStoreBrowserLRATest {
3537
private RecoveryManagerImple recoveryManager;
3638
private ObjStoreBrowser osb;
3739

38-
private static String[][] LRA_OSB_TYPES = {
40+
private final static String[][] LRA_OSB_TYPES = {
3941
// osTypeClassName, beanTypeClassName - see com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser
4042
{LongRunningAction.getType().substring(1), LongRunningAction.class.getName(), LRAActionBean.class.getName()},
4143
{FailedLongRunningAction.getType().substring(1), FailedLongRunningAction.class.getName(), LRAActionBean.class.getName()}
@@ -49,9 +51,11 @@ public void setUp() {
4951
recoveryManager.addModule(new LRARecoveryModule());
5052

5153
// initiating the ObjStoreBrowser
52-
osb = new ObjStoreBrowser();
54+
osb = ObjStoreBrowser.getInstance();
5355
for(String[] typeAndBean: LRA_OSB_TYPES) {
54-
assertTrue(osb.addType(typeAndBean[0], typeAndBean[1], typeAndBean[2]));
56+
String typeName = typeAndBean[0].replace("/", File.separator);
57+
osb.addOSBTypeHandler(typeName, new OSBTypeHandler(true, true, typeAndBean[1], typeAndBean[2],
58+
typeAndBean[0], null, this.getClass().getClassLoader()));
5559
}
5660
osb.start();
5761
}

0 commit comments

Comments
 (0)