Merge pull request #65 from utPLSQL/feature/params_non_nullable

Feature/params non nullable
Fixes #60
Bumps version to 3.1.2

Author: pesse

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.utplsql</groupId>
   <artifactId>java-api</artifactId>
-  <version>3.1.1.1-SNAPSHOT</version>
+  <version>3.1.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>utPLSQL-java-api</name>
@@ -36,6 +36,11 @@
       <version>12.2.0.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.2</version>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>

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

@@ -20,7 +20,6 @@ private DBHelper() {}
      * @throws SQLException any database error
      */
     public static String newSysGuid(Connection conn) throws SQLException {
-        assert conn != null;
         try (CallableStatement callableStatement = conn.prepareCall("BEGIN ? := sys_guid(); END;")) {
             callableStatement.registerOutParameter(1, OracleTypes.RAW);
             callableStatement.executeUpdate();
@@ -38,7 +37,6 @@ public static String newSysGuid(Connection conn) throws SQLException {
      */
     @Deprecated
     public static String getCurrentSchema(Connection conn) throws SQLException {
-        assert conn != null;
         try (CallableStatement callableStatement = conn.prepareCall("BEGIN ? := sys_context('userenv', 'current_schema'); END;")) {
             callableStatement.registerOutParameter(1, Types.VARCHAR);
             callableStatement.executeUpdate();
@@ -55,7 +53,6 @@ public static String getCurrentSchema(Connection conn) throws SQLException {
      */
     @Deprecated
     public static Version getDatabaseFrameworkVersion( Connection conn ) throws SQLException {
-        Objects.requireNonNull(conn);
         Version result = new Version("");
         try (PreparedStatement stmt = conn.prepareStatement("select ut_runner.version() from dual"))
         {
@@ -84,7 +81,6 @@ public static Version getDatabaseFrameworkVersion( Connection conn ) throws SQLE
      */
     @Deprecated
     public static String getOracleDatabaseVersion( Connection conn ) throws SQLException {
-        assert conn != null;
         String result = null;
         try (PreparedStatement stmt = conn.prepareStatement("select version from product_component_version where product like 'Oracle Database%'"))
         {
@@ -102,7 +98,6 @@ public static String getOracleDatabaseVersion( Connection conn ) throws SQLExcep
      * @param conn the connection
      */
     public static void enableDBMSOutput(Connection conn) {
-        assert conn != null;
         try (CallableStatement call = conn.prepareCall("BEGIN dbms_output.enable(NULL); END;")) {
             call.execute();
         } catch (SQLException e) {
@@ -115,7 +110,6 @@ public static void enableDBMSOutput(Connection conn) {
      * @param conn the connection
      */
     public static void disableDBMSOutput(Connection conn) {
-        assert conn != null;
         try (CallableStatement call = conn.prepareCall("BEGIN dbms_output.disable(); END;")) {
             call.execute();
         } catch (SQLException e) {

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

@@ -1,5 +1,7 @@
 package org.utplsql.api;
 
+import javax.annotation.Nullable;
+
 /**
  * This class provides an easy way to get environmental variables.
  * This is mainly to improve testability but also to standardize the way how utPLSQL API and CLI read from
@@ -37,7 +39,7 @@ public static String getEnvValue(String key) {
      * @param defaultValue Default value if nothing found
      * @return Environment value or defaultValue
      */
-    public static String getEnvValue(String key, String defaultValue) {
+    public static String getEnvValue(String key, @Nullable String defaultValue) {
 
         String val = System.getProperty(key);
         if (val == null || val.isEmpty()) val = System.getenv(key);

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

@@ -57,7 +57,7 @@ private void setObjectType(String objectType) {
     }
 
     @Override
-    public String getSQLTypeName() throws SQLException {
+    public String getSQLTypeName() {
         return CustomTypes.UT_FILE_MAPPING;
     }
 

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

@@ -11,7 +11,7 @@ private JavaApiVersionInfo() { }
 
     private static final String BUILD_NO = "123";
     private static final String MAVEN_PROJECT_NAME = "utPLSQL-java-api";
-    private static final String MAVEN_PROJECT_VERSION = "3.1.1.1-SNAPSHOT";
+    private static final String MAVEN_PROJECT_VERSION = "3.1.2-SNAPSHOT";
 
     public static String getVersion() {
         return MAVEN_PROJECT_VERSION + "." + BUILD_NO;

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

@@ -27,7 +27,7 @@ public String getValue() {
     }
 
     @Override
-    public String getSQLTypeName() throws SQLException {
+    public String getSQLTypeName() {
         return CustomTypes.UT_KEY_VALUE_PAIR;
     }
 

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

@@ -58,7 +58,7 @@ public TestRunner colorConsole(boolean colorConsole) {
     }
 
     public TestRunner addReporterList(List<Reporter> reporterList) {
-        if (options.reporterList != null) options.reporterList.addAll(reporterList);
+        options.reporterList.addAll(reporterList);
         return this;
     }
 
@@ -120,7 +120,7 @@ private void delayedAddReporters() {
             throw new IllegalStateException("ReporterFactory must be set to add delayed Reporters!");
     }
 
-    public void run(Connection conn) throws SomeTestsFailedException, SQLException, DatabaseNotCompatibleException, UtPLSQLNotInstalledException {
+    public void run(Connection conn) throws SQLException {
 
         DatabaseInformation databaseInformation = new DefaultDatabaseInformation();
 

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

@@ -2,6 +2,7 @@
 
 import org.utplsql.api.exception.InvalidVersionException;
 
+import javax.annotation.Nullable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -105,7 +106,7 @@ public String getNormalizedString()
             return "invalid";
     }
 
-    private int compareToWithNulls( Integer i1, Integer i2 ) {
+    private int compareToWithNulls(@Nullable Integer i1, @Nullable Integer i2 ) {
         if ( i1 == null && i2 == null )
             return 0;
         else if ( i1 == null )

src/main/java/org/utplsql/api/compatibility/CompatibilityProxy.java

@@ -1,6 +1,5 @@
 package org.utplsql.api.compatibility;
 
-import org.utplsql.api.DBHelper;
 import org.utplsql.api.TestRunnerOptions;
 import org.utplsql.api.Version;
 import org.utplsql.api.db.DatabaseInformation;
@@ -12,10 +11,8 @@
 import org.utplsql.api.testRunner.TestRunnerStatement;
 import org.utplsql.api.testRunner.TestRunnerStatementProvider;
 
-import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.sql.Types;
 import java.util.Objects;
 
 /** Class to check compatibility with database framework and also to give several specific implementations depending
@@ -120,13 +117,9 @@ private boolean versionCompatibilityCheckPre303(String requested )
         Version requestedVersion = new Version(requested);
 
         Objects.requireNonNull(databaseVersion.getMajor(), "Illegal database Version: " + databaseVersion.toString());
-        if (
-                databaseVersion.getMajor().equals(requestedVersion.getMajor())
-                        && (requestedVersion.getMinor() == null
-                        || requestedVersion.getMinor().equals(databaseVersion.getMinor())) )
-            return true;
-        else
-            return false;
+        return databaseVersion.getMajor().equals(requestedVersion.getMajor())
+                && (requestedVersion.getMinor() == null
+                || requestedVersion.getMinor().equals(databaseVersion.getMinor()));
     }
 
     /** Checks if actual API-version is compatible with utPLSQL database version and throws a DatabaseNotCompatibleException if not

src/main/java/org/utplsql/api/db/DatabaseInformation.java

@@ -2,6 +2,7 @@
 
 import org.utplsql.api.Version;
 
+import javax.annotation.Nullable;
 import java.sql.Connection;
 import java.sql.SQLException;
 
@@ -17,5 +18,5 @@ public interface DatabaseInformation {
 
     String getCurrentSchema( Connection conn ) throws SQLException;
 
-    int frameworkCompatibilityCheck(Connection conn, String requested, String current) throws SQLException;
+    int frameworkCompatibilityCheck(Connection conn, String requested, @Nullable String current) throws SQLException;
 }