Skip to content

Commit 0dc0cca

Browse files
zeitlingervadeg
authored andcommitted
backport to Java 8
1 parent 28a8a77 commit 0dc0cca

File tree

1 file changed

+24
-19
lines changed

1 file changed

+24
-19
lines changed

src/main/java/org/zalando/typemapper/postgres/PgTypeHelper.java

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,14 @@
11
package org.zalando.typemapper.postgres;
22

3-
import java.lang.reflect.Array;
4-
import java.lang.reflect.Field;
5-
import java.lang.reflect.InvocationTargetException;
6-
import java.sql.Connection;
7-
import java.sql.SQLException;
8-
import java.sql.Timestamp;
9-
import java.sql.Types;
10-
11-
import java.util.*;
12-
133
import javax.persistence.Column;
144

5+
import com.google.common.base.Optional;
156
import org.postgresql.core.BaseConnection;
16-
177
import org.postgresql.jdbc.PostgresJDBCDriverReusedTimestampUtils;
18-
198
import org.postgresql.util.PGobject;
20-
219
import org.slf4j.Logger;
2210
import org.slf4j.LoggerFactory;
23-
24-
import com.google.common.base.Optional;
25-
26-
11+
import org.zalando.sprocwrapper.util.NameUtils;
2712
import org.zalando.typemapper.annotations.DatabaseField;
2813
import org.zalando.typemapper.annotations.DatabaseType;
2914
import org.zalando.typemapper.core.DatabaseFieldDescriptor;
@@ -36,7 +21,25 @@
3621
import org.zalando.typemapper.core.fieldMapper.DefaultObjectMapper;
3722
import org.zalando.typemapper.core.fieldMapper.GlobalValueTransformerRegistry;
3823
import org.zalando.typemapper.core.fieldMapper.ObjectMapper;
39-
import org.zalando.sprocwrapper.util.NameUtils;
24+
25+
import java.lang.reflect.Array;
26+
import java.lang.reflect.Field;
27+
import java.lang.reflect.InvocationTargetException;
28+
import java.sql.Connection;
29+
import java.sql.SQLException;
30+
import java.sql.Timestamp;
31+
import java.sql.Types;
32+
import java.util.ArrayList;
33+
import java.util.Arrays;
34+
import java.util.Collection;
35+
import java.util.Collections;
36+
import java.util.Comparator;
37+
import java.util.Date;
38+
import java.util.HashMap;
39+
import java.util.List;
40+
import java.util.Locale;
41+
import java.util.Map;
42+
import java.util.TreeMap;
4043

4144
public class PgTypeHelper {
4245

@@ -265,7 +268,9 @@ public int compare(final Field a, final Field b) {
265268
for (final Field f : fields) {
266269
final DatabaseFieldDescriptor databaseFieldDescriptor = getDatabaseFieldDescriptor(f);
267270
if (databaseFieldDescriptor != null) {
268-
f.trySetAccessible();
271+
if (!f.isAccessible()) {
272+
f.setAccessible(true);
273+
}
269274

270275
Object value;
271276
try {

0 commit comments

Comments
 (0)