Merge pull request #100 from zeitlinger/oid

vadeg · web-flow · commit 28a8a774327b · 2022-10-13T19:59:29.000+02:00
Use long everywhere a oid is used
diff --git a/cve-suppressions.xml b/cve-suppressions.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.1.xsd">
-
+    <suppress>
+        <filePath regex="true">spring-.*-5\.3\.23\.jar</filePath>
+        <cve>CVE-2016-1000027</cve>
+    </suppress>
 </suppressions>
diff --git a/pom.xml b/pom.xml
@@ -61,9 +61,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <spring.version>5.2.16.RELEASE</spring.version>
-        <postgresql.version>42.2.14</postgresql.version>
-        <dependency-check-maven.version>6.3.1</dependency-check-maven.version>
+        <spring.version>5.3.23</spring.version>
+        <postgresql.version>42.5.0</postgresql.version>
+        <dependency-check-maven.version>7.2.1</dependency-check-maven.version>
     </properties>
 
     <dependencies>
diff --git a/src/main/java/org/zalando/typemapper/core/TypeMapper.java b/src/main/java/org/zalando/typemapper/core/TypeMapper.java
@@ -79,7 +79,7 @@ private ResultTree extractResultTree(final ResultSet set) throws SQLException {
         final ResultTree tree = new ResultTree();
 
         for (int i = 1; i <= rsMetaData.getColumnCount(); i++) {
-            final int typeId = pgSet.getColumnOID(i);
+            final long typeId = pgSet.getColumnOID(i);
             DbResultNode node = null;
 
             final Object obj = pgSet.getObject(i);
diff --git a/src/main/java/org/zalando/typemapper/core/db/DbFunctionRegister.java b/src/main/java/org/zalando/typemapper/core/db/DbFunctionRegister.java
@@ -66,9 +66,9 @@ public DbFunctionRegister(final Connection connection) throws SQLException {
                 final int paramPosition = resultSet.getInt(i++);
                 final String paramName = resultSet.getString(i++);
                 final String paramType = resultSet.getString(i++);
-                final int procedureId = resultSet.getInt(i++);
+                final long procedureId = resultSet.getLong(i++);
                 final String paramTypeName = resultSet.getString(i++);
-                final int paramTypeId = resultSet.getInt(i++);
+                final long paramTypeId = resultSet.getLong(i++);
 
                 addFunctionParam(functionSchema, functionName, paramName, paramPosition, paramType, procedureId,
                     paramTypeName, paramTypeId);
@@ -85,8 +85,8 @@ public DbFunctionRegister(final Connection connection) throws SQLException {
     }
 
     private void addFunctionParam(final String functionSchema, final String functionName, final String paramName,
-            final int paramPosition, final String paramType, final int procedureId, final String paramTypeName,
-            final int paramTypeId) {
+                                  final int paramPosition, final String paramType, final long procedureId, final String paramTypeName,
+                                  final long paramTypeId) {
 
         final String functionId = getFunctionIdentifier(functionSchema, functionName);
         DbFunction function = functions.get(functionId);
diff --git a/src/main/java/org/zalando/typemapper/core/db/DbType.java b/src/main/java/org/zalando/typemapper/core/db/DbType.java
@@ -8,10 +8,10 @@ public class DbType {
 
     private final String schema;
     private final String name;
-    private final int id;
+    private final long id;
     private Map<Integer, DbTypeField> fields = new HashMap<Integer, DbTypeField>();
 
-    public DbType(final String schema, final String name, final int id) {
+    public DbType(final String schema, final String name, final long id) {
         this.schema = schema;
         this.name = name;
         this.id = id;
@@ -25,7 +25,7 @@ public String getName() {
         return name;
     }
 
-    public int getId() {
+    public long getId() {
         return id;
     }
 
diff --git a/src/main/java/org/zalando/typemapper/core/db/DbTypeField.java b/src/main/java/org/zalando/typemapper/core/db/DbTypeField.java
@@ -6,10 +6,10 @@ public class DbTypeField {
     private final int position;
     private final String type;
     private final String typeName;
-    private final int typeId;
+    private final long typeId;
 
     public DbTypeField(final String fieldName, final int fieldPosition, final String fieldType,
-            final String fieldTypeName, final int fieldTypeId) {
+            final String fieldTypeName, final long fieldTypeId) {
         this.name = fieldName;
         this.position = fieldPosition;
         this.type = fieldType;
@@ -33,7 +33,7 @@ public String getTypeName() {
         return typeName;
     }
 
-    public int getTypeId() {
+    public long getTypeId() {
         return typeId;
     }
 
diff --git a/src/main/java/org/zalando/typemapper/core/db/DbTypeRegister.java b/src/main/java/org/zalando/typemapper/core/db/DbTypeRegister.java
@@ -1,10 +1,14 @@
 package org.zalando.typemapper.core.db;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -13,12 +17,6 @@
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-
 public class DbTypeRegister {
 
     private static final Logger LOG = LoggerFactory.getLogger(DbTypeRegister.class);
@@ -36,18 +34,18 @@ public class DbTypeRegister {
 
     private final Map<String, String> typeFQN;
 
-    private final Map<Integer, String> typeIdToFQN;
+    private final Map<Long, String> typeIdToFQN;
 
     public DbTypeRegister(final Connection connection) throws SQLException {
         PreparedStatement statement = null;
         ResultSet resultSet = null;
         try {
             searchPath = getSearchPath(connection);
-            typeByName = new HashMap<String, DbType>();
+            typeByName = new HashMap<>();
 
             typeIdToFQN = new ConcurrentHashMap<>();
 
-            final HashMap<String, List<String>> typeNameToFQN = new HashMap<String, List<String>>();
+            final HashMap<String, List<String>> typeNameToFQN = new HashMap<>();
 
             //J-
             statement = connection.prepareStatement(
@@ -81,15 +79,15 @@ public DbTypeRegister(final Connection connection) throws SQLException {
                 int i = 1;
                 final String typeSchema = resultSet.getString(i++);
                 final String typeName = resultSet.getString(i++);
-                final int typeId = resultSet.getInt(i++);
+                final long typeId = resultSet.getLong(i++);
                 final String typeType = resultSet.getString(i++);
                 final String fieldName = resultSet.getString(i++);
                 final String fieldType = resultSet.getString(i++);
                 final String fieldTypeName = resultSet.getString(i++);
-                final int fieldTypeId = resultSet.getInt(i++);
+                final long fieldTypeId = resultSet.getLong(i++);
                 final int fieldPosition = resultSet.getInt(i++);
                 final boolean isArray = resultSet.getBoolean(i++);
-                final int typeElem = resultSet.getInt(i++);
+                final long typeElem = resultSet.getLong(i++);
 
                 addField(typeSchema, typeName, typeId, fieldName, fieldPosition, fieldType, fieldTypeName, fieldTypeId,
                     typeType, isArray, typeNameToFQN, typeElem);
@@ -123,10 +121,10 @@ public Map<String, DbType> getTypes() {
         return typeByName;
     }
 
-    private void addField(final String typeSchema, final String typeName, final int typeId, final String fieldName,
-            final int fieldPosition, final String fieldType, final String fieldTypeName, final int fieldTypeId,
-            final String typeType, final boolean isArray, final Map<String, List<String>> typeNameToFQN,
-            final int typeElem) {
+    private void addField(final String typeSchema, final String typeName, final long typeId, final String fieldName,
+                          final int fieldPosition, final String fieldType, final String fieldTypeName, final long fieldTypeId,
+                          final String typeType, final boolean isArray, final Map<String, List<String>> typeNameToFQN,
+                          final long typeElem) {
 
         if (isArray) {
 
@@ -210,7 +208,7 @@ public static DbType getDbType(final String name, final Connection connection) t
         return fqName == null ? null : register.typeByName.get(fqName);
     }
 
-    public static DbType getDbType(final int id, final Connection connection) throws SQLException {
+    public static DbType getDbType(final long id, final Connection connection) throws SQLException {
         final DbTypeRegister register = getRegistry(connection);
         DbType type = null;
 
@@ -241,7 +239,7 @@ public static DbType getDbType(final int id, final Connection connection) throws
                     PreparedStatement ps = null;
                     try {
                         ps = connection.prepareStatement(sql);
-                        ps.setInt(1, id);
+                        ps.setLong(1, id);
                         res = ps.executeQuery();
                         if (res.next()) {
                             typeFQN = getTypeIdentifier(res.getString(1), res.getString(2));
diff --git a/src/main/java/org/zalando/typemapper/core/result/ArrayResultNode.java b/src/main/java/org/zalando/typemapper/core/result/ArrayResultNode.java
@@ -15,11 +15,11 @@ public class ArrayResultNode implements DbResultNode {
 
     private String name;
     private String type;
-    private int typeId;
+    private long typeId;
     private List<DbResultNode> children;
     private DbType typeDef;
 
-    public ArrayResultNode(final String name, final String value, final String typeName, final int typeId,
+    public ArrayResultNode(final String name, final String value, final String typeName, final long typeId,
             final Connection connection) throws SQLException {
         this.name = name;
         this.type = typeName;
diff --git a/src/main/java/org/zalando/typemapper/core/result/ObjectResultNode.java b/src/main/java/org/zalando/typemapper/core/result/ObjectResultNode.java
@@ -21,11 +21,11 @@ public class ObjectResultNode implements DbResultNode {
 
     private final String name;
     private final String type;
-    private final int typeId;
+    private final long typeId;
     private List<DbResultNode> children;
     private final Map<String, DbResultNode> nodeMap = new HashMap<>();
 
-    public ObjectResultNode(final String value, final String name, final String typeName, final int typeId,
+    public ObjectResultNode(final String value, final String name, final String typeName, final long typeId,
                             final Connection connection) throws SQLException {
         super();
         this.type = typeName;
diff --git a/src/main/java/org/zalando/typemapper/postgres/PgRow.java b/src/main/java/org/zalando/typemapper/postgres/PgRow.java
@@ -1,13 +1,12 @@
 package org.zalando.typemapper.postgres;
 
+import org.postgresql.util.PGobject;
+
 import java.sql.Connection;
 import java.sql.SQLException;
-
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.postgresql.util.PGobject;
-
 public final class PgRow extends PGobject {
 
     private static final long serialVersionUID = -2855096142894174113L;
@@ -57,12 +56,12 @@ public PgRow(final PgTypeHelper.PgTypeDataHolder typeDataHolder, final Connectio
     }
 
     public static PgRow ROW(final Object... array) throws SQLException {
-        return new PgRow(null, array == null ? null : Arrays.asList(array));
+        return new PgRow("unknownType", array == null ? null : Arrays.asList(array));
     }
 
     @SuppressWarnings("unchecked")
     public static PgRow ROW(final Collection<?> collection) throws SQLException {
-        return new PgRow(null, (Collection<Object>) collection);
+        return new PgRow("unknownType", (Collection<Object>) collection);
     }
 
     @Override
