code cleanup, removed obsolete JRockitParser

Author: irockel

tda/src/main/java/de/grimmfrost/tda/mcp/HeadlessAnalysisProvider.java

@@ -17,8 +17,8 @@
  * Headless analysis provider for TDA.
  */
 public class HeadlessAnalysisProvider {
-    private Map<String, Map> threadStore = new HashMap<>();
-    private List<DefaultMutableTreeNode> topNodes = new ArrayList<>();
+    private final Map<String, Map<String, String>> threadStore = new HashMap<>();
+    private final List<DefaultMutableTreeNode> topNodes = new ArrayList<>();
     private String currentLogFile;
 
     public void parseLogFile(String filePath) throws IOException {

tda/src/main/java/de/grimmfrost/tda/parser/DumpParserFactory.java

@@ -64,7 +64,8 @@ public static DumpParserFactory get() {
      *                             the current time stamp instead of a parsed one.
      * @return a proper dump parser for the given log file, null if no proper parser was found.
      */
-    public DumpParser getDumpParserForLogfile(InputStream dumpFileStream, Map threadStore, boolean withCurrentTimeStamp, int startCounter) {
+    public DumpParser getDumpParserForLogfile(InputStream dumpFileStream, Map<String, Map<String, String>> threadStore,
+                                              boolean withCurrentTimeStamp, int startCounter) {
         BufferedReader bis = null;
         int readAheadLimit = PrefManager.get().getStreamResetBuffer();
         int lineCounter = 0;
@@ -104,14 +105,11 @@ public DumpParser getDumpParserForLogfile(InputStream dumpFileStream, Map thread
                         currentDumpParser = new WrappedSunJDKParser(bis, threadStore, lineCounter, withCurrentTimeStamp, startCounter, dm);
                     } else if(SunJDKParser.checkForSupportedThreadDump(line)) {
                         currentDumpParser = new SunJDKParser(bis, threadStore, lineCounter, withCurrentTimeStamp, startCounter, dm);
-                    } else if(BeaJDKParser.checkForSupportedThreadDump(line)) {
-                        currentDumpParser = new BeaJDKParser(bis, threadStore, lineCounter, dm);
                     }
                 }
                 lineCounter++;
             }
-            //System.out.println("Selected Dump Parser: " + currentDumpParser.getClass().getName());
-            if ((currentDumpParser != null) && (bis != null)) {
+            if (currentDumpParser != null) {
                 bis.reset();
             }
         } catch (IOException ex) {

tda/src/main/java/de/grimmfrost/tda/parser/SunJDKParser.java

@@ -51,7 +51,7 @@
 public class SunJDKParser extends AbstractDumpParser {
 
     private MutableTreeNode nextDump = null;
-    private Map threadStore = null;
+    private Map<String, Map<String, String>> threadStore = null;
     private int counter = 1;
     private int lineCounter = 0;
     private boolean foundClassHistograms = false;
@@ -60,7 +60,7 @@ public class SunJDKParser extends AbstractDumpParser {
     /** 
      * Creates a new instance of SunJDKParser 
      */
-    public SunJDKParser(BufferedReader bis, Map threadStore, int lineCounter, boolean withCurrentTimeStamp, int startCounter, DateMatcher dm) {
+    public SunJDKParser(BufferedReader bis, Map<String, Map<String, String>> threadStore, int lineCounter, boolean withCurrentTimeStamp, int startCounter, DateMatcher dm) {
         super(bis, dm);
         this.threadStore = threadStore;
         this.withCurrentTimeStamp = withCurrentTimeStamp;
@@ -120,7 +120,7 @@ public MutableTreeNode parseNext() {
             DefaultMutableTreeNode catVirtualThreads = null;
 
             try {
-                Map threads = new HashMap();
+                Map<String, String> threads = new HashMap<>();
                 overallTDI = new ThreadDumpInfo("Dump No. " + counter++, 0);
                 if (withCurrentTimeStamp) {
                     overallTDI.setStartTime((new Date(System.currentTimeMillis())).toString());

tda/src/test/java/de/grimmfrost/tda/parser/BeaJDKParserTest.java

@@ -27,29 +27,28 @@
 import org.junit.jupiter.api.*;
 import static org.junit.jupiter.api.Assertions.*;
 import java.io.InputStream;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
- *
+ * test if the dump parser factory selects the right dump parser for the provided log files.
  * @author irockel
  */
 public class DumpParserFactoryTest {
 
     @BeforeEach
-    protected void setUp() throws Exception {
+    protected void setUp() {
     }
 
     @AfterEach
-    protected void tearDown() throws Exception {
+    protected void tearDown() {
     }
 
     /**
      * Test of get method, of class de.grimmfrost.tda.DumpParserFactory.
      */
     @Test
     public void testGet() {
-        System.out.println("get");
-        
         DumpParserFactory result = DumpParserFactory.get();
         assertNotNull(result);                
     }
@@ -59,32 +58,28 @@ public void testGet() {
      */
     @Test
     public void testGetDumpParserForSunLogfile() throws FileNotFoundException {
-        System.out.println("getDumpParserForVersion");
-        
         InputStream dumpFileStream = new FileInputStream("src/test/resources/test.log");
-        Map threadStore = null;
+        Map<String, Map<String, String>> threadStore = new HashMap<>();
         DumpParserFactory instance = DumpParserFactory.get();
 
         DumpParser result = instance.getDumpParserForLogfile(dumpFileStream, threadStore, false, 0);
         assertNotNull(result);
-        
-        assertTrue(result instanceof SunJDKParser);
+
+        assertInstanceOf(SunJDKParser.class, result);
     }
 
     /**
      * Test of getDumpParserForVersion method, of class de.grimmfrost.tda.DumpParserFactory.
      */
     @Test
-    public void testGetDumpParserForBeaLogfile() throws FileNotFoundException {
-        System.out.println("getDumpParserForVersion");
-        
-        InputStream dumpFileStream = new FileInputStream("src/test/resources/jrockit_15_dump.txt");
-        Map threadStore = null;
+    public void testGetDumpParserForJSONLogfile() throws FileNotFoundException {
+        InputStream dumpFileStream = new FileInputStream("src/test/resources/intellij_dump.json");
+        Map<String, Map<String, String>> threadStore = new HashMap<>();
         DumpParserFactory instance = DumpParserFactory.get();
-        
+
         DumpParser result = instance.getDumpParserForLogfile(dumpFileStream, threadStore, false, 0);
         assertNotNull(result);
-        
-        assertTrue(result instanceof BeaJDKParser);
-    }    
+
+        assertInstanceOf(JCmdJSONParser.class, result);
+    }
 }

tda/src/test/java/de/grimmfrost/tda/parser/DumpParserFactoryTest.java

@@ -15,12 +15,11 @@ public class JCmdJSONParserTest {
 
     @Test
     public void testJSONDumpParsing() throws Exception {
-        System.out.println("testJSONDumpParsing");
         InputStream dumpFileStream = new FileInputStream("src/test/resources/intellij_dump.json");
-        Map threadStore = new HashMap();
+        Map<String, Map<String, String>> threadStore = new HashMap<>();
         DumpParser instance = DumpParserFactory.get().getDumpParserForLogfile(dumpFileStream, threadStore, false, 0);
-        
-        assertTrue(instance instanceof JCmdJSONParser);
+
+        assertInstanceOf(JCmdJSONParser.class, instance);
 
         DefaultMutableTreeNode result = (DefaultMutableTreeNode) instance.parseNext();
         assertNotNull(result);