Refactored Reporter to be more clear

Author: pesse

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

@@ -1,6 +1,5 @@
 package org.utplsql.api.reporter;
 
-import org.utplsql.api.CustomTypes;
 import org.utplsql.api.ResourceUtil;
 
 import java.io.IOException;
@@ -9,9 +8,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.sql.SQLException;
-import java.sql.SQLInput;
-import java.sql.SQLOutput;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -32,6 +28,26 @@ public CoverageHTMLReporter(String selfType, Object[] attributes) {
         super(selfType, attributes);
     }
 
+    @Override
+    protected void setAttributes(Object[] attributes) {
+        super.setAttributes(attributes);
+
+        if ( attributes != null ) {
+            projectName = String.valueOf(attributes[3]);
+            assetsPath = String.valueOf(attributes[4]);
+        }
+    }
+
+    @Override
+    protected Object[] getAttributes() {
+        Object[] attributes = super.getAttributes();
+
+        attributes[3] = projectName;
+        attributes[4] = assetsPath;
+
+        return attributes;
+    }
+
     public String getProjectName() {
         return projectName;
     }

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

@@ -1,8 +1,6 @@
 package org.utplsql.api.reporter;
 
-import java.sql.SQLException;
-import java.sql.SQLInput;
-import java.sql.SQLOutput;
+import java.math.BigDecimal;
 
 public class DocumentationReporter extends Reporter {
 
@@ -17,6 +15,24 @@ public DocumentationReporter(String selfType, Object[] attributes ) {
         super(selfType, attributes);
     }
 
+    @Override
+    protected void setAttributes(Object[] attributes) {
+        super.setAttributes(attributes);
+
+        if ( attributes != null ) {
+            lvl = ((BigDecimal)attributes[3]).intValue();
+            failed = ((BigDecimal)attributes[4]).intValue();
+        }
+    }
+
+    @Override
+    protected Object[] getAttributes() {
+        Object[] attributes = super.getAttributes();
+        attributes[3] = lvl;
+        attributes[4] = failed;
+        return attributes;
+    }
+
     public int getLvl() {
         return lvl;
     }

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

@@ -7,27 +7,24 @@
 import oracle.sql.ORAData;
 import oracle.sql.STRUCT;
 import oracle.sql.StructDescriptor;
-import org.utplsql.api.DBHelper;
 
 import java.sql.*;
-import java.util.Calendar;
 
-/**
- * Created by Vinicius on 13/04/2017.
+/** This is a basic Reporter implementation, using ORAData interface
+ *
+ * @author pesse
  */
 public class Reporter implements ORAData {
 
-    protected String selfType;
-    protected String id;
-    protected Object[] attributes;
+    private String selfType;
+    private String id;
+    private Object[] attributes;
+    private boolean hasOutput = false;
+    private boolean init = false;
 
     public Reporter( String typeName, Object[] attributes ) {
-        selfType = typeName;
-
-        if ( attributes != null ) {
-            this.id = String.valueOf(attributes[1]);
-        }
-        this.attributes = attributes;
+        setTypeName(typeName);
+        setAttributes( attributes );
     }
 
     private void setTypeName( String typeName ) {
@@ -42,19 +39,69 @@ public Reporter init( Connection con ) throws SQLException {
 
         OracleConnection oraConn = con.unwrap(OracleConnection.class);
 
+        initDbReporter( oraConn );
+        initHasOutput( oraConn );
+
+        init = true;
+
+        return this;
+    }
+
+    /** Initializes the Reporter from database
+     * This is necessary because we set up OutputBuffer (and maybe other stuff) we don't want to know and care about
+     * in the java API. Let's just do the instantiation of the Reporter in the database and map it into this object.
+     *
+     * @param oraConn
+     * @throws SQLException
+     */
+    private void initDbReporter( OracleConnection oraConn ) throws SQLException {
         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());
 
-        // TODO: Really override things
-        this.attributes = obj.attributes;
+        setAttributes(obj.getAttributes());
+    }
+
+    /** Checks whether the Reporter has an output or not
+     *
+     * @param oraConn
+     * @throws SQLException
+     */
+    private void initHasOutput( OracleConnection oraConn ) throws SQLException {
+        OracleCallableStatement cstmt = (OracleCallableStatement)oraConn.prepareCall("{? = call ?.has_output()}");
+
+        cstmt.registerOutParameter(1, OracleTypes.INTEGER);
+        cstmt.setORAData(2, this);
+        cstmt.execute();
+
+        Integer i = cstmt.getInt(1);
+        if ( i != null && i == 1 ) {
+            hasOutput = true;
+        }
+        else {
+            hasOutput = false;
+        }
+    }
 
-        // Check whether we have output or not
+    protected void setAttributes(Object[] attributes ) {
+        if (attributes != null) {
+            this.id = String.valueOf(attributes[1]);
+        }
+        this.attributes = attributes;
+    }
 
+    protected Object[] getAttributes() {
+        return attributes;
+    }
 
-        return this;
+    public boolean hasOutput() {
+        return hasOutput;
+    }
+
+    public boolean isInit() {
+        return init;
     }
 
     public String getTypeName() {
@@ -69,8 +116,8 @@ public String getId() {
     public Datum toDatum(Connection c) throws SQLException
     {
         StructDescriptor sd =
-                StructDescriptor.createDescriptor(selfType, c);
-        return new STRUCT(sd, c, attributes);
+                StructDescriptor.createDescriptor(getTypeName(), c);
+        return new STRUCT(sd, c, getAttributes());
     }
 
 }

src/test/java/org/utplsql/api/OraDataIT.java

@@ -20,29 +20,8 @@ public void myTest2() throws SQLException {
 
         OracleConnection oraConn = getConnection().unwrap(OracleConnection.class);
 
-        /*String sql = "{? = call ut_documentation_reporter()}";
-
-        OracleCallableStatement callableStatement = null;
-
-        callableStatement = (OracleCallableStatement) oraConn.prepareCall(sql);
-        callableStatement.registerOutParameter(1, OracleTypes.STRUCT, "UT_REPORTER_BASE");
-        //callableStatement.registerOutParameter(1, OracleTypes.REF, "UT_REPORTER_BASE");
-        callableStatement.execute();
-
-        Reporter obj = (Reporter) callableStatement.getORAData(1, ReporterFactory.getInstance());
-
-*/
         Reporter obj = new DocumentationReporter().init(oraConn);
 
-        OracleCallableStatement cstmt = (OracleCallableStatement)oraConn.prepareCall("{? = call ?.has_output()}");
-
-        cstmt.registerOutParameter(1, OracleTypes.INTEGER);
-        cstmt.setORAData(2, obj);
-
-        cstmt.execute();
-
-        int hasOutput = cstmt.getInt(1);
-
         String runnerSql = "begin ut_runner.run( a_paths => ut_varchar2_list('app'), a_reporters => ?); end;";
 
         CallableStatement stmt = oraConn.prepareCall(runnerSql);