Refactor to allow for other user callouts in the future.

Author: anthony-tuininga

src/oracledb/base_impl.pxd

@@ -568,6 +568,7 @@ cdef class ConnectParamsImpl:
     cdef bytes _get_password(self)
     cdef str _get_private_key(self)
     cdef str _get_token(self)
+    cdef object _get_public_instance(self)
     cdef object _get_token_expires(self, str token)
     cdef str _get_wallet_password(self)
     cdef int _parse_connect_string(self, str connect_string) except -1

src/oracledb/impl/base/connect_params.pyx

@@ -257,6 +257,19 @@ cdef class ConnectParamsImpl:
             errors._raise_err(errors.ERR_EXPIRED_ACCESS_TOKEN)
         return self._xor_bytes(self._token, self._token_obfuscator).decode()
 
+    cdef object _get_public_instance(self):
+        """
+        Returns the public instance to use when making calls out to user
+        defined code.
+        """
+        cdef object inst
+        if isinstance(self, PoolParamsImpl):
+            inst = PY_TYPE_POOL_PARAMS.__new__(PY_TYPE_POOL_PARAMS)
+        else:
+            inst = PY_TYPE_CONNECT_PARAMS.__new__(PY_TYPE_CONNECT_PARAMS)
+        inst._impl = self
+        return inst
+
     cdef object _get_token_expires(self, str token):
         """
         Gets the expiry date from the token.

src/oracledb/impl/base/parsers.pyx

@@ -383,14 +383,8 @@ cdef class ConnectStringParser(BaseParser):
         if protocol is not None:
             fn = REGISTERED_PROTOCOLS.get(protocol)
             if fn is not None:
-                if isinstance(self.params_impl, PoolParamsImpl):
-                    params = PY_TYPE_POOL_PARAMS.__new__(PY_TYPE_POOL_PARAMS)
-                else:
-                    params = PY_TYPE_CONNECT_PARAMS.__new__(
-                        PY_TYPE_CONNECT_PARAMS
-                    )
-                params._impl = self.params_impl
                 arg = self.data_as_str[self.temp_pos:]
+                params = self.params_impl._get_public_instance()
                 try:
                     fn(protocol, arg, params)
                 except Exception as e: