Merge hotfix branch

database-parser/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>database-parser</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.2</version>
 
   <name>OpenEdge database definition lexer and parser</name>
   <description>OpenEdge dump files parser</description>

listing-parser/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>listing-parser</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.2</version>
 
   <name>OpenEdge listing so-called parser</name>
   <description>OpenEdge listing files parser</description>

openedge-checks/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.checks</groupId>
   <artifactId>openedge-checks</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.2</version>
 
   <name>OpenEdge checks</name>
   <description>OpenEdge checks</description>
@@ -54,12 +54,12 @@
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.6.1</version>
+      <version>2.6.2</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.6.1</version>
+      <version>2.6.2</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>

openedge-plugin/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.sonar.openedge</groupId>
   <artifactId>sonar-openedge-plugin</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.2</version>
   <packaging>sonar-plugin</packaging>
 
   <name>OpenEdge plugin for SonarQube</name>
@@ -62,17 +62,17 @@
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.6.1</version>
+      <version>2.6.2</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.6.1</version>
+      <version>2.6.2</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.6.1</version>
+      <version>2.6.2</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>

openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeProparseSensor.java

@@ -42,6 +42,8 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.sax.SAXSource;
 
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
@@ -82,7 +84,9 @@
 import org.sonar.plugins.openedge.foundation.OpenEdgeRulesDefinition;
 import org.sonar.plugins.openedge.foundation.OpenEdgeSettings;
 import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
