Skip to content

Commit 28a8a77

Browse files
vadegvadeg
authored
Merge pull request #100 from zeitlinger/oid
Use long everywhere a oid is used
2 parents 79cfe3f + e7a8dc7 commit 28a8a77

10 files changed

Lines changed: 43 additions & 43 deletions

File tree

‎cve-suppressions.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.1.xsd">
3-
3+
<suppress>
4+
<filePath regex="true">spring-.*-5\.3\.23\.jar</filePath>
5+
<cve>CVE-2016-1000027</cve>
6+
</suppress>
47
</suppressions>

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6262
<maven.compiler.source>11</maven.compiler.source>
6363
<maven.compiler.target>11</maven.compiler.target>
64-
<spring.version>5.2.16.RELEASE</spring.version>
65-
<postgresql.version>42.2.14</postgresql.version>
66-
<dependency-check-maven.version>6.3.1</dependency-check-maven.version>
64+
<spring.version>5.3.23</spring.version>
65+
<postgresql.version>42.5.0</postgresql.version>
66+
<dependency-check-maven.version>7.2.1</dependency-check-maven.version>
6767
</properties>
6868

6969
<dependencies>

‎src/main/java/org/zalando/typemapper/core/TypeMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private ResultTree extractResultTree(final ResultSet set) throws SQLException {
7979
final ResultTree tree = new ResultTree();
8080

8181
for (int i = 1; i <= rsMetaData.getColumnCount(); i++) {
82-
final int typeId = pgSet.getColumnOID(i);
82+
final long typeId = pgSet.getColumnOID(i);
8383
DbResultNode node = null;
8484

8585
final Object obj = pgSet.getObject(i);

‎src/main/java/org/zalando/typemapper/core/db/DbFunctionRegister.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ public DbFunctionRegister(final Connection connection) throws SQLException {
6666
final int paramPosition = resultSet.getInt(i++);
6767
final String paramName = resultSet.getString(i++);
6868
final String paramType = resultSet.getString(i++);
69-
final int procedureId = resultSet.getInt(i++);
69+
final long procedureId = resultSet.getLong(i++);
7070
final String paramTypeName = resultSet.getString(i++);
71-
final int paramTypeId = resultSet.getInt(i++);
71+
final long paramTypeId = resultSet.getLong(i++);
7272

7373
addFunctionParam(functionSchema, functionName, paramName, paramPosition, paramType, procedureId,
7474
paramTypeName, paramTypeId);
@@ -85,8 +85,8 @@ public DbFunctionRegister(final Connection connection) throws SQLException {
8585
}
8686

8787
private void addFunctionParam(final String functionSchema, final String functionName, final String paramName,
88-
final int paramPosition, final String paramType, final int procedureId, final String paramTypeName,
89-
final int paramTypeId) {
88+
final int paramPosition, final String paramType, final long procedureId, final String paramTypeName,
89+
final long paramTypeId) {
9090

9191
final String functionId = getFunctionIdentifier(functionSchema, functionName);
9292
DbFunction function = functions.get(functionId);

‎src/main/java/org/zalando/typemapper/core/db/DbType.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ public class DbType {
88

99
private final String schema;
1010
private final String name;
11-
private final int id;
11+
private final long id;
1212
private Map<Integer, DbTypeField> fields = new HashMap<Integer, DbTypeField>();
1313

14-
public DbType(final String schema, final String name, final int id) {
14+
public DbType(final String schema, final String name, final long id) {
1515
this.schema = schema;
1616
this.name = name;
1717
this.id = id;
@@ -25,7 +25,7 @@ public String getName() {
2525
return name;
2626
}
2727

28-
public int getId() {
28+
public long getId() {
2929
return id;
3030
}
3131

‎src/main/java/org/zalando/typemapper/core/db/DbTypeField.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ public class DbTypeField {
66
private final int position;
77
private final String type;
88
private final String typeName;
9-
private final int typeId;
9+
private final long typeId;
1010

1111
public DbTypeField(final String fieldName, final int fieldPosition, final String fieldType,
12-
final String fieldTypeName, final int fieldTypeId) {
12+
final String fieldTypeName, final long fieldTypeId) {
1313
this.name = fieldName;
1414
this.position = fieldPosition;
1515
this.type = fieldType;
@@ -33,7 +33,7 @@ public String getTypeName() {
3333
return typeName;
3434
}
3535

36-
public int getTypeId() {
36+
public long getTypeId() {
3737
return typeId;
3838
}
3939

‎src/main/java/org/zalando/typemapper/core/db/DbTypeRegister.java‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package org.zalando.typemapper.core.db;
22

3+
import com.google.common.base.Preconditions;
4+
import com.google.common.collect.ImmutableMap;
5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
7+
38
import java.sql.Connection;
49
import java.sql.PreparedStatement;
510
import java.sql.ResultSet;
611
import java.sql.SQLException;
7-
812
import java.util.Arrays;
913
import java.util.HashMap;
1014
import java.util.LinkedList;
@@ -13,12 +17,6 @@
1317
import java.util.Map.Entry;
1418
import java.util.concurrent.ConcurrentHashMap;
1519

16-
import org.slf4j.Logger;
17-
import org.slf4j.LoggerFactory;
18-
19-
import com.google.common.base.Preconditions;
20-
import com.google.common.collect.ImmutableMap;
21-
2220
public class DbTypeRegister {
2321

2422
private static final Logger LOG = LoggerFactory.getLogger(DbTypeRegister.class);
@@ -36,18 +34,18 @@ public class DbTypeRegister {
3634

3735
private final Map<String, String> typeFQN;
3836

39-
private final Map<Integer, String> typeIdToFQN;
37+
private final Map<Long, String> typeIdToFQN;
4038

4139
public DbTypeRegister(final Connection connection) throws SQLException {
4240
PreparedStatement statement = null;
4341
ResultSet resultSet = null;
4442
try {
4543
searchPath = getSearchPath(connection);
46-
typeByName = new HashMap<String, DbType>();
44+
typeByName = new HashMap<>();
4745

4846
typeIdToFQN = new ConcurrentHashMap<>();
4947

50-
final HashMap<String, List<String>> typeNameToFQN = new HashMap<String, List<String>>();
48+
final HashMap<String, List<String>> typeNameToFQN = new HashMap<>();
5149

5250
//J-
5351
statement = connection.prepareStatement(
@@ -81,15 +79,15 @@ public DbTypeRegister(final Connection connection) throws SQLException {
8179
int i = 1;
8280
final String typeSchema = resultSet.getString(i++);
8381
final String typeName = resultSet.getString(i++);
84-
final int typeId = resultSet.getInt(i++);
82+
final long typeId = resultSet.getLong(i++);
8583
final String typeType = resultSet.getString(i++);
8684
final String fieldName = resultSet.getString(i++);
8785
final String fieldType = resultSet.getString(i++);
8886
final String fieldTypeName = resultSet.getString(i++);
89-
final int fieldTypeId = resultSet.getInt(i++);
87+
final long fieldTypeId = resultSet.getLong(i++);
9088
final int fieldPosition = resultSet.getInt(i++);
9189
final boolean isArray = resultSet.getBoolean(i++);
92-
final int typeElem = resultSet.getInt(i++);
90+
final long typeElem = resultSet.getLong(i++);
9391

9492
addField(typeSchema, typeName, typeId, fieldName, fieldPosition, fieldType, fieldTypeName, fieldTypeId,
9593
typeType, isArray, typeNameToFQN, typeElem);
@@ -123,10 +121,10 @@ public Map<String, DbType> getTypes() {
123121
return typeByName;
124122
}
125123

126-
private void addField(final String typeSchema, final String typeName, final int typeId, final String fieldName,
127-
final int fieldPosition, final String fieldType, final String fieldTypeName, final int fieldTypeId,
128-
final String typeType, final boolean isArray, final Map<String, List<String>> typeNameToFQN,
129-
final int typeElem) {
124+
private void addField(final String typeSchema, final String typeName, final long typeId, final String fieldName,
125+
final int fieldPosition, final String fieldType, final String fieldTypeName, final long fieldTypeId,
126+
final String typeType, final boolean isArray, final Map<String, List<String>> typeNameToFQN,
127+
final long typeElem) {
130128

131129
if (isArray) {
132130

@@ -210,7 +208,7 @@ public static DbType getDbType(final String name, final Connection connection) t
210208
return fqName == null ? null : register.typeByName.get(fqName);
211209
}
212210

213-
public static DbType getDbType(final int id, final Connection connection) throws SQLException {
211+
public static DbType getDbType(final long id, final Connection connection) throws SQLException {
214212
final DbTypeRegister register = getRegistry(connection);
215213
DbType type = null;
216214

@@ -241,7 +239,7 @@ public static DbType getDbType(final int id, final Connection connection) throws
241239
PreparedStatement ps = null;
242240
try {
243241
ps = connection.prepareStatement(sql);
244-
ps.setInt(1, id);
242+
ps.setLong(1, id);
245243
res = ps.executeQuery();
246244
if (res.next()) {
247245
typeFQN = getTypeIdentifier(res.getString(1), res.getString(2));

‎src/main/java/org/zalando/typemapper/core/result/ArrayResultNode.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ public class ArrayResultNode implements DbResultNode {
1515

1616
private String name;
1717
private String type;
18-
private int typeId;
18+
private long typeId;
1919
private List<DbResultNode> children;
2020
private DbType typeDef;
2121

22-
public ArrayResultNode(final String name, final String value, final String typeName, final int typeId,
22+
public ArrayResultNode(final String name, final String value, final String typeName, final long typeId,
2323
final Connection connection) throws SQLException {
2424
this.name = name;
2525
this.type = typeName;

‎src/main/java/org/zalando/typemapper/core/result/ObjectResultNode.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public class ObjectResultNode implements DbResultNode {
2121

2222
private final String name;
2323
private final String type;
24-
private final int typeId;
24+
private final long typeId;
2525
private List<DbResultNode> children;
2626
private final Map<String, DbResultNode> nodeMap = new HashMap<>();
2727

28-
public ObjectResultNode(final String value, final String name, final String typeName, final int typeId,
28+
public ObjectResultNode(final String value, final String name, final String typeName, final long typeId,
2929
final Connection connection) throws SQLException {
3030
super();
3131
this.type = typeName;

‎src/main/java/org/zalando/typemapper/postgres/PgRow.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package org.zalando.typemapper.postgres;
22

3+
import org.postgresql.util.PGobject;
4+
35
import java.sql.Connection;
46
import java.sql.SQLException;
5-
67
import java.util.Arrays;
78
import java.util.Collection;
89

9-
import org.postgresql.util.PGobject;
10-
1110
public final class PgRow extends PGobject {
1211

1312
private static final long serialVersionUID = -2855096142894174113L;
@@ -57,12 +56,12 @@ public PgRow(final PgTypeHelper.PgTypeDataHolder typeDataHolder, final Connectio
5756
}
5857

5958
public static PgRow ROW(final Object... array) throws SQLException {
60-
return new PgRow(null, array == null ? null : Arrays.asList(array));
59+
return new PgRow("unknownType", array == null ? null : Arrays.asList(array));
6160
}
6261

6362
@SuppressWarnings("unchecked")
6463
public static PgRow ROW(final Collection<?> collection) throws SQLException {
65-
return new PgRow(null, (Collection<Object>) collection);
64+
return new PgRow("unknownType", (Collection<Object>) collection);
6665
}
6766

6867
@Override

0 commit comments

Comments
 (0)