Tidying up

pesse · pesse · commit 9b0452c0388d · 2018-10-22T20:40:24.000+02:00
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()

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ private void setObjectType(String objectType) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@Override`
`60`		`- public String getSQLTypeName() throws SQLException {`
	`60`	`+ public String getSQLTypeName() {`
`61`	`61`	`return CustomTypes.UT_FILE_MAPPING;`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public String getValue() {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`		`- public String getSQLTypeName() throws SQLException {`
	`30`	`+ public String getSQLTypeName() {`
`31`	`31`	`return CustomTypes.UT_KEY_VALUE_PAIR;`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ private void delayedAddReporters() {`
`120`	`120`	`throw new IllegalStateException("ReporterFactory must be set to add delayed Reporters!");`
`121`	`121`	`}`
`122`	`122`
`123`		`- public void run(Connection conn) throws SomeTestsFailedException, SQLException, DatabaseNotCompatibleException, UtPLSQLNotInstalledException {`
	`123`	`+ public void run(Connection conn) throws SQLException {`
`124`	`124`
`125`	`125`	`DatabaseInformation databaseInformation = new DefaultDatabaseInformation();`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,12 @@ public void printAvailable(Connection conn, List<PrintStream> printStreams) thro`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Override`
`50`		`- public void fetchAvailable(Connection conn, Consumer<String> onLineFetched) throws SQLException {`
	`50`	`+ public void fetchAvailable(Connection conn, Consumer<String> onLineFetched) {`
`51`	`51`	`onLineFetched.accept(null);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`
`55`		`- public List<String> fetchAll(Connection conn) throws SQLException {`
	`55`	`+ public List<String> fetchAll(Connection conn) {`
`56`	`56`	`return new ArrayList<>();`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public void fetchAllLines() throws SQLException {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`@Test`
`113`		`- public void getOutputFromSonarReporter() throws SQLException, InvalidVersionException {`
	`113`	`+ public void getOutputFromSonarReporter() throws SQLException {`
`114`	`114`	`Reporter reporter = new DefaultReporter(CoreReporters.UT_SONAR_TEST_REPORTER.name(), null).init(newConnection());`
`115`	`115`
`116`	`116`	`new TestRunner()`