Skip to content

Commit 7d6bce1

Browse files
committed
Fix the bug and class typo
Signed-off-by: Vadim <[email protected]>
1 parent 590e15c commit 7d6bce1

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

src/main/java/org/zalando/typemapper/core/fieldMapper/EnumrationFieldMapper.java renamed to src/main/java/org/zalando/typemapper/core/fieldMapper/EnumerationFieldMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55

6-
public class EnumrationFieldMapper implements FieldMapper {
6+
public class EnumerationFieldMapper implements FieldMapper {
77

8-
private static final Logger LOG = LoggerFactory.getLogger(EnumrationFieldMapper.class);
8+
private static final Logger LOG = LoggerFactory.getLogger(EnumerationFieldMapper.class);
99

1010
@SuppressWarnings("rawtypes")
1111
@Override

src/main/java/org/zalando/typemapper/core/fieldMapper/FieldMapperRegister.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class FieldMapperRegister {
5656
FieldMapperRegister.register(Boolean.class, booleanMapper);
5757
FieldMapperRegister.register(boolean.class, booleanMapper);
5858

59-
final FieldMapper enumMapper = new EnumrationFieldMapper();
59+
final FieldMapper enumMapper = new EnumerationFieldMapper();
6060
FieldMapperRegister.register(Enum.class, enumMapper);
6161

6262
final FieldMapper bigDecimalMapper = new BigDecimalFieldMappper();

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,13 @@ public ObjectResultNode(final String value, final String name, final String type
7373
} else if (fieldDef.getType().equals("ARRAY")) {
7474
node = new ArrayResultNode(fieldDef.getName(), fieldValue, fieldDef.getTypeName().substring(1),
7575
fieldDef.getTypeId(), connection);
76+
} else if (fieldDef.getType().equals("enum")) {
77+
/*
78+
This is a special case when JDBC driver returns enum as an object.
79+
This happens when the enum class is not in the search path. Otherwise it will be handled as a
80+
regular field by org.zalando.typemapper.core.fieldMapper.EnumerationFieldMapper
81+
*/
82+
node = new SimpleResultNode(fieldValue, this.type);
7683
} else {
7784
node = new SimpleResultNode(fieldValue, fieldDef.getName());
7885
}

0 commit comments

Comments
 (0)