Fix the mapping bug

* Fix the mapping bug related to enum database types which are located in the schema not in the search path.
* Add additional logging and integration tests for the use case when the schema is not in the search path.
* Cleanup the Java 8 code

Author: vadeg

database/test/21_shard1/22_schema3/00_create_schema.sql

@@ -0,0 +1,16 @@
+RESET role;
+
+CREATE SCHEMA ztest_schema3
+ AUTHORIZATION zalando_api_owner;
+
+ALTER DEFAULT PRIVILEGES FOR ROLE postgres IN SCHEMA ztest_schema3 REVOKE EXECUTE ON FUNCTIONS FROM public;
+ALTER DEFAULT PRIVILEGES FOR ROLE zalando_api_owner IN SCHEMA ztest_schema3 REVOKE EXECUTE ON FUNCTIONS FROM public;
+ALTER DEFAULT PRIVILEGES IN SCHEMA ztest_schema3 REVOKE EXECUTE ON FUNCTIONS FROM public;
+
+ALTER DEFAULT PRIVILEGES FOR ROLE zalando_api_owner IN SCHEMA ztest_schema3 GRANT EXECUTE ON FUNCTIONS TO zalando_api_executor;
+
+GRANT USAGE ON SCHEMA ztest_schema3 TO zalando_api_usage;
+
+SET ROLE TO zalando_api_owner;
+
+SET search_path TO ztest_schema3, public;

database/test/21_shard1/22_schema3/03_types/10_color_enum.sql

@@ -0,0 +1,6 @@
+CREATE TYPE color AS ENUM (
+    'RED',
+    'BLUE',
+    'GREEN',
+    'ORANGE'
+    );

database/test/21_shard1/22_schema3/03_types/20_car_domain_object.sql

@@ -0,0 +1,6 @@
+CREATE TYPE CAR AS
+(
+    id    BIGINT,
+    brand TEXT,
+    color ztest_schema3.COLOR
+);

database/test/21_shard1/22_schema3/03_types/30_customer_address.sql

@@ -0,0 +1,5 @@
+CREATE TYPE CUSTOMER_ADDRESS AS
+(
+    street       VARCHAR,
+    house_number INT
+);

database/test/21_shard1/22_schema3/03_types/40_customer.sql

@@ -0,0 +1,6 @@
+CREATE TYPE CUSTOMER AS
+(
+    id      BIGINT,
+    name    TEXT,
+    address ztest_schema3.CUSTOMER_ADDRESS
+);

database/test/21_shard1/22_schema3/05_stored_procedures/10_list_cars.sql

@@ -0,0 +1,14 @@
+CREATE OR REPLACE FUNCTION get_all_cars()
+    RETURNS SETOF ztest_schema3.CAR AS
+$body$
+BEGIN
+    RETURN QUERY SELECT t.id, t.brand,
+                        t.color
+                 FROM (VALUES (1::BIGINT, 'Toyota'::TEXT, 'RED'::ztest_schema3.COLOR),
+                              (2::BIGINT, 'Mercedes'::TEXT, 'BLUE'::ztest_schema3.COLOR))
+                          AS t (id, brand, color);
+END;
+$body$
+    LANGUAGE plpgsql
+    SECURITY DEFINER
+    COST 100;

database/test/21_shard1/22_schema3/05_stored_procedures/20_list_customers.sql

@@ -0,0 +1,13 @@
+CREATE OR REPLACE FUNCTION get_all_customers()
+    RETURNS SETOF ztest_schema3.CUSTOMER AS
+$body$
+BEGIN
+    RETURN QUERY SELECT t.id, t.name,
+                        t.address
+                 FROM (VALUES (1::BIGINT, 'John'::TEXT, ROW('First street', 15)::ztest_schema3.CUSTOMER_ADDRESS))
+                          AS t (id, name, address);
+END;
+$body$
+    LANGUAGE plpgsql
+    SECURITY DEFINER
+    COST 100;

pom.xml

@@ -59,8 +59,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <spring.version>5.2.12.RELEASE</spring.version>
         <postgresql.version>42.2.14</postgresql.version>
     </properties>
@@ -434,6 +434,7 @@
                                         CREATE EXTENSION hstore;
                                         DROP SCHEMA IF EXISTS ztest_schema1 CASCADE;
                                         DROP SCHEMA IF EXISTS ztest_schema2 CASCADE;
+                                        DROP SCHEMA IF EXISTS ztest_schema3 CASCADE;
                                     </sqlCommand>
                                     <onError>continue</onError>
                                 </configuration>

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

