From 7bbf06d84855e126143b31b2139736baa9925af2 Mon Sep 17 00:00:00 2001 From: John Connelly Date: Thu, 23 Apr 2026 16:06:27 -0700 Subject: [PATCH] Cleaned up compiler warnings --- driver/pom.xml | 6 ++---- .../main/java/oracle/nosql/driver/iam/Utils.java | 14 +++++++------- .../driver/iam/pki/PemEncryptedKeyException.java | 1 + .../driver/iam/pki/PemEncryptionException.java | 1 + .../oracle/nosql/driver/iam/pki/PemException.java | 1 + .../oracle/nosql/driver/values/JsonReader.java | 2 +- .../java/oracle/nosql/driver/values/JsonUtils.java | 10 +++++----- examples/pom.xml | 6 ++---- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/driver/pom.xml b/driver/pom.xml index a778e547..a469b343 100644 --- a/driver/pom.xml +++ b/driver/pom.xml @@ -39,8 +39,7 @@ UTF-8 - 11 - 11 + 11 ${maven.build.timestamp} d-MMMM-yyyy Copyright (c) 2011, 2026 Oracle and/or its affiliates. All rights reserved. @@ -274,8 +273,7 @@ 3.11.0 true - 11 - 11 + 11 true true -Xlint:all diff --git a/driver/src/main/java/oracle/nosql/driver/iam/Utils.java b/driver/src/main/java/oracle/nosql/driver/iam/Utils.java index 6df6abcf..c468919e 100644 --- a/driver/src/main/java/oracle/nosql/driver/iam/Utils.java +++ b/driver/src/main/java/oracle/nosql/driver/iam/Utils.java @@ -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); @@ -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(); @@ -551,10 +551,10 @@ static Map parseResourcePrincipalTokenResponse(String response) try { Map 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(); @@ -621,10 +621,10 @@ private static void parse(String json, Map 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(); diff --git a/driver/src/main/java/oracle/nosql/driver/iam/pki/PemEncryptedKeyException.java b/driver/src/main/java/oracle/nosql/driver/iam/pki/PemEncryptedKeyException.java index 27abf8c6..7edf2a62 100644 --- a/driver/src/main/java/oracle/nosql/driver/iam/pki/PemEncryptedKeyException.java +++ b/driver/src/main/java/oracle/nosql/driver/iam/pki/PemEncryptedKeyException.java @@ -8,6 +8,7 @@ package oracle.nosql.driver.iam.pki; public class PemEncryptedKeyException extends PemEncryptionException { + private static final long serialVersionUID = 1L; /** * @hidden */ diff --git a/driver/src/main/java/oracle/nosql/driver/iam/pki/PemEncryptionException.java b/driver/src/main/java/oracle/nosql/driver/iam/pki/PemEncryptionException.java index 373f09f2..b83e6bd6 100644 --- a/driver/src/main/java/oracle/nosql/driver/iam/pki/PemEncryptionException.java +++ b/driver/src/main/java/oracle/nosql/driver/iam/pki/PemEncryptionException.java @@ -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); diff --git a/driver/src/main/java/oracle/nosql/driver/iam/pki/PemException.java b/driver/src/main/java/oracle/nosql/driver/iam/pki/PemException.java index 38f2fde7..ecf55d18 100644 --- a/driver/src/main/java/oracle/nosql/driver/iam/pki/PemException.java +++ b/driver/src/main/java/oracle/nosql/driver/iam/pki/PemException.java @@ -12,6 +12,7 @@ * @hidden */ public class PemException extends IllegalStateException { + private static final long serialVersionUID = 1L; PemException(final String message) { this(message, null); diff --git a/driver/src/main/java/oracle/nosql/driver/values/JsonReader.java b/driver/src/main/java/oracle/nosql/driver/values/JsonReader.java index 307c2bbe..50615ec6 100644 --- a/driver/src/main/java/oracle/nosql/driver/values/JsonReader.java +++ b/driver/src/main/java/oracle/nosql/driver/values/JsonReader.java @@ -153,7 +153,7 @@ public MapValueJsonIterator(Reader input, JsonOptions options) { } public long getLocationOffset() { - return parser.getCurrentLocation().getByteOffset(); + return parser.currentLocation().getByteOffset(); } @Override diff --git a/driver/src/main/java/oracle/nosql/driver/values/JsonUtils.java b/driver/src/main/java/oracle/nosql/driver/values/JsonUtils.java index 5d373a56..2d90af38 100644 --- a/driver/src/main/java/oracle/nosql/driver/values/JsonUtils.java +++ b/driver/src/main/java/oracle/nosql/driver/values/JsonUtils.java @@ -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); } @@ -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); @@ -391,7 +391,7 @@ private static JsonParseException createParseException(String msg, JsonParser jp) { return new JsonParseException(msg, jp == null ? null : - jp.getCurrentLocation()); + jp.currentLocation()); } /** @@ -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); } @@ -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); diff --git a/examples/pom.xml b/examples/pom.xml index 65ef80dd..44528ce5 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -12,8 +12,7 @@ UTF-8 - 11 - 11 + 11 true true @@ -37,8 +36,7 @@ 3.11.0 true - 11 - 11 + 11 true true