Tidying up

utPLSQL · Oct 22, 2018 · 9b0452c · 9b0452c
1 parent 6d12174
commit 9b0452c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 16 deletions.
diff --git a/src/main/java/org/utplsql/api/FileMapping.java b/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;
     }
 

diff --git a/src/main/java/org/utplsql/api/KeyValuePair.java b/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;
     }
 

diff --git a/src/main/java/org/utplsql/api/TestRunner.java b/src/main/java/org/utplsql/api/TestRunner.java
@@ -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();
 

diff --git a/src/main/java/org/utplsql/api/compatibility/CompatibilityProxy.java b/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

diff --git a/src/main/java/org/utplsql/api/outputBuffer/NonOutputBuffer.java b/src/main/java/org/utplsql/api/outputBuffer/NonOutputBuffer.java
@@ -47,12 +47,12 @@ public void printAvailable(Connection conn, List<PrintStream> printStreams) thro
     }
 
     @Override
-    public void fetchAvailable(Connection conn, Consumer<String> onLineFetched) throws SQLException {
+    public void fetchAvailable(Connection conn, Consumer<String> onLineFetched) {
         onLineFetched.accept(null);
     }
 
     @Override
-    public List<String> fetchAll(Connection conn) throws SQLException {
+    public List<String> fetchAll(Connection conn) {
         return new ArrayList<>();
     }
 }
diff --git a/src/test/java/org/utplsql/api/OutputBufferIT.java b/src/test/java/org/utplsql/api/OutputBufferIT.java
@@ -110,7 +110,7 @@ public void fetchAllLines() throws SQLException {
     }
 
     @Test
-    public void getOutputFromSonarReporter() throws SQLException, InvalidVersionException {
+    public void getOutputFromSonarReporter() throws SQLException {
         Reporter reporter = new DefaultReporter(CoreReporters.UT_SONAR_TEST_REPORTER.name(), null).init(newConnection());
 
         new TestRunner()