@@ -71,7 +71,6 @@ public ITEM mapRow(final ResultSet set, final int count) throws SQLException {
     }
 
     private ResultTree extractResultTree(final ResultSet set) throws SQLException {
-        LOG.trace("Extracting result tree");
 
         // cast to obtain more information from the result set.
         final PgResultSet pgSet = set.unwrap(PgResultSet.class);
@@ -100,7 +99,7 @@ private ResultTree extractResultTree(final ResultSet set) throws SQLException {
                 int j = 1;
                 for (final String fieldValue : fieldValues) {
                     final DbTypeField fieldDef = function.getFieldByPos(j);
-                    DbResultNode currentNode = null;
+                    DbResultNode currentNode;
                     if (fieldDef.getType().equals("USER-DEFINED")) {
                         currentNode = new ObjectResultNode(fieldValue, fieldDef.getName(), fieldDef.getTypeName(),
                                 fieldDef.getTypeId(), pgSet.getStatement().getConnection());
@@ -141,7 +140,7 @@ private ResultTree extractResultTree(final ResultSet set) throws SQLException {
             tree.addChild(node);
         }
 
-        LOG.trace("Extracted ResultTree: {}", tree);
+        LOG.debug("Extracted ResultTree: {}", tree);
 
         return tree;
     }

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

@@ -1,15 +1,7 @@
 package org.zalando.typemapper.core.fieldMapper;
 
-import static org.zalando.typemapper.postgres.PgTypeHelper.getDatabaseFieldDescriptor;
-
-import java.lang.reflect.InvocationTargetException;
-
-import java.util.List;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-
 import org.zalando.typemapper.core.DatabaseFieldDescriptor;
 import org.zalando.typemapper.core.Mapping;
 import org.zalando.typemapper.core.result.ArrayResultNode;
@@ -18,6 +10,11 @@
 import org.zalando.typemapper.core.result.ObjectResultNode;
 import org.zalando.typemapper.exception.NotsupportedTypeException;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+import static org.zalando.typemapper.postgres.PgTypeHelper.*;
+
 public class ObjectFieldMapper {
 
     private static final Logger LOG = LoggerFactory.getLogger(ObjectFieldMapper.class);
@@ -34,9 +31,10 @@ private static boolean isRowWithAllFieldsNull(final ObjectResultNode node) {
         return true;
     }
 
-    public static final Object mapFromDbObjectNode(final Class classz, final ObjectResultNode node,
-            final Mapping mapping) throws InstantiationException, IllegalAccessException, IllegalArgumentException,
-        InvocationTargetException, NotsupportedTypeException, NoSuchMethodException, SecurityException {
+    public static Object mapFromDbObjectNode(final Class classz, final ObjectResultNode node,
+                                                   final Mapping mapping) throws InstantiationException,
+            IllegalAccessException, IllegalArgumentException,
+            InvocationTargetException, NotsupportedTypeException, NoSuchMethodException, SecurityException {
         final DatabaseFieldDescriptor descriptor = getDatabaseFieldDescriptor(mapping.getField());
         final Object value;
 
@@ -53,18 +51,26 @@ public static final Object mapFromDbObjectNode(final Class classz, final ObjectR
     }
 
     @SuppressWarnings("unchecked")
-    public static final Object mapField(@SuppressWarnings("rawtypes") final Class clazz, final ObjectResultNode node)
-        throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException,
+    public static Object mapField(@SuppressWarnings("rawtypes") final Class clazz, final ObjectResultNode node)
+            throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException,
             NotsupportedTypeException, SecurityException, NoSuchMethodException {
         if (node.getChildren() == null) {
             return null;
         }
 
-        Object result = null;
+        Object result;
 
         // instantiate enums by string value
         if (clazz.isEnum()) {
-            final DbResultNode currentNode = node.getChildByName(node.getType());
+            final DbResultNode currentNode = node.getChildByName(node.getName());
+            if (currentNode == null) {
+                final String error =
+                        String.format(
+                                "Can not map the enum class \"%s\" to the database field \"%s\" of type \"%s\". Enum value is not found.",
+                                clazz.getName(),
+                                node.getName(), node.getType());
+                throw new IllegalStateException(error);
+            }
             result = Enum.valueOf(clazz, currentNode.getValue());
         } else {
             result = clazz.getDeclaredConstructor().newInstance();
@@ -87,16 +93,15 @@ public static final Object mapField(@SuppressWarnings("rawtypes") final Class cl
                 try {
                     if (DbResultNodeType.SIMPLE.equals(currentNode.getNodeType())) {
                         mapping.map(result,
-                            mapping.getFieldMapper().mapField(currentNode.getValue(), mapping.getFieldClass()));
+                                mapping.getFieldMapper().mapField(currentNode.getValue(), mapping.getFieldClass()));
                     } else if (DbResultNodeType.OBJECT.equals(currentNode.getNodeType())) {
                         mapping.map(result, mapFromDbObjectNode(clazz, (ObjectResultNode) currentNode, mapping));
                     } else if (DbResultNodeType.ARRAY.equals(currentNode.getNodeType())) {
                         mapping.map(result,
-                            ArrayFieldMapper.mapField(mapping.getField(), (ArrayResultNode) currentNode));
+                                ArrayFieldMapper.mapField(mapping.getField(), (ArrayResultNode) currentNode));
                     }
                 } catch (final Exception e) {
-                    LOG.error("Failed to map property {} of class {}",
-                        new Object[] {mapping.getName(), clazz.getSimpleName(), e});
+                    LOG.error("Failed to map property {} of class {}", mapping.getName(), clazz.getSimpleName(), e);
                 }
             }
         }