@@ -104,6 +108,7 @@ public class OpenEdgeProparseSensor implements Sensor {
   private final DocumentBuilder dBuilder;
   private final JAXBContext context;
   private final Unmarshaller unmarshaller;
+  private final SAXParserFactory sax;
 
   // File statistics
   private int numFiles;
@@ -126,12 +131,14 @@ public class OpenEdgeProparseSensor implements Sensor {
   public OpenEdgeProparseSensor(OpenEdgeSettings settings, OpenEdgeComponents components) {
     this.settings = settings;
     this.components = components;
-
     dbFactory = DocumentBuilderFactory.newInstance();
+    sax = SAXParserFactory.newInstance();
+    sax.setNamespaceAware(false);
+
     try {
       dbFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
       dBuilder = dbFactory.newDocumentBuilder();
-      context = JAXBContext.newInstance(CrossReference.class);
+      context = JAXBContext.newInstance("com.progress.xref", CrossReference.class.getClassLoader());
       unmarshaller = context.createUnmarshaller();
     } catch (ParserConfigurationException | JAXBException caught) {
       throw new IllegalStateException(caught);
@@ -214,7 +221,6 @@ private Document parseXREF(File xrefFile) {
         doc = dBuilder.parse(
             settings.useXrefFilter() ? new InvalidXMLFilterStream(settings.getXrefBytes(), inpStream) : inpStream);
         xmlParseTime += (System.currentTimeMillis() - startTime);
-        numXREF++;
       } catch (SAXException | IOException caught) {
         LOG.error("Unable to parse XREF file " + xrefFile.getAbsolutePath(), caught);
       }
@@ -229,11 +235,14 @@ private CrossReference jaxbXREF(File xrefFile) {
       LOG.debug("Parsing XML XREF file {}", xrefFile.getAbsolutePath());
       try (InputStream inpStream = new FileInputStream(xrefFile)) {
         long startTime = System.currentTimeMillis();
-        doc = (CrossReference) unmarshaller.unmarshal(
+        InputSource is = new InputSource(
             settings.useXrefFilter() ? new InvalidXMLFilterStream(settings.getXrefBytes(), inpStream) : inpStream);
+        XMLReader reader = sax.newSAXParser().getXMLReader();
+        SAXSource source = new SAXSource(reader, is);
+        doc = (CrossReference) unmarshaller.unmarshal(source);
         xmlParseTime += (System.currentTimeMillis() - startTime);
         numXREF++;
-      } catch (JAXBException | IOException caught) {
+      } catch (JAXBException | SAXException | ParserConfigurationException | IOException caught) {
         LOG.error("Unable to parse XREF file " + xrefFile.getAbsolutePath(), caught);
       }
     }

pom.xml

@@ -5,7 +5,7 @@
   <groupId>eu.rssw</groupId>
   <artifactId>sonar-openedge</artifactId>
   <packaging>pom</packaging>
-  <version>2.6.1</version>
+  <version>2.6.2</version>
   <name>OpenEdge plugin for SonarQube</name>
   <url>http://www.riverside-software.fr/</url>
   <description>Open source code analysis for OpenEdge</description>

profiler-parser/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>profiler-parser</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.2</version>
 
   <name>OpenEdge profiler output lexer and parser</name>
   <description>OpenEdge profiler files parser</description>

proparse/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>proparse</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.2</version>
 
   <name>Proparse</name>
   <description>ABL code parser</description>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>eu.rssw.openedge.rcode</groupId>
       <artifactId>rcode-reader</artifactId>
-      <version>2.6.1</version>
+      <version>2.6.2</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>

proparse/src/main/java/com/progress/xref/CrossReference.java

@@ -185,9 +185,7 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "source"
-})
+@XmlType(name = "", propOrder = {"source"})
 @XmlRootElement(name = "Cross-reference")
 public class CrossReference {
 

proparse/src/main/java/org/prorefactor/treeparser/ParseUnit.java

@@ -275,7 +275,8 @@ public static void attachXrefToTreeParser(ProgramRootNode root, CrossReference x
                   && ((src.getFileNum() == 1 && recNode.getFileIndex() == 0)
                       || Files.isSameFile(srcFile.toPath(), new File(recNode.getStatement().getFileName()).toPath()))) {
                 recNode.setLink(IConstants.WHOLE_INDEX, "WHOLE-INDEX".equals(ref.getDetail()));
-                recNode.setLink(IConstants.SEARCH_INDEX_NAME, ref.getObjectContext());
+                recNode.setLink(IConstants.SEARCH_INDEX_NAME,
+                    recNode.getTableBuffer().getTable().getName() + "." + ref.getObjectContext());
                 lFound = true;
                 break;
               }

proparse/src/test/java/org/prorefactor/core/JPNodeTest.java

@@ -31,6 +31,9 @@
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.sax.SAXSource;
 
 import org.prorefactor.core.nodetypes.RecordNameNode;
 import org.prorefactor.core.util.UnitTestModule;
@@ -39,6 +42,9 @@
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -68,7 +74,7 @@ public class JPNodeTest {
   @BeforeTest
   public void setUp() throws IOException, InvalidRCodeException {
     try {
-      context = JAXBContext.newInstance(CrossReference.class);
+      context = JAXBContext.newInstance("com.progress.xref", this.getClass().getClassLoader());
       unmarshaller = context.createUnmarshaller();
     } catch (JAXBException caught) {
       throw new IllegalStateException(caught);
@@ -347,10 +353,17 @@ public void testFormatPhrase() {
   }
 
   @Test
-  public void testXref01() throws JAXBException, IOException {
+  public void testXref01() throws JAXBException, IOException, SAXException, ParserConfigurationException {
     ParseUnit unit = genericTest("xref.p");
     unit.treeParser01();
-    CrossReference doc = (CrossReference) unmarshaller.unmarshal(new FileInputStream(SRC_DIR + "/xref.p.xref"));
+
+    InputSource is = new InputSource(new FileInputStream(SRC_DIR + "/xref.p.xref"));
+    SAXParserFactory sax = SAXParserFactory.newInstance();
+    sax.setNamespaceAware(false);
+    XMLReader reader = sax.newSAXParser().getXMLReader();
+    SAXSource source = new SAXSource(reader, is);
+
+    CrossReference doc = (CrossReference) unmarshaller.unmarshal(source);
     unit.attachXref(doc);
 
     List<JPNode> nodes = unit.getTopNode().query(ABLNodeType.RECORD_NAME);
@@ -360,14 +373,14 @@ public void testXref01() throws JAXBException, IOException {
     RecordNameNode item = (RecordNameNode) nodes.get(2);
 
     assertEquals(warehouse.getLink(IConstants.WHOLE_INDEX), Boolean.TRUE);
-    assertEquals(warehouse.getLink(IConstants.SEARCH_INDEX_NAME), "warehousenum");
+    assertEquals(warehouse.getLink(IConstants.SEARCH_INDEX_NAME), "Warehouse.warehousenum");
 
     assertEquals(customer.getLink(IConstants.WHOLE_INDEX), Boolean.FALSE);
-    assertEquals(customer.getLink(IConstants.SEARCH_INDEX_NAME), "CountryPost");
+    assertEquals(customer.getLink(IConstants.SEARCH_INDEX_NAME), "Customer.CountryPost");
     assertEquals(customer.getLink(IConstants.SORT_ACCESS), "Address");
 
     assertEquals(item.getLink(IConstants.WHOLE_INDEX), Boolean.TRUE);
-    assertEquals(item.getLink(IConstants.SEARCH_INDEX_NAME), "ItemNum");
+    assertEquals(item.getLink(IConstants.SEARCH_INDEX_NAME), "Item.ItemNum");
   }
 
 }

rcode-reader/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.rcode</groupId>
   <artifactId>rcode-reader</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.2</version>
 
   <name>rcode-reader</name>
   <description>rcode reader</description>