Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita4fd7ad

Browse files
authored
Merge pull request#65 from utPLSQL/feature/params_non_nullable
Feature/params non nullableFixes#60Bumps version to 3.1.2
2 parents5ee67a9 +9b0452c commita4fd7ad

16 files changed

+34
-34
lines changed

‎pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.utplsql</groupId>
66
<artifactId>java-api</artifactId>
7-
<version>3.1.1.1-SNAPSHOT</version>
7+
<version>3.1.2-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<name>utPLSQL-java-api</name>
@@ -36,6 +36,11 @@
3636
<version>12.2.0.1</version>
3737
<scope>compile</scope>
3838
</dependency>
39+
<dependency>
40+
<groupId>com.google.code.findbugs</groupId>
41+
<artifactId>jsr305</artifactId>
42+
<version>3.0.2</version>
43+
</dependency>
3944
<dependency>
4045
<groupId>org.junit.jupiter</groupId>
4146
<artifactId>junit-jupiter-api</artifactId>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ private DBHelper() {}
2020
* @throws SQLException any database error
2121
*/
2222
publicstaticStringnewSysGuid(Connectionconn)throwsSQLException {
23-
assertconn !=null;
2423
try (CallableStatementcallableStatement =conn.prepareCall("BEGIN ? := sys_guid(); END;")) {
2524
callableStatement.registerOutParameter(1,OracleTypes.RAW);
2625
callableStatement.executeUpdate();
@@ -38,7 +37,6 @@ public static String newSysGuid(Connection conn) throws SQLException {
3837
*/
3938
@Deprecated
4039
publicstaticStringgetCurrentSchema(Connectionconn)throwsSQLException {
41-
assertconn !=null;
4240
try (CallableStatementcallableStatement =conn.prepareCall("BEGIN ? := sys_context('userenv', 'current_schema'); END;")) {
4341
callableStatement.registerOutParameter(1,Types.VARCHAR);
4442
callableStatement.executeUpdate();
@@ -55,7 +53,6 @@ public static String getCurrentSchema(Connection conn) throws SQLException {
5553
*/
5654
@Deprecated
5755
publicstaticVersiongetDatabaseFrameworkVersion(Connectionconn )throwsSQLException {
58-
Objects.requireNonNull(conn);
5956
Versionresult =newVersion("");
6057
try (PreparedStatementstmt =conn.prepareStatement("select ut_runner.version() from dual"))
6158
{
@@ -84,7 +81,6 @@ public static Version getDatabaseFrameworkVersion( Connection conn ) throws SQLE
8481
*/
8582
@Deprecated
8683
publicstaticStringgetOracleDatabaseVersion(Connectionconn )throwsSQLException {
87-
assertconn !=null;
8884
Stringresult =null;
8985
try (PreparedStatementstmt =conn.prepareStatement("select version from product_component_version where product like 'Oracle Database%'"))
9086
{
@@ -102,7 +98,6 @@ public static String getOracleDatabaseVersion( Connection conn ) throws SQLExcep
10298
* @param conn the connection
10399
*/
104100
publicstaticvoidenableDBMSOutput(Connectionconn) {
105-
assertconn !=null;
106101
try (CallableStatementcall =conn.prepareCall("BEGIN dbms_output.enable(NULL); END;")) {
107102
call.execute();
108103
}catch (SQLExceptione) {
@@ -115,7 +110,6 @@ public static void enableDBMSOutput(Connection conn) {
115110
* @param conn the connection
116111
*/
117112
publicstaticvoiddisableDBMSOutput(Connectionconn) {
118-
assertconn !=null;
119113
try (CallableStatementcall =conn.prepareCall("BEGIN dbms_output.disable(); END;")) {
120114
call.execute();
121115
}catch (SQLExceptione) {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
packageorg.utplsql.api;
22

3+
importjavax.annotation.Nullable;
4+
35
/**
46
* This class provides an easy way to get environmental variables.
57
* 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) {
3739
* @param defaultValue Default value if nothing found
3840
* @return Environment value or defaultValue
3941
*/
40-
publicstaticStringgetEnvValue(Stringkey,StringdefaultValue) {
42+
publicstaticStringgetEnvValue(Stringkey,@NullableStringdefaultValue) {
4143

4244
Stringval =System.getProperty(key);
4345
if (val ==null ||val.isEmpty())val =System.getenv(key);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private void setObjectType(String objectType) {
5757
}
5858

5959
@Override
60-
publicStringgetSQLTypeName()throwsSQLException{
60+
publicStringgetSQLTypeName() {
6161
returnCustomTypes.UT_FILE_MAPPING;
6262
}
6363

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ private JavaApiVersionInfo() { }
1111

1212
privatestaticfinalStringBUILD_NO ="123";
1313
privatestaticfinalStringMAVEN_PROJECT_NAME ="utPLSQL-java-api";
14-
privatestaticfinalStringMAVEN_PROJECT_VERSION ="3.1.1.1-SNAPSHOT";
14+
privatestaticfinalStringMAVEN_PROJECT_VERSION ="3.1.2-SNAPSHOT";
1515

1616
publicstaticStringgetVersion() {
1717
returnMAVEN_PROJECT_VERSION +"." +BUILD_NO;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public String getValue() {
2727
}
2828

2929
@Override
30-
publicStringgetSQLTypeName()throwsSQLException{
30+
publicStringgetSQLTypeName() {
3131
returnCustomTypes.UT_KEY_VALUE_PAIR;
3232
}
3333

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public TestRunner colorConsole(boolean colorConsole) {
5858
}
5959

6060
publicTestRunneraddReporterList(List<Reporter>reporterList) {
61-
if (options.reporterList !=null)options.reporterList.addAll(reporterList);
61+
options.reporterList.addAll(reporterList);
6262
returnthis;
6363
}
6464

@@ -120,7 +120,7 @@ private void delayedAddReporters() {
120120
thrownewIllegalStateException("ReporterFactory must be set to add delayed Reporters!");
121121
}
122122

123-
publicvoidrun(Connectionconn)throwsSomeTestsFailedException,SQLException,DatabaseNotCompatibleException,UtPLSQLNotInstalledException {
123+
publicvoidrun(Connectionconn)throwsSQLException {
124124

125125
DatabaseInformationdatabaseInformation =newDefaultDatabaseInformation();
126126

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
importorg.utplsql.api.exception.InvalidVersionException;
44

5+
importjavax.annotation.Nullable;
56
importjava.util.regex.Matcher;
67
importjava.util.regex.Pattern;
78

@@ -105,7 +106,7 @@ public String getNormalizedString()
105106
return"invalid";
106107
}
107108

108-
privateintcompareToWithNulls(Integeri1,Integeri2 ) {
109+
privateintcompareToWithNulls(@NullableIntegeri1,@NullableIntegeri2 ) {
109110
if (i1 ==null &&i2 ==null )
110111
return0;
111112
elseif (i1 ==null )

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
packageorg.utplsql.api.compatibility;
22

3-
importorg.utplsql.api.DBHelper;
43
importorg.utplsql.api.TestRunnerOptions;
54
importorg.utplsql.api.Version;
65
importorg.utplsql.api.db.DatabaseInformation;
@@ -12,10 +11,8 @@
1211
importorg.utplsql.api.testRunner.TestRunnerStatement;
1312
importorg.utplsql.api.testRunner.TestRunnerStatementProvider;
1413

15-
importjava.sql.CallableStatement;
1614
importjava.sql.Connection;
1715
importjava.sql.SQLException;
18-
importjava.sql.Types;
1916
importjava.util.Objects;
2017

2118
/** Class to check compatibility with database framework and also to give several specific implementations depending
@@ -120,13 +117,9 @@ private boolean versionCompatibilityCheckPre303(String requested )
120117
VersionrequestedVersion =newVersion(requested);
121118

122119
Objects.requireNonNull(databaseVersion.getMajor(),"Illegal database Version: " +databaseVersion.toString());
123-
if (
124-
databaseVersion.getMajor().equals(requestedVersion.getMajor())
125-
&& (requestedVersion.getMinor() ==null
126-
||requestedVersion.getMinor().equals(databaseVersion.getMinor())) )
127-
returntrue;
128-
else
129-
returnfalse;
120+
returndatabaseVersion.getMajor().equals(requestedVersion.getMajor())
121+
&& (requestedVersion.getMinor() ==null
122+
||requestedVersion.getMinor().equals(databaseVersion.getMinor()));
130123
}
131124

132125
/** 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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
importorg.utplsql.api.Version;
44

5+
importjavax.annotation.Nullable;
56
importjava.sql.Connection;
67
importjava.sql.SQLException;
78

@@ -17,5 +18,5 @@ public interface DatabaseInformation {
1718

1819
StringgetCurrentSchema(Connectionconn )throwsSQLException;
1920

20-
intframeworkCompatibilityCheck(Connectionconn,Stringrequested,Stringcurrent)throwsSQLException;
21+
intframeworkCompatibilityCheck(Connectionconn,Stringrequested,@NullableStringcurrent)throwsSQLException;
2122
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp