Adapted providers to new version of the driver

Author: fmeheust

ojdbc-provider-azure/src/main/java/oracle/jdbc/provider/azure/AzureResourceFactory.java

@@ -59,6 +59,7 @@
  * {@link TokenCredential} created by {@link TokenCredentialFactory} is passed
  * to the {@link #request(TokenCredential, ParameterSet)} method of a subclass.
  * </p>
+ * @param <T> the type
  */
 public abstract class AzureResourceFactory<T> implements ResourceFactory<T> {
 

ojdbc-provider-azure/src/main/java/oracle/jdbc/provider/azure/configuration/AzureVaultJsonProvider.java

@@ -38,7 +38,7 @@
 
 package oracle.jdbc.provider.azure.configuration;
 
-import oracle.jdbc.driver.OracleConfigurationJsonProvider;
+import oracle.jdbc.driver.configuration.OracleConfigurationParsableProvider;
 import oracle.jdbc.provider.azure.keyvault.KeyVaultSecretFactory;
 import oracle.jdbc.provider.parameter.Parameter;
 import oracle.jdbc.provider.parameter.ParameterSet;
@@ -52,9 +52,9 @@
 
 /**
  * A provider for JSON payload which contains configuration from Azure Vault.
- * See {@link #getJson(String)} for the spec of the JSON payload.
+ * See {@link #getInputStream(String)} for the spec of the JSON payload.
  */
-public class AzureVaultJsonProvider extends OracleConfigurationJsonProvider {
+public class AzureVaultJsonProvider extends OracleConfigurationParsableProvider {
 
   /**
    * Parser that recognizes the "key" and "value" field,
@@ -85,7 +85,7 @@ public class AzureVaultJsonProvider extends OracleConfigurationJsonProvider {
    * @return JSON payload
    **/
   @Override
-  public InputStream getJson(String secretIdentifier) {
+  public InputStream getInputStream(String secretIdentifier) {
     final String valueFieldName = "value";
     Map<String, String> optionsWithSecret = new HashMap<>(options);
     optionsWithSecret.put(valueFieldName, secretIdentifier);

ojdbc-provider-jackson-oson/src/main/java/oracle/jdbc/provider/oson/OsonGenerator.java

@@ -532,7 +532,7 @@ public void writeNull() throws IOException {
 
   /**
    * Checks if the generator is closed.
-   * @return
+   * @return true if the generator is closed, otherwise false.
    */
   @Override
   public boolean isClosed() {

ojdbc-provider-jackson-oson/src/main/java/oracle/jdbc/provider/oson/OsonModule.java

@@ -74,7 +74,7 @@
  *   <li>{@link Duration} - {@link OsonDurationDeserializer} and {@link OsonDurationSerializer}</li>
  *   <li>{@link BigInteger} - {@link OsonBigIntegerDeserializer} and {@link OsonBigIntegerSerializer}</li>
  *   <li>{@link Year} - {@link OsonYearDeserializer} and {@link OsonYearSerializer}</li>
- *   <li>{@link byte[]} - {@link OsonByteDeserializer} and {@link OsonByteSerializer}</li>
+ *   <li>byte[] - {@link OsonByteDeserializer} and {@link OsonByteSerializer}</li>
  *   <li>{@link java.util.Date}- {@link OsonDateSerializer} and {@link OsonDateDeserializer} </li>
  *   <li>{@link java.sql.Date}- {@link OsonDateSerializer} and {@link OsonSqlDateDeserializer} </li>
  *   <li>{@link Timestamp}- {@link OsonDateSerializer} and {@link OsonTimeStampDeserializer} </li>

ojdbc-provider-jackson-oson/src/main/java/oracle/jdbc/provider/oson/deser/OsonByteDeserializer.java

@@ -59,16 +59,15 @@
  *
  * @see StdScalarDeserializer
  * @see OsonParser
- * @see byte[]
- */
+  */
 public class OsonByteDeserializer extends StdScalarDeserializer<byte[]> {
-   /**
+  /**
   * A singleton instance of the deserializer.
   */
    public static final OsonByteDeserializer INSTANCE = new OsonByteDeserializer();
 
-   /**
-  * Default constructor that initializes the deserializer for the {@link byte[]} class.
+  /**
+  * Default constructor that initializes the deserializer for the byte[] class.
   */
    protected OsonByteDeserializer() {
     super(Year.class);

ojdbc-provider-jackson-oson/src/main/java/oracle/jdbc/provider/oson/ser/OsonByteSerializer.java

@@ -55,7 +55,6 @@
  *
  * @see StdSerializer
  * @see OsonGenerator
- * @see byte[]
  */
 public class OsonByteSerializer extends StdSerializer<byte[]> {
 

ojdbc-provider-oci/src/main/java/oracle/jdbc/provider/oci/configuration/OciObjectStorageProvider.java

@@ -38,7 +38,7 @@
 
 package oracle.jdbc.provider.oci.configuration;
 
-import oracle.jdbc.driver.OracleConfigurationJsonProvider;
+import oracle.jdbc.driver.configuration.OracleConfigurationParsableProvider;
 import oracle.jdbc.provider.oci.objectstorage.ObjectFactory;
 import oracle.jdbc.provider.parameter.ParameterSet;
 import oracle.jdbc.util.OracleConfigurationCache;
@@ -49,10 +49,10 @@
 
 /**
  * A provider for JSON payload which contains configuration from OCI Object
- * Storage. See {@link #getJson(String)} for the spec of the JSON payload.
+ * Storage. See {@link #getInputStream(String)} for the spec of the JSON payload.
  */
 public class OciObjectStorageProvider
-  extends OracleConfigurationJsonProvider {
+  extends OracleConfigurationParsableProvider {
 
   /**
    * {@inheritDoc}
@@ -71,7 +71,7 @@ public class OciObjectStorageProvider
    * @return JSON payload
    */
   @Override
-  public InputStream getJson(String objectUrl) {
+  public InputStream getInputStream(String objectUrl) {
     // Add implicit prefix if not informed
     if (!objectUrl.startsWith("https://")) {
       objectUrl = "https://" + objectUrl;

ojdbc-provider-oci/src/main/java/oracle/jdbc/provider/oci/configuration/OciVaultJsonProvider.java

@@ -1,6 +1,6 @@
 package oracle.jdbc.provider.oci.configuration;
 
-import oracle.jdbc.driver.OracleConfigurationJsonProvider;
+import oracle.jdbc.driver.configuration.OracleConfigurationParsableProvider;
 import oracle.jdbc.provider.oci.vault.SecretFactory;
 import oracle.jdbc.provider.parameter.ParameterSet;
 import oracle.jdbc.util.OracleConfigurationCache;
@@ -13,9 +13,9 @@
 
 /**
  * A provider for JSON payload which contains configuration from OCI Vault.
- * See {@link #getJson(String)} for the spec of the JSON payload.
+ * See {@link #getInputStream(String)} for the spec of the JSON payload.
  **/
-public class OciVaultJsonProvider extends OracleConfigurationJsonProvider {
+public class OciVaultJsonProvider extends OracleConfigurationParsableProvider {
 
   /**
    * {@inheritDoc}
@@ -30,7 +30,7 @@ public class OciVaultJsonProvider extends OracleConfigurationJsonProvider {
    * @return JSON payload
    **/
   @Override
-  public InputStream getJson(String secretOcid) {
+  public InputStream getInputStream(String secretOcid) {
     final String valueFieldName = "value";
     Map<String, String> optionsWithOcid = new HashMap<>(options);
     optionsWithOcid.put(valueFieldName, secretOcid);

pom.xml

@@ -32,7 +32,7 @@
   <properties>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <jdbc.version>23.6.0.24.10</jdbc.version>
+    <jdbc.version>23.7.0.25.01</jdbc.version>
     <junit.version>5.9.0</junit.version>
     <mockito.version>4.11.0</mockito.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>