Removes error logging for UPSERT command when creating an entity (#407)

* Removes error logging for UPSERT command. - Removes error logging for the UPSERT prepared statements for entities that have no MERGE/UPSERT prepared statement associated to it. - Edits the log level and sets its to `INFO`. --------- Co-authored-by: Victor Camargo <victor.camargo@feedzai.com>
feedzai · Oct 17, 2023 · 94ba1a5 · 94ba1a5
1 parent 2676acb
commit 94ba1a5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
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
@@ -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<String> columns, final List<String> 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<String> 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
@@ -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<String> columns, final List<String> 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<String> 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
@@ -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<String> 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<String> 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
@@ -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<String> columns, final List<String> 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<String> insertIntoIgnoring = new ArrayList<>();