diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/DB2Engine.java b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/DB2Engine.java index 12841d93..007f6cc1 100644 --- a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/DB2Engine.java +++ b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/DB2Engine.java @@ -444,8 +444,7 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) .setUpsert(psUpsert); } catch (final IllegalArgumentException e) { - logger.warn("{} Returning an entity without an UPSERT/MERGE prepared statement.", e.getMessage()); - logger.debug("Stack trace error: ", e); + logger.info("{} Returning an entity without an UPSERT/MERGE prepared statement.", e.getMessage()); return new MappedEntity() .setInsert(ps) .setInsertReturning(psReturn) @@ -470,9 +469,8 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) private String buildUpsertStatement(final DbEntity entity, final List columns, final List values) { if (entity.getPkFields().isEmpty() || columns.isEmpty() || values.isEmpty()) { - throw new IllegalArgumentException(String.format("The 'MERGE INTO' prepared statement was not created because the entity " - + "'%s' has no primary keys. Skipping statement creation.", - entity.getName())); + throw new IllegalArgumentException(String.format("The 'MERGE INTO' prepared statement was not created for the entity " + + "'%s'.", entity.getName())); } final List merge = new ArrayList<>(); diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/H2Engine.java b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/H2Engine.java index 4e98d27e..c8dd0b18 100644 --- a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/H2Engine.java +++ b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/H2Engine.java @@ -493,8 +493,7 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) .setUpsert(psMerge); } catch (final IllegalArgumentException e) { - logger.warn("{} Returning an entity without an UPSERT/MERGE prepared statement.", e.getMessage()); - logger.debug("Stack trace error: ", e); + logger.info("{} Returning an entity without an UPSERT/MERGE prepared statement.", e.getMessage()); return new MappedEntity() .setInsert(ps) .setInsertReturning(psReturn) @@ -518,9 +517,8 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) private String buildUpsertStatement(final DbEntity entity, final List columns, final List values) { if (entity.getPkFields().isEmpty() || columns.isEmpty() || values.isEmpty()) { - throw new IllegalArgumentException(String.format("The 'MERGE INTO' prepared statement was not created because the entity " - + "'%s' has no primary keys. Skipping statement creation.", - entity.getName())); + throw new IllegalArgumentException(String.format("The 'MERGE INTO' prepared statement was not created for the entity " + + "'%s'.", entity.getName())); } final List mergeInto = new ArrayList<>(); diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/MySqlEngine.java b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/MySqlEngine.java index f5c94d31..1cc15e32 100644 --- a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/MySqlEngine.java +++ b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/MySqlEngine.java @@ -408,8 +408,7 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) .setUpsert(psUpsert); } catch (final IllegalArgumentException e) { - logger.warn("{} Returning an entity without an UPSERT/MERGE prepared statement.", e.getMessage()); - logger.debug("Stack trace error: ", e); + logger.info("{} Returning an entity without an UPSERT/MERGE prepared statement.", e.getMessage()); return new MappedEntity() .setInsert(ps) .setInsertReturning(psReturn) @@ -433,9 +432,7 @@ private String buildUpsertStatement(final DbEntity entity, final List co if (entity.getPkFields().isEmpty() || columns.isEmpty() || values.isEmpty()) { throw new IllegalArgumentException(String.format("The 'INSERT INTO (...) ON DUPLICATE KEY UPDATE' prepared statement was " - + "not created because the entity '%s' has no primary keys. " - + "Skipping statement creation.", - entity.getName())); + + "not created for entity '%s.", entity.getName())); } List insertIntoIgnoring = new ArrayList<>(); diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java index 26c377cb..8d84b96c 100644 --- a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java +++ b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java @@ -413,8 +413,7 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) .setAutoIncColumn(returning); } catch (final IllegalArgumentException e) { - logger.warn("{} Returning an entity without an UPSERT/MERGE prepared statement.", e.getMessage()); - logger.debug("Stack trace error: ", e); + logger.info("{} Returning an entity without an UPSERT/MERGE prepared statement.", e.getMessage()); return new MappedEntity() .setInsert(ps) .setInsertReturning(psReturn) @@ -438,10 +437,8 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) private String buildUpsertStatement(final DbEntity entity, final List columns, final List values) { if (entity.getPkFields().isEmpty() || columns.isEmpty() || values.isEmpty()) { - throw new IllegalArgumentException(String.format("The 'INSERT INTO (...) ON CONFLICT DO UPDATE' prepared statement was not " - + "created because the entity '%s' has no primary keys. " - + "Skipping statement creation.", - entity.getName())); + throw new IllegalArgumentException(String.format("The 'INSERT INTO (...) ON CONFLICT DO UPDATE' prepared " + + "statement was not created for entity '%s'.", entity.getName())); } List insertIntoIgnoring = new ArrayList<>();