branch-3.0: [fix](jdbc catalog) Use factory methods to return mapped types instead #46623

branch-3.0: [fix](jdbc catalog) Use factory methods to return mapped types instead #46623 #120028