Upgrade the Maven Plugin to the API version 3.1.0

Author: alberto-hernandez

README.md

@@ -3,7 +3,7 @@ A maven plugin for running Unit Tests with utPLSQL v3+
 
 ### Compatibility
 
-This plugin is compatible with the Java-API 3.0.4.
+This plugin is compatible with the Java-API 3.1.0.
 
 ### Prerequisites
 You have to be a fully utPLSQL environment available compatible with the Java API.
@@ -20,6 +20,9 @@ You have to be a fully utPLSQL environment available compatible with the Java AP
 * `password`
   * Password of the connection to the database
   * Default: `${dbPass}`
+* `version`
+  * Version of the  utplsql
+  * Default: `3.1.0`
 * `ignoreFailure`
   * Ignore or continue when a test fail
   * Default: `${maven.test.failure.ignore}`
@@ -62,6 +65,7 @@ The next snippet is a sample of declaration of the pom
 			<url>url_of_connection</url>
 			<user>user</user>
 			<password>password</password>
+			<version>3.1.0</version>
 			<failOnErrors>false</failOnErrors>
 			<reporters>
 				<reporter>

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.utplsql</groupId>
     <artifactId>utplsql-maven-plugin-build</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>utplsql-maven-plugin Maven Plugin Build</name>

utplsql-maven-plugin/pom.xml

@@ -17,13 +17,12 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 	</properties>
-
 	<dependencies>
 
 		<dependency>
 			<groupId>org.utplsql</groupId>
 			<artifactId>java-api</artifactId>
-			<version>3.0.4</version>
+			<version>3.1.0</version>
 		</dependency>
 
 		<dependency>
@@ -118,9 +117,22 @@
 						</goals>
 					</execution>
 				</executions>
-				
+
 			</plugin>
 		</plugins>
 	</build>
 
+	<repositories>
+		<repository>
+			<id>utplsql-java-api</id>
+			<url>https://packagecloud.io/utplsql/utplsql-java-api/maven2</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
 </project>

utplsql-maven-plugin/src/main/java/org/utplsql/UtPLSQLMojo.java

@@ -18,6 +18,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.utplsql.api.FileMapperOptions;
 import org.utplsql.api.TestRunner;
+import org.utplsql.api.Version;
 import org.utplsql.api.exception.SomeTestsFailedException;
 import org.utplsql.api.reporter.Reporter;
 import org.utplsql.api.reporter.ReporterFactory;
@@ -43,6 +44,9 @@ public class UtPLSQLMojo extends AbstractMojo
 
 	@Parameter(defaultValue = "${dbPass}")
 	private String password;
+	
+	@Parameter(defaultValue = "3.1.0")
+	private String version;
 
 	@Parameter
 	private String includeObject;
@@ -86,13 +90,14 @@ public class UtPLSQLMojo extends AbstractMojo
 	public void execute() throws MojoExecutionException
 	{
 		Connection connection = null;
-		try
+		try 
 		{
 			FileMapperOptions sourceMappingOptions = buildOptions(sources, PluginDefault.buildDefaultSource(), "sources");
 			FileMapperOptions testMappingOptions = buildOptions(tests, PluginDefault.buildDefaultTest(), "test");
-
+			
 			// Create the Connection to the Database
 			connection = DriverManager.getConnection(url, user, password);
+			
 			List<Reporter> reporterList = initReporters(connection);
 
 			logParameters(sourceMappingOptions, testMappingOptions, reporterList);
@@ -117,7 +122,7 @@ public void execute() throws MojoExecutionException
 			}
 
 			runner.run(connection);
-
+			
 		}
 		catch (SomeTestsFailedException e)
 		{
@@ -135,11 +140,6 @@ public void execute() throws MojoExecutionException
 			{
 				// Write Reporters
 				reporterWriter.writeReporters(connection);
-
-				if (connection != null)
-				{
-					connection.close();
-				}
 			}
 			catch (Exception e)
 			{
@@ -184,13 +184,17 @@ private FileMapperOptions buildOptions(List<Resource> resources, Resource defaul
 	private List<Reporter> initReporters(Connection connection) throws SQLException
 	{
 		List<Reporter> reporterList = new ArrayList<>();
+		
+		Version utlVersion = new Version (version);
 
-		// Initializate Reporters
-		reporterWriter = new ReporterWriter(targetDir);
+		// Initialized Reporters
+		reporterWriter = new ReporterWriter(targetDir, utlVersion);
+		
+		ReporterFactory reporterFactory = ReporterFactory.createEmpty();
 
 		for (ReporterParameter reporterParameter : reporters)
 		{
-			Reporter reporter = ReporterFactory.createReporter(reporterParameter.getName());
+			Reporter reporter = reporterFactory.createReporter(reporterParameter.getName());
 			reporter.init(connection);
 			reporterList.add(reporter);
 
@@ -224,7 +228,7 @@ private void logParameters(FileMapperOptions sourceMappingOptions, FileMapperOpt
 
 		log.debug("Invoking TestRunner with: ");
 		log.debug("reporters=");
-		reporterList.forEach((Reporter r) -> log.debug(r.getSelfType()));
+		reporterList.forEach((Reporter r) -> log.debug(r.getTypeName()));
 		log.debug("sources=");
 		sourceMappingOptions.getFilePaths().forEach(log::debug);
 		log.debug("tests=");

utplsql-maven-plugin/src/main/java/org/utplsql/reporter/ReporterWriter.java

@@ -14,7 +14,9 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugin.logging.SystemStreamLog;
-import org.utplsql.api.OutputBuffer;
+import org.utplsql.api.Version;
+import org.utplsql.api.outputBuffer.OutputBuffer;
+import org.utplsql.api.outputBuffer.OutputBufferProvider;
 import org.utplsql.api.reporter.Reporter;
 import org.utplsql.model.ReporterParameter;
 
@@ -27,14 +29,22 @@ public class ReporterWriter
 
 	// Output Directory
 	private String outputDirectory;
+	
+	// Database Version
+	private Version databaseVersion;
 
+	
 	/**
-	 * 
+	 * Constructor of the reporter writer
+	 * @param outputDirectory
+	 * @param databaseVersion
 	 */
-	public ReporterWriter(String outputDirectory)
+	public ReporterWriter(String outputDirectory, Version databaseVersion)
 	{
-		listReporters = new ArrayList<>();
+		this.listReporters = new ArrayList<>();
 		this.outputDirectory = outputDirectory;
+		this.databaseVersion = databaseVersion;
+		
 	}
 
 	/**
@@ -64,7 +74,7 @@ private void writeReports(Connection connection, Reporter reporter, ReporterPara
 		//
 		try
 		{
-			OutputBuffer buffer = new OutputBuffer(reporter);
+			OutputBuffer buffer = OutputBufferProvider.getCompatibleOutputBuffer(databaseVersion, reporter, connection);
 
 			if (reporterParameter.isFileOutput())
 			{
@@ -82,15 +92,15 @@ private void writeReports(Connection connection, Reporter reporter, ReporterPara
 				}
 
 				fout = new FileOutputStream(file);
-				LOG.info(format("Writing report %s to %s", reporter.getSelfType(), file.getAbsolutePath()));
+				LOG.info(format("Writing report %s to %s", reporter.getTypeName(), file.getAbsolutePath()));
 
 				// Added to the Report
 				printStreams.add(new PrintStream(fout));
 			}
 
 			if (reporterParameter.isConsoleOutput())
 			{
-				LOG.info(format("Writing report %s to Console", reporter.getSelfType()));
+				LOG.info(format("Writing report %s to Console", reporter.getTypeName()));
 				printStreams.add(System.out);
 			}
 			buffer.printAvailable(connection, printStreams);

utplsql-maven-plugin/src/test/resources/pom.xml

@@ -11,7 +11,7 @@
 
 
     <properties>
-      	<dbUrl>jdbc:oracle:thin:@180.129.3.101:1521:xe</dbUrl>  
+      	<dbUrl>jdbc:oracle:thin:@127.0.0.1:1521:xe</dbUrl>  
       	<dbUser>ut3</dbUser> 
   		<dbPass>XNtxj8eEgA6X6b6f</dbPass> 
     </properties>