Skip to content

Cleaned up compiler warnings #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
connelly38 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Cleaned up compiler warnings #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions driver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>d-MMMM-yyyy</maven.build.timestamp.format>
<copyright>Copyright (c) 2011, 2026 Oracle and/or its affiliates. All rights reserved.</copyright>
Expand Down Expand Up @@ -274,8 +273,7 @@
<version>3.11.0</version>
<configuration>
<fork>true</fork>
<source>11</source>
<target>11</target>
<release>11</release>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<compilerArgument>-Xlint:all</compilerArgument>
Expand Down
14 changes: 7 additions & 7 deletions driver/src/main/java/oracle/nosql/driver/iam/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ static String findField(String json, JsonParser parser, String... name)
continue;
}

String fieldName = parser.getCurrentName();
String fieldName = parser.currentName();
if (fieldName == null) {
throw new IllegalStateException(
"Null token or field name found in JSON " + json);
Expand Down Expand Up @@ -521,10 +521,10 @@ static String replace(
static String parseTokenResponse(String response) {
try {
JsonParser parser = createParser(response);
if (parser.getCurrentToken() == null) {
if (parser.currentToken() == null) {
parser.nextToken();
}
while (parser.getCurrentToken() != null) {
while (parser.currentToken() != null) {
String field = findField(response, parser, "token");
if (field != null) {
parser.nextToken();
Expand All @@ -551,10 +551,10 @@ static Map<String, String> parseResourcePrincipalTokenResponse(String response)
try {
Map<String, String> results = new HashMap<>();
JsonParser parser = createParser(response);
if (parser.getCurrentToken() == null) {
if (parser.currentToken() == null) {
parser.nextToken();
}
while (parser.getCurrentToken() != null) {
while (parser.currentToken() != null) {
String field = findField(response, parser, RESOURCE_PRINCIPAL_TOKEN_FIELDS);
if (field != null) {
parser.nextToken();
Expand Down Expand Up @@ -621,10 +621,10 @@ private static void parse(String json,
Map<String, String> reults)
throws IOException {

if (parser.getCurrentToken() == null) {
if (parser.currentToken() == null) {
parser.nextToken();
}
while (parser.getCurrentToken() != null) {
while (parser.currentToken() != null) {
String field = findField(json, parser, FIELDS);
if (field != null) {
parser.nextToken();
Expand Down
1 change: 1 addition & 0 deletions driver/src/main/java/oracle/nosql/driver/iam/pki/PemEncryptedKeyException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package oracle.nosql.driver.iam.pki;

public class PemEncryptedKeyException extends PemEncryptionException {
private static final long serialVersionUID = 1L;
/**
* @hidden
*/
Expand Down
1 change: 1 addition & 0 deletions driver/src/main/java/oracle/nosql/driver/iam/pki/PemEncryptionException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package oracle.nosql.driver.iam.pki;

public class PemEncryptionException extends PemException {
private static final long serialVersionUID = 1L;

PemEncryptionException(Throwable cause) {
super(cause);
Expand Down
1 change: 1 addition & 0 deletions driver/src/main/java/oracle/nosql/driver/iam/pki/PemException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* @hidden
*/
public class PemException extends IllegalStateException {
private static final long serialVersionUID = 1L;

PemException(final String message) {
this(message, null);
Expand Down
2 changes: 1 addition & 1 deletion driver/src/main/java/oracle/nosql/driver/values/JsonReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public MapValueJsonIterator(Reader input, JsonOptions options) {
}

public long getLocationOffset() {
return parser.getCurrentLocation().getByteOffset();
return parser.currentLocation().getByteOffset();
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions driver/src/main/java/oracle/nosql/driver/values/JsonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ static FieldValue createValueFromJson(JsonParser jp,
JsonOptions options) {

try {
JsonToken token = (getNext ? jp.nextToken() : jp.getCurrentToken());
JsonToken token = (getNext ? jp.nextToken() : jp.currentToken());
if (token == null) {
throw createParseException("Empty JSON", jp);
}
Expand Down Expand Up @@ -329,7 +329,7 @@ private static FieldValue parseObject(JsonParser jp, JsonOptions options)

JsonToken token;
while ((token = jp.nextToken()) != JsonToken.END_OBJECT) {
String fieldName = jp.getCurrentName();
String fieldName = jp.currentName();
if (token == null || fieldName == null) {
throw createParseException(
"null token or field name parsing JSON object", jp);
Expand Down Expand Up @@ -391,7 +391,7 @@ private static JsonParseException createParseException(String msg,
JsonParser jp) {
return new JsonParseException(msg,
jp == null ? null :
jp.getCurrentLocation());
jp.currentLocation());
}

/**
Expand Down Expand Up @@ -546,7 +546,7 @@ public static void generateEventsFromJson(FieldValueEventHandler handler,
"generateEventsFromJson: parser must be non-null");
try {

JsonToken token = (getNext ? jp.nextToken() : jp.getCurrentToken());
JsonToken token = (getNext ? jp.nextToken() : jp.currentToken());
if (token == null) {
throw createParseException("Empty JSON", jp);
}
Expand Down Expand Up @@ -668,7 +668,7 @@ private static void parseObject(FieldValueEventHandler handler,
handler.startMap(mapSize);
JsonToken token;
while ((token = jp.nextToken()) != JsonToken.END_OBJECT) {
String fieldName = jp.getCurrentName();
String fieldName = jp.currentName();
if (token == null || fieldName == null) {
throw createParseException(
"null token or field name parsing JSON object", jp);
Expand Down
6 changes: 2 additions & 4 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<!-- don't install, test, or deploy example jar -->
<maven.install.skip>true</maven.install.skip>
<maven.deploy.skip>true</maven.deploy.skip>
Expand All @@ -37,8 +36,7 @@
<version>3.11.0</version>
<configuration>
<fork>true</fork>
<source>11</source>
<target>11</target>
<release>11</release>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<!-- <compilerArgument>-Xlint:all</compilerArgument> -->
Expand Down