Started to rewrite the whole reporter API

so it works with the new core reporter objects.

Author: pesse

src/main/java/org/utplsql/api/OutputBuffer.java

@@ -67,7 +67,7 @@ public void fetchAvailable(Connection conn, Callback cb) throws SQLException {
         ResultSet resultSet = null;
         try {
             preparedStatement = conn.prepareStatement("SELECT * FROM table(ut_output_buffer.get_lines(?))");
-            preparedStatement.setString(1, getReporter().getReporterId());
+            preparedStatement.setString(1, getReporter().getId());
             resultSet = preparedStatement.executeQuery();
 
             while (resultSet.next())
@@ -92,7 +92,7 @@ public List<String> fetchAll(Connection conn) throws SQLException {
         try {
             callableStatement = conn.prepareCall("BEGIN ? := ut_output_buffer.get_lines_cursor(?); END;");
             callableStatement.registerOutParameter(1, OracleTypes.CURSOR);
-            callableStatement.setString(2, getReporter().getReporterId());
+            callableStatement.setString(2, getReporter().getId());
             callableStatement.execute();
 
             resultSet = (ResultSet) callableStatement.getObject(1);

src/main/java/org/utplsql/api/TestRunner.java

@@ -156,7 +156,7 @@ else if (e.getErrorCode() == UtPLSQLNotInstalledException.ERROR_CODE) {
      * @throws SQLException any sql exception
      */
     private void validateReporter(Connection conn, Reporter reporter) throws SQLException {
-        if (reporter.getReporterId() == null || reporter.getReporterId().isEmpty())
+        if (reporter.getId() == null || reporter.getId().isEmpty())
             reporter.init(conn);
     }
 

src/main/java/org/utplsql/api/reporter/CoverageHTMLReporter.java

@@ -25,17 +25,11 @@ public class CoverageHTMLReporter extends Reporter {
     private String assetsPath;
 
     public CoverageHTMLReporter() {
-        this(null, DEFAULT_ASSETS_PATH);
+        super(DefaultReporters.UT_COVERAGE_HTML_REPORTER.name(), null);
     }
 
-    public CoverageHTMLReporter(String projectName, String assetsPath) {
-        this.projectName = projectName;
-        this.assetsPath = assetsPath;
-    }
-
-    @Override
-    public String getSQLTypeName() throws SQLException {
-        return DefaultReporters.UT_COVERAGE_HTML_REPORTER.name();
+    public CoverageHTMLReporter(String selfType, Object[] attributes) {
+        super(selfType, attributes);
     }
 
     public String getProjectName() {
@@ -54,20 +48,6 @@ public void setAssetsPath(String assetsPath) {
         this.assetsPath = assetsPath;
     }
 
-    @Override
-    public void readSQL(SQLInput stream, String typeName) throws SQLException {
-        super.readSQL(stream, typeName);
-        setProjectName(stream.readString());
-        setAssetsPath(stream.readString());
-    }
-
-    @Override
-    public void writeSQL(SQLOutput stream) throws SQLException {
-        super.writeSQL(stream);
-        stream.writeString(getProjectName());
-        stream.writeString(getAssetsPath());
-    }
-
     /** Copies files from Classpath to a target directory.
      * Can omit the first x folders of the asset-path when copying to the target directory
      *

src/main/java/org/utplsql/api/reporter/CoverageSonarReporter.java

@@ -1,5 +1,6 @@
 package org.utplsql.api.reporter;
 
+import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
 /** This enum defines default reporters, added and maintained by the utPLSQL team, and their (default) factory method
@@ -12,24 +13,24 @@ public enum DefaultReporters {
             "Based on open-source simplecov-html coverage reporter for Ruby.\n" +
             "Includes source code in the report."),
     UT_DOCUMENTATION_REPORTER(DocumentationReporter::new, "A textual pretty-print of unit test results (usually use for console output)"),
-    UT_TEAMCITY_REPORTER(TeamCityReporter::new, "For reporting live progress of test execution with Teamcity CI."),
-    UT_XUNIT_REPORTER(XUnitReporter::new, "Used for reporting test results with CI servers like Jenkins/Hudson/Teamcity."),
-    UT_COVERALLS_REPORTER(CoverallsReporter::new, "Generates a JSON coverage report providing information on code coverage with line numbers.\n" +
+    UT_TEAMCITY_REPORTER(ReporterFactory.getDefaultReporterFactoryMethod(), "For reporting live progress of test execution with Teamcity CI."),
+    UT_XUNIT_REPORTER(ReporterFactory.getDefaultReporterFactoryMethod(), "Used for reporting test results with CI servers like Jenkins/Hudson/Teamcity."),
+    UT_COVERALLS_REPORTER(ReporterFactory.getDefaultReporterFactoryMethod(), "Generates a JSON coverage report providing information on code coverage with line numbers.\n" +
             "Designed for [Coveralls](https://coveralls.io/)."),
-    UT_COVERAGE_SONAR_REPORTER(CoverageSonarReporter::new, "Generates a JSON coverage report providing information on code coverage with line numbers.\n" +
+    UT_COVERAGE_SONAR_REPORTER(ReporterFactory.getDefaultReporterFactoryMethod(), "Generates a JSON coverage report providing information on code coverage with line numbers.\n" +
             "Designed for [SonarQube](https://about.sonarqube.com/) to report coverage."),
-    UT_SONAR_TEST_REPORTER(SonarTestReporter::new, "Generates a JSON report providing detailed information on test execution.\n" +
+    UT_SONAR_TEST_REPORTER(ReporterFactory.getDefaultReporterFactoryMethod(), "Generates a JSON report providing detailed information on test execution.\n" +
             "Designed for [SonarQube](https://about.sonarqube.com/) to report test execution.");
 
-    private Supplier<? extends Reporter> factoryMethod;
+    private BiFunction<String, Object[], ? extends Reporter> factoryMethod;
     private String description;
 
-    DefaultReporters(Supplier<? extends Reporter> factoryMethod, String description ) {
+    DefaultReporters(BiFunction<String, Object[], ? extends Reporter> factoryMethod, String description ) {
         this.factoryMethod = factoryMethod;
         this.description = description;
     }
 
-    public Supplier<? extends Reporter> getFactoryMethod() {
+    public BiFunction<String, Object[], ? extends Reporter> getFactoryMethod() {
         return factoryMethod;
     }
 

src/main/java/org/utplsql/api/reporter/CoverallsReporter.java

@@ -10,8 +10,11 @@ public class DocumentationReporter extends Reporter {
     private int failed;
 
     public DocumentationReporter() {
-        this.lvl = 0;
-        this.failed = 0;
+        super( DefaultReporters.UT_DOCUMENTATION_REPORTER.name(), null );
+    }
+
+    public DocumentationReporter(String selfType, Object[] attributes ) {
+        super(selfType, attributes);
     }
 
     public int getLvl() {
@@ -30,23 +33,4 @@ public void setFailed(int failed) {
         this.failed = failed;
     }
 
-    @Override
-    public String getSQLTypeName() throws SQLException {
-        return DefaultReporters.UT_DOCUMENTATION_REPORTER.name();
-    }
-
-    @Override
-    public void readSQL(SQLInput stream, String typeName) throws SQLException {
-        super.readSQL(stream, typeName);
-        setLvl(stream.readInt());
-        setFailed(stream.readInt());
-    }
-
-    @Override
-    public void writeSQL(SQLOutput stream) throws SQLException {
-        super.writeSQL(stream);
-        stream.writeInt(getLvl());
-        stream.writeInt(getFailed());
-    }
-
 }

src/main/java/org/utplsql/api/reporter/DefaultReporters.java

@@ -1,5 +1,12 @@
 package org.utplsql.api.reporter;
 
+import oracle.jdbc.OracleCallableStatement;
+import oracle.jdbc.OracleConnection;
+import oracle.jdbc.OracleTypes;
+import oracle.sql.Datum;
+import oracle.sql.ORAData;
+import oracle.sql.STRUCT;
+import oracle.sql.StructDescriptor;
 import org.utplsql.api.DBHelper;
 
 import java.sql.*;
@@ -8,57 +15,62 @@
 /**
  * Created by Vinicius on 13/04/2017.
  */
-public abstract class Reporter implements SQLData {
+public class Reporter implements ORAData {
 
-    private String selfType;
-    private String reporterId;
-    private java.sql.Date startDate;
+    protected String selfType;
+    protected String id;
+    protected Object[] attributes;
 
-    public Reporter() {}
+    public Reporter( String typeName, Object[] attributes ) {
+        selfType = typeName;
 
-    public Reporter init(Connection conn) throws SQLException {
-        setSelfType(getSQLTypeName());
-        setStartDate(new java.sql.Date(Calendar.getInstance().getTimeInMillis()));
-        setReporterId(DBHelper.newSysGuid(conn));
-        return this;
+        if ( attributes != null ) {
+            this.id = String.valueOf(attributes[1]);
+        }
+        this.attributes = attributes;
     }
 
-    public String getSelfType() {
-        return this.selfType;
+    private void setTypeName( String typeName ) {
+        this.selfType = typeName.replaceAll("[^0-9a-zA-Z_]", "");
     }
 
-    private void setSelfType(String selfType) {
-        this.selfType = selfType;
+    public void setParameters( Object[] parameters ) {
+        // Empty method
     }
 
-    public String getReporterId() {
-        return this.reporterId;
-    }
+    public Reporter init( Connection con ) throws SQLException {
 
-    private void setReporterId(String reporterId) {
-        this.reporterId = reporterId;
-    }
+        OracleConnection oraConn = con.unwrap(OracleConnection.class);
+
+        OracleCallableStatement callableStatement = (OracleCallableStatement) oraConn.prepareCall("{? = call " + selfType + "()}");
+        callableStatement.registerOutParameter(1, OracleTypes.STRUCT, "UT_REPORTER_BASE");
+        callableStatement.execute();
+
+        Reporter obj = (Reporter) callableStatement.getORAData(1, ReporterFactory.getInstance());
 
-    public java.sql.Date getStartDate() {
-        return this.startDate;
+        // TODO: Really override things
+        this.attributes = obj.attributes;
+
+        // Check whether we have output or not
+
+
+        return this;
     }
 
-    private void setStartDate(java.sql.Date startDate) {
-        this.startDate = startDate;
+    public String getTypeName() {
+        return this.selfType;
     }
 
-    @Override
-    public void readSQL(SQLInput stream, String typeName) throws SQLException {
-        setSelfType(stream.readString());
-        setReporterId(stream.readString());
-        setStartDate(stream.readDate());
+    public String getId() {
+        return this.id;
     }
 
-    @Override
-    public void writeSQL(SQLOutput stream) throws SQLException {
-        stream.writeString(getSelfType());
-        stream.writeString(getReporterId());
-        stream.writeDate(getStartDate());
+
+    public Datum toDatum(Connection c) throws SQLException
+    {
+        StructDescriptor sd =
+                StructDescriptor.createDescriptor(selfType, c);
+        return new STRUCT(sd, c, attributes);
     }
 
 }