From 2a471ade38c104b1523d0381d46744c4c64df053 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 09:05:36 +0900 Subject: [PATCH 01/78] Remove unused instance fields --- .../seasar/doma/jdbc/criteria/expression/SelectExpression.java | 3 +-- .../org/seasar/doma/jdbc/criteria/query/SelectBuilder.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/expression/SelectExpression.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/expression/SelectExpression.java index c55f69b29..0070d84b1 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/expression/SelectExpression.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/expression/SelectExpression.java @@ -10,12 +10,11 @@ public class SelectExpression implements PropertyMetamodel { - private final SubSelectContext.Single subSelectContext; public final SelectContext context; public final PropertyMetamodel propertyMetamodel; public SelectExpression(SubSelectContext.Single subSelectContext) { - this.subSelectContext = Objects.requireNonNull(subSelectContext); + Objects.requireNonNull(subSelectContext); this.context = subSelectContext.get(); this.propertyMetamodel = subSelectContext.getPropertyMetamodel(); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/SelectBuilder.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/SelectBuilder.java index b1770e750..4af51208a 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/SelectBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/SelectBuilder.java @@ -23,7 +23,6 @@ import org.seasar.doma.jdbc.criteria.option.ForUpdateOption; public class SelectBuilder { - private final Config config; private final SelectContext context; private final Function commenter; private final PreparedSqlBuilder buf; @@ -51,7 +50,7 @@ public SelectBuilder( PreparedSqlBuilder buf, AliasManager aliasManager) { Objects.requireNonNull(config); - this.config = Objects.requireNonNull(config); + Objects.requireNonNull(config); this.context = Objects.requireNonNull(context); this.commenter = Objects.requireNonNull(commenter); this.buf = Objects.requireNonNull(buf); From 165052d3c45a4ed5f6368a36ebec239464aeac03 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 09:08:38 +0900 Subject: [PATCH 02/78] Remove "unused" suppression --- .../org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java index d5d5d5b32..526a6abf2 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java @@ -194,7 +194,6 @@ public void testParamToLiteral() throws Exception { } private static class Employee { - @SuppressWarnings("unused") final int id; final String name; From 3609466108ce8660d22114c59cb59749ff519d97 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 09:10:24 +0900 Subject: [PATCH 03/78] Remove unnecessary `private` --- .../java/org/seasar/doma/jdbc/tx/TransactionIsolationLevel.java | 2 +- doma-core/src/main/java/org/seasar/doma/message/Message.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionIsolationLevel.java b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionIsolationLevel.java index cb4ffdab1..0ff409daa 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionIsolationLevel.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionIsolationLevel.java @@ -22,7 +22,7 @@ public enum TransactionIsolationLevel { private int level; - private TransactionIsolationLevel(int level) { + TransactionIsolationLevel(int level) { this.level = level; } diff --git a/doma-core/src/main/java/org/seasar/doma/message/Message.java b/doma-core/src/main/java/org/seasar/doma/message/Message.java index 792397194..f9f4e6715 100644 --- a/doma-core/src/main/java/org/seasar/doma/message/Message.java +++ b/doma-core/src/main/java/org/seasar/doma/message/Message.java @@ -958,7 +958,7 @@ public enum Message implements MessageResource { private final String messagePattern; - private Message(String messagePattern) { + Message(String messagePattern) { this.messagePattern = messagePattern; } From c889e0fe14760d386421a98bf8bec78a94631a2c Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 09:28:14 +0900 Subject: [PATCH 04/78] Remove unnecessary `static`, `public`, and `abstract` --- .../java/org/seasar/doma/jdbc/Naming.java | 16 ++++---- .../doma/jdbc/entity/PostDeleteContext.java | 10 ++--- .../doma/jdbc/entity/PostInsertContext.java | 10 ++--- .../doma/jdbc/entity/PostUpdateContext.java | 12 +++--- .../doma/jdbc/entity/PreDeleteContext.java | 10 ++--- .../doma/jdbc/entity/PreInsertContext.java | 10 ++--- .../doma/jdbc/entity/PreUpdateContext.java | 14 +++---- .../doma/jdbc/tx/TransactionManager.java | 39 +++++++++---------- 8 files changed, 59 insertions(+), 62 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/Naming.java b/doma-core/src/main/java/org/seasar/doma/jdbc/Naming.java index 0af71779c..204a24016 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/Naming.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/Naming.java @@ -8,28 +8,28 @@ public interface Naming { /** the adapter for {@link NamingType#NONE} */ - static Naming NONE = new Adapter(NamingType.NONE); + Naming NONE = new Adapter(NamingType.NONE); /** the adapter for {@link NamingType#LOWER_CASE} */ - static Naming LOWER_CASE = new Adapter(NamingType.LOWER_CASE); + Naming LOWER_CASE = new Adapter(NamingType.LOWER_CASE); /** the adapter for {@link NamingType#UPPER_CASE} */ - static Naming UPPER_CASE = new Adapter(NamingType.UPPER_CASE); + Naming UPPER_CASE = new Adapter(NamingType.UPPER_CASE); /** the adapter for {@link NamingType#SNAKE_LOWER_CASE} */ - static Naming SNAKE_LOWER_CASE = new Adapter(NamingType.SNAKE_LOWER_CASE); + Naming SNAKE_LOWER_CASE = new Adapter(NamingType.SNAKE_LOWER_CASE); /** the adapter for {@link NamingType#SNAKE_UPPER_CASE} */ - static Naming SNAKE_UPPER_CASE = new Adapter(NamingType.SNAKE_UPPER_CASE); + Naming SNAKE_UPPER_CASE = new Adapter(NamingType.SNAKE_UPPER_CASE); /** the adapter for {@link NamingType#LENIENT_SNAKE_LOWER_CASE} */ - static Naming LENIENT_SNAKE_LOWER_CASE = new Adapter(NamingType.LENIENT_SNAKE_LOWER_CASE); + Naming LENIENT_SNAKE_LOWER_CASE = new Adapter(NamingType.LENIENT_SNAKE_LOWER_CASE); /** the adapter for {@link NamingType#LENIENT_SNAKE_UPPER_CASE} */ - static Naming LENIENT_SNAKE_UPPER_CASE = new Adapter(NamingType.LENIENT_SNAKE_UPPER_CASE); + Naming LENIENT_SNAKE_UPPER_CASE = new Adapter(NamingType.LENIENT_SNAKE_UPPER_CASE); /** the default convention */ - static Naming DEFAULT = NONE; + Naming DEFAULT = NONE; /** * Applies the naming convention. diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostDeleteContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostDeleteContext.java index 84a230a8c..658a993ae 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostDeleteContext.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostDeleteContext.java @@ -17,28 +17,28 @@ public interface PostDeleteContext { * * @return the entity description */ - public EntityType getEntityType(); + EntityType getEntityType(); /** * The method that is annotated with {@link Delete}. * * @return the method */ - public Method getMethod(); + Method getMethod(); /** * Returns the configuration. * * @return the configuration */ - public Config getConfig(); + Config getConfig(); /** * Returns the new entity. * * @return the new entity */ - public E getNewEntity(); + E getNewEntity(); /** * Sets the new entity. @@ -48,5 +48,5 @@ public interface PostDeleteContext { * @param newEntity the entity * @throws DomaNullPointerException if {@code newEntity} is {@code null} */ - public void setNewEntity(E newEntity); + void setNewEntity(E newEntity); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostInsertContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostInsertContext.java index 4afe3e61a..535897de4 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostInsertContext.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostInsertContext.java @@ -17,28 +17,28 @@ public interface PostInsertContext { * * @return the entity description */ - public EntityType getEntityType(); + EntityType getEntityType(); /** * The method that is annotated with {@link Insert}. * * @return the method */ - public Method getMethod(); + Method getMethod(); /** * Returns the configuration. * * @return the configuration */ - public Config getConfig(); + Config getConfig(); /** * Returns the new entity. * * @return the new entity */ - public E getNewEntity(); + E getNewEntity(); /** * Sets the new entity. @@ -48,5 +48,5 @@ public interface PostInsertContext { * @param newEntity the entity * @throws DomaNullPointerException if {@code newEntity} is {@code null} */ - public void setNewEntity(E newEntity); + void setNewEntity(E newEntity); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostUpdateContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostUpdateContext.java index 1d88dd4a6..b327754c3 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostUpdateContext.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PostUpdateContext.java @@ -23,35 +23,35 @@ public interface PostUpdateContext { * @exception EntityPropertyNotDefinedException if the property is not defined in the entity * @see OriginalStates */ - public boolean isPropertyChanged(String propertyName); + boolean isPropertyChanged(String propertyName); /** * Returns the entity description. * * @return the entity description */ - public EntityType getEntityType(); + EntityType getEntityType(); /** * The method that is annotated with {@link Update}. * * @return the method */ - public Method getMethod(); + Method getMethod(); /** * Returns the configuration. * * @return the configuration */ - public Config getConfig(); + Config getConfig(); /** * Returns the new entity. * * @return the new entity */ - public E getNewEntity(); + E getNewEntity(); /** * Sets the new entity. @@ -61,5 +61,5 @@ public interface PostUpdateContext { * @param newEntity the entity * @throws DomaNullPointerException if {@code newEntity} is {@code null} */ - public void setNewEntity(E newEntity); + void setNewEntity(E newEntity); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreDeleteContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreDeleteContext.java index ca28be43f..48293b1f3 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreDeleteContext.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreDeleteContext.java @@ -17,28 +17,28 @@ public interface PreDeleteContext { * * @return the entity description */ - public EntityType getEntityType(); + EntityType getEntityType(); /** * The method that is annotated with {@link Delete}. * * @return the method */ - public Method getMethod(); + Method getMethod(); /** * Returns the configuration. * * @return the configuration */ - public Config getConfig(); + Config getConfig(); /** * Returns the new entity. * * @return the new entity */ - public E getNewEntity(); + E getNewEntity(); /** * Sets the new entity. @@ -48,5 +48,5 @@ public interface PreDeleteContext { * @param newEntity the entity * @throws DomaNullPointerException if {@code newEntity} is {@code null} */ - public void setNewEntity(E newEntity); + void setNewEntity(E newEntity); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreInsertContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreInsertContext.java index 46cda8ad0..06ea8881e 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreInsertContext.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreInsertContext.java @@ -17,28 +17,28 @@ public interface PreInsertContext { * * @return the entity description */ - public EntityType getEntityType(); + EntityType getEntityType(); /** * The method that is annotated with {@link Insert}. * * @return the method */ - public Method getMethod(); + Method getMethod(); /** * Returns the configuration. * * @return the configuration */ - public Config getConfig(); + Config getConfig(); /** * Returns the new entity. * * @return the new entity */ - public E getNewEntity(); + E getNewEntity(); /** * Sets the new entity. @@ -48,5 +48,5 @@ public interface PreInsertContext { * @param newEntity the entity * @throws DomaNullPointerException if {@code newEntity} is {@code null} */ - public void setNewEntity(E newEntity); + void setNewEntity(E newEntity); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreUpdateContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreUpdateContext.java index afa03961a..5513bb4d9 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreUpdateContext.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/PreUpdateContext.java @@ -20,7 +20,7 @@ public interface PreUpdateContext { * * @return {@code true} if the entity is changed */ - public boolean isEntityChanged(); + boolean isEntityChanged(); /** * Whether the entity property is changed. @@ -32,35 +32,35 @@ public interface PreUpdateContext { * @exception EntityPropertyNotDefinedException if the property is not defined in the entity * @see OriginalStates */ - public boolean isPropertyChanged(String propertyName); + boolean isPropertyChanged(String propertyName); /** * Returns the entity description. * * @return the entity description */ - public EntityType getEntityType(); + EntityType getEntityType(); /** * The method that is annotated with {@link Update}. * * @return the method */ - public Method getMethod(); + Method getMethod(); /** * Returns the configuration. * * @return the configuration */ - public Config getConfig(); + Config getConfig(); /** * Returns the new entity. * * @return the new entity */ - public E getNewEntity(); + E getNewEntity(); /** * Sets the new entity. @@ -70,5 +70,5 @@ public interface PreUpdateContext { * @param newEntity the entity * @throws DomaNullPointerException if {@code newEntity} is {@code null} */ - public void setNewEntity(E newEntity); + void setNewEntity(E newEntity); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionManager.java b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionManager.java index 98c214508..e839e234a 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionManager.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionManager.java @@ -16,7 +16,7 @@ public interface TransactionManager { * * @param block the code that is executed in the transaction */ - public abstract void required(Runnable block); + void required(Runnable block); /** * Executes the transaction whose attribute is REQUIRED with the specified transaction isolation @@ -25,7 +25,7 @@ public interface TransactionManager { * @param isolationLevel the transaction isolation level * @param block the code that is executed in the transaction */ - public abstract void required(TransactionIsolationLevel isolationLevel, Runnable block); + void required(TransactionIsolationLevel isolationLevel, Runnable block); /** * Executes the transaction whose attribute is REQUIRED and returns the result. @@ -34,7 +34,7 @@ public interface TransactionManager { * @param the result type * @return the result */ - public abstract RESULT required(Supplier supplier); + RESULT required(Supplier supplier); /** * Executes the transaction whose attribute is REQUIRED with the specified transaction isolation @@ -45,15 +45,14 @@ public interface TransactionManager { * @param the result type * @return the result */ - public abstract RESULT required( - TransactionIsolationLevel isolationLevel, Supplier supplier); + RESULT required(TransactionIsolationLevel isolationLevel, Supplier supplier); /** * Executes the transaction whose attribute is REQUIRES_NEW. * * @param block the code that is executed in the transaction */ - public abstract void requiresNew(Runnable block); + void requiresNew(Runnable block); /** * Executes the transaction whose attribute is REQUIRES_NEW with the specified transaction @@ -62,7 +61,7 @@ public abstract RESULT required( * @param isolationLevel the transaction isolation level * @param block the code that is executed in the transaction */ - public abstract void requiresNew(TransactionIsolationLevel isolationLevel, Runnable block); + void requiresNew(TransactionIsolationLevel isolationLevel, Runnable block); /** * Executes the transaction whose attribute is REQUIRES_NEW and returns the result. @@ -71,7 +70,7 @@ public abstract RESULT required( * @param the result type * @return the result */ - public abstract RESULT requiresNew(Supplier supplier); + RESULT requiresNew(Supplier supplier); /** * Executes the transaction whose attribute is REQUIRES_NEW with the specified transaction @@ -82,15 +81,14 @@ public abstract RESULT required( * @param the result type * @return the result */ - public abstract RESULT requiresNew( - TransactionIsolationLevel isolationLevel, Supplier supplier); + RESULT requiresNew(TransactionIsolationLevel isolationLevel, Supplier supplier); /** * Executes the transaction whose attribute is NOT_SUPPORTED. * * @param block the code that is executed in the transaction */ - public abstract void notSupported(Runnable block); + void notSupported(Runnable block); /** * Executes the transaction whose attribute is NOT_SUPPORTED with the specified transaction @@ -99,7 +97,7 @@ public abstract RESULT requiresNew( * @param isolationLevel the transaction isolation level * @param block the code that is executed in the transaction */ - public abstract void notSupported(TransactionIsolationLevel isolationLevel, Runnable block); + void notSupported(TransactionIsolationLevel isolationLevel, Runnable block); /** * Executes the transaction whose attribute is NOT_SUPPORTED and returns the result. @@ -108,7 +106,7 @@ public abstract RESULT requiresNew( * @param the result type * @return the result */ - public abstract RESULT notSupported(Supplier supplier); + RESULT notSupported(Supplier supplier); /** * Executes the transaction whose attribute is NOT_SUPPORTED with the specified transaction @@ -119,18 +117,17 @@ public abstract RESULT requiresNew( * @param the result type * @return the result */ - public abstract RESULT notSupported( - TransactionIsolationLevel isolationLevel, Supplier supplier); + RESULT notSupported(TransactionIsolationLevel isolationLevel, Supplier supplier); /** Marks the current transaction to undo in the end of the transaction. */ - public abstract void setRollbackOnly(); + void setRollbackOnly(); /** * Whether the current transaction is marked to be undone. * * @return {@code true} if the current transaction is marked. */ - public abstract boolean isRollbackOnly(); + boolean isRollbackOnly(); /** * Creates a save point with the specified name. @@ -143,7 +140,7 @@ public abstract RESULT notSupported( * @throws SavepointAlreadyExistsException if the save point already exists * @throws JdbcException if a JDBC related error occurs */ - public abstract void setSavepoint(String savepointName); + void setSavepoint(String savepointName); /** * Whether the current transaction has the save point. @@ -155,7 +152,7 @@ public abstract RESULT notSupported( * @throws TransactionNotYetBegunException if the transaction is not begun * @return {@code true} if the transaction has the save point */ - public abstract boolean hasSavepoint(String savepointName); + boolean hasSavepoint(String savepointName); /** * Removes the specified save point and subsequent save points from the current transaction. @@ -167,7 +164,7 @@ public abstract RESULT notSupported( * @throws TransactionNotYetBegunException if the transaction is not yet begun * @throws JdbcException if a JDBC related error occurs */ - public abstract void releaseSavepoint(String savepointName); + void releaseSavepoint(String savepointName); /** * Undoes all changes made after the given save point. @@ -180,5 +177,5 @@ public abstract RESULT notSupported( * @throws TransactionNotYetBegunException if the transaction is not begun * @throws JdbcException if a JDBC related error occurs */ - public abstract void rollback(String savepointName); + void rollback(String savepointName); } From 8a1636508f65d041847fb34624f3e85244e2a34a Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 09:29:10 +0900 Subject: [PATCH 05/78] Replace with 'StandardCharsets.UTF_8' --- .../src/main/java/org/seasar/doma/internal/Constants.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/Constants.java b/doma-core/src/main/java/org/seasar/doma/internal/Constants.java index 226bb8cb4..fc60e03c0 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/Constants.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/Constants.java @@ -1,12 +1,13 @@ package org.seasar.doma.internal; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; public final class Constants { public static final String ROWNUMBER_COLUMN_NAME = "doma_rownumber_"; - public static final Charset UTF_8 = Charset.forName("UTF-8"); + public static final Charset UTF_8 = StandardCharsets.UTF_8; public static final String SQL_PATH_PREFIX = "META-INF/"; From b3c1a0ea73fd91e953b78bfce22725edb942d4f7 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 09:37:59 +0900 Subject: [PATCH 06/78] Remove redundant if statements --- .../seasar/doma/internal/jdbc/sql/SqlTokenizer.java | 10 ++-------- .../java/org/seasar/doma/internal/util/ClassUtil.java | 5 +---- .../src/test/java/__/java/lang/_String__ARRAY__.java | 3 --- .../src/test/java/example/domain/PhoneNumber.java | 5 ++--- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java index 2c2889507..da02e126f 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java @@ -611,13 +611,10 @@ protected boolean isWordTerminated() { if (buf.hasRemaining()) { char c = buf.get(); buf.reset(); - if (!isWordPart(c)) { - return true; - } + return !isWordPart(c); } else { return true; } - return false; } protected boolean isBlockCommentDirectiveTerminated() { @@ -625,13 +622,10 @@ protected boolean isBlockCommentDirectiveTerminated() { if (buf.hasRemaining()) { char c = buf.get(); buf.reset(); - if (!isWordPart(c)) { - return true; - } + return !isWordPart(c); } else { return true; } - return false; } protected boolean isWordPart(char c) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java b/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java index 0b91bf46c..b7bba5f61 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java @@ -152,9 +152,6 @@ public static R traverse(Class clazz, Function, R> f) { return null; } R result = traverse(superclass, f); - if (result != null) { - return result; - } - return null; + return result; } } diff --git a/doma-core/src/test/java/__/java/lang/_String__ARRAY__.java b/doma-core/src/test/java/__/java/lang/_String__ARRAY__.java index 6cd182516..7dc73e3d4 100644 --- a/doma-core/src/test/java/__/java/lang/_String__ARRAY__.java +++ b/doma-core/src/test/java/__/java/lang/_String__ARRAY__.java @@ -18,9 +18,6 @@ public String[] newDomain(Object value) { @Override public Object getBasicValue(String[] domain) { - if (domain == null) { - return null; - } return null; } diff --git a/doma-core/src/test/java/example/domain/PhoneNumber.java b/doma-core/src/test/java/example/domain/PhoneNumber.java index 775451c8b..ab23247a5 100644 --- a/doma-core/src/test/java/example/domain/PhoneNumber.java +++ b/doma-core/src/test/java/example/domain/PhoneNumber.java @@ -30,8 +30,7 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) return false; PhoneNumber other = (PhoneNumber) obj; if (value == null) { - if (other.value != null) return false; - } else if (!value.equals(other.value)) return false; - return true; + return other.value == null; + } else return value.equals(other.value); } } From 4c91e19ec04e3bf1c64edba81e87fbd6427b6ec3 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 09:46:07 +0900 Subject: [PATCH 07/78] Replace with 'String.join' --- .../org/seasar/doma/jdbc/builder/MapBatchInsertBuilder.java | 3 +-- .../java/org/seasar/doma/jdbc/builder/MapInsertBuilder.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilder.java b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilder.java index b9d3b8db8..30562f04f 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilder.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import org.seasar.doma.DomaIllegalArgumentException; import org.seasar.doma.DomaNullPointerException; import org.seasar.doma.jdbc.Config; @@ -121,7 +120,7 @@ public int[] execute(Iterable> parameter) { .sql("insert into ") .sql(tableName) .sql(" (") - .sql(keySet.stream().collect(Collectors.joining(", "))) + .sql(String.join(", ", keySet)) .sql(")"); builder.sql("values ("); keySet.forEach( diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/MapInsertBuilder.java b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/MapInsertBuilder.java index 1d2d6306c..0ec04fcc3 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/MapInsertBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/MapInsertBuilder.java @@ -1,7 +1,6 @@ package org.seasar.doma.jdbc.builder; import java.util.Map; -import java.util.stream.Collectors; import org.seasar.doma.DomaIllegalArgumentException; import org.seasar.doma.DomaNullPointerException; import org.seasar.doma.jdbc.Config; @@ -66,7 +65,7 @@ public int execute(Map parameter) { .sql("insert into ") .sql(tableName) .sql(" (") - .sql(parameter.keySet().stream().collect(Collectors.joining(", "))) + .sql(String.join(", ", parameter.keySet())) .sql(")"); builder.sql("values ("); parameter.forEach( From f57215af0bdda1d6de425aba09c1321c3582deb3 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 09:50:22 +0900 Subject: [PATCH 08/78] Replace with enhanced 'for' --- .../java/org/seasar/doma/jdbc/command/BatchModifyCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/command/BatchModifyCommand.java b/doma-core/src/main/java/org/seasar/doma/jdbc/command/BatchModifyCommand.java index 95478a465..d1aaaad05 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/command/BatchModifyCommand.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/command/BatchModifyCommand.java @@ -136,8 +136,8 @@ protected void validateRows(PreparedStatement preparedStatement, PreparedSql sql if (!query.isOptimisticLockCheckRequired()) { return; } - for (int i = 0; i < rows.length; ++i) { - if (rows[i] != 1) { + for (int row : rows) { + if (row != 1) { throw new BatchOptimisticLockException(query.getConfig().getExceptionSqlLogType(), sql); } } From 182293ef09de001eaf3197816436d36c1e8f17a0 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 09:55:51 +0900 Subject: [PATCH 09/78] Specify type parameter --- .../java/org/seasar/doma/jdbc/command/SelectCommandTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java index a54d85bdb..43e329844 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java @@ -244,7 +244,7 @@ public void testExecute_resultStream() throws Exception { @Test public void getGetQuery() { SqlFileSelectQuery query = new SqlFileSelectQuery(); - SelectCommand command = + SelectCommand> command = new SelectCommand<>(query, new EntityResultListHandler<>(_Emp.getSingletonInternal())); assertEquals(query, command.getQuery()); } From 31f8621e841e75c9fee70a43d08c8172d81d04ef Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 09:59:09 +0900 Subject: [PATCH 10/78] Remove boxing --- .../internal/expr/ExpressionEvaluator.java | 4 +- .../doma/jdbc/command/ModifyCommand.java | 2 +- .../expr/ExpressionEvaluatorTest.java | 16 +++--- .../internal/expr/ExpressionParserTest.java | 42 +++++++------- .../jdbc/command/EntityProviderTest.java | 8 +-- .../EntitySingleResultHandlerTest.java | 2 +- .../internal/jdbc/scalar/ScalarsTest.java | 5 +- .../doma/internal/jdbc/sql/SqlParserTest.java | 6 +- .../doma/jdbc/command/DeleteCommandTest.java | 4 +- .../doma/jdbc/command/InsertCommandTest.java | 8 +-- .../doma/jdbc/command/UpdateCommandTest.java | 16 +++--- .../jdbc/query/AutoBatchDeleteQueryTest.java | 22 ++++---- .../jdbc/query/AutoBatchInsertQueryTest.java | 10 ++-- .../jdbc/query/AutoBatchUpdateQueryTest.java | 56 +++++++++---------- .../doma/jdbc/query/AutoDeleteQueryTest.java | 10 ++-- .../doma/jdbc/query/AutoInsertQueryTest.java | 16 +++--- .../doma/jdbc/query/AutoUpdateQueryTest.java | 34 +++++------ .../query/SqlFileBatchInsertQueryTest.java | 4 +- .../query/SqlFileBatchUpdateQueryTest.java | 4 +- .../jdbc/query/SqlFileUpdateQueryTest.java | 42 +++++++------- 20 files changed, 154 insertions(+), 157 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java index 227452e04..a5fe963b1 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java @@ -762,11 +762,11 @@ protected EvaluationResult createEvaluationResult( return new EvaluationResult(nullable, Integer.class); } else if (value instanceof OptionalLong) { OptionalLong optional = (OptionalLong) value; - Long nullable = optional.isPresent() ? Long.valueOf(optional.getAsLong()) : null; + Long nullable = optional.isPresent() ? optional.getAsLong() : null; return new EvaluationResult(nullable, Long.class); } else if (value instanceof OptionalDouble) { OptionalDouble optional = (OptionalDouble) value; - Double nullable = optional.isPresent() ? Double.valueOf(optional.getAsDouble()) : null; + Double nullable = optional.isPresent() ? optional.getAsDouble() : null; return new EvaluationResult(nullable, Double.class); } if (target != null) { diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/command/ModifyCommand.java b/doma-core/src/main/java/org/seasar/doma/jdbc/command/ModifyCommand.java index 8e0dadbd1..8b6079a7d 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/command/ModifyCommand.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/command/ModifyCommand.java @@ -39,7 +39,7 @@ public Integer execute() { JdbcLogger logger = query.getConfig().getJdbcLogger(); logger.logSqlExecutionSkipping( query.getClassName(), query.getMethodName(), query.getSqlExecutionSkipCause()); - return Integer.valueOf(0); + return 0; } Connection connection = JdbcUtil.getConnection(query.getConfig().getDataSource()); try { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java index 4b84f6240..fbc74b272 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java @@ -79,7 +79,7 @@ public void testInvokeMethod_optionalInt() throws Exception { EvaluationResult result = evaluator.invokeMethod( location, method, person, Person.class, new Class[] {}, new Object[] {}); - assertEquals(Integer.valueOf(10), result.getValue()); + assertEquals(10, result.getValue()); assertEquals(Integer.class, result.getValueClass()); } @@ -104,7 +104,7 @@ public void testInvokeMethod_static_optionalInt() throws Exception { EvaluationResult result = evaluator.invokeMethod( location, method, null, Person.class, new Class[] {}, new Object[] {}); - assertEquals(Integer.valueOf(10), result.getValue()); + assertEquals(10, result.getValue()); assertEquals(Integer.class, result.getValueClass()); } @@ -181,9 +181,7 @@ public void testFindMethod_overload_string() throws Exception { @Test public void testFindMethod_autoBoxing() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); - Method method = - evaluator.findMethod( - "compareTo", Integer.valueOf(1), Integer.class, new Class[] {int.class}); + Method method = evaluator.findMethod("compareTo", 1, Integer.class, new Class[] {int.class}); assertNotNull(method); assertEquals(Integer.class, method.getDeclaringClass()); } @@ -298,7 +296,7 @@ public void testGetFieldValue_static_optionalInt() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Field field = Person.class.getField("staticAge"); EvaluationResult result = evaluator.getFieldValue(location, field, null); - assertEquals(Integer.valueOf(10), result.getValue()); + assertEquals(10, result.getValue()); assertEquals(Integer.class, result.getValueClass()); } @@ -319,7 +317,7 @@ public void testGetFieldValue_optionalInt() throws Exception { Person person = new Person(); person.age = OptionalInt.of(10); EvaluationResult result = evaluator.getFieldValue(location, field, person); - assertEquals(Integer.valueOf(10), result.getValue()); + assertEquals(10, result.getValue()); assertEquals(Integer.class, result.getValueClass()); } @@ -341,7 +339,7 @@ public void testGetFieldValue_optionalLong() throws Exception { Person person = new Person(); person.salary = OptionalLong.of(10L); EvaluationResult result = evaluator.getFieldValue(location, field, person); - assertEquals(Long.valueOf(10L), result.getValue()); + assertEquals(10L, result.getValue()); assertEquals(Long.class, result.getValueClass()); } @@ -363,7 +361,7 @@ public void testGetFieldValue_optionalDouble() throws Exception { Person person = new Person(); person.temperature = OptionalDouble.of(10L); EvaluationResult result = evaluator.getFieldValue(location, field, person); - assertEquals(Double.valueOf(10d), result.getValue()); + assertEquals(10d, result.getValue()); assertEquals(Double.class, result.getValueClass()); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java index c4d66fb2c..166420452 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java @@ -136,7 +136,7 @@ public void testNoParamMethod() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("hoge", new Value(String.class, "aaa")); EvaluationResult evaluationResult = evaluator.evaluate(expression); - assertEquals(new Integer(3), evaluationResult.getValue()); + assertEquals(3, evaluationResult.getValue()); } @Test @@ -146,7 +146,7 @@ public void testMethod() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("hoge", new Value(String.class, "aaa")); EvaluationResult evaluationResult = evaluator.evaluate(expression); - assertEquals(new Integer(3), evaluationResult.getValue()); + assertEquals(3, evaluationResult.getValue()); } @Test @@ -176,7 +176,7 @@ public void testMethod4() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("hoge", new Value(Hoge.class, new Hoge())); EvaluationResult evaluationResult = evaluator.evaluate(expression); - assertEquals(new Integer(2), evaluationResult.getValue()); + assertEquals(2, evaluationResult.getValue()); } @Test @@ -186,7 +186,7 @@ public void testMethod5() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("hoge", new Value(Hoge.class, new Hoge())); EvaluationResult evaluationResult = evaluator.evaluate(expression); - assertEquals(new Integer(2), evaluationResult.getValue()); + assertEquals(2, evaluationResult.getValue()); } @Test @@ -339,7 +339,7 @@ public void testNew() throws Exception { ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); EvaluationResult evaluationResult = evaluator.evaluate(expression); - assertEquals(new Integer(10), evaluationResult.getValue()); + assertEquals(10, evaluationResult.getValue()); } @Test @@ -673,19 +673,19 @@ public void testInt() throws Exception { ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); EvaluationResult result = evaluator.evaluate(node); - assertEquals(new Integer(2), result.getValue()); + assertEquals(2, result.getValue()); parser = new ExpressionParser("+2"); node = parser.parse(); evaluator = new ExpressionEvaluator(); result = evaluator.evaluate(node); - assertEquals(new Integer(2), result.getValue()); + assertEquals(2, result.getValue()); parser = new ExpressionParser("-2"); node = parser.parse(); evaluator = new ExpressionEvaluator(); result = evaluator.evaluate(node); - assertEquals(new Integer(-2), result.getValue()); + assertEquals(-2, result.getValue()); } @Test @@ -694,19 +694,19 @@ public void testLong() throws Exception { ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); EvaluationResult result = evaluator.evaluate(node); - assertEquals(new Long(2), result.getValue()); + assertEquals(2L, result.getValue()); parser = new ExpressionParser("+2L"); node = parser.parse(); evaluator = new ExpressionEvaluator(); result = evaluator.evaluate(node); - assertEquals(new Long(2), result.getValue()); + assertEquals(2L, result.getValue()); parser = new ExpressionParser("-2L"); node = parser.parse(); evaluator = new ExpressionEvaluator(); result = evaluator.evaluate(node); - assertEquals(new Long(-2), result.getValue()); + assertEquals((long) -2, result.getValue()); } @Test @@ -715,19 +715,19 @@ public void testFloat() throws Exception { ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); EvaluationResult result = evaluator.evaluate(node); - assertEquals(new Float(2.5), result.getValue()); + assertEquals(2.5f, result.getValue()); parser = new ExpressionParser("+2.5F"); node = parser.parse(); evaluator = new ExpressionEvaluator(); result = evaluator.evaluate(node); - assertEquals(new Float(2.5), result.getValue()); + assertEquals(2.5f, result.getValue()); parser = new ExpressionParser("-2.5F"); node = parser.parse(); evaluator = new ExpressionEvaluator(); result = evaluator.evaluate(node); - assertEquals(new Float(-2.5), result.getValue()); + assertEquals((float) -2.5, result.getValue()); } @Test @@ -736,19 +736,19 @@ public void testDouble() throws Exception { ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); EvaluationResult result = evaluator.evaluate(node); - assertEquals(new Double(2.5), result.getValue()); + assertEquals(2.5, result.getValue()); parser = new ExpressionParser("+2.5D"); node = parser.parse(); evaluator = new ExpressionEvaluator(); result = evaluator.evaluate(node); - assertEquals(new Double(2.5), result.getValue()); + assertEquals(2.5, result.getValue()); parser = new ExpressionParser("-2.5D"); node = parser.parse(); evaluator = new ExpressionEvaluator(); result = evaluator.evaluate(node); - assertEquals(new Double(-2.5), result.getValue()); + assertEquals(-2.5, result.getValue()); } @Test @@ -778,7 +778,7 @@ public void testChar() throws Exception { ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); EvaluationResult result = evaluator.evaluate(node); - assertEquals(new Character('a'), result.getValue()); + assertEquals('a', result.getValue()); } @Test @@ -832,7 +832,7 @@ public void testArithmeticOperators() throws Exception { ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); EvaluationResult result = evaluator.evaluate(node); - assertEquals(new Integer(14), result.getValue()); + assertEquals(14, result.getValue()); } @Test @@ -841,7 +841,7 @@ public void testArithmeticOperators2() throws Exception { ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); EvaluationResult result = evaluator.evaluate(node); - assertEquals(new Integer(14), result.getValue()); + assertEquals(14, result.getValue()); } @Test @@ -850,7 +850,7 @@ public void testArithmeticOperators3() throws Exception { ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); EvaluationResult result = evaluator.evaluate(node); - assertEquals(new Integer(-3), result.getValue()); + assertEquals(-3, result.getValue()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityProviderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityProviderTest.java index 6653aa873..f43501628 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityProviderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityProviderTest.java @@ -44,10 +44,10 @@ public void testGetEntity() throws Exception { new EntityProvider<>(entityType, new MySelectQuery(new MockConfig()), false); Emp emp = provider.get(resultSet); - assertEquals(new Integer(1), emp.getId()); + assertEquals(1, emp.getId()); assertEquals("aaa", emp.getName()); assertEquals(new BigDecimal(10), emp.getSalary()); - assertEquals(new Integer(100), emp.getVersion()); + assertEquals(100, emp.getVersion()); } @Test @@ -90,10 +90,10 @@ public void testGetEntity_EmptyUnknownColumnHandler() throws Exception { entityType, new MySelectQuery(new EmptyUnknownColumnHandlerConfig()), false); Emp emp = provider.get(resultSet); - assertEquals(new Integer(1), emp.getId()); + assertEquals(1, emp.getId()); assertEquals("aaa", emp.getName()); assertEquals(new BigDecimal(10), emp.getSalary()); - assertEquals(new Integer(100), emp.getVersion()); + assertEquals(100, emp.getVersion()); } protected class MySelectQuery implements SelectQuery { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java index ded8d8d20..672c7f172 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java @@ -50,7 +50,7 @@ public void testHandle() throws Exception { EntitySingleResultHandler handler = new EntitySingleResultHandler(_Emp.getSingletonInternal()); Emp emp = handler.handle(resultSet, query, (i, next) -> {}).get(); - assertEquals(new Integer(1), emp.getId()); + assertEquals(1, emp.getId()); assertEquals("aaa", emp.getName()); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java index ee3ff7014..f37e09512 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java @@ -113,8 +113,7 @@ public void testWrapBasic_null() throws Exception { @SuppressWarnings("unchecked") @Test public void testWrapBasic_optional() throws Exception { - Supplier> supplier = - Scalars.wrap(new Integer(10), Integer.class, true, classHelper); + Supplier> supplier = Scalars.wrap(10, Integer.class, true, classHelper); assertNotNull(supplier); Scalar scalar = supplier.get(); @@ -124,7 +123,7 @@ public void testWrapBasic_optional() throws Exception { Wrapper wrapper = scalar.getWrapper(); assertEquals(IntegerWrapper.class, wrapper.getClass()); - assertEquals(new Integer(10), wrapper.get()); + assertEquals(10, wrapper.get()); } @SuppressWarnings("unchecked") diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java index b78a88755..36feee06f 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java @@ -655,7 +655,7 @@ public void testSelect() throws Exception { sql.getFormattedSql()); assertEquals(2, sql.getParameters().size()); assertEquals("hoge", sql.getParameters().get(0).getWrapper().get()); - assertEquals(new Integer(5), sql.getParameters().get(1).getWrapper().get()); + assertEquals(5, sql.getParameters().get(1).getWrapper().get()); } @Test @@ -674,9 +674,9 @@ public void testUpdate() throws Exception { assertEquals("update aaa set no = ?, set name = ? where id = ?", sql.getRawSql()); assertEquals("update aaa set no = 10, set name = 'hoge' where id = 100", sql.getFormattedSql()); assertEquals(3, sql.getParameters().size()); - assertEquals(new Integer(10), sql.getParameters().get(0).getWrapper().get()); + assertEquals(10, sql.getParameters().get(0).getWrapper().get()); assertEquals("hoge", sql.getParameters().get(1).getWrapper().get()); - assertEquals(new Integer(100), sql.getParameters().get(2).getWrapper().get()); + assertEquals(100, sql.getParameters().get(2).getWrapper().get()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java index f22559880..8c9075625 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java @@ -55,8 +55,8 @@ public void testExecute() throws Exception { List bindValues = runtimeConfig.dataSource.connection.preparedStatement.bindValues; assertEquals(2, bindValues.size()); - assertEquals(new Integer(1), bindValues.get(0).getValue()); - assertEquals(new Integer(10), bindValues.get(1).getValue()); + assertEquals(1, bindValues.get(0).getValue()); + assertEquals(10, bindValues.get(1).getValue()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java index ed1ee8b8c..25f270233 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java @@ -50,10 +50,10 @@ public void testExecute() throws Exception { assertEquals("insert into EMP (ID, NAME, SALARY, VERSION) values (?, ?, ?, ?)", sql); List bindValues = runtimeConfig.dataSource.connection.preparedStatement.bindValues; - assertEquals(new Integer(1), bindValues.get(0).getValue()); + assertEquals(1, bindValues.get(0).getValue()); assertEquals(new String("hoge"), bindValues.get(1).getValue()); assertEquals(new BigDecimal(1000), bindValues.get(2).getValue()); - assertEquals(new Integer(10), bindValues.get(3).getValue()); + assertEquals(10, bindValues.get(3).getValue()); } @Test @@ -81,9 +81,9 @@ public void testExecute_defaultVersion() throws Exception { List bindValues = runtimeConfig.dataSource.connection.preparedStatement.bindValues; assertEquals(4, bindValues.size()); - assertEquals(new Integer(1), bindValues.get(0).getValue()); + assertEquals(1, bindValues.get(0).getValue()); assertEquals(new String("hoge"), bindValues.get(1).getValue()); assertEquals(new BigDecimal(1000), bindValues.get(2).getValue()); - assertEquals(new Integer(1), bindValues.get(3).getValue()); + assertEquals(1, bindValues.get(3).getValue()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java index 540e9164c..b0d37a31f 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java @@ -54,9 +54,9 @@ public void testExecute() throws Exception { List bindValues = runtimeConfig.dataSource.connection.preparedStatement.bindValues; assertEquals(4, bindValues.size()); assertEquals("hoge", bindValues.get(0).getValue()); - assertEquals(new Integer(10), bindValues.get(1).getValue()); - assertEquals(new Integer(1), bindValues.get(2).getValue()); - assertEquals(new Integer(10), bindValues.get(3).getValue()); + assertEquals(10, bindValues.get(1).getValue()); + assertEquals(1, bindValues.get(2).getValue()); + assertEquals(10, bindValues.get(3).getValue()); } @Test @@ -138,14 +138,14 @@ public void testExecute_OriginalStates() throws Exception { List bindValues = runtimeConfig.dataSource.connection.preparedStatement.bindValues; assertEquals(4, bindValues.size()); assertEquals("hoge", bindValues.get(0).getValue()); - assertEquals(new Integer(10), bindValues.get(1).getValue()); - assertEquals(new Integer(1), bindValues.get(2).getValue()); - assertEquals(new Integer(10), bindValues.get(3).getValue()); + assertEquals(10, bindValues.get(1).getValue()); + assertEquals(1, bindValues.get(2).getValue()); + assertEquals(10, bindValues.get(3).getValue()); Emp updatedStates = emp.originalStates; - assertEquals(new Integer(1), updatedStates.getId()); + assertEquals(1, updatedStates.getId()); assertEquals("hoge", updatedStates.getName()); assertNull(updatedStates.getSalary()); - assertEquals(new Integer(11), updatedStates.getVersion()); + assertEquals(11, updatedStates.getVersion()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java index 1cb47398b..27748fc07 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java @@ -62,7 +62,7 @@ public void testOption_default() throws Exception { Emp emp2 = new Emp(); emp2.setId(20); emp2.setSalary(new BigDecimal(2000)); - emp2.setVersion(new Integer(10)); + emp2.setVersion(10); AutoBatchDeleteQuery query = new AutoBatchDeleteQuery(_Emp.getSingletonInternal()); query.setMethod(method); @@ -77,15 +77,15 @@ public void testOption_default() throws Exception { assertEquals("delete from EMP where ID = ? and VERSION = ?", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(2, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); assertTrue(parameters.get(1).getWrapper().get() == null); sql = query.getSqls().get(1); assertEquals("delete from EMP where ID = ? and VERSION = ?", sql.getRawSql()); parameters = sql.getParameters(); assertEquals(2, parameters.size()); - assertEquals(new Integer(20), parameters.get(0).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(1).getWrapper().get()); + assertEquals(20, parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(1).getWrapper().get()); } @Test @@ -97,7 +97,7 @@ public void testOption_ignoreVersion() throws Exception { Emp emp2 = new Emp(); emp2.setId(20); emp2.setSalary(new BigDecimal(2000)); - emp2.setVersion(new Integer(10)); + emp2.setVersion(10); AutoBatchDeleteQuery query = new AutoBatchDeleteQuery(_Emp.getSingletonInternal()); query.setMethod(method); @@ -113,13 +113,13 @@ public void testOption_ignoreVersion() throws Exception { assertEquals("delete from EMP where ID = ?", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(1, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); sql = query.getSqls().get(1); assertEquals("delete from EMP where ID = ?", sql.getRawSql()); parameters = sql.getParameters(); assertEquals(1, parameters.size()); - assertEquals(new Integer(20), parameters.get(0).getWrapper().get()); + assertEquals(20, parameters.get(0).getWrapper().get()); } @Test @@ -149,8 +149,8 @@ public void testTenantId() throws Exception { "delete from SALESMAN where ID = ? and VERSION = ? and TENANT_ID = ?", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); - assertEquals(new Integer(1), parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); + assertEquals(1, parameters.get(1).getWrapper().get()); assertEquals("bbb", parameters.get(2).getWrapper().get()); sql = query.getSqls().get(1); @@ -158,8 +158,8 @@ public void testTenantId() throws Exception { "delete from SALESMAN where ID = ? and VERSION = ? and TENANT_ID = ?", sql.getRawSql()); parameters = sql.getParameters(); assertEquals(3, parameters.size()); - assertEquals(new Integer(20), parameters.get(0).getWrapper().get()); - assertEquals(new Integer(2), parameters.get(1).getWrapper().get()); + assertEquals(20, parameters.get(0).getWrapper().get()); + assertEquals(2, parameters.get(1).getWrapper().get()); assertEquals("bbb", parameters.get(2).getWrapper().get()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java index 84bebd4cd..4ae0a7885 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java @@ -62,7 +62,7 @@ public void testOption_default() throws Exception { Emp emp2 = new Emp(); emp2.setId(20); emp2.setSalary(new BigDecimal(2000)); - emp2.setVersion(new Integer(10)); + emp2.setVersion(10); AutoBatchInsertQuery query = new AutoBatchInsertQuery(_Emp.getSingletonInternal()); query.setMethod(method); @@ -78,19 +78,19 @@ public void testOption_default() throws Exception { "insert into EMP (ID, NAME, SALARY, VERSION) values (?, ?, ?, ?)", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(4, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); assertEquals("aaa", parameters.get(1).getWrapper().get()); assertNull(parameters.get(2).getWrapper().get()); - assertEquals(new Integer(1), parameters.get(3).getWrapper().get()); + assertEquals(1, parameters.get(3).getWrapper().get()); sql = query.getSqls().get(1); assertEquals( "insert into EMP (ID, NAME, SALARY, VERSION) values (?, ?, ?, ?)", sql.getRawSql()); parameters = sql.getParameters(); assertEquals(4, parameters.size()); - assertEquals(new Integer(20), parameters.get(0).getWrapper().get()); + assertEquals(20, parameters.get(0).getWrapper().get()); assertNull(parameters.get(1).getWrapper().get()); assertEquals(new BigDecimal(2000), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(3).getWrapper().get()); + assertEquals(10, parameters.get(3).getWrapper().get()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java index 0f8812c0e..287878792 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java @@ -87,9 +87,9 @@ public void testOption_default() throws Exception { assertEquals(5, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); assertTrue(parameters.get(1).getWrapper().get() == null); - assertEquals(new Integer(100), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(3).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(4).getWrapper().get()); + assertEquals(100, parameters.get(2).getWrapper().get()); + assertEquals(10, parameters.get(3).getWrapper().get()); + assertEquals(100, parameters.get(4).getWrapper().get()); sql = query.getSqls().get(1); assertEquals( @@ -99,9 +99,9 @@ public void testOption_default() throws Exception { assertEquals(5, parameters.size()); assertTrue(parameters.get(0).getWrapper().get() == null); assertEquals(new BigDecimal(2000), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(200), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(20), parameters.get(3).getWrapper().get()); - assertEquals(new Integer(200), parameters.get(4).getWrapper().get()); + assertEquals(200, parameters.get(2).getWrapper().get()); + assertEquals(20, parameters.get(3).getWrapper().get()); + assertEquals(200, parameters.get(4).getWrapper().get()); } @Test @@ -132,8 +132,8 @@ public void testOption_ignoreVersion() throws Exception { assertEquals(4, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); assertNull(parameters.get(1).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(3).getWrapper().get()); + assertEquals(100, parameters.get(2).getWrapper().get()); + assertEquals(10, parameters.get(3).getWrapper().get()); sql = query.getSqls().get(1); assertEquals("update EMP set NAME = ?, SALARY = ?, VERSION = ? where ID = ?", sql.getRawSql()); @@ -141,8 +141,8 @@ public void testOption_ignoreVersion() throws Exception { assertEquals(4, parameters.size()); assertNull(parameters.get(0).getWrapper().get()); assertEquals(new BigDecimal(2000), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(200), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(20), parameters.get(3).getWrapper().get()); + assertEquals(200, parameters.get(2).getWrapper().get()); + assertEquals(20, parameters.get(3).getWrapper().get()); } @Test @@ -173,9 +173,9 @@ public void testOption_include() throws Exception { List> parameters = sql.getParameters(); assertEquals(4, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(3).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(3).getWrapper().get()); sql = query.getSqls().get(1); assertEquals( @@ -183,9 +183,9 @@ public void testOption_include() throws Exception { parameters = sql.getParameters(); assertEquals(4, parameters.size()); assertNull(parameters.get(0).getWrapper().get()); - assertEquals(new Integer(200), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(20), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(200), parameters.get(3).getWrapper().get()); + assertEquals(200, parameters.get(1).getWrapper().get()); + assertEquals(20, parameters.get(2).getWrapper().get()); + assertEquals(200, parameters.get(3).getWrapper().get()); } @Test @@ -216,9 +216,9 @@ public void testOption_exclude() throws Exception { List> parameters = sql.getParameters(); assertEquals(4, parameters.size()); assertEquals(new BigDecimal(200), parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(3).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(3).getWrapper().get()); sql = query.getSqls().get(1); assertEquals( @@ -226,9 +226,9 @@ public void testOption_exclude() throws Exception { parameters = sql.getParameters(); assertEquals(4, parameters.size()); assertNull(parameters.get(0).getWrapper().get()); - assertEquals(new Integer(200), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(20), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(200), parameters.get(3).getWrapper().get()); + assertEquals(200, parameters.get(1).getWrapper().get()); + assertEquals(20, parameters.get(2).getWrapper().get()); + assertEquals(200, parameters.get(3).getWrapper().get()); } @Test @@ -275,9 +275,9 @@ public void testTenantId() throws Exception { assertEquals(6, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); assertTrue(parameters.get(1).getWrapper().get() == null); - assertEquals(new Integer(100), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(3).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(4).getWrapper().get()); + assertEquals(100, parameters.get(2).getWrapper().get()); + assertEquals(10, parameters.get(3).getWrapper().get()); + assertEquals(100, parameters.get(4).getWrapper().get()); assertEquals("bbb", parameters.get(5).getWrapper().get()); sql = query.getSqls().get(1); @@ -288,9 +288,9 @@ public void testTenantId() throws Exception { assertEquals(6, parameters.size()); assertTrue(parameters.get(0).getWrapper().get() == null); assertEquals(new BigDecimal(2000), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(200), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(20), parameters.get(3).getWrapper().get()); - assertEquals(new Integer(200), parameters.get(4).getWrapper().get()); + assertEquals(200, parameters.get(2).getWrapper().get()); + assertEquals(20, parameters.get(3).getWrapper().get()); + assertEquals(200, parameters.get(4).getWrapper().get()); assertEquals("bbb", parameters.get(5).getWrapper().get()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java index c657dbf03..ed78bc3d0 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java @@ -65,8 +65,8 @@ public void testOption_default() throws Exception { assertEquals("delete from EMP where ID = ? and VERSION = ?", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(2, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); } @Test @@ -90,7 +90,7 @@ public void testOption_ignoreVersion() throws Exception { assertEquals("delete from EMP where ID = ?", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(1, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); } @Test @@ -117,8 +117,8 @@ public void testTenantId() throws Exception { List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); assertEquals("bbb", parameters.get(2).getWrapper().get()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java index aa31ce11d..645b27cc3 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java @@ -67,10 +67,10 @@ public void testOption_default() throws Exception { "insert into EMP (ID, NAME, SALARY, VERSION) values (?, ?, ?, ?)", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(4, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); assertEquals("aaa", parameters.get(1).getWrapper().get()); assertNull(parameters.get(2).getWrapper().get()); - assertEquals(new Integer(1), parameters.get(3).getWrapper().get()); + assertEquals(1, parameters.get(3).getWrapper().get()); } @Test @@ -93,9 +93,9 @@ public void testOption_excludeNull() throws Exception { assertEquals("insert into EMP (ID, NAME, VERSION) values (?, ?, ?)", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); assertEquals("aaa", parameters.get(1).getWrapper().get()); - assertEquals(new Integer(1), parameters.get(2).getWrapper().get()); + assertEquals(1, parameters.get(2).getWrapper().get()); } @Test @@ -119,9 +119,9 @@ public void testOption_include() throws Exception { assertEquals("insert into EMP (ID, NAME, VERSION) values (?, ?, ?)", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); assertEquals("aaa", parameters.get(1).getWrapper().get()); - assertEquals(new Integer(1), parameters.get(2).getWrapper().get()); + assertEquals(1, parameters.get(2).getWrapper().get()); } @Test @@ -145,8 +145,8 @@ public void testOption_exclude() throws Exception { assertEquals("insert into EMP (ID, SALARY, VERSION) values (?, ?, ?)", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); assertEquals(new BigDecimal(200), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(1), parameters.get(2).getWrapper().get()); + assertEquals(1, parameters.get(2).getWrapper().get()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java index 45ec9e7d0..139c82581 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java @@ -75,9 +75,9 @@ public void testOption_default() throws Exception { List> parameters = sql.getParameters(); assertEquals(4, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(3).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(3).getWrapper().get()); } @Test @@ -100,9 +100,9 @@ public void testOption_excludeNull() throws Exception { assertEquals("update EMP set VERSION = ? + 1 where ID = ? and VERSION = ?", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); - assertEquals(new Integer(100), parameters.get(0).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(1).getWrapper().get()); + assertEquals(100, parameters.get(2).getWrapper().get()); } @Test @@ -128,8 +128,8 @@ public void testOption_ignoreVersion() throws Exception { List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); } @Test @@ -156,9 +156,9 @@ public void testOption_include() throws Exception { List> parameters = sql.getParameters(); assertEquals(4, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(3).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(3).getWrapper().get()); } @Test @@ -185,9 +185,9 @@ public void testOption_exclude() throws Exception { List> parameters = sql.getParameters(); assertEquals(4, parameters.size()); assertEquals(new BigDecimal(200), parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); } @Test @@ -234,9 +234,9 @@ public void testTenantId() throws Exception { assertEquals(6, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); assertNull(parameters.get(1).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(3).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(4).getWrapper().get()); + assertEquals(100, parameters.get(2).getWrapper().get()); + assertEquals(10, parameters.get(3).getWrapper().get()); + assertEquals(100, parameters.get(4).getWrapper().get()); assertEquals("bbb", parameters.get(5).getWrapper().get()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java index 65421161c..cd1ff8927 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java @@ -82,7 +82,7 @@ public void testOption_default() throws Exception { assertEquals("insert into emp (id, name, salary) values (?, ?, ?)", sql.getRawSql()); List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); - assertEquals(new Integer(10), parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(0).getWrapper().get()); assertEquals("aaa", parameters.get(1).getWrapper().get()); assertNull(parameters.get(2).getWrapper().get()); @@ -90,7 +90,7 @@ public void testOption_default() throws Exception { assertEquals("insert into emp (id, name, salary) values (?, ?, ?)", sql.getRawSql()); parameters = sql.getParameters(); assertEquals(3, parameters.size()); - assertEquals(new Integer(20), parameters.get(0).getWrapper().get()); + assertEquals(20, parameters.get(0).getWrapper().get()); assertNull(parameters.get(1).getWrapper().get()); assertEquals(new BigDecimal(2000), parameters.get(2).getWrapper().get()); } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java index bc0197382..58cf2c698 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java @@ -88,7 +88,7 @@ public void testOption_default() throws Exception { assertEquals(3, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); assertNull(parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); sql = query.getSqls().get(1); assertEquals("update emp set name = ?, salary = ? where id = ?", sql.getRawSql()); @@ -96,7 +96,7 @@ public void testOption_default() throws Exception { assertEquals(3, parameters.size()); assertNull(parameters.get(0).getWrapper().get()); assertEquals(new BigDecimal(2000), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(20), parameters.get(2).getWrapper().get()); + assertEquals(20, parameters.get(2).getWrapper().get()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java index 1f2c01783..c2016fdbc 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java @@ -74,8 +74,8 @@ public void testPopulate() throws Exception { assertEquals(4, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); assertEquals(null, parameters.get(1).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(3).getWrapper().get()); + assertEquals(100, parameters.get(2).getWrapper().get()); + assertEquals(10, parameters.get(3).getWrapper().get()); assertTrue(query.isExecutable()); } @@ -105,8 +105,8 @@ public void testPopulate_states() throws Exception { List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); assertTrue(query.isExecutable()); } @@ -135,8 +135,8 @@ public void testPopulate_excludeNull() throws Exception { List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); assertEquals("hoge", parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); assertTrue(query.isExecutable()); } @@ -164,8 +164,8 @@ public void testPopulate_excludeNull_updateNullableInPreUpdate() throws Exceptio List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); assertEquals("hoge", parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); assertTrue(query.isExecutable()); } @@ -195,8 +195,8 @@ public void testPopulate_ignoreVersion() throws Exception { List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); assertTrue(query.isExecutable()); } @@ -226,8 +226,8 @@ public void testPopulate_include() throws Exception { List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); assertTrue(query.isExecutable()); } @@ -257,9 +257,9 @@ public void testPopulate_exclude() throws Exception { List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); assertEquals(new BigDecimal(200), parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); assertTrue(query.isExecutable()); } @@ -293,9 +293,9 @@ public void testNonEntity() throws Exception { query.setCallerClassName("aaa"); query.setCallerMethodName("bbb"); query.setSqlLogType(SqlLogType.FORMATTED); - query.addParameter("id", Integer.class, Integer.valueOf(10)); + query.addParameter("id", Integer.class, 10); query.addParameter("name", String.class, "aaa"); - query.addParameter("version", Integer.class, Integer.valueOf(100)); + query.addParameter("version", Integer.class, 100); query.prepare(); UpdateQuery updateQuery = query; @@ -306,8 +306,8 @@ public void testNonEntity() throws Exception { List> parameters = sql.getParameters(); assertEquals(3, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); - assertEquals(new Integer(100), parameters.get(1).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(2).getWrapper().get()); + assertEquals(100, parameters.get(1).getWrapper().get()); + assertEquals(10, parameters.get(2).getWrapper().get()); assertTrue(query.isExecutable()); } @@ -342,8 +342,8 @@ public void testOriginalStates_unchanged() throws Exception { assertEquals("update aaa set VERSION = 100 + 1 where id = 10", sql.getFormattedSql()); List> parameters = sql.getParameters(); assertEquals(2, parameters.size()); - assertEquals(new Integer(100), parameters.get(0).getWrapper().get()); - assertEquals(new Integer(10), parameters.get(1).getWrapper().get()); + assertEquals(100, parameters.get(0).getWrapper().get()); + assertEquals(10, parameters.get(1).getWrapper().get()); assertFalse(query.isExecutable()); } From 95e7e20f2d953ff1ea4c6a0c076e0bdab1c64374 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:00:11 +0900 Subject: [PATCH 11/78] Remove unboxing --- .../doma/internal/expr/EvaluationResult.java | 2 +- .../doma/internal/util/BoxedPrimitiveUtil.java | 16 ++++++++-------- .../org/seasar/doma/wrapper/ByteWrapper.java | 4 ++-- .../org/seasar/doma/wrapper/IntegerWrapper.java | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/EvaluationResult.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/EvaluationResult.java index ec4806493..6ed57596b 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/EvaluationResult.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/EvaluationResult.java @@ -24,7 +24,7 @@ public Object getValue() { public boolean getBooleanValue() { if (value instanceof Boolean) { - return ((Boolean) value).booleanValue(); + return (Boolean) value; } return false; } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/util/BoxedPrimitiveUtil.java b/doma-core/src/main/java/org/seasar/doma/internal/util/BoxedPrimitiveUtil.java index f78e34a26..cf67b3979 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/util/BoxedPrimitiveUtil.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/util/BoxedPrimitiveUtil.java @@ -3,34 +3,34 @@ public final class BoxedPrimitiveUtil { public static char unbox(Character value) { - return value != null ? value.charValue() : 0; + return value != null ? value : 0; } public static boolean unbox(Boolean value) { - return value != null ? value.booleanValue() : false; + return value != null ? value : false; } public static byte unbox(Byte value) { - return value != null ? value.byteValue() : 0; + return value != null ? value : 0; } public static short unbox(Short value) { - return value != null ? value.shortValue() : 0; + return value != null ? value : 0; } public static int unbox(Integer value) { - return value != null ? value.intValue() : 0; + return value != null ? value : 0; } public static long unbox(Long value) { - return value != null ? value.longValue() : 0L; + return value != null ? value : 0L; } public static float unbox(Float value) { - return value != null ? value.floatValue() : 0f; + return value != null ? value : 0f; } public static double unbox(Double value) { - return value != null ? value.doubleValue() : 0d; + return value != null ? value : 0d; } } diff --git a/doma-core/src/main/java/org/seasar/doma/wrapper/ByteWrapper.java b/doma-core/src/main/java/org/seasar/doma/wrapper/ByteWrapper.java index d31f8686a..3ad199e0f 100644 --- a/doma-core/src/main/java/org/seasar/doma/wrapper/ByteWrapper.java +++ b/doma-core/src/main/java/org/seasar/doma/wrapper/ByteWrapper.java @@ -22,7 +22,7 @@ public void set(Number v) { public void increment() { Byte value = doGet(); if (value != null) { - doSet((byte) (value.byteValue() + 1)); + doSet((byte) (value + 1)); } } @@ -30,7 +30,7 @@ public void increment() { public void decrement() { Byte value = doGet(); if (value != null) { - doSet((byte) (value.byteValue() - 1)); + doSet((byte) (value - 1)); } } diff --git a/doma-core/src/main/java/org/seasar/doma/wrapper/IntegerWrapper.java b/doma-core/src/main/java/org/seasar/doma/wrapper/IntegerWrapper.java index 9d95a0c4b..8560eff55 100644 --- a/doma-core/src/main/java/org/seasar/doma/wrapper/IntegerWrapper.java +++ b/doma-core/src/main/java/org/seasar/doma/wrapper/IntegerWrapper.java @@ -22,7 +22,7 @@ public void set(Number v) { public void increment() { Integer value = doGet(); if (value != null) { - doSet(value.intValue() + 1); + doSet(value + 1); } } @@ -30,7 +30,7 @@ public void increment() { public void decrement() { Integer value = doGet(); if (value != null) { - doSet(value.intValue() - 1); + doSet(value - 1); } } From a8542b831f3ebe471ab1b0bef6ea3f139b81d45f Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:03:25 +0900 Subject: [PATCH 12/78] Replace with <> --- .../doma/internal/expr/ExpressionEvaluator.java | 10 +++++----- .../doma/internal/expr/ExpressionParser.java | 4 ++-- .../internal/expr/node/CommaOperatorNode.java | 2 +- .../jdbc/command/EntityResultListHandler.java | 2 +- .../jdbc/command/EntitySingleResultHandler.java | 2 +- .../doma/internal/jdbc/command/MapProvider.java | 4 ++-- .../jdbc/command/MapResultListHandler.java | 2 +- .../jdbc/command/MapSingleResultHandler.java | 3 +-- .../OptionalEntitySingleResultHandler.java | 2 +- .../command/OptionalMapSingleResultHandler.java | 4 +--- .../jdbc/command/ScalarResultListHandler.java | 2 +- .../jdbc/command/ScalarSingleResultHandler.java | 2 +- .../internal/jdbc/command/ScriptReader.java | 2 +- .../doma/internal/jdbc/scalar/Scalars.java | 4 ++-- .../internal/jdbc/sql/BasicInOutParameter.java | 2 +- .../internal/jdbc/sql/BasicInParameter.java | 4 ++-- .../internal/jdbc/sql/BasicOutParameter.java | 2 +- .../internal/jdbc/sql/CallableSqlBuilder.java | 2 +- .../internal/jdbc/sql/DomainListParameter.java | 2 +- .../jdbc/sql/EntityResultListParameter.java | 2 +- .../jdbc/sql/MapResultListParameter.java | 2 +- .../jdbc/sql/NodePreparedSqlBuilder.java | 2 +- .../jdbc/sql/OptionalBasicInOutParameter.java | 2 +- .../jdbc/sql/OptionalBasicInParameter.java | 2 +- .../jdbc/sql/OptionalBasicOutParameter.java | 2 +- .../internal/jdbc/sql/ScalarListParameter.java | 2 +- .../jdbc/sql/ScalarResultListParameter.java | 2 +- .../doma/internal/jdbc/sql/SqlParser.java | 2 +- .../internal/jdbc/sql/node/AbstractSqlNode.java | 2 +- .../internal/jdbc/sql/node/IfBlockNode.java | 2 +- .../doma/internal/jdbc/sql/node/OtherNode.java | 2 +- .../internal/jdbc/sql/node/WhitespaceNode.java | 3 +-- .../seasar/doma/jdbc/builder/BatchBuilder.java | 2 +- .../doma/jdbc/builder/BuildingHelper.java | 4 ++-- .../seasar/doma/jdbc/builder/SelectBuilder.java | 4 ++-- .../seasar/doma/jdbc/dialect/MysqlDialect.java | 2 +- .../doma/jdbc/dialect/StandardDialect.java | 10 +++++----- .../jdbc/id/AbstractPreGenerateIdGenerator.java | 3 +-- .../doma/jdbc/id/BuiltinTableIdGenerator.java | 6 +++--- .../doma/jdbc/query/AbstractSelectQuery.java | 6 +++--- .../doma/jdbc/query/AutoBatchDeleteQuery.java | 4 ++-- .../doma/jdbc/query/AutoBatchInsertQuery.java | 4 ++-- .../doma/jdbc/query/AutoBatchModifyQuery.java | 6 +++--- .../doma/jdbc/query/AutoBatchUpdateQuery.java | 4 ++-- .../seasar/doma/jdbc/query/AutoDeleteQuery.java | 6 ++---- .../seasar/doma/jdbc/query/AutoInsertQuery.java | 6 ++---- .../seasar/doma/jdbc/query/AutoUpdateQuery.java | 10 +++++----- .../doma/jdbc/query/BatchUpdateQueryHelper.java | 2 +- .../doma/jdbc/query/SqlBatchModifyQuery.java | 4 ++-- .../jdbc/query/SqlFileBatchDeleteQuery.java | 4 ++-- .../jdbc/query/SqlFileBatchInsertQuery.java | 4 ++-- .../jdbc/query/SqlFileBatchModifyQuery.java | 6 +++--- .../jdbc/query/SqlFileBatchUpdateQuery.java | 4 ++-- .../doma/jdbc/query/SqlFileDeleteQuery.java | 6 +++--- .../doma/jdbc/query/SqlFileInsertQuery.java | 6 +++--- .../doma/jdbc/query/SqlFileModifyQuery.java | 2 +- .../doma/jdbc/query/SqlFileUpdateQuery.java | 8 ++++---- .../seasar/doma/jdbc/query/SqlModifyQuery.java | 2 +- .../doma/jdbc/query/SqlProcessorQuery.java | 2 +- .../doma/jdbc/tx/LocalTransactionContext.java | 4 ++-- .../jdbc/tx/LocalTransactionDataSource.java | 3 +-- .../internal/expr/ExpressionEvaluatorTest.java | 11 ++++------- .../command/BasicResultListHandlerTest.java | 4 ++-- .../command/BasicSingleResultHandlerTest.java | 6 +++--- .../command/CallableSqlParameterBinderTest.java | 14 ++++++-------- .../command/DomainResultListHandlerTest.java | 2 +- .../command/DomainSingleResultHandlerTest.java | 4 ++-- .../command/EntityResultListHandlerTest.java | 2 +- .../command/EntitySingleResultHandlerTest.java | 4 ++-- .../command/PreparedSqlParameterBinderTest.java | 7 +++---- .../jdbc/command/ScalarProviderTest.java | 4 ++-- .../jdbc/sql/PreparedSqlBuilderTest.java | 7 +++---- .../doma/internal/jdbc/sql/SqlParserTest.java | 12 ++++++------ .../jdbc/builder/MapBatchInsertBuilderTest.java | 2 +- .../jdbc/command/BatchDeleteCommandTest.java | 2 +- .../jdbc/command/BatchInsertCommandTest.java | 2 +- .../jdbc/command/BatchUpdateCommandTest.java | 6 +++--- .../doma/jdbc/command/DeleteCommandTest.java | 6 +++--- .../doma/jdbc/command/FunctionCommandTest.java | 13 ++++++------- .../doma/jdbc/command/InsertCommandTest.java | 4 ++-- .../doma/jdbc/command/SelectCommandTest.java | 15 +++++---------- .../doma/jdbc/command/UpdateCommandTest.java | 8 ++++---- .../jdbc/entity/OriginalStatesAccessorTest.java | 4 ++-- .../jdbc/id/BuiltinTableIdGeneratorTest.java | 2 +- .../jdbc/query/AutoBatchDeleteQueryTest.java | 8 ++++---- .../jdbc/query/AutoBatchInsertQueryTest.java | 4 ++-- .../jdbc/query/AutoBatchUpdateQueryTest.java | 14 +++++++------- .../doma/jdbc/query/AutoDeleteQueryTest.java | 9 ++++----- .../doma/jdbc/query/AutoFunctionQueryTest.java | 5 ++--- .../doma/jdbc/query/AutoInsertQueryTest.java | 10 +++++----- .../doma/jdbc/query/AutoUpdateQueryTest.java | 17 ++++++++--------- .../jdbc/query/SqlFileBatchDeleteQueryTest.java | 4 ++-- .../jdbc/query/SqlFileBatchInsertQueryTest.java | 4 ++-- .../jdbc/query/SqlFileBatchUpdateQueryTest.java | 14 +++++++------- 94 files changed, 211 insertions(+), 237 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java index a5fe963b1..12815b7f3 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java @@ -85,7 +85,7 @@ public ExpressionEvaluator( ExpressionFunctions expressionFunctions, ClassHelper classHelper) { assertNotNull(variableValues, expressionFunctions, classHelper); - this.variableValues = new HashMap(variableValues); + this.variableValues = new HashMap<>(variableValues); this.expressionFunctions = expressionFunctions; this.classHelper = classHelper; } @@ -531,7 +531,7 @@ protected Method findMethod( protected Method findMethodFromInterfaces( String methodName, Object target, Class targetClass, Class[] paramTypes) { - LinkedList methods = new LinkedList(); + LinkedList methods = new LinkedList<>(); for (Class clazz = targetClass; clazz != null && clazz != Object.class; clazz = clazz.getSuperclass()) { @@ -548,7 +548,7 @@ protected Method findMethodFromInterfaces( protected Method findMethodFromClasses( String methodName, Object target, Class targetClass, Class[] paramTypes) { - LinkedList methods = new LinkedList(); + LinkedList methods = new LinkedList<>(); for (Class clazz = targetClass; clazz != null && clazz != Object.class; clazz = clazz.getSuperclass()) { @@ -831,7 +831,7 @@ protected EvaluationResult concat(Text other) { protected static class Number { - protected static final Map, Integer> priorityMap = new HashMap, Integer>(); + protected static final Map, Integer> priorityMap = new HashMap<>(); static { priorityMap.put(BigDecimal.class, 80); @@ -993,7 +993,7 @@ protected class ParameterCollector implements ExpressionNodeVisitor> { public ParameterCollection collect(ExpressionNode node) { - List evaluationResults = new ArrayList(); + List evaluationResults = new ArrayList<>(); node.accept(this, evaluationResults); return new ParameterCollection(evaluationResults); } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java index c1f157486..9eb520e01 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java @@ -39,9 +39,9 @@ public class ExpressionParser { - protected final Deque expressionNodes = new LinkedList(); + protected final Deque expressionNodes = new LinkedList<>(); - protected final Deque operatorNodes = new LinkedList(); + protected final Deque operatorNodes = new LinkedList<>(); protected final ExpressionReducer expressionReducer = new ExpressionReducer(); diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/node/CommaOperatorNode.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/node/CommaOperatorNode.java index 847a1b62b..eb28aedc8 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/node/CommaOperatorNode.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/node/CommaOperatorNode.java @@ -9,7 +9,7 @@ public class CommaOperatorNode implements OperatorNode { protected static final int PRIORITY = 0; - protected final List expressionNodes = new ArrayList(); + protected final List expressionNodes = new ArrayList<>(); protected final ExpressionLocation location; diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandler.java index 1fdbaa0fa..870084dfb 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandler.java @@ -5,6 +5,6 @@ public class EntityResultListHandler extends AbstractResultListHandler { public EntityResultListHandler(EntityType entityType) { - super(new EntityIterationHandler<>(entityType, new ResultListCallback())); + super(new EntityIterationHandler<>(entityType, new ResultListCallback<>())); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandler.java index 9e48c3689..57074b0d7 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandler.java @@ -5,6 +5,6 @@ public class EntitySingleResultHandler extends AbstractSingleResultHandler { public EntitySingleResultHandler(EntityType entityType) { - super(new EntityIterationHandler<>(entityType, new SingleResultCallback())); + super(new EntityIterationHandler<>(entityType, new SingleResultCallback<>())); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapProvider.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapProvider.java index 8602d79a7..c4e7eb378 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapProvider.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapProvider.java @@ -35,7 +35,7 @@ public MapProvider(Query query, MapKeyNamingType mapKeyNamingType) { @Override public Map get(ResultSet resultSet) throws SQLException { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); if (indexMap == null) { indexMap = createIndexMap(resultSet.getMetaData()); } @@ -53,7 +53,7 @@ protected HashMap createIndexMap(ResultSetMetaData resultSetMet throws SQLException { MapKeyNaming naming = query.getConfig().getMapKeyNaming(); Method method = query.getMethod(); - HashMap indexMap = new HashMap(); + HashMap indexMap = new HashMap<>(); int count = resultSetMeta.getColumnCount(); for (int i = 1; i < count + 1; i++) { String columnName = resultSetMeta.getColumnLabel(i); diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapResultListHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapResultListHandler.java index 9984caa8a..9417b6425 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapResultListHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapResultListHandler.java @@ -6,6 +6,6 @@ public class MapResultListHandler extends AbstractResultListHandler> { public MapResultListHandler(MapKeyNamingType keyNamingType) { - super(new MapIterationHandler<>(keyNamingType, new ResultListCallback>())); + super(new MapIterationHandler<>(keyNamingType, new ResultListCallback<>())); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapSingleResultHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapSingleResultHandler.java index 3802fc0af..3d491049d 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapSingleResultHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapSingleResultHandler.java @@ -6,7 +6,6 @@ public class MapSingleResultHandler extends AbstractSingleResultHandler> { public MapSingleResultHandler(MapKeyNamingType keyNamingType) { - super( - new MapIterationHandler<>(keyNamingType, new SingleResultCallback>())); + super(new MapIterationHandler<>(keyNamingType, new SingleResultCallback<>())); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalEntitySingleResultHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalEntitySingleResultHandler.java index d72d756aa..81159e08d 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalEntitySingleResultHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalEntitySingleResultHandler.java @@ -7,6 +7,6 @@ public class OptionalEntitySingleResultHandler extends AbstractSingleResultHandler> { public OptionalEntitySingleResultHandler(EntityType entityType) { - super(new EntityIterationHandler<>(entityType, new OptionalSingleResultCallback())); + super(new EntityIterationHandler<>(entityType, new OptionalSingleResultCallback<>())); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalMapSingleResultHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalMapSingleResultHandler.java index cb66876ea..73999ebdb 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalMapSingleResultHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalMapSingleResultHandler.java @@ -8,8 +8,6 @@ public class OptionalMapSingleResultHandler extends AbstractSingleResultHandler>> { public OptionalMapSingleResultHandler(MapKeyNamingType keyNamingType) { - super( - new MapIterationHandler<>( - keyNamingType, new OptionalSingleResultCallback>())); + super(new MapIterationHandler<>(keyNamingType, new OptionalSingleResultCallback<>())); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScalarResultListHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScalarResultListHandler.java index c2d275c84..c01b39150 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScalarResultListHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScalarResultListHandler.java @@ -7,6 +7,6 @@ public class ScalarResultListHandler extends AbstractResultListHandler { public ScalarResultListHandler(Supplier> supplier) { - super(new ScalarIterationHandler<>(supplier, new ResultListCallback())); + super(new ScalarIterationHandler<>(supplier, new ResultListCallback<>())); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScalarSingleResultHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScalarSingleResultHandler.java index 747d5587a..d6bb9e0be 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScalarSingleResultHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScalarSingleResultHandler.java @@ -9,6 +9,6 @@ public class ScalarSingleResultHandler public ScalarSingleResultHandler(Supplier> supplier) { super( new ScalarIterationHandler<>( - supplier, new SingleResultCallback(() -> supplier.get().getDefault()))); + supplier, new SingleResultCallback<>(() -> supplier.get().getDefault()))); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptReader.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptReader.java index 7dcf6447a..b9eecf8b1 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptReader.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptReader.java @@ -94,7 +94,7 @@ protected class SqlBuilder { protected StringBuilder buf = new StringBuilder(300); - protected List wordList = new ArrayList(); + protected List wordList = new ArrayList<>(); protected ScriptBlockContext sqlBlockContext; diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/scalar/Scalars.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/scalar/Scalars.java index ed7e00de0..6a5643109 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/scalar/Scalars.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/scalar/Scalars.java @@ -231,9 +231,9 @@ public final class Scalars { protected static Supplier> createBasicScalarSupplier( Supplier> wrapperSupplier, boolean optional) { if (optional) { - return () -> new OptionalBasicScalar(wrapperSupplier); + return () -> new OptionalBasicScalar<>(wrapperSupplier); } else { - return () -> new BasicScalar(wrapperSupplier); + return () -> new BasicScalar<>(wrapperSupplier); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicInOutParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicInOutParameter.java index f83f98249..322b6c6ed 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicInOutParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicInOutParameter.java @@ -8,6 +8,6 @@ public class BasicInOutParameter extends ScalarInOutParameter { public BasicInOutParameter(Supplier> supplier, Reference reference) { - super(new BasicScalar(supplier), reference); + super(new BasicScalar<>(supplier), reference); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicInParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicInParameter.java index 666268454..00444a1be 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicInParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicInParameter.java @@ -7,10 +7,10 @@ public class BasicInParameter extends ScalarInParameter { public BasicInParameter(Supplier> supplier) { - super(new BasicScalar(supplier)); + super(new BasicScalar<>(supplier)); } public BasicInParameter(Supplier> supplier, BASIC value) { - super(new BasicScalar(supplier), value); + super(new BasicScalar<>(supplier), value); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicOutParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicOutParameter.java index c3c4e5111..5238b2e6c 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicOutParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/BasicOutParameter.java @@ -8,6 +8,6 @@ public class BasicOutParameter extends ScalarOutParameter { public BasicOutParameter(Supplier> supplier, Reference reference) { - super(new BasicScalar(supplier), reference); + super(new BasicScalar<>(supplier), reference); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/CallableSqlBuilder.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/CallableSqlBuilder.java index cba79f57f..b8d7e0747 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/CallableSqlBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/CallableSqlBuilder.java @@ -82,7 +82,7 @@ public CallableSql build(Function commenter) { } context.cutBackIfNecessary(); context.append(")}"); - LinkedList allParameters = new LinkedList(parameters); + LinkedList allParameters = new LinkedList<>(parameters); if (resultParameter != null) { allParameters.addFirst(resultParameter); } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainListParameter.java index c420d83d5..53f7b3855 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainListParameter.java @@ -19,6 +19,6 @@ public DomainListParameter(DomainType domainType, List li @Override public ScalarProvider createObjectProvider(Query query) { - return new ScalarProvider(() -> domainType.createScalar(), query); + return new ScalarProvider<>(() -> domainType.createScalar(), query); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/EntityResultListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/EntityResultListParameter.java index b7ec338c8..228ec37b2 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/EntityResultListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/EntityResultListParameter.java @@ -14,7 +14,7 @@ public class EntityResultListParameter extends AbstractResultListParamet boolean resultMappingEnsured; public EntityResultListParameter(EntityType entityType, boolean resultMappingEnsured) { - super(new ArrayList()); + super(new ArrayList<>()); assertNotNull(entityType); this.entityType = entityType; this.resultMappingEnsured = resultMappingEnsured; diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/MapResultListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/MapResultListParameter.java index b425d5e9f..4b28c18f8 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/MapResultListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/MapResultListParameter.java @@ -14,7 +14,7 @@ public class MapResultListParameter extends AbstractResultListParameter>()); + super(new ArrayList<>()); assertNotNull(mapKeyNamingType); this.mapKeyNamingType = mapKeyNamingType; } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java index 11ad4957e..6a4f9e805 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java @@ -839,7 +839,7 @@ protected void addLiteralValue(Scalar scala } protected void addBindValue(Scalar scalar) { - appendParameterInternal(new ScalarInParameter(scalar)); + appendParameterInternal(new ScalarInParameter<>(scalar)); } protected void appendParameter(InParameter parameter) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInOutParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInOutParameter.java index 16de40f26..81a5e41d6 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInOutParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInOutParameter.java @@ -11,6 +11,6 @@ public class OptionalBasicInOutParameter public OptionalBasicInOutParameter( Supplier> supplier, Reference> reference) { - super(new OptionalBasicScalar(supplier), reference); + super(new OptionalBasicScalar<>(supplier), reference); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInParameter.java index 740f2e490..bf8d0875b 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInParameter.java @@ -8,6 +8,6 @@ public class OptionalBasicInParameter extends ScalarInParameter> { public OptionalBasicInParameter(Supplier> supplier, Optional value) { - super(new OptionalBasicScalar(supplier), value); + super(new OptionalBasicScalar<>(supplier), value); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicOutParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicOutParameter.java index 16a6b18bc..4284ec37c 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicOutParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicOutParameter.java @@ -10,6 +10,6 @@ public class OptionalBasicOutParameter extends ScalarOutParameter> supplier, Reference> reference) { - super(new OptionalBasicScalar(supplier), reference); + super(new OptionalBasicScalar<>(supplier), reference); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarListParameter.java index c25756180..53d12426f 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarListParameter.java @@ -21,6 +21,6 @@ public ScalarListParameter( @Override public ScalarProvider createObjectProvider(Query query) { - return new ScalarProvider(suppler, query); + return new ScalarProvider<>(suppler, query); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarResultListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarResultListParameter.java index dc282f839..6c53863a8 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarResultListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarResultListParameter.java @@ -15,7 +15,7 @@ public class ScalarResultListParameter protected final Supplier> supplier; public ScalarResultListParameter(Supplier> supplier) { - super(new ArrayList()); + super(new ArrayList<>()); assertNotNull(supplier); this.supplier = supplier; } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlParser.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlParser.java index 11c6b8846..f8899e432 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlParser.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlParser.java @@ -54,7 +54,7 @@ public class SqlParser { protected static final Pattern LITERAL_PATTERN = Pattern.compile("[-+'.0-9]|.*'|true|false|null", Pattern.CASE_INSENSITIVE); - protected final Deque nodeStack = new LinkedList(); + protected final Deque nodeStack = new LinkedList<>(); protected final String sql; diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/AbstractSqlNode.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/AbstractSqlNode.java index f6a2f14e3..e6a11e293 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/AbstractSqlNode.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/AbstractSqlNode.java @@ -8,7 +8,7 @@ public abstract class AbstractSqlNode implements AppendableSqlNode { - protected final List children = new ArrayList(); + protected final List children = new ArrayList<>(); @Override public void appendNode(SqlNode child) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/IfBlockNode.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/IfBlockNode.java index 1a1d3dd87..74f0854b3 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/IfBlockNode.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/IfBlockNode.java @@ -11,7 +11,7 @@ public class IfBlockNode extends AbstractSqlNode implements BlockNode { protected IfNode ifNode; - protected List elseifNodes = new ArrayList(); + protected List elseifNodes = new ArrayList<>(); protected ElseNode elseNode; diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/OtherNode.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/OtherNode.java index 534824f7f..e531c310d 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/OtherNode.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/OtherNode.java @@ -11,7 +11,7 @@ public class OtherNode extends AbstractSqlNode { - protected static final Map otherNodeMap = new HashMap(); + protected static final Map otherNodeMap = new HashMap<>(); static { otherNodeMap.put(",", new OtherNode(",")); diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/WhitespaceNode.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/WhitespaceNode.java index fc59c6611..9db9a67eb 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/WhitespaceNode.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/WhitespaceNode.java @@ -11,8 +11,7 @@ public class WhitespaceNode extends AbstractSqlNode { - protected static final Map nodeMap = - new HashMap(); + protected static final Map nodeMap = new HashMap<>(); static { nodeMap.put(String.valueOf('\u0009'), new WhitespaceNode('\u0009')); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BatchBuilder.java b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BatchBuilder.java index cd2790a3b..04fd813cf 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BatchBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BatchBuilder.java @@ -230,7 +230,7 @@

BatchBuilder appendParam(Class

paramClass, P param, boolea } if (paramClass != batchParam.paramClass) { if (batchParam.paramClass == Object.class) { - final BatchParam

newBatchParam = new BatchParam

(batchParam, paramClass); + final BatchParam

newBatchParam = new BatchParam<>(batchParam, paramClass); newBatchParam.add(param); helper.modifyParam(newBatchParam); } else if (param == null && paramClass == Object.class) { diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BuildingHelper.java b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BuildingHelper.java index 8cbacadc6..677b1c4cd 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BuildingHelper.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BuildingHelper.java @@ -12,7 +12,7 @@ class BuildingHelper { private static final String lineSeparator = System.getProperty("line.separator"); - private final LinkedList items = new LinkedList(); + private final LinkedList items = new LinkedList<>(); BuildingHelper() {} @@ -39,7 +39,7 @@ void removeLast() { } List getParams() { - List results = new ArrayList(); + List results = new ArrayList<>(); for (Item item : items) { if (item.kind == ItemKind.PARAM) { results.add(item.param); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/SelectBuilder.java b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/SelectBuilder.java index 02a326b18..534af3485 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/SelectBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/SelectBuilder.java @@ -448,7 +448,7 @@ public List getEntityResultList(Class elementClass) EntityType entityType = EntityTypeFactory.getEntityType(elementClass, config.getClassHelper()); query.setEntityType(entityType); - ResultSetHandler> handler = new EntityResultListHandler(entityType); + ResultSetHandler> handler = new EntityResultListHandler<>(entityType); return execute(handler); } @@ -771,7 +771,7 @@ protected RESULT streamMapInternal( private RESULT execute(ResultSetHandler resultSetHandler) { prepare(); - SelectCommand command = new SelectCommand(query, resultSetHandler); + SelectCommand command = new SelectCommand<>(query, resultSetHandler); RESULT result = command.execute(); query.complete(); return result; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MysqlDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MysqlDialect.java index c0547fea3..f5676eeed 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MysqlDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MysqlDialect.java @@ -23,7 +23,7 @@ public class MysqlDialect extends StandardDialect { /** the set of {@literal SQLState} code that represents unique violation */ protected static final Set UNIQUE_CONSTRAINT_VIOLATION_ERROR_CODES = - new HashSet(Arrays.asList(1022, 1062)); + new HashSet<>(Arrays.asList(1022, 1062)); /** the quotation mark of the start */ protected static final char OPEN_QUOTE = '`'; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java index 9b01c7266..5f975d6cc 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java @@ -87,7 +87,7 @@ public class StandardDialect implements Dialect { /** the set of {@literal SQLState} code that represents unique violation */ protected static final Set UNIQUE_CONSTRAINT_VIOLATION_STATE_CODES = - new HashSet(Arrays.asList("23", "27", "44")); + new HashSet<>(Arrays.asList("23", "27", "44")); private static final CriteriaBuilder CRITERIA_SQL_BUILDER = new StandardCriteriaBuilder(); @@ -545,7 +545,7 @@ public Void visitTimestampWrapper( @Override public > Void visitEnumWrapper( EnumWrapper wrapper, JdbcMappingFunction p, JdbcMappingHint q) throws SQLException { - return p.apply(wrapper, new EnumType(wrapper.getBasicClass())); + return p.apply(wrapper, new EnumType<>(wrapper.getBasicClass())); } @Override @@ -693,7 +693,7 @@ public String visitTimestampWrapper( @Override public > String visitEnumWrapper( EnumWrapper wrapper, SqlLogFormattingFunction p, Void q) throws RuntimeException { - return p.apply(wrapper, new EnumType(wrapper.getBasicClass())); + return p.apply(wrapper, new EnumType<>(wrapper.getBasicClass())); } @Override @@ -1024,10 +1024,10 @@ public boolean isNotBlank(CharSequence charSequence) { public static class StandardScriptBlockContext implements ScriptBlockContext { /** the key wards that represents the start of a block */ - protected List> sqlBlockStartKeywordsList = new ArrayList>(); + protected List> sqlBlockStartKeywordsList = new ArrayList<>(); /** the key words */ - protected List keywords = new ArrayList(); + protected List keywords = new ArrayList<>(); /** {@code true} if this context is inside of a block */ protected boolean inBlock; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/id/AbstractPreGenerateIdGenerator.java b/doma-core/src/main/java/org/seasar/doma/jdbc/id/AbstractPreGenerateIdGenerator.java index 4557b06a1..f3b115b18 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/id/AbstractPreGenerateIdGenerator.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/id/AbstractPreGenerateIdGenerator.java @@ -13,8 +13,7 @@ public abstract class AbstractPreGenerateIdGenerator extends AbstractIdGenerator protected long allocationSize; // the keys are data source names and the values are identity contexts - protected ConcurrentMap idContextMap = - new ConcurrentHashMap(); + protected ConcurrentMap idContextMap = new ConcurrentHashMap<>(); /** * Sets the initial value. diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java b/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java index 655a68a58..81cc60ae1 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java @@ -79,8 +79,8 @@ public void initialize() { createUpdateFormattedSql(), null, Arrays.asList( - new BasicInParameter(() -> allocationSizeWrapper), - new BasicInParameter(() -> pkColumnValueWrapper)), + new BasicInParameter<>(() -> allocationSizeWrapper), + new BasicInParameter<>(() -> pkColumnValueWrapper)), SqlLogType.FORMATTED); selectSql = new PreparedSql( @@ -88,7 +88,7 @@ public void initialize() { createSelectRawSql(), createSelectFormattedSql(), null, - Arrays.asList(new BasicInParameter(() -> pkColumnValueWrapper)), + Arrays.asList(new BasicInParameter<>(() -> pkColumnValueWrapper)), SqlLogType.FORMATTED); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AbstractSelectQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AbstractSelectQuery.java index ef1e85705..659ecd98a 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AbstractSelectQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AbstractSelectQuery.java @@ -29,7 +29,7 @@ public abstract class AbstractSelectQuery extends AbstractQuery implements SelectQuery { - protected final Map parameters = new HashMap(); + protected final Map parameters = new HashMap<>(); protected SelectOptions options = SelectOptions.get(); @@ -112,8 +112,8 @@ protected void executeCount(SqlNode sqlNode) { query.addParameters(parameters); query.prepare(); SelectCommand command = - new SelectCommand( - query, new BasicSingleResultHandler(() -> new PrimitiveLongWrapper())); + new SelectCommand<>( + query, new BasicSingleResultHandler<>(() -> new PrimitiveLongWrapper())); long count = command.execute(); query.complete(); SelectOptionsAccessor.setCountSize(options, count); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java index 848e05e61..5c98200f7 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java @@ -57,7 +57,7 @@ public void prepare() { protected void preDelete() { AutoBatchPreDeleteContext context = - new AutoBatchPreDeleteContext(entityType, method, config); + new AutoBatchPreDeleteContext<>(entityType, method, config); entityType.preDelete(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); @@ -134,7 +134,7 @@ public void complete() { protected void postDelete() { AutoBatchPostDeleteContext context = - new AutoBatchPostDeleteContext(entityType, method, config); + new AutoBatchPostDeleteContext<>(entityType, method, config); entityType.postDelete(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchInsertQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchInsertQuery.java index bf2df73b0..e0de88769 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchInsertQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchInsertQuery.java @@ -70,7 +70,7 @@ public void prepare() { protected void preInsert() { AutoBatchPreInsertContext context = - new AutoBatchPreInsertContext(entityType, method, config); + new AutoBatchPreInsertContext<>(entityType, method, config); entityType.preInsert(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); @@ -186,7 +186,7 @@ public void complete() { protected void postInsert() { AutoBatchPostInsertContext context = - new AutoBatchPostInsertContext(entityType, method, config); + new AutoBatchPostInsertContext<>(entityType, method, config); entityType.postInsert(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchModifyQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchModifyQuery.java index e616ffd29..40b0861fb 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchModifyQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchModifyQuery.java @@ -107,14 +107,14 @@ protected boolean isTargetPropertyName(String name) { public void setEntities(Iterable entities) { assertNotNull(entities); if (entities instanceof Collection) { - this.entities = new ArrayList((Collection) entities); + this.entities = new ArrayList<>((Collection) entities); } else { - this.entities = new ArrayList(); + this.entities = new ArrayList<>(); for (ENTITY entity : entities) { this.entities.add(entity); } } - this.sqls = new ArrayList(this.entities.size()); + this.sqls = new ArrayList<>(this.entities.size()); } public List getEntities() { diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java index fb41c5a4c..6c2aa9864 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java @@ -72,7 +72,7 @@ protected void setupHelper() { protected void preUpdate() { AutoBatchPreUpdateContext context = - new AutoBatchPreUpdateContext(entityType, method, config); + new AutoBatchPreUpdateContext<>(entityType, method, config); entityType.preUpdate(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); @@ -165,7 +165,7 @@ public void complete() { protected void postUpdate() { AutoBatchPostUpdateContext context = - new AutoBatchPostUpdateContext(entityType, method, config); + new AutoBatchPostUpdateContext<>(entityType, method, config); entityType.postUpdate(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoDeleteQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoDeleteQuery.java index b7a2a707e..f204c1cd9 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoDeleteQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoDeleteQuery.java @@ -39,8 +39,7 @@ public void prepare() { } protected void preDelete() { - AutoPreDeleteContext context = - new AutoPreDeleteContext(entityType, method, config); + AutoPreDeleteContext context = new AutoPreDeleteContext<>(entityType, method, config); entityType.preDelete(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); @@ -110,8 +109,7 @@ public void complete() { } protected void postDelete() { - AutoPostDeleteContext context = - new AutoPostDeleteContext(entityType, method, config); + AutoPostDeleteContext context = new AutoPostDeleteContext<>(entityType, method, config); entityType.postDelete(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoInsertQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoInsertQuery.java index e35388d07..3a69d8fc3 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoInsertQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoInsertQuery.java @@ -48,8 +48,7 @@ public void prepare() { } protected void preInsert() { - AutoPreInsertContext context = - new AutoPreInsertContext(entityType, method, config); + AutoPreInsertContext context = new AutoPreInsertContext<>(entityType, method, config); entityType.preInsert(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); @@ -154,8 +153,7 @@ public void complete() { } protected void postInsert() { - AutoPostInsertContext context = - new AutoPostInsertContext(entityType, method, config); + AutoPostInsertContext context = new AutoPostInsertContext<>(entityType, method, config); entityType.postInsert(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoUpdateQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoUpdateQuery.java index 50dd8e7c0..0e80d41a5 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoUpdateQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoUpdateQuery.java @@ -50,7 +50,7 @@ public void prepare() { protected void setupHelper() { helper = - new UpdateQueryHelper( + new UpdateQueryHelper<>( config, entityType, includedPropertyNames, @@ -64,7 +64,7 @@ protected void setupHelper() { protected void preUpdate() { List> targetPropertyTypes = helper.getTargetPropertyTypes(entity); AutoPreUpdateContext context = - new AutoPreUpdateContext(entityType, method, config, targetPropertyTypes); + new AutoPreUpdateContext<>(entityType, method, config, targetPropertyTypes); entityType.preUpdate(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); @@ -156,7 +156,7 @@ protected void postUpdate() { targetPropertyTypes.add(versionPropertyType); } AutoPostUpdateContext context = - new AutoPostUpdateContext(entityType, method, config, targetPropertyTypes); + new AutoPostUpdateContext<>(entityType, method, config, targetPropertyTypes); entityType.postUpdate(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); @@ -191,7 +191,7 @@ public AutoPreUpdateContext( List> targetPropertyTypes) { super(entityType, method, config); assertNotNull(targetPropertyTypes); - changedPropertyNames = new HashSet(targetPropertyTypes.size()); + changedPropertyNames = new HashSet<>(targetPropertyTypes.size()); for (EntityPropertyType propertyType : targetPropertyTypes) { changedPropertyNames.add(propertyType.getName()); } @@ -220,7 +220,7 @@ public AutoPostUpdateContext( List> targetPropertyTypes) { super(entityType, method, config); assertNotNull(targetPropertyTypes); - changedPropertyNames = new HashSet(targetPropertyTypes.size()); + changedPropertyNames = new HashSet<>(targetPropertyTypes.size()); for (EntityPropertyType propertyType : targetPropertyTypes) { changedPropertyNames.add(propertyType.getName()); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/BatchUpdateQueryHelper.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/BatchUpdateQueryHelper.java index fb5d1d496..c3f389773 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/BatchUpdateQueryHelper.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/BatchUpdateQueryHelper.java @@ -41,7 +41,7 @@ public BatchUpdateQueryHelper( public List> getTargetPropertyTypes() { List> targetPropertyTypes = - new ArrayList>(entityType.getEntityPropertyTypes().size()); + new ArrayList<>(entityType.getEntityPropertyTypes().size()); for (EntityPropertyType p : entityType.getEntityPropertyTypes()) { if (!p.isUpdatable()) { continue; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlBatchModifyQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlBatchModifyQuery.java index 67f0d6520..92be03265 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlBatchModifyQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlBatchModifyQuery.java @@ -24,7 +24,7 @@ public abstract class SqlBatchModifyQuery extends AbstractQuery implements Batch protected SqlNode sqlNode; - protected final Map> parameters = new LinkedHashMap>(); + protected final Map> parameters = new LinkedHashMap<>(); protected List sqls; @@ -60,7 +60,7 @@ protected void prepareOptions() { } protected void prepareSql() { - sqls = new ArrayList(); + sqls = new ArrayList<>(); IntStream.rangeClosed(0, parameterSize - 1) .forEach( i -> { diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQuery.java index 689efe362..f23bedeb2 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQuery.java @@ -100,7 +100,7 @@ protected EntityHandler(EntityType entityType) { protected void preDelete() { SqlFileBatchPreDeleteContext context = - new SqlFileBatchPreDeleteContext(entityType, method, config); + new SqlFileBatchPreDeleteContext<>(entityType, method, config); entityType.preDelete(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); @@ -109,7 +109,7 @@ protected void preDelete() { protected void postDelete() { SqlFileBatchPostDeleteContext context = - new SqlFileBatchPostDeleteContext(entityType, method, config); + new SqlFileBatchPostDeleteContext<>(entityType, method, config); entityType.postDelete(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQuery.java index 7ba9e6c21..54d6bd95c 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQuery.java @@ -86,7 +86,7 @@ protected EntityHandler(EntityType entityType) { protected void preInsert() { SqlFileBatchPreInsertContext context = - new SqlFileBatchPreInsertContext(entityType, method, config); + new SqlFileBatchPreInsertContext<>(entityType, method, config); entityType.preInsert(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); @@ -95,7 +95,7 @@ protected void preInsert() { protected void postInsert() { SqlFileBatchPostInsertContext context = - new SqlFileBatchPostInsertContext(entityType, method, config); + new SqlFileBatchPostInsertContext<>(entityType, method, config); entityType.postInsert(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchModifyQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchModifyQuery.java index 34a39b129..fc00b37fa 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchModifyQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchModifyQuery.java @@ -120,14 +120,14 @@ public void setParameterName(String parameterName) { public void setElements(Iterable elements) { assertNotNull(elements); if (elements instanceof Collection) { - this.elements = new ArrayList((Collection) elements); + this.elements = new ArrayList<>((Collection) elements); } else { - this.elements = new ArrayList(); + this.elements = new ArrayList<>(); for (ELEMENT element : elements) { this.elements.add(element); } } - this.sqls = new ArrayList(this.elements.size()); + this.sqls = new ArrayList<>(this.elements.size()); } public List getEntities() { diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQuery.java index 2d4a606e0..aae424b8a 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQuery.java @@ -152,7 +152,7 @@ protected void init() { protected void preUpdate() { SqlFileBatchPreUpdateContext context = - new SqlFileBatchPreUpdateContext(entityType, method, config); + new SqlFileBatchPreUpdateContext<>(entityType, method, config); entityType.preUpdate(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); @@ -165,7 +165,7 @@ protected void prepareTargetPropertyTypes() { protected void postUpdate() { SqlFileBatchPostUpdateContext context = - new SqlFileBatchPostUpdateContext(entityType, method, config); + new SqlFileBatchPostUpdateContext<>(entityType, method, config); entityType.postUpdate(currentEntity, context); if (context.getNewEntity() != null) { currentEntity = context.getNewEntity(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileDeleteQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileDeleteQuery.java index 6543f56d0..e9702876c 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileDeleteQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileDeleteQuery.java @@ -60,7 +60,7 @@ public void complete() { @Override public void setEntityAndEntityType(String name, E entity, EntityType entityType) { - entityHandler = new EntityHandler(name, entity, entityType); + entityHandler = new EntityHandler<>(name, entity, entityType); } public void setVersionIgnored(boolean versionIgnored) { @@ -99,7 +99,7 @@ protected EntityHandler(String name, E entity, EntityType entityType) { protected void preDelete() { SqlFilePreDeleteContext context = - new SqlFilePreDeleteContext(entityType, method, config); + new SqlFilePreDeleteContext<>(entityType, method, config); entityType.preDelete(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); @@ -109,7 +109,7 @@ protected void preDelete() { protected void postDelete() { SqlFilePostDeleteContext context = - new SqlFilePostDeleteContext(entityType, method, config); + new SqlFilePostDeleteContext<>(entityType, method, config); entityType.postDelete(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileInsertQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileInsertQuery.java index b91c90ef8..004cf7c21 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileInsertQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileInsertQuery.java @@ -62,7 +62,7 @@ public void complete() { @Override public void setEntityAndEntityType(String name, E entity, EntityType entityType) { - entityHandler = new EntityHandler(name, entity, entityType); + entityHandler = new EntityHandler<>(name, entity, entityType); } public void setNullExcluded(boolean nullExcluded) { @@ -86,7 +86,7 @@ protected EntityHandler(String name, E entity, EntityType entityType) { protected void preInsert() { SqlFilePreInsertContext context = - new SqlFilePreInsertContext(entityType, method, config); + new SqlFilePreInsertContext<>(entityType, method, config); entityType.preInsert(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); @@ -96,7 +96,7 @@ protected void preInsert() { protected void postInsert() { SqlFilePostInsertContext context = - new SqlFilePostInsertContext(entityType, method, config); + new SqlFilePostInsertContext<>(entityType, method, config); entityType.postInsert(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileModifyQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileModifyQuery.java index b893ce1d1..f9285eef8 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileModifyQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileModifyQuery.java @@ -26,7 +26,7 @@ public abstract class SqlFileModifyQuery extends AbstractQuery implements Modify protected String sqlFilePath; - protected final Map parameters = new LinkedHashMap(); + protected final Map parameters = new LinkedHashMap<>(); protected PreparedSql sql; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileUpdateQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileUpdateQuery.java index c187392a6..7cfc137be 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileUpdateQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileUpdateQuery.java @@ -107,7 +107,7 @@ public void complete() { @Override public void setEntityAndEntityType(String name, E entity, EntityType entityType) { - entityHandler = new EntityHandler(name, entity, entityType); + entityHandler = new EntityHandler<>(name, entity, entityType); } public void setNullExcluded(boolean nullExcluded) { @@ -150,7 +150,7 @@ protected EntityHandler(String name, E entity, EntityType entityType) { protected void init() { helper = - new UpdateQueryHelper( + new UpdateQueryHelper<>( config, entityType, includedPropertyNames, @@ -163,7 +163,7 @@ protected void init() { protected void preUpdate() { SqlFilePreUpdateContext context = - new SqlFilePreUpdateContext(entityType, method, config); + new SqlFilePreUpdateContext<>(entityType, method, config); entityType.preUpdate(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); @@ -181,7 +181,7 @@ protected boolean hasTargetPropertyTypes() { protected void postUpdate() { SqlFilePostUpdateContext context = - new SqlFilePostUpdateContext(entityType, method, config); + new SqlFilePostUpdateContext<>(entityType, method, config); entityType.postUpdate(entity, context); if (context.getNewEntity() != null) { entity = context.getNewEntity(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlModifyQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlModifyQuery.java index f51219796..d725c52cf 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlModifyQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlModifyQuery.java @@ -19,7 +19,7 @@ public abstract class SqlModifyQuery extends AbstractQuery implements ModifyQuer protected SqlNode sqlNode; - protected final Map parameters = new LinkedHashMap(); + protected final Map parameters = new LinkedHashMap<>(); protected PreparedSql sql; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlProcessorQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlProcessorQuery.java index 75ee299a2..316600e18 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlProcessorQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlProcessorQuery.java @@ -14,7 +14,7 @@ public class SqlProcessorQuery extends AbstractQuery { - protected final Map parameters = new HashMap(); + protected final Map parameters = new HashMap<>(); protected String sqlFilePath; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionContext.java index b528a538c..c9c849b7d 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionContext.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionContext.java @@ -13,9 +13,9 @@ /** A context for a local transaction. */ public class LocalTransactionContext { - private final List savepointNames = new ArrayList(); + private final List savepointNames = new ArrayList<>(); - private final Map savepointMap = new HashMap(); + private final Map savepointMap = new HashMap<>(); private LocalTransactionConnection localTxConnection; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSource.java b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSource.java index 8438c82f7..76c619cca 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSource.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSource.java @@ -20,8 +20,7 @@ */ public final class LocalTransactionDataSource implements DataSource { - private final ThreadLocal localTxContextHolder = - new ThreadLocal(); + private final ThreadLocal localTxContextHolder = new ThreadLocal<>(); private final DataSource dataSource; diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java index fbc74b272..e4e7cd884 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java @@ -124,8 +124,7 @@ public void testInvokeMethod_static_optionalInt_empty() throws Exception { public void testFindMethod() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = - evaluator.findMethod( - "add", new ArrayList(), ArrayList.class, new Class[] {Object.class}); + evaluator.findMethod("add", new ArrayList<>(), ArrayList.class, new Class[] {Object.class}); assertNotNull(method); assertEquals(Collection.class, method.getDeclaringClass()); } @@ -134,8 +133,7 @@ public void testFindMethod() throws Exception { public void testFindMethod_String_is_subtype_of_Object() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = - evaluator.findMethod( - "add", new ArrayList(), ArrayList.class, new Class[] {String.class}); + evaluator.findMethod("add", new ArrayList<>(), ArrayList.class, new Class[] {String.class}); assertNotNull(method); assertEquals(Collection.class, method.getDeclaringClass()); } @@ -144,8 +142,7 @@ public void testFindMethod_String_is_subtype_of_Object() throws Exception { public void testFindMethod_List_is_subtype_of_Object() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = - evaluator.findMethod( - "add", new ArrayList(), ArrayList.class, new Class[] {List.class}); + evaluator.findMethod("add", new ArrayList<>(), ArrayList.class, new Class[] {List.class}); assertNotNull(method); assertEquals(Collection.class, method.getDeclaringClass()); } @@ -155,7 +152,7 @@ public void testFindMethod_List_is_subtype_of_Collection() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = evaluator.findMethod( - "addAll", new ArrayList(), ArrayList.class, new Class[] {List.class}); + "addAll", new ArrayList<>(), ArrayList.class, new Class[] {List.class}); assertNotNull(method); assertEquals(Collection.class, method.getDeclaringClass()); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java index 7fd39b90e..986b43496 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java @@ -47,7 +47,7 @@ public void testHandle() throws Exception { query.prepare(); BasicResultListHandler handler = - new BasicResultListHandler(() -> new org.seasar.doma.wrapper.StringWrapper()); + new BasicResultListHandler<>(() -> new org.seasar.doma.wrapper.StringWrapper()); List results = handler.handle(resultSet, query, (i, next) -> {}).get(); assertEquals(2, results.size()); assertEquals("aaa", results.get(0)); @@ -73,7 +73,7 @@ public void testHandle_NonSingleColumnException() throws Exception { query.prepare(); BasicResultListHandler handler = - new BasicResultListHandler(() -> new org.seasar.doma.wrapper.StringWrapper()); + new BasicResultListHandler<>(() -> new org.seasar.doma.wrapper.StringWrapper()); try { handler.handle(resultSet, query, (i, next) -> {}); fail(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java index 2357fdfaa..3f15a7789 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java @@ -46,7 +46,7 @@ public void testHandle() throws Exception { query.prepare(); BasicSingleResultHandler handler = - new BasicSingleResultHandler(() -> new org.seasar.doma.wrapper.StringWrapper()); + new BasicSingleResultHandler<>(() -> new org.seasar.doma.wrapper.StringWrapper()); String result = handler.handle(resultSet, query, (i, next) -> {}).get(); assertEquals("aaa", result); } @@ -69,7 +69,7 @@ public void testHandle_NonUniqueResultException() throws Exception { query.prepare(); BasicSingleResultHandler handler = - new BasicSingleResultHandler(() -> new org.seasar.doma.wrapper.StringWrapper()); + new BasicSingleResultHandler<>(() -> new org.seasar.doma.wrapper.StringWrapper()); try { handler.handle(resultSet, query, (i, next) -> {}); fail(); @@ -95,7 +95,7 @@ public void testHandle_NonSingleColumnException() throws Exception { query.prepare(); BasicSingleResultHandler handler = - new BasicSingleResultHandler(() -> new org.seasar.doma.wrapper.StringWrapper()); + new BasicSingleResultHandler<>(() -> new org.seasar.doma.wrapper.StringWrapper()); try { handler.handle(resultSet, query, (i, next) -> {}); fail(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterBinderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterBinderTest.java index 151e71a29..359e915eb 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterBinderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterBinderTest.java @@ -31,17 +31,15 @@ public void testBind() throws Exception { List parameters = new ArrayList<>(); parameters.add( - new BasicSingleResultParameter( - () -> new org.seasar.doma.wrapper.IntegerWrapper())); + new BasicSingleResultParameter<>(() -> new org.seasar.doma.wrapper.IntegerWrapper())); + parameters.add(new BasicInParameter<>(() -> new org.seasar.doma.wrapper.StringWrapper("aaa"))); parameters.add( - new BasicInParameter(() -> new org.seasar.doma.wrapper.StringWrapper("aaa"))); - parameters.add( - new BasicInOutParameter( + new BasicInOutParameter<>( () -> new org.seasar.doma.wrapper.BigDecimalWrapper(), - new Reference(new BigDecimal(10)))); + new Reference<>(new BigDecimal(10)))); parameters.add( - new BasicOutParameter( - () -> new org.seasar.doma.wrapper.StringWrapper("bbb"), new Reference())); + new BasicOutParameter<>( + () -> new org.seasar.doma.wrapper.StringWrapper("bbb"), new Reference<>())); CallableSqlParameterBinder binder = new CallableSqlParameterBinder(new MyQuery()); binder.bind(callableStatement, parameters); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java index 9ca53933f..b35fef6cb 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java @@ -47,7 +47,7 @@ public void testHandle() throws Exception { query.prepare(); DomainResultListHandler handler = - new DomainResultListHandler(_PhoneNumber.getSingletonInternal()); + new DomainResultListHandler<>(_PhoneNumber.getSingletonInternal()); List results = handler.handle(resultSet, query, (i, next) -> {}).get(); assertEquals(2, results.size()); assertEquals("01-2345-6789", results.get(0).getValue()); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java index 679f734b5..6cc5a63ec 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java @@ -47,7 +47,7 @@ public void testHandle() throws Exception { query.prepare(); DomainSingleResultHandler handler = - new DomainSingleResultHandler(_PhoneNumber.getSingletonInternal()); + new DomainSingleResultHandler<>(_PhoneNumber.getSingletonInternal()); PhoneNumber result = handler.handle(resultSet, query, (i, next) -> {}).get(); assertEquals("01-2345-6789", result.getValue()); } @@ -70,7 +70,7 @@ public void testHandle_NonUniqueResultException() throws Exception { query.prepare(); DomainSingleResultHandler handler = - new DomainSingleResultHandler(_PhoneNumber.getSingletonInternal()); + new DomainSingleResultHandler<>(_PhoneNumber.getSingletonInternal()); try { handler.handle(resultSet, query, (i, next) -> {}); fail(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java index fa0873109..7e017e035 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java @@ -48,7 +48,7 @@ public void testHandle() throws Exception { query.prepare(); EntityResultListHandler handler = - new EntityResultListHandler(_Emp.getSingletonInternal()); + new EntityResultListHandler<>(_Emp.getSingletonInternal()); List entities = handler.handle(resultSet, query, (i, next) -> {}).get(); assertEquals(2, entities.size()); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java index 672c7f172..a16593482 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java @@ -48,7 +48,7 @@ public void testHandle() throws Exception { query.prepare(); EntitySingleResultHandler handler = - new EntitySingleResultHandler(_Emp.getSingletonInternal()); + new EntitySingleResultHandler<>(_Emp.getSingletonInternal()); Emp emp = handler.handle(resultSet, query, (i, next) -> {}).get(); assertEquals(1, emp.getId()); assertEquals("aaa", emp.getName()); @@ -73,7 +73,7 @@ public void testHandle_NonUniqueResultException() throws Exception { query.prepare(); EntitySingleResultHandler handler = - new EntitySingleResultHandler(_Emp.getSingletonInternal()); + new EntitySingleResultHandler<>(_Emp.getSingletonInternal()); try { handler.handle(resultSet, query, (i, next) -> {}); fail(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/PreparedSqlParameterBinderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/PreparedSqlParameterBinderTest.java index 6c96f569a..cc7768bd5 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/PreparedSqlParameterBinderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/PreparedSqlParameterBinderTest.java @@ -22,11 +22,10 @@ public class PreparedSqlParameterBinderTest { @Test public void testBind() throws Exception { MockPreparedStatement preparedStatement = new MockPreparedStatement(); - List> parameters = new ArrayList>(); + List> parameters = new ArrayList<>(); + parameters.add(new BasicInParameter<>(() -> new org.seasar.doma.wrapper.StringWrapper("aaa"))); parameters.add( - new BasicInParameter(() -> new org.seasar.doma.wrapper.StringWrapper("aaa"))); - parameters.add( - new BasicInParameter( + new BasicInParameter<>( () -> new org.seasar.doma.wrapper.BigDecimalWrapper(new BigDecimal(10)))); PreparedSqlParameterBinder binder = new PreparedSqlParameterBinder(new MyQuery()); binder.bind(preparedStatement, parameters); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java index 5be0d246c..bc5269cae 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java @@ -35,7 +35,7 @@ public void testBasic() throws Exception { ScalarProvider provider = new ScalarProvider<>( () -> - new org.seasar.doma.internal.jdbc.scalar.BasicScalar( + new org.seasar.doma.internal.jdbc.scalar.BasicScalar<>( () -> new org.seasar.doma.wrapper.StringWrapper()), new MySelectQuery()); String result = provider.get(resultSet); @@ -54,7 +54,7 @@ public void testOptionalBasic() throws Exception { ScalarProvider> provider = new ScalarProvider<>( () -> - new org.seasar.doma.internal.jdbc.scalar.OptionalBasicScalar( + new org.seasar.doma.internal.jdbc.scalar.OptionalBasicScalar<>( () -> new org.seasar.doma.wrapper.StringWrapper()), new MySelectQuery()); Optional result = provider.get(resultSet); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilderTest.java index 6bba6f5a0..e0adb0db0 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilderTest.java @@ -27,11 +27,11 @@ public void testAppend() throws Exception { new PreparedSqlBuilder(config, SqlKind.SELECT, SqlLogType.FORMATTED); builder.appendSql("select * from aaa where name = "); Wrapper stringWrapper = new StringWrapper("hoge"); - builder.appendParameter(new BasicInParameter(() -> stringWrapper)); + builder.appendParameter(new BasicInParameter<>(() -> stringWrapper)); builder.appendSql(" and salary = "); Wrapper bigDecimalWrapper = new BigDecimalWrapper(new BigDecimal(100)); - builder.appendParameter(new BasicInParameter(() -> bigDecimalWrapper)); + builder.appendParameter(new BasicInParameter<>(() -> bigDecimalWrapper)); PreparedSql sql = builder.build(Function.identity()); assertEquals("select * from aaa where name = ? and salary = ?", sql.toString()); } @@ -44,8 +44,7 @@ public void testAppendParameter_domain() throws Exception { DomainType phoneNumberType = DomainTypeFactory.getDomainType(PhoneNumber.class, new ClassHelper() {}); PhoneNumber phoneNumber = new PhoneNumber("03-1234-5678"); - builder.appendParameter( - new DomainInParameter(phoneNumberType, phoneNumber)); + builder.appendParameter(new DomainInParameter<>(phoneNumberType, phoneNumber)); PreparedSql sql = builder.build(Function.identity()); assertEquals("select * from aaa where phoneNumber = ?", sql.toString()); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java index 36feee06f..539e640dd 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java @@ -682,7 +682,7 @@ public void testUpdate() throws Exception { @Test public void testFor() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add("aaa"); list.add("bbb"); list.add("ccc"); @@ -731,7 +731,7 @@ public void testFor_array() throws Exception { @Test public void testFor_removeWhere() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); evaluator.add("names", new Value(List.class, list)); String testSql = "select * from aaa where /*%for n : names*/name = /*n*/'a' /*%if n_has_next */or /*%end*//*%end*/"; @@ -749,7 +749,7 @@ public void testFor_removeWhere() throws Exception { @Test public void testFor_removeOrderBy() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); evaluator.add("names", new Value(List.class, list)); String testSql = "select * from aaa order by /*%for n : names*/name = /*n*/'a' /*%if n_has_next */, /*%end*//*%end*/"; @@ -767,7 +767,7 @@ public void testFor_removeOrderBy() throws Exception { @Test public void testFor_removeGroupBy() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); evaluator.add("names", new Value(List.class, list)); String testSql = "select * from aaa group by /*%for n : names*/name = /*n*/'a' /*%if n_has_next */, /*%end*//*%end*/"; @@ -785,7 +785,7 @@ public void testFor_removeGroupBy() throws Exception { @Test public void testFor_removeOr() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); evaluator.add("names", new Value(List.class, list)); String testSql = "select * from aaa where /*%for n : names*/name = /*n*/'a' /*%if n_has_next */or /*%end*//*%end*/ or salary > 100"; @@ -803,7 +803,7 @@ public void testFor_removeOr() throws Exception { @Test public void testFor_index() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add("aaa"); list.add("bbb"); list.add("ccc"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java index 67467e9ae..dbb0da2cd 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java @@ -242,7 +242,7 @@ public void testHashMap() throws Exception { @Test public void testEmptyList() throws Exception { MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp"); - List> employees = new ArrayList>(); + List> employees = new ArrayList<>(); try { builder.execute(employees); } catch (JdbcException e) { diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java index 3da67c1a6..2f1b3279b 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java @@ -36,7 +36,7 @@ public void testExecute() throws Exception { emp2.setName("foo"); emp2.setVersion(20); - AutoBatchDeleteQuery query = new AutoBatchDeleteQuery(_Emp.getSingletonInternal()); + AutoBatchDeleteQuery query = new AutoBatchDeleteQuery<>(_Emp.getSingletonInternal()); query.setMethod(getClass().getDeclaredMethod(method.getName())); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java index 8247466d3..5e83915e7 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java @@ -27,7 +27,7 @@ public void testExecute(TestInfo testInfo) throws Exception { emp2.setName("foo"); emp2.setVersion(20); - AutoBatchInsertQuery query = new AutoBatchInsertQuery(_Emp.getSingletonInternal()); + AutoBatchInsertQuery query = new AutoBatchInsertQuery<>(_Emp.getSingletonInternal()); query.setMethod(testInfo.getTestMethod().get()); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java index 98b5d3a44..1e099b33e 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java @@ -38,7 +38,7 @@ public void testExecute() throws Exception { emp2.setName("foo"); emp2.setVersion(20); - AutoBatchUpdateQuery query = new AutoBatchUpdateQuery(_Emp.getSingletonInternal()); + AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); @@ -66,7 +66,7 @@ public void testExecute_throwsOptimisticLockException() throws Exception { runtimeConfig.dataSource.connection.preparedStatement.updatedRows = 0; - AutoBatchUpdateQuery query = new AutoBatchUpdateQuery(_Emp.getSingletonInternal()); + AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp)); @@ -91,7 +91,7 @@ public void testExecute_suppressesOptimisticLockException() throws Exception { runtimeConfig.dataSource.connection.preparedStatement.updatedRows = 0; - AutoBatchUpdateQuery query = new AutoBatchUpdateQuery(_Emp.getSingletonInternal()); + AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp)); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java index 8c9075625..56a604a0c 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java @@ -38,7 +38,7 @@ public void testExecute() throws Exception { emp.setSalary(new BigDecimal(1000)); emp.setVersion(10); - AutoDeleteQuery query = new AutoDeleteQuery(_Emp.getSingletonInternal()); + AutoDeleteQuery query = new AutoDeleteQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -69,7 +69,7 @@ public void testExecute_throwsOptimisticLockException() throws Exception { MockPreparedStatement ps = new MockPreparedStatement(); ps.updatedRows = 0; runtimeConfig.dataSource.connection = new MockConnection(ps); - AutoDeleteQuery query = new AutoDeleteQuery(_Emp.getSingletonInternal()); + AutoDeleteQuery query = new AutoDeleteQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -92,7 +92,7 @@ public void testExecute_suppressesOptimisticLockException() throws Exception { emp.setName("aaa"); emp.setVersion(100); - AutoDeleteQuery query = new AutoDeleteQuery(_Emp.getSingletonInternal()); + AutoDeleteQuery query = new AutoDeleteQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java index e027cd0ce..02368af68 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java @@ -32,22 +32,21 @@ public void testExecute() throws Exception { IntegerWrapper bbb = new IntegerWrapper(50); IntegerWrapper ccc = new IntegerWrapper(60); - AutoFunctionQuery query = new AutoFunctionQuery(); + AutoFunctionQuery query = new AutoFunctionQuery<>(); query.setConfig(runtimeConfig); query.setCatalogName("xxx"); query.setSchemaName("yyy"); query.setFunctionName("aaa"); query.setResultParameter( - new BasicSingleResultParameter( - () -> new org.seasar.doma.wrapper.IntegerWrapper())); - query.addParameter(new BasicInParameter(() -> aaa)); - query.addParameter(new BasicOutParameter(() -> bbb, new Reference())); - query.addParameter(new BasicInOutParameter(() -> ccc, new Reference())); + new BasicSingleResultParameter<>(() -> new org.seasar.doma.wrapper.IntegerWrapper())); + query.addParameter(new BasicInParameter<>(() -> aaa)); + query.addParameter(new BasicOutParameter<>(() -> bbb, new Reference<>())); + query.addParameter(new BasicInOutParameter<>(() -> ccc, new Reference<>())); query.setCallerClassName("aaa"); query.setCallerMethodName("bbb"); query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - Integer result = new FunctionCommand(query).execute(); + Integer result = new FunctionCommand<>(query).execute(); query.complete(); assertNotNull(result); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java index 25f270233..50d4f9b08 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java @@ -34,7 +34,7 @@ public void testExecute() throws Exception { emp.setSalary(new BigDecimal(1000)); emp.setVersion(10); - AutoInsertQuery query = new AutoInsertQuery(_Emp.getSingletonInternal()); + AutoInsertQuery query = new AutoInsertQuery<>(_Emp.getSingletonInternal()); query.setMethod(getClass().getDeclaredMethod(method.getName())); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -64,7 +64,7 @@ public void testExecute_defaultVersion() throws Exception { emp.setSalary(new BigDecimal(1000)); emp.setVersion(null); - AutoInsertQuery query = new AutoInsertQuery(_Emp.getSingletonInternal()); + AutoInsertQuery query = new AutoInsertQuery<>(_Emp.getSingletonInternal()); query.setMethod(getClass().getDeclaredMethod(method.getName())); query.setConfig(runtimeConfig); query.setEntity(emp); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java index 43e329844..1afbbedc1 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java @@ -67,8 +67,7 @@ public void testExecute_singleResult() throws Exception { query.prepare(); SelectCommand command = - new SelectCommand( - query, new EntitySingleResultHandler(_Emp.getSingletonInternal())); + new SelectCommand<>(query, new EntitySingleResultHandler<>(_Emp.getSingletonInternal())); Emp entity = command.execute(); query.complete(); @@ -111,8 +110,7 @@ public void testExecute_resultList() throws Exception { query.prepare(); SelectCommand> command = - new SelectCommand>( - query, new EntityResultListHandler(_Emp.getSingletonInternal())); + new SelectCommand<>(query, new EntityResultListHandler<>(_Emp.getSingletonInternal())); List entities = command.execute(); query.complete(); @@ -164,8 +162,7 @@ public void testExecute_NoResultException() throws Exception { query.prepare(); SelectCommand command = - new SelectCommand( - query, new EntitySingleResultHandler(_Emp.getSingletonInternal())); + new SelectCommand<>(query, new EntitySingleResultHandler<>(_Emp.getSingletonInternal())); try { command.execute(); fail(); @@ -199,10 +196,8 @@ public void testExecute_resultStream() throws Exception { query.prepare(); SelectCommand> command = - new SelectCommand>( - query, - new EntityStreamHandler>( - _Emp.getSingletonInternal(), Function.identity())); + new SelectCommand<>( + query, new EntityStreamHandler<>(_Emp.getSingletonInternal(), Function.identity())); try (Stream stream = command.execute()) { query.complete(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java index b0d37a31f..556e064cf 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java @@ -36,7 +36,7 @@ public void testExecute() throws Exception { emp.setVersion(10); emp.originalStates = new Emp(); - AutoUpdateQuery query = new AutoUpdateQuery(_Emp.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(getClass().getDeclaredMethod(method.getName())); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -68,7 +68,7 @@ public void testExecute_throwsOptimisticLockException() throws Exception { runtimeConfig.dataSource.connection.preparedStatement.updatedRows = 0; - AutoUpdateQuery query = new AutoUpdateQuery(_Emp.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(getClass().getDeclaredMethod(method.getName())); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -93,7 +93,7 @@ public void testExecute_suppressesOptimisticLockException() throws Exception { runtimeConfig.dataSource.connection.preparedStatement.updatedRows = 0; - AutoUpdateQuery query = new AutoUpdateQuery(_Emp.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(getClass().getDeclaredMethod(method.getName())); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -120,7 +120,7 @@ public void testExecute_OriginalStates() throws Exception { emp.originalStates = states; - AutoUpdateQuery query = new AutoUpdateQuery(_Emp.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(getClass().getDeclaredMethod(method.getName())); query.setConfig(runtimeConfig); query.setEntity(emp); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessorTest.java index 27414663c..bed952663 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessorTest.java @@ -12,7 +12,7 @@ public void testGet() throws Exception { Hoge hoge = new Hoge(); hoge.setOriginalStates(states); OriginalStatesAccessor accessor = - new OriginalStatesAccessor(Hoge.class, "originalStates"); + new OriginalStatesAccessor<>(Hoge.class, "originalStates"); assertSame(states, accessor.get(hoge)); } @@ -21,7 +21,7 @@ public void testSet() throws Exception { Hoge states = new Hoge(); Hoge hoge = new Hoge(); OriginalStatesAccessor accessor = - new OriginalStatesAccessor(Hoge.class, "originalStates"); + new OriginalStatesAccessor<>(Hoge.class, "originalStates"); accessor.set(hoge, states); assertSame(states, hoge.getOriginalStates()); } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinTableIdGeneratorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinTableIdGeneratorTest.java index 684924f04..fec5558dc 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinTableIdGeneratorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinTableIdGeneratorTest.java @@ -24,7 +24,7 @@ public void test() throws Exception { MockConnection connection2 = new MockConnection(); MockResultSet resultSet2 = connection2.preparedStatement.resultSet; resultSet2.rows.add(new RowData(11L)); - final LinkedList connections = new LinkedList(); + final LinkedList connections = new LinkedList<>(); connections.add(connection); connections.add(connection2); config.dataSource = diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java index 27748fc07..96bc9be24 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java @@ -40,7 +40,7 @@ public void testPrepare() throws Exception { emp2.setId(20); emp2.setName("bbb"); - AutoBatchDeleteQuery query = new AutoBatchDeleteQuery(_Emp.getSingletonInternal()); + AutoBatchDeleteQuery query = new AutoBatchDeleteQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); @@ -64,7 +64,7 @@ public void testOption_default() throws Exception { emp2.setSalary(new BigDecimal(2000)); emp2.setVersion(10); - AutoBatchDeleteQuery query = new AutoBatchDeleteQuery(_Emp.getSingletonInternal()); + AutoBatchDeleteQuery query = new AutoBatchDeleteQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); @@ -99,7 +99,7 @@ public void testOption_ignoreVersion() throws Exception { emp2.setSalary(new BigDecimal(2000)); emp2.setVersion(10); - AutoBatchDeleteQuery query = new AutoBatchDeleteQuery(_Emp.getSingletonInternal()); + AutoBatchDeleteQuery query = new AutoBatchDeleteQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); @@ -135,7 +135,7 @@ public void testTenantId() throws Exception { emp2.setVersion(2); AutoBatchDeleteQuery query = - new AutoBatchDeleteQuery(_Salesman.getSingletonInternal()); + new AutoBatchDeleteQuery<>(_Salesman.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java index 4ae0a7885..5d825a4dd 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java @@ -39,7 +39,7 @@ public void testPrepare() throws Exception { emp2.setId(20); emp2.setName("bbb"); - AutoBatchInsertQuery query = new AutoBatchInsertQuery(_Emp.getSingletonInternal()); + AutoBatchInsertQuery query = new AutoBatchInsertQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setCallerClassName("aaa"); @@ -64,7 +64,7 @@ public void testOption_default() throws Exception { emp2.setSalary(new BigDecimal(2000)); emp2.setVersion(10); - AutoBatchInsertQuery query = new AutoBatchInsertQuery(_Emp.getSingletonInternal()); + AutoBatchInsertQuery query = new AutoBatchInsertQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setCallerClassName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java index 287878792..a15aec99a 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java @@ -45,7 +45,7 @@ public void testPrepare() throws Exception { emp2.setName("bbb"); emp2.setVersion(200); - AutoBatchUpdateQuery query = new AutoBatchUpdateQuery(_Emp.getSingletonInternal()); + AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); @@ -70,7 +70,7 @@ public void testOption_default() throws Exception { emp2.setSalary(new BigDecimal(2000)); emp2.setVersion(200); - AutoBatchUpdateQuery query = new AutoBatchUpdateQuery(_Emp.getSingletonInternal()); + AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); @@ -116,7 +116,7 @@ public void testOption_ignoreVersion() throws Exception { emp2.setSalary(new BigDecimal(2000)); emp2.setVersion(200); - AutoBatchUpdateQuery query = new AutoBatchUpdateQuery(_Emp.getSingletonInternal()); + AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); @@ -157,7 +157,7 @@ public void testOption_include() throws Exception { emp2.setId(20); emp2.setVersion(200); - AutoBatchUpdateQuery query = new AutoBatchUpdateQuery(_Emp.getSingletonInternal()); + AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); @@ -200,7 +200,7 @@ public void testOption_exclude() throws Exception { emp2.setId(20); emp2.setVersion(200); - AutoBatchUpdateQuery query = new AutoBatchUpdateQuery(_Emp.getSingletonInternal()); + AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(emp1, emp2)); @@ -233,7 +233,7 @@ public void testOption_exclude() throws Exception { @Test public void testIsExecutable() throws Exception { - AutoBatchUpdateQuery query = new AutoBatchUpdateQuery(_Emp.getSingletonInternal()); + AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setCallerClassName("aaa"); @@ -258,7 +258,7 @@ public void testTenantId() throws Exception { s2.setVersion(200); AutoBatchUpdateQuery query = - new AutoBatchUpdateQuery(_Salesman.getSingletonInternal()); + new AutoBatchUpdateQuery<>(_Salesman.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntities(Arrays.asList(s1, s2)); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java index ed78bc3d0..36a85f6c4 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java @@ -32,7 +32,7 @@ protected void setUp(TestInfo testInfo) throws Exception { public void testPrepare() throws Exception { Emp emp = new Emp(); - AutoDeleteQuery query = new AutoDeleteQuery(_Emp.getSingletonInternal()); + AutoDeleteQuery query = new AutoDeleteQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -52,7 +52,7 @@ public void testOption_default() throws Exception { emp.setName("aaa"); emp.setVersion(100); - AutoDeleteQuery query = new AutoDeleteQuery(_Emp.getSingletonInternal()); + AutoDeleteQuery query = new AutoDeleteQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -76,7 +76,7 @@ public void testOption_ignoreVersion() throws Exception { emp.setName("aaa"); emp.setVersion(100); - AutoDeleteQuery query = new AutoDeleteQuery(_Emp.getSingletonInternal()); + AutoDeleteQuery query = new AutoDeleteQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -101,8 +101,7 @@ public void testTenantId() throws Exception { salesman.setTenantId("bbb"); salesman.setVersion(100); - AutoDeleteQuery query = - new AutoDeleteQuery(_Salesman.getSingletonInternal()); + AutoDeleteQuery query = new AutoDeleteQuery<>(_Salesman.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(salesman); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java index c730a81e0..fe6898cff 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java @@ -13,12 +13,11 @@ public class AutoFunctionQueryTest { @Test public void testPrepare() throws Exception { - AutoFunctionQuery query = new AutoFunctionQuery(); + AutoFunctionQuery query = new AutoFunctionQuery<>(); query.setConfig(runtimeConfig); query.setFunctionName("aaa"); query.setResultParameter( - new BasicSingleResultParameter( - () -> new org.seasar.doma.wrapper.IntegerWrapper())); + new BasicSingleResultParameter<>(() -> new org.seasar.doma.wrapper.IntegerWrapper())); query.setCallerClassName("aaa"); query.setCallerMethodName("bbb"); query.setSqlLogType(SqlLogType.FORMATTED); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java index 645b27cc3..f1470b762 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java @@ -34,7 +34,7 @@ public void testPrepare() throws Exception { emp.setId(10); emp.setName("aaa"); - AutoInsertQuery query = new AutoInsertQuery(_Emp.getSingletonInternal()); + AutoInsertQuery query = new AutoInsertQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -53,7 +53,7 @@ public void testOption_default() throws Exception { emp.setId(10); emp.setName("aaa"); - AutoInsertQuery query = new AutoInsertQuery(_Emp.getSingletonInternal()); + AutoInsertQuery query = new AutoInsertQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -79,7 +79,7 @@ public void testOption_excludeNull() throws Exception { emp.setId(10); emp.setName("aaa"); - AutoInsertQuery query = new AutoInsertQuery(_Emp.getSingletonInternal()); + AutoInsertQuery query = new AutoInsertQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -105,7 +105,7 @@ public void testOption_include() throws Exception { emp.setName("aaa"); emp.setSalary(new BigDecimal(200)); - AutoInsertQuery query = new AutoInsertQuery(_Emp.getSingletonInternal()); + AutoInsertQuery query = new AutoInsertQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -131,7 +131,7 @@ public void testOption_exclude() throws Exception { emp.setName("aaa"); emp.setSalary(new BigDecimal(200)); - AutoInsertQuery query = new AutoInsertQuery(_Emp.getSingletonInternal()); + AutoInsertQuery query = new AutoInsertQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java index 139c82581..a929d56b9 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java @@ -38,7 +38,7 @@ public void testPrepare() throws Exception { emp.setName("aaa"); emp.setVersion(100); - AutoUpdateQuery query = new AutoUpdateQuery(_Emp.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -59,7 +59,7 @@ public void testOption_default() throws Exception { emp.setVersion(100); emp.originalStates = new Emp(); - AutoUpdateQuery query = new AutoUpdateQuery(_Emp.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -86,7 +86,7 @@ public void testOption_excludeNull() throws Exception { emp.setId(10); emp.setVersion(100); - AutoUpdateQuery query = new AutoUpdateQuery(_Emp.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -113,7 +113,7 @@ public void testOption_ignoreVersion() throws Exception { emp.setVersion(100); emp.originalStates = new Emp(); - AutoUpdateQuery query = new AutoUpdateQuery(_Emp.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -140,7 +140,7 @@ public void testOption_include() throws Exception { emp.setSalary(new BigDecimal(200)); emp.setVersion(100); - AutoUpdateQuery query = new AutoUpdateQuery(_Emp.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -169,7 +169,7 @@ public void testOption_exclude() throws Exception { emp.setSalary(new BigDecimal(200)); emp.setVersion(100); - AutoUpdateQuery query = new AutoUpdateQuery(_Emp.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -195,7 +195,7 @@ public void testIsExecutable() throws Exception { Emp emp = new Emp(); emp.originalStates = new Emp(); - AutoUpdateQuery query = new AutoUpdateQuery(_Emp.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(emp); @@ -215,8 +215,7 @@ public void testTenantId() throws Exception { salesman.setTenantId("bbb"); salesman.setVersion(100); - AutoUpdateQuery query = - new AutoUpdateQuery(_Salesman.getSingletonInternal()); + AutoUpdateQuery query = new AutoUpdateQuery<>(_Salesman.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); query.setEntity(salesman); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java index a361d6667..42829e890 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java @@ -38,7 +38,7 @@ public void testPrepare() throws Exception { emp2.setName("bbb"); emp2.setVersion(200); - SqlFileBatchDeleteQuery query = new SqlFileBatchDeleteQuery(Emp.class); + SqlFileBatchDeleteQuery query = new SqlFileBatchDeleteQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); query.setSqlFilePath(SqlFileUtil.buildPath(getClass().getName(), method.getName())); @@ -61,7 +61,7 @@ public void testOption_default() throws Exception { Emp emp2 = new Emp(); emp2.setName("bbb"); - SqlFileBatchDeleteQuery query = new SqlFileBatchDeleteQuery(Emp.class); + SqlFileBatchDeleteQuery query = new SqlFileBatchDeleteQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); query.setSqlFilePath(SqlFileUtil.buildPath(getClass().getName(), method.getName())); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java index cd1ff8927..31327f40f 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java @@ -40,7 +40,7 @@ public void testPrepare() throws Exception { emp2.setName("bbb"); emp2.setVersion(200); - SqlFileBatchInsertQuery query = new SqlFileBatchInsertQuery(Emp.class); + SqlFileBatchInsertQuery query = new SqlFileBatchInsertQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); query.setSqlFilePath(SqlFileUtil.buildPath(getClass().getName(), method.getName())); @@ -67,7 +67,7 @@ public void testOption_default() throws Exception { emp2.setSalary(new BigDecimal(2000)); emp2.setVersion(200); - SqlFileBatchInsertQuery query = new SqlFileBatchInsertQuery(Emp.class); + SqlFileBatchInsertQuery query = new SqlFileBatchInsertQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); query.setSqlFilePath(SqlFileUtil.buildPath(getClass().getName(), method.getName())); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java index 58cf2c698..b35b55487 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java @@ -44,7 +44,7 @@ public void testPrepare() throws Exception { emp2.setName("bbb"); emp2.setVersion(200); - SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery(Emp.class); + SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); query.setSqlFilePath(SqlFileUtil.buildPath(getClass().getName(), method.getName())); @@ -71,7 +71,7 @@ public void testOption_default() throws Exception { emp2.setSalary(new BigDecimal(2000)); emp2.setVersion(200); - SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery(Emp.class); + SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); query.setSqlFilePath(SqlFileUtil.buildPath(getClass().getName(), method.getName())); @@ -101,7 +101,7 @@ public void testOption_default() throws Exception { @Test public void testIsExecutable() throws Exception { - SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery(Emp.class); + SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); query.setSqlFilePath(SqlFileUtil.buildPath(getClass().getName(), method.getName())); @@ -125,7 +125,7 @@ public void testPopulate() throws Exception { emp2.setName("bbb"); emp2.setVersion(200); - SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery(Emp.class); + SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); query.setSqlFilePath(SqlFileUtil.buildPath(getClass().getName(), "testPopulate")); @@ -155,7 +155,7 @@ public void testPopulate_include() throws Exception { emp2.setName("bbb"); emp2.setVersion(200); - SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery(Emp.class); + SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); query.setSqlFilePath(SqlFileUtil.buildPath(getClass().getName(), "testPopulate")); @@ -185,7 +185,7 @@ public void testPopulate_exclude() throws Exception { emp2.setName("bbb"); emp2.setVersion(200); - SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery(Emp.class); + SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); query.setSqlFilePath(SqlFileUtil.buildPath(getClass().getName(), "testPopulate")); @@ -215,7 +215,7 @@ public void testPopulate_ignoreVersion() throws Exception { emp2.setName("bbb"); emp2.setVersion(200); - SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery(Emp.class); + SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); query.setSqlFilePath(SqlFileUtil.buildPath(getClass().getName(), "testPopulate")); From 541bf450fda34bd51636aa277cd8290f93ab471d Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:07:10 +0900 Subject: [PATCH 13/78] Collapse 'catch' blocks --- .../seasar/doma/internal/util/ClassUtil.java | 20 +++++-------------- .../doma/internal/util/ConstructorUtil.java | 11 ++++------ .../seasar/doma/internal/util/FieldUtil.java | 8 ++------ .../seasar/doma/internal/util/MethodUtil.java | 6 +----- .../doma/jdbc/domain/DomainTypeFactory.java | 4 ---- .../doma/jdbc/entity/EntityTypeFactory.java | 4 ---- 6 files changed, 12 insertions(+), 41 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java b/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java index b7bba5f61..528f7c4ee 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java @@ -16,9 +16,7 @@ public final class ClassUtil { public static T newInstance(Class clazz) throws WrapException { try { return clazz.newInstance(); - } catch (InstantiationException e) { - throw new WrapException(e); - } catch (IllegalAccessException e) { + } catch (InstantiationException | IllegalAccessException e) { throw new WrapException(e); } } @@ -27,9 +25,7 @@ public static Constructor getConstructor(Class clazz, Class... para throws WrapException { try { return clazz.getConstructor(parameterTypes); - } catch (SecurityException e) { - throw new WrapException(e); - } catch (NoSuchMethodException e) { + } catch (SecurityException | NoSuchMethodException e) { throw new WrapException(e); } } @@ -38,9 +34,7 @@ public static Method getMethod(Class clazz, String name, Class... para throws WrapException { try { return clazz.getMethod(name, parameterTypes); - } catch (SecurityException e) { - throw new WrapException(e); - } catch (NoSuchMethodException e) { + } catch (SecurityException | NoSuchMethodException e) { throw new WrapException(e); } } @@ -50,9 +44,7 @@ public static Method getDeclaredMethod( assertNotNull(clazz, name, parameterTypes); try { return clazz.getDeclaredMethod(name, parameterTypes); - } catch (SecurityException e) { - throw new WrapException(e); - } catch (NoSuchMethodException e) { + } catch (SecurityException | NoSuchMethodException e) { throw new WrapException(e); } } @@ -61,9 +53,7 @@ public static Field getDeclaredField(Class clazz, String name) throws Wra assertNotNull(clazz, name); try { return clazz.getDeclaredField(name); - } catch (SecurityException e) { - throw new WrapException(e); - } catch (NoSuchFieldException e) { + } catch (SecurityException | NoSuchFieldException e) { throw new WrapException(e); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/util/ConstructorUtil.java b/doma-core/src/main/java/org/seasar/doma/internal/util/ConstructorUtil.java index 1b5c56320..97bc86b4d 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/util/ConstructorUtil.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/util/ConstructorUtil.java @@ -10,13 +10,10 @@ public static T newInstance(Constructor constructor, Object... params) throws WrapException { try { return constructor.newInstance(params); - } catch (IllegalArgumentException e) { - throw new WrapException(e); - } catch (InstantiationException e) { - throw new WrapException(e); - } catch (IllegalAccessException e) { - throw new WrapException(e); - } catch (InvocationTargetException e) { + } catch (IllegalArgumentException + | InvocationTargetException + | IllegalAccessException + | InstantiationException e) { throw new WrapException(e); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/util/FieldUtil.java b/doma-core/src/main/java/org/seasar/doma/internal/util/FieldUtil.java index be02a1b1e..282ddc238 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/util/FieldUtil.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/util/FieldUtil.java @@ -12,9 +12,7 @@ public static Object get(Field field, Object target) throws WrapException { assertNotNull(field); try { return field.get(target); - } catch (IllegalArgumentException e) { - throw new WrapException(e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new WrapException(e); } } @@ -23,9 +21,7 @@ public static void set(Field field, Object target, Object value) throws WrapExce assertNotNull(field); try { field.set(target, value); - } catch (IllegalArgumentException e) { - throw new WrapException(e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new WrapException(e); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/util/MethodUtil.java b/doma-core/src/main/java/org/seasar/doma/internal/util/MethodUtil.java index c79de791f..1824450fc 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/util/MethodUtil.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/util/MethodUtil.java @@ -14,11 +14,7 @@ public static T invoke(Method method, Object target, Object... params) throw @SuppressWarnings("unchecked") T result = (T) method.invoke(target, params); return result; - } catch (IllegalArgumentException e) { - throw new WrapException(e); - } catch (IllegalAccessException e) { - throw new WrapException(e); - } catch (InvocationTargetException e) { + } catch (IllegalArgumentException | InvocationTargetException | IllegalAccessException e) { throw new WrapException(e); } } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/domain/DomainTypeFactory.java b/doma-core/src/main/java/org/seasar/doma/jdbc/domain/DomainTypeFactory.java index 7d2ab93f9..9fb5161b5 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/domain/DomainTypeFactory.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/domain/DomainTypeFactory.java @@ -117,8 +117,6 @@ public static DomainType getExternalDomainType( try { Method method = ClassUtil.getMethod(clazz, "getSingletonInternal"); return MethodUtil.invoke(method, null); - } catch (WrapException e) { - return null; } catch (Exception e) { return null; } @@ -128,8 +126,6 @@ private static Class loadExternalDomainDescClass(String domainName, ClassHelp String domainTypeClassName = ClassNames.newExternalDomainTypeClassName(domainName).toString(); try { return classHelper.forName(domainTypeClassName); - } catch (WrapException e) { - return null; } catch (Exception e) { return null; } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/EntityTypeFactory.java b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/EntityTypeFactory.java index 6f21c3c7d..c85b86462 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/EntityTypeFactory.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/EntityTypeFactory.java @@ -5,7 +5,6 @@ import org.seasar.doma.DomaNullPointerException; import org.seasar.doma.Entity; import org.seasar.doma.internal.ClassNames; -import org.seasar.doma.internal.WrapException; import org.seasar.doma.internal.util.ClassUtil; import org.seasar.doma.internal.util.MethodUtil; import org.seasar.doma.jdbc.ClassHelper; @@ -43,9 +42,6 @@ public static EntityType getEntityType(Class entityClass, ClassHelper Class clazz = classHelper.forName(entityTypeClassName); Method method = ClassUtil.getMethod(clazz, "getSingletonInternal"); return MethodUtil.invoke(method, null); - } catch (WrapException e) { - throw new EntityTypeNotFoundException( - e.getCause(), entityClass.getName(), entityTypeClassName); } catch (Exception e) { throw new EntityTypeNotFoundException( e.getCause(), entityClass.getName(), entityTypeClassName); From 0557a18662cc801179a6632bf1bd09a4d4539faa Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:09:14 +0900 Subject: [PATCH 14/78] Replace with 'contains()' --- .../seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java index 6a4f9e805..75c1bf4f6 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java @@ -296,7 +296,7 @@ public Void visitEmbeddedVariableNode(EmbeddedVariableNode node, Context p) { location.getPosition(), node.getVariableName()); } - if (fragment.indexOf("--") > -1) { + if (fragment.contains("--")) { throw new JdbcException( Message.DOMA2122, location.getSql(), @@ -304,7 +304,7 @@ public Void visitEmbeddedVariableNode(EmbeddedVariableNode node, Context p) { location.getPosition(), node.getVariableName()); } - if (fragment.indexOf("/*") > -1) { + if (fragment.contains("/*")) { throw new JdbcException( Message.DOMA2123, location.getSql(), From c2547c0cc817a8a156a1e3820e2857282e95c216 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:12:03 +0900 Subject: [PATCH 15/78] Replace with lambda --- .../internal/jdbc/sql/NodePreparedSqlBuilder.java | 14 ++++---------- .../doma/jdbc/id/BuiltinTableIdGenerator.java | 10 +++------- .../doma/internal/jdbc/dao/DaoImplSupportTest.java | 10 +--------- .../org/seasar/doma/internal/util/IOUtilTest.java | 9 ++------- 4 files changed, 10 insertions(+), 33 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java index 75c1bf4f6..59272174e 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java @@ -116,11 +116,8 @@ public NodePreparedSqlBuilder( sqlFilePath, evaluator, sqlLogType, - new Function>() { - @Override - public List apply(ExpandNode node) { - throw new UnsupportedOperationException(); - } + node -> { + throw new UnsupportedOperationException(); }); } @@ -138,11 +135,8 @@ public NodePreparedSqlBuilder( evaluator, sqlLogType, columnsExpander, - new BiConsumer() { - @Override - public void accept(PopulateNode node, SqlContext context) { - throw new UnsupportedOperationException(); - } + (node, context) -> { + throw new UnsupportedOperationException(); }); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java b/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java index 81cc60ae1..4fac4f127 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java @@ -156,13 +156,9 @@ protected long getNewInitialValue(final IdGenerationConfig config) { try { Long value = controller.requiresNew( - new RequiresNewController.Callback() { - - @Override - public Long execute() { - updateId(config, updateSql); - return selectId(config, selectSql); - } + () -> { + updateId(config, updateSql); + return selectId(config, selectSql); }); return value - allocationSize; } catch (Throwable t) { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java index 54b3b0acc..aa5051c53 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java @@ -4,7 +4,6 @@ import static org.junit.jupiter.api.Assertions.fail; import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.sql.Connection; import javax.sql.DataSource; @@ -77,14 +76,7 @@ public void testConstructorParameter5() throws Exception { private T mock(Class aClass) { ClassLoader loader = Thread.currentThread().getContextClassLoader(); Class[] interfaces = {aClass}; - InvocationHandler h = - new InvocationHandler() { - - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - return null; - } - }; + InvocationHandler h = (proxy, method, args) -> null; Object proxy = Proxy.newProxyInstance(loader, interfaces, h); return aClass.cast(proxy); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/util/IOUtilTest.java b/doma-core/src/test/java/org/seasar/doma/internal/util/IOUtilTest.java index 2591d72a2..bb3619e43 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/util/IOUtilTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/util/IOUtilTest.java @@ -3,7 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.Closeable; import java.io.File; import java.io.IOException; import org.junit.jupiter.api.Test; @@ -13,12 +12,8 @@ public class IOUtilTest { @Test public void test() throws Exception { IOUtil.close( - new Closeable() { - - @Override - public void close() throws IOException { - throw new IOException(); - } + () -> { + throw new IOException(); }); } From 7613d12077f3d3eef65fa2ed40d70fefe566aef3 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:13:53 +0900 Subject: [PATCH 16/78] Replace lambda with method reference --- .../jdbc/command/DomainCollectorHandler.java | 2 +- .../jdbc/command/DomainResultListHandler.java | 2 +- .../jdbc/command/DomainSingleResultHandler.java | 2 +- .../internal/jdbc/command/DomainStreamHandler.java | 2 +- .../doma/internal/jdbc/command/MapProvider.java | 2 +- .../command/OptionalDomainCollectorHandler.java | 2 +- .../command/OptionalDomainResultListHandler.java | 2 +- .../command/OptionalDomainSingleResultHandler.java | 2 +- .../jdbc/command/OptionalDomainStreamHandler.java | 2 +- .../command/OptionalDoubleCollectorHandler.java | 2 +- .../command/OptionalDoubleResultListHandler.java | 2 +- .../command/OptionalDoubleSingleResultHandler.java | 2 +- .../jdbc/command/OptionalDoubleStreamHandler.java | 2 +- .../jdbc/command/OptionalIntCollectorHandler.java | 2 +- .../jdbc/command/OptionalIntResultListHandler.java | 2 +- .../command/OptionalIntSingleResultHandler.java | 2 +- .../jdbc/command/OptionalIntStreamHandler.java | 2 +- .../jdbc/command/OptionalLongCollectorHandler.java | 2 +- .../command/OptionalLongResultListHandler.java | 2 +- .../command/OptionalLongSingleResultHandler.java | 2 +- .../jdbc/command/OptionalLongStreamHandler.java | 2 +- .../internal/jdbc/sql/DomainListParameter.java | 2 +- .../jdbc/sql/DomainResultListParameter.java | 2 +- .../jdbc/sql/OptionalDomainListParameter.java | 2 +- .../sql/OptionalDomainResultListParameter.java | 2 +- .../jdbc/sql/OptionalDoubleListParameter.java | 2 +- .../sql/OptionalDoubleResultListParameter.java | 2 +- .../jdbc/sql/OptionalIntListParameter.java | 2 +- .../jdbc/sql/OptionalIntResultListParameter.java | 2 +- .../jdbc/sql/OptionalLongListParameter.java | 2 +- .../jdbc/sql/OptionalLongResultListParameter.java | 2 +- .../org/seasar/doma/jdbc/AbstractJdbcLogger.java | 8 ++++---- .../doma/jdbc/entity/AbstractEntityType.java | 2 +- .../doma/jdbc/query/AbstractSelectQuery.java | 3 +-- .../java/__/org/seasar/doma/jdbc/domain/_Job.java | 3 ++- .../example/domain/_InternationalPhoneNumber.java | 3 ++- .../src/test/java/example/domain/_JobType.java | 3 ++- .../src/test/java/example/domain/_PhoneNumber.java | 3 ++- .../jdbc/command/BasicResultListHandlerTest.java | 7 +++---- .../jdbc/command/BasicSingleResultHandlerTest.java | 10 ++++------ .../command/CallableSqlParameterBinderTest.java | 9 ++++----- .../internal/jdbc/command/ScalarProviderTest.java | 12 +++++------- .../doma/jdbc/command/FunctionCommandTest.java | 3 +-- .../doma/jdbc/entity/DefaultPropertyTypeTest.java | 14 ++++---------- .../doma/jdbc/query/AutoFunctionQueryTest.java | 4 ++-- 45 files changed, 68 insertions(+), 78 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainCollectorHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainCollectorHandler.java index f5f549233..0d6a04a74 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainCollectorHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainCollectorHandler.java @@ -8,6 +8,6 @@ public class DomainCollectorHandler public DomainCollectorHandler( DomainType domainType, Collector collector) { - super(() -> domainType.createScalar(), collector); + super(domainType::createScalar, collector); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandler.java index 2b50a1f27..116e40fde 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandler.java @@ -7,7 +7,7 @@ public class DomainResultListHandler extends ScalarResultListHandler { public DomainResultListHandler(DomainType domainType) { - super(() -> domainType.createScalar()); + super(domainType::createScalar); assertNotNull(domainType); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandler.java index baa7fca16..9db6323d9 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandler.java @@ -8,7 +8,7 @@ public class DomainSingleResultHandler extends ScalarSingleResultHandler { public DomainSingleResultHandler(DomainType domainType) { - super(() -> domainType.createScalar()); + super(domainType::createScalar); assertNotNull(domainType); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainStreamHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainStreamHandler.java index 28a2929fd..444747bec 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainStreamHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/DomainStreamHandler.java @@ -9,6 +9,6 @@ public class DomainStreamHandler public DomainStreamHandler( DomainType domainType, Function, RESULT> mapper) { - super(() -> domainType.createScalar(), mapper); + super(domainType::createScalar, mapper); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapProvider.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapProvider.java index c4e7eb378..371f06299 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapProvider.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/MapProvider.java @@ -42,7 +42,7 @@ public Map get(ResultSet resultSet) throws SQLException { for (Map.Entry entry : indexMap.entrySet()) { Integer index = entry.getKey(); String key = entry.getValue(); - BasicScalar scalar = new BasicScalar<>(() -> new ObjectWrapper()); + BasicScalar scalar = new BasicScalar<>(ObjectWrapper::new); fetch(resultSet, scalar, index, jdbcMappingVisitor); map.put(key, scalar.get()); } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainCollectorHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainCollectorHandler.java index 21578a9a0..15ac24584 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainCollectorHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainCollectorHandler.java @@ -9,6 +9,6 @@ public class OptionalDomainCollectorHandler public OptionalDomainCollectorHandler( DomainType domainType, Collector, ?, RESULT> collector) { - super(() -> domainType.createOptionalScalar(), collector); + super(domainType::createOptionalScalar, collector); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainResultListHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainResultListHandler.java index 7e110dd02..63b662a88 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainResultListHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainResultListHandler.java @@ -9,7 +9,7 @@ public class OptionalDomainResultListHandler extends ScalarResultListHandler> { public OptionalDomainResultListHandler(DomainType domainType) { - super(() -> domainType.createOptionalScalar()); + super(domainType::createOptionalScalar); assertNotNull(domainType); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainSingleResultHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainSingleResultHandler.java index 35cf95bb2..4d76b003b 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainSingleResultHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainSingleResultHandler.java @@ -9,7 +9,7 @@ public class OptionalDomainSingleResultHandler extends ScalarSingleResultHandler> { public OptionalDomainSingleResultHandler(DomainType domainType) { - super(() -> domainType.createOptionalScalar()); + super(domainType::createOptionalScalar); assertNotNull(domainType); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainStreamHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainStreamHandler.java index ea7410291..2eeaf329c 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainStreamHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDomainStreamHandler.java @@ -10,6 +10,6 @@ public class OptionalDomainStreamHandler public OptionalDomainStreamHandler( DomainType domainType, Function>, RESULT> mapper) { - super(() -> domainType.createOptionalScalar(), mapper); + super(domainType::createOptionalScalar, mapper); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleCollectorHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleCollectorHandler.java index be14b0233..d0b9c4ce7 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleCollectorHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleCollectorHandler.java @@ -8,6 +8,6 @@ public class OptionalDoubleCollectorHandler extends ScalarCollectorHandler { public OptionalDoubleCollectorHandler(Collector collector) { - super(() -> new OptionalDoubleScalar(), collector); + super(OptionalDoubleScalar::new, collector); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleResultListHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleResultListHandler.java index 60d9a72ca..da0946ad0 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleResultListHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleResultListHandler.java @@ -7,6 +7,6 @@ public class OptionalDoubleResultListHandler extends ScalarResultListHandler { public OptionalDoubleResultListHandler() { - super(() -> new OptionalDoubleScalar()); + super(OptionalDoubleScalar::new); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleSingleResultHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleSingleResultHandler.java index 096d113e7..e9361262f 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleSingleResultHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleSingleResultHandler.java @@ -7,6 +7,6 @@ public class OptionalDoubleSingleResultHandler extends ScalarSingleResultHandler { public OptionalDoubleSingleResultHandler() { - super(() -> new OptionalDoubleScalar()); + super(OptionalDoubleScalar::new); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleStreamHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleStreamHandler.java index 16f8dfea0..2317b5eae 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleStreamHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalDoubleStreamHandler.java @@ -13,6 +13,6 @@ public class OptionalDoubleStreamHandler extends ScalarStreamHandler { public OptionalDoubleStreamHandler(Function, RESULT> mapper) { - super(() -> new OptionalDoubleScalar(), mapper); + super(OptionalDoubleScalar::new, mapper); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntCollectorHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntCollectorHandler.java index 05456bb81..8fb76f92f 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntCollectorHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntCollectorHandler.java @@ -8,6 +8,6 @@ public class OptionalIntCollectorHandler extends ScalarCollectorHandler { public OptionalIntCollectorHandler(Collector mapper) { - super(() -> new OptionalIntScalar(), mapper); + super(OptionalIntScalar::new, mapper); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntResultListHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntResultListHandler.java index 8ed3c03b8..7390f73c8 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntResultListHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntResultListHandler.java @@ -6,6 +6,6 @@ public class OptionalIntResultListHandler extends ScalarResultListHandler { public OptionalIntResultListHandler() { - super(() -> new OptionalIntScalar()); + super(OptionalIntScalar::new); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntSingleResultHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntSingleResultHandler.java index 642c985df..1a5cce326 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntSingleResultHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntSingleResultHandler.java @@ -7,6 +7,6 @@ public class OptionalIntSingleResultHandler extends ScalarSingleResultHandler { public OptionalIntSingleResultHandler() { - super(() -> new OptionalIntScalar()); + super(OptionalIntScalar::new); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntStreamHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntStreamHandler.java index 583ed70e8..417422e72 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntStreamHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalIntStreamHandler.java @@ -9,6 +9,6 @@ public class OptionalIntStreamHandler extends ScalarStreamHandler { public OptionalIntStreamHandler(Function, RESULT> mapper) { - super(() -> new OptionalIntScalar(), mapper); + super(OptionalIntScalar::new, mapper); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongCollectorHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongCollectorHandler.java index 9050ae14f..8b719a469 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongCollectorHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongCollectorHandler.java @@ -8,6 +8,6 @@ public class OptionalLongCollectorHandler extends ScalarCollectorHandler { public OptionalLongCollectorHandler(Collector collector) { - super(() -> new OptionalLongScalar(), collector); + super(OptionalLongScalar::new, collector); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongResultListHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongResultListHandler.java index 48c1607f2..668d358f7 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongResultListHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongResultListHandler.java @@ -6,6 +6,6 @@ public class OptionalLongResultListHandler extends ScalarResultListHandler { public OptionalLongResultListHandler() { - super(() -> new OptionalLongScalar()); + super(OptionalLongScalar::new); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongSingleResultHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongSingleResultHandler.java index 91ceb6917..e78d6440a 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongSingleResultHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongSingleResultHandler.java @@ -6,6 +6,6 @@ public class OptionalLongSingleResultHandler extends ScalarSingleResultHandler { public OptionalLongSingleResultHandler() { - super(() -> new OptionalLongScalar()); + super(OptionalLongScalar::new); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongStreamHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongStreamHandler.java index cbf30d108..c8fe95369 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongStreamHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/OptionalLongStreamHandler.java @@ -9,6 +9,6 @@ public class OptionalLongStreamHandler extends ScalarStreamHandler { public OptionalLongStreamHandler(Function, RESULT> mapper) { - super(() -> new OptionalLongScalar(), mapper); + super(OptionalLongScalar::new, mapper); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainListParameter.java index 53f7b3855..e4c1185e2 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainListParameter.java @@ -19,6 +19,6 @@ public DomainListParameter(DomainType domainType, List li @Override public ScalarProvider createObjectProvider(Query query) { - return new ScalarProvider<>(() -> domainType.createScalar(), query); + return new ScalarProvider<>(domainType::createScalar, query); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainResultListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainResultListParameter.java index fe04f468b..39e4d359e 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainResultListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/DomainResultListParameter.java @@ -6,6 +6,6 @@ public class DomainResultListParameter extends ScalarResultListParameter { public DomainResultListParameter(DomainType domainType) { - super(() -> domainType.createScalar()); + super(domainType::createScalar); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainListParameter.java index 195d9fc2c..70eecc7a0 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainListParameter.java @@ -9,6 +9,6 @@ public class OptionalDomainListParameter public OptionalDomainListParameter( DomainType domainType, List> list, String name) { - super(() -> domainType.createOptionalScalar(), list, name); + super(domainType::createOptionalScalar, list, name); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainResultListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainResultListParameter.java index 6a0b0c250..9c7cef2bb 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainResultListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainResultListParameter.java @@ -7,6 +7,6 @@ public class OptionalDomainResultListParameter extends ScalarResultListParameter> { public OptionalDomainResultListParameter(DomainType domainType) { - super(() -> domainType.createOptionalScalar()); + super(domainType::createOptionalScalar); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleListParameter.java index 7127af717..bd27af1ee 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleListParameter.java @@ -7,6 +7,6 @@ public class OptionalDoubleListParameter extends ScalarListParameter { public OptionalDoubleListParameter(List list, String name) { - super(() -> new OptionalDoubleScalar(), list, name); + super(OptionalDoubleScalar::new, list, name); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleResultListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleResultListParameter.java index 725da9585..a55267385 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleResultListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleResultListParameter.java @@ -7,6 +7,6 @@ public class OptionalDoubleResultListParameter extends ScalarResultListParameter { public OptionalDoubleResultListParameter() { - super(() -> new OptionalDoubleScalar()); + super(OptionalDoubleScalar::new); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntListParameter.java index b3f96dd9b..f9d5f616c 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntListParameter.java @@ -7,6 +7,6 @@ public class OptionalIntListParameter extends ScalarListParameter { public OptionalIntListParameter(List list, String name) { - super(() -> new OptionalIntScalar(), list, name); + super(OptionalIntScalar::new, list, name); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntResultListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntResultListParameter.java index c1d039583..6803a8798 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntResultListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntResultListParameter.java @@ -7,6 +7,6 @@ public class OptionalIntResultListParameter extends ScalarResultListParameter { public OptionalIntResultListParameter() { - super(() -> new OptionalIntScalar()); + super(OptionalIntScalar::new); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongListParameter.java index 8b9168ce6..72fc0ad72 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongListParameter.java @@ -7,6 +7,6 @@ public class OptionalLongListParameter extends ScalarListParameter { public OptionalLongListParameter(List list, String name) { - super(() -> new OptionalLongScalar(), list, name); + super(OptionalLongScalar::new, list, name); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongResultListParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongResultListParameter.java index 8a8972383..1788c973a 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongResultListParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongResultListParameter.java @@ -6,6 +6,6 @@ public class OptionalLongResultListParameter extends ScalarResultListParameter { public OptionalLongResultListParameter() { - super(() -> new OptionalLongScalar()); + super(OptionalLongScalar::new); } } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/AbstractJdbcLogger.java b/doma-core/src/main/java/org/seasar/doma/jdbc/AbstractJdbcLogger.java index be70de991..67b2bf674 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/AbstractJdbcLogger.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/AbstractJdbcLogger.java @@ -325,7 +325,7 @@ protected void logTransactionRollbackFailure( public void logAutoCommitEnablingFailure( String callerClassName, String callerMethodName, SQLException e) { logAutoCommitEnablingFailure( - callerClassName, callerMethodName, e, defaultLevel, () -> Message.DOMA2071.getMessage()); + callerClassName, callerMethodName, e, defaultLevel, Message.DOMA2071::getMessage); } protected void logAutoCommitEnablingFailure( @@ -366,7 +366,7 @@ protected void logTransactionIsolationSettingFailure( public void logConnectionClosingFailure( String callerClassName, String callerMethodName, SQLException e) { logConnectionClosingFailure( - callerClassName, callerMethodName, e, defaultLevel, () -> Message.DOMA2073.getMessage()); + callerClassName, callerMethodName, e, defaultLevel, Message.DOMA2073::getMessage); } protected void logConnectionClosingFailure( @@ -382,7 +382,7 @@ protected void logConnectionClosingFailure( public void logStatementClosingFailure( String callerClassName, String callerMethodName, SQLException e) { logStatementClosingFailure( - callerClassName, callerMethodName, e, defaultLevel, () -> Message.DOMA2074.getMessage()); + callerClassName, callerMethodName, e, defaultLevel, Message.DOMA2074::getMessage); } protected void logStatementClosingFailure( @@ -398,7 +398,7 @@ protected void logStatementClosingFailure( public void logResultSetClosingFailure( String callerClassName, String callerMethodName, SQLException e) { logResultSetClosingFailure( - callerClassName, callerMethodName, e, defaultLevel, () -> Message.DOMA2075.getMessage()); + callerClassName, callerMethodName, e, defaultLevel, Message.DOMA2075::getMessage); } protected void logResultSetClosingFailure( diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/AbstractEntityType.java b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/AbstractEntityType.java index b89735a3a..b185091e6 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/AbstractEntityType.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/AbstractEntityType.java @@ -17,7 +17,7 @@ public String getQualifiedTableName() { @Override @Deprecated public String getQualifiedTableName(Function quoteFunction) { - return getQualifiedTableName((namingType, text) -> namingType.apply(text), quoteFunction); + return getQualifiedTableName(NamingType::apply, quoteFunction); } @Override diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AbstractSelectQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AbstractSelectQuery.java index 659ecd98a..19bdc83c9 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AbstractSelectQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AbstractSelectQuery.java @@ -112,8 +112,7 @@ protected void executeCount(SqlNode sqlNode) { query.addParameters(parameters); query.prepare(); SelectCommand command = - new SelectCommand<>( - query, new BasicSingleResultHandler<>(() -> new PrimitiveLongWrapper())); + new SelectCommand<>(query, new BasicSingleResultHandler<>(PrimitiveLongWrapper::new)); long count = command.execute(); query.complete(); SelectOptionsAccessor.setCountSize(options, count); diff --git a/doma-core/src/test/java/__/org/seasar/doma/jdbc/domain/_Job.java b/doma-core/src/test/java/__/org/seasar/doma/jdbc/domain/_Job.java index d6ee2dfa1..083385fd0 100644 --- a/doma-core/src/test/java/__/org/seasar/doma/jdbc/domain/_Job.java +++ b/doma-core/src/test/java/__/org/seasar/doma/jdbc/domain/_Job.java @@ -1,13 +1,14 @@ package __.org.seasar.doma.jdbc.domain; import org.seasar.doma.jdbc.domain.Job; +import org.seasar.doma.wrapper.StringWrapper; public final class _Job extends org.seasar.doma.jdbc.domain.AbstractDomainType { private static final _Job singleton = new _Job(); private _Job() { - super(() -> new org.seasar.doma.wrapper.StringWrapper()); + super(StringWrapper::new); } @Override diff --git a/doma-core/src/test/java/example/domain/_InternationalPhoneNumber.java b/doma-core/src/test/java/example/domain/_InternationalPhoneNumber.java index 8e276c02e..1fbbf0535 100644 --- a/doma-core/src/test/java/example/domain/_InternationalPhoneNumber.java +++ b/doma-core/src/test/java/example/domain/_InternationalPhoneNumber.java @@ -1,6 +1,7 @@ package example.domain; import org.seasar.doma.jdbc.domain.AbstractDomainType; +import org.seasar.doma.wrapper.StringWrapper; public class _InternationalPhoneNumber extends AbstractDomainType { @@ -8,7 +9,7 @@ public class _InternationalPhoneNumber private static final _InternationalPhoneNumber singleton = new _InternationalPhoneNumber(); private _InternationalPhoneNumber() { - super(() -> new org.seasar.doma.wrapper.StringWrapper()); + super(StringWrapper::new); } @Override diff --git a/doma-core/src/test/java/example/domain/_JobType.java b/doma-core/src/test/java/example/domain/_JobType.java index 915cfd0be..4935b3e6e 100644 --- a/doma-core/src/test/java/example/domain/_JobType.java +++ b/doma-core/src/test/java/example/domain/_JobType.java @@ -1,13 +1,14 @@ package example.domain; import org.seasar.doma.jdbc.domain.AbstractDomainType; +import org.seasar.doma.wrapper.IntegerWrapper; public class _JobType extends AbstractDomainType { private static final _JobType singleton = new _JobType(); private _JobType() { - super(() -> new org.seasar.doma.wrapper.IntegerWrapper()); + super(IntegerWrapper::new); } @Override diff --git a/doma-core/src/test/java/example/domain/_PhoneNumber.java b/doma-core/src/test/java/example/domain/_PhoneNumber.java index 962521607..1eb102a15 100644 --- a/doma-core/src/test/java/example/domain/_PhoneNumber.java +++ b/doma-core/src/test/java/example/domain/_PhoneNumber.java @@ -1,13 +1,14 @@ package example.domain; import org.seasar.doma.jdbc.domain.AbstractDomainType; +import org.seasar.doma.wrapper.StringWrapper; public class _PhoneNumber extends AbstractDomainType { private static final _PhoneNumber singleton = new _PhoneNumber(); private _PhoneNumber() { - super(() -> new org.seasar.doma.wrapper.StringWrapper()); + super(StringWrapper::new); } @Override diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java index 986b43496..e121b9697 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java @@ -17,6 +17,7 @@ import org.seasar.doma.jdbc.NonSingleColumnException; import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.SqlFileSelectQuery; +import org.seasar.doma.wrapper.StringWrapper; public class BasicResultListHandlerTest { @@ -46,8 +47,7 @@ public void testHandle() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - BasicResultListHandler handler = - new BasicResultListHandler<>(() -> new org.seasar.doma.wrapper.StringWrapper()); + BasicResultListHandler handler = new BasicResultListHandler<>(StringWrapper::new); List results = handler.handle(resultSet, query, (i, next) -> {}).get(); assertEquals(2, results.size()); assertEquals("aaa", results.get(0)); @@ -72,8 +72,7 @@ public void testHandle_NonSingleColumnException() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - BasicResultListHandler handler = - new BasicResultListHandler<>(() -> new org.seasar.doma.wrapper.StringWrapper()); + BasicResultListHandler handler = new BasicResultListHandler<>(StringWrapper::new); try { handler.handle(resultSet, query, (i, next) -> {}); fail(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java index 3f15a7789..20385a73f 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java @@ -17,6 +17,7 @@ import org.seasar.doma.jdbc.NonUniqueResultException; import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.SqlFileSelectQuery; +import org.seasar.doma.wrapper.StringWrapper; public class BasicSingleResultHandlerTest { @@ -45,8 +46,7 @@ public void testHandle() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - BasicSingleResultHandler handler = - new BasicSingleResultHandler<>(() -> new org.seasar.doma.wrapper.StringWrapper()); + BasicSingleResultHandler handler = new BasicSingleResultHandler<>(StringWrapper::new); String result = handler.handle(resultSet, query, (i, next) -> {}).get(); assertEquals("aaa", result); } @@ -68,8 +68,7 @@ public void testHandle_NonUniqueResultException() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - BasicSingleResultHandler handler = - new BasicSingleResultHandler<>(() -> new org.seasar.doma.wrapper.StringWrapper()); + BasicSingleResultHandler handler = new BasicSingleResultHandler<>(StringWrapper::new); try { handler.handle(resultSet, query, (i, next) -> {}); fail(); @@ -94,8 +93,7 @@ public void testHandle_NonSingleColumnException() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - BasicSingleResultHandler handler = - new BasicSingleResultHandler<>(() -> new org.seasar.doma.wrapper.StringWrapper()); + BasicSingleResultHandler handler = new BasicSingleResultHandler<>(StringWrapper::new); try { handler.handle(resultSet, query, (i, next) -> {}); fail(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterBinderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterBinderTest.java index 359e915eb..5a280c8ec 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterBinderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterBinderTest.java @@ -20,6 +20,8 @@ import org.seasar.doma.jdbc.Sql; import org.seasar.doma.jdbc.SqlParameter; import org.seasar.doma.jdbc.query.Query; +import org.seasar.doma.wrapper.BigDecimalWrapper; +import org.seasar.doma.wrapper.IntegerWrapper; public class CallableSqlParameterBinderTest { @@ -30,13 +32,10 @@ public void testBind() throws Exception { MockCallableStatement callableStatement = new MockCallableStatement(); List parameters = new ArrayList<>(); - parameters.add( - new BasicSingleResultParameter<>(() -> new org.seasar.doma.wrapper.IntegerWrapper())); + parameters.add(new BasicSingleResultParameter<>(IntegerWrapper::new)); parameters.add(new BasicInParameter<>(() -> new org.seasar.doma.wrapper.StringWrapper("aaa"))); parameters.add( - new BasicInOutParameter<>( - () -> new org.seasar.doma.wrapper.BigDecimalWrapper(), - new Reference<>(new BigDecimal(10)))); + new BasicInOutParameter<>(BigDecimalWrapper::new, new Reference<>(new BigDecimal(10)))); parameters.add( new BasicOutParameter<>( () -> new org.seasar.doma.wrapper.StringWrapper("bbb"), new Reference<>())); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java index bc5269cae..4a24d660a 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java @@ -19,6 +19,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.domain.DomainType; import org.seasar.doma.jdbc.query.SelectQuery; +import org.seasar.doma.wrapper.StringWrapper; public class ScalarProviderTest { @@ -34,9 +35,7 @@ public void testBasic() throws Exception { ScalarProvider provider = new ScalarProvider<>( - () -> - new org.seasar.doma.internal.jdbc.scalar.BasicScalar<>( - () -> new org.seasar.doma.wrapper.StringWrapper()), + () -> new org.seasar.doma.internal.jdbc.scalar.BasicScalar<>(StringWrapper::new), new MySelectQuery()); String result = provider.get(resultSet); @@ -54,8 +53,7 @@ public void testOptionalBasic() throws Exception { ScalarProvider> provider = new ScalarProvider<>( () -> - new org.seasar.doma.internal.jdbc.scalar.OptionalBasicScalar<>( - () -> new org.seasar.doma.wrapper.StringWrapper()), + new org.seasar.doma.internal.jdbc.scalar.OptionalBasicScalar<>(StringWrapper::new), new MySelectQuery()); Optional result = provider.get(resultSet); @@ -73,7 +71,7 @@ public void testDomain() throws Exception { DomainType domainType = _PhoneNumber.getSingletonInternal(); ScalarProvider provider = - new ScalarProvider<>(() -> domainType.createScalar(), new MySelectQuery()); + new ScalarProvider<>(domainType::createScalar, new MySelectQuery()); PhoneNumber result = provider.get(resultSet); assertEquals("hoge", result.getValue()); @@ -90,7 +88,7 @@ public void testOptionalDomain() throws Exception { DomainType domainType = _PhoneNumber.getSingletonInternal(); ScalarProvider> provider = - new ScalarProvider<>(() -> domainType.createOptionalScalar(), new MySelectQuery()); + new ScalarProvider<>(domainType::createOptionalScalar, new MySelectQuery()); Optional result = provider.get(resultSet); assertEquals("hoge", result.get().getValue()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java index 02368af68..df8a684bd 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java @@ -37,8 +37,7 @@ public void testExecute() throws Exception { query.setCatalogName("xxx"); query.setSchemaName("yyy"); query.setFunctionName("aaa"); - query.setResultParameter( - new BasicSingleResultParameter<>(() -> new org.seasar.doma.wrapper.IntegerWrapper())); + query.setResultParameter(new BasicSingleResultParameter<>(IntegerWrapper::new)); query.addParameter(new BasicInParameter<>(() -> aaa)); query.addParameter(new BasicOutParameter<>(() -> bbb, new Reference<>())); query.addParameter(new BasicInOutParameter<>(() -> ccc, new Reference<>())); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java index 5400a15d3..5cdba028d 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java @@ -69,7 +69,7 @@ public void testGetColumnName_naming_columnNameDefined() throws Exception { true, true, false); - assertEquals("foo", propertyType.getColumnName((namingType, text) -> namingType.apply(text))); + assertEquals("foo", propertyType.getColumnName(NamingType::apply)); } @Test @@ -159,7 +159,7 @@ public void testGetColumnName_naiming_columnNotDefined() throws Exception { true, true, false); - assertEquals("HOGE", propertyType.getColumnName((namingType, text) -> namingType.apply(text))); + assertEquals("HOGE", propertyType.getColumnName(NamingType::apply)); } @Test @@ -174,10 +174,7 @@ public void testGetColumnName_naiming_quote_quoteRequired() throws Exception { true, true, true); - assertEquals( - "[HOGE]", - propertyType.getColumnName( - (namingType, text) -> namingType.apply(text), text -> "[" + text + "]")); + assertEquals("[HOGE]", propertyType.getColumnName(NamingType::apply, text -> "[" + text + "]")); } @Test @@ -192,10 +189,7 @@ public void testGetColumnName_naiming_quote_quoteNotRequired() throws Exception true, true, false); - assertEquals( - "HOGE", - propertyType.getColumnName( - (namingType, text) -> namingType.apply(text), text -> "[" + text + "]")); + assertEquals("HOGE", propertyType.getColumnName(NamingType::apply, text -> "[" + text + "]")); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java index fe6898cff..1683b7bde 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java @@ -6,6 +6,7 @@ import org.seasar.doma.internal.jdbc.mock.MockConfig; import org.seasar.doma.internal.jdbc.sql.BasicSingleResultParameter; import org.seasar.doma.jdbc.SqlLogType; +import org.seasar.doma.wrapper.IntegerWrapper; public class AutoFunctionQueryTest { @@ -16,8 +17,7 @@ public void testPrepare() throws Exception { AutoFunctionQuery query = new AutoFunctionQuery<>(); query.setConfig(runtimeConfig); query.setFunctionName("aaa"); - query.setResultParameter( - new BasicSingleResultParameter<>(() -> new org.seasar.doma.wrapper.IntegerWrapper())); + query.setResultParameter(new BasicSingleResultParameter<>(IntegerWrapper::new)); query.setCallerClassName("aaa"); query.setCallerMethodName("bbb"); query.setSqlLogType(SqlLogType.FORMATTED); From 30b5602a4cd445b1d7429a56cb0ce4b713367d08 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:15:55 +0900 Subject: [PATCH 17/78] Replace with expression lambda --- .../doma/jdbc/criteria/NativeSqlSelectTest.java | 7 +------ .../doma/jdbc/tx/LocalTransactionManagerTest.java | 12 ++---------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/NativeSqlSelectTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/NativeSqlSelectTest.java index 52b50236a..966cf13c5 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/NativeSqlSelectTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/NativeSqlSelectTest.java @@ -1179,12 +1179,7 @@ public String comment(String sql, CommentContext context) { NativeSql nativeSql = new NativeSql(config); Emp_ e = new Emp_(); - Statement> stmt = - nativeSql.from( - e, - options -> { - options.setComment("hello"); - }); + Statement> stmt = nativeSql.from(e, options -> options.setComment("hello")); Sql sql = stmt.asSql(); assertEquals( diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java index 92d8ee578..f1c6e43b6 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java @@ -90,11 +90,7 @@ public void testRequiresNew_blcok() throws Exception { @Test public void testRequiresNew_supplier() throws Exception { LocalTransactionManager manager = new LocalTransactionManager(transaction); - String result = - manager.requiresNew( - () -> { - return "aaa"; - }); + String result = manager.requiresNew(() -> "aaa"); assertEquals("aaa", result); } @@ -119,11 +115,7 @@ public void testNotSupported_block() throws Exception { @Test public void testNotSupported_supplier() throws Exception { LocalTransactionManager manager = new LocalTransactionManager(transaction); - String result = - manager.notSupported( - () -> { - return "aaa"; - }); + String result = manager.notSupported(() -> "aaa"); assertEquals("aaa", result); } From 0729cc469b1d5c257157ba7d6a385efd1994edc3 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:19:28 +0900 Subject: [PATCH 18/78] Make `static` --- .../org/seasar/doma/internal/expr/ExpressionParserTest.java | 2 +- .../seasar/doma/internal/jdbc/command/EntityProviderTest.java | 2 +- .../java/org/seasar/doma/internal/util/ConstructorUtilTest.java | 2 +- .../java/org/seasar/doma/internal/util/GenericUtilTest.java | 2 +- .../org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java index 166420452..97f819ed8 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java @@ -862,7 +862,7 @@ public void testConcat() throws Exception { assertEquals("abcde", result.getValue()); } - public class Hoge { + public static class Hoge { private final String foo = "abcdef"; diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityProviderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityProviderTest.java index f43501628..4c88d7e49 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityProviderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityProviderTest.java @@ -96,7 +96,7 @@ public void testGetEntity_EmptyUnknownColumnHandler() throws Exception { assertEquals(100, emp.getVersion()); } - protected class MySelectQuery implements SelectQuery { + protected static class MySelectQuery implements SelectQuery { private final Config config; diff --git a/doma-core/src/test/java/org/seasar/doma/internal/util/ConstructorUtilTest.java b/doma-core/src/test/java/org/seasar/doma/internal/util/ConstructorUtilTest.java index 15c60faad..aa96490b0 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/util/ConstructorUtilTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/util/ConstructorUtilTest.java @@ -24,7 +24,7 @@ public void testGetConstructor() throws Exception { assertEquals("bcd", result); } - public class Hoge { + public static class Hoge { public Hoge(String name) {} } } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/util/GenericUtilTest.java b/doma-core/src/test/java/org/seasar/doma/internal/util/GenericUtilTest.java index 22aca1018..0a594555a 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/util/GenericUtilTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/util/GenericUtilTest.java @@ -83,7 +83,7 @@ public interface Aaa2 { T3 m3(T3 value); } - public class Bbb2 implements Aaa2 { + public static class Bbb2 implements Aaa2 { @Override public T1 m1(T1 value) { return value; diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java index 24ab76f22..ac7d1416c 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java @@ -35,7 +35,7 @@ public void testReleaseAndGetSavepoint() throws Exception { } } - class MySavepoint implements Savepoint { + static class MySavepoint implements Savepoint { String name; From 61c7a784a2455fafff0882b020ec5c46e4d8cba2 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:25:55 +0900 Subject: [PATCH 19/78] Avoid unpredictable BigDecimal constructor call --- .../org/seasar/doma/internal/expr/ExpressionParserTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java index 97f819ed8..4cdc8822f 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java @@ -757,19 +757,19 @@ public void testBigDecimal() throws Exception { ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); EvaluationResult result = evaluator.evaluate(node); - assertEquals(new BigDecimal(2.5), result.getValue()); + assertEquals(new BigDecimal("2.5"), result.getValue()); parser = new ExpressionParser("+2.5B"); node = parser.parse(); evaluator = new ExpressionEvaluator(); result = evaluator.evaluate(node); - assertEquals(new BigDecimal(2.5), result.getValue()); + assertEquals(new BigDecimal("2.5"), result.getValue()); parser = new ExpressionParser("-2.5B"); node = parser.parse(); evaluator = new ExpressionEvaluator(); result = evaluator.evaluate(node); - assertEquals(new BigDecimal(-2.5), result.getValue()); + assertEquals(BigDecimal.valueOf(-2.5), result.getValue()); } @Test From e2aa92dc047cb1e1aa5d932ea1435de9801e033e Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:29:45 +0900 Subject: [PATCH 20/78] Replace with 'Collections.singleList()' --- .../java/org/seasar/doma/jdbc/dialect/Mssql2008Dialect.java | 5 +++-- .../main/java/org/seasar/doma/jdbc/dialect/MysqlDialect.java | 5 +++-- .../java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java | 4 ++-- .../org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java | 3 ++- .../org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java | 5 +++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Mssql2008Dialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Mssql2008Dialect.java index a2242d471..e77e72da1 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Mssql2008Dialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Mssql2008Dialect.java @@ -2,6 +2,7 @@ import java.sql.SQLException; import java.util.Arrays; +import java.util.Collections; import java.util.function.Consumer; import org.seasar.doma.DomaNullPointerException; import org.seasar.doma.expr.ExpressionFunctions; @@ -174,8 +175,8 @@ protected Mssql2008ScriptBlockContext() { sqlBlockStartKeywordsList.add(Arrays.asList("alter", "procedure")); sqlBlockStartKeywordsList.add(Arrays.asList("alter", "function")); sqlBlockStartKeywordsList.add(Arrays.asList("alter", "trigger")); - sqlBlockStartKeywordsList.add(Arrays.asList("declare")); - sqlBlockStartKeywordsList.add(Arrays.asList("begin")); + sqlBlockStartKeywordsList.add(Collections.singletonList("declare")); + sqlBlockStartKeywordsList.add(Collections.singletonList("begin")); } } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MysqlDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MysqlDialect.java index f5676eeed..0dc2a5ef5 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MysqlDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MysqlDialect.java @@ -2,6 +2,7 @@ import java.sql.SQLException; import java.util.Arrays; +import java.util.Collections; import java.util.HashSet; import java.util.Set; import org.seasar.doma.DomaNullPointerException; @@ -170,8 +171,8 @@ protected MysqlScriptBlockContext() { sqlBlockStartKeywordsList.add(Arrays.asList("alter", "procedure")); sqlBlockStartKeywordsList.add(Arrays.asList("alter", "function")); sqlBlockStartKeywordsList.add(Arrays.asList("alter", "trigger")); - sqlBlockStartKeywordsList.add(Arrays.asList("declare")); - sqlBlockStartKeywordsList.add(Arrays.asList("begin")); + sqlBlockStartKeywordsList.add(Collections.singletonList("declare")); + sqlBlockStartKeywordsList.add(Collections.singletonList("begin")); } } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java index 29f8fc6de..40bd0f878 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java @@ -406,8 +406,8 @@ protected Oracle11ScriptBlockContext() { sqlBlockStartKeywordsList.add(Arrays.asList("create", "procedure")); sqlBlockStartKeywordsList.add(Arrays.asList("create", "function")); sqlBlockStartKeywordsList.add(Arrays.asList("create", "trigger")); - sqlBlockStartKeywordsList.add(Arrays.asList("declare")); - sqlBlockStartKeywordsList.add(Arrays.asList("begin")); + sqlBlockStartKeywordsList.add(Collections.singletonList("declare")); + sqlBlockStartKeywordsList.add(Collections.singletonList("begin")); } } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java b/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java index 4fac4f127..c1e234c20 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java @@ -5,6 +5,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Arrays; +import java.util.Collections; import org.seasar.doma.GenerationType; import org.seasar.doma.internal.jdbc.sql.BasicInParameter; import org.seasar.doma.internal.jdbc.util.JdbcUtil; @@ -88,7 +89,7 @@ public void initialize() { createSelectRawSql(), createSelectFormattedSql(), null, - Arrays.asList(new BasicInParameter<>(() -> pkColumnValueWrapper)), + Collections.singletonList(new BasicInParameter<>(() -> pkColumnValueWrapper)), SqlLogType.FORMATTED); } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java index 1e099b33e..b658df4da 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java @@ -7,6 +7,7 @@ import example.entity._Emp; import java.lang.reflect.Method; import java.util.Arrays; +import java.util.Collections; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; @@ -69,7 +70,7 @@ public void testExecute_throwsOptimisticLockException() throws Exception { AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); - query.setEntities(Arrays.asList(emp)); + query.setEntities(Collections.singletonList(emp)); query.setCallerClassName("aaa"); query.setCallerMethodName("bbb"); query.setSqlLogType(SqlLogType.FORMATTED); @@ -94,7 +95,7 @@ public void testExecute_suppressesOptimisticLockException() throws Exception { AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); - query.setEntities(Arrays.asList(emp)); + query.setEntities(Collections.singletonList(emp)); query.setOptimisticLockExceptionSuppressed(true); query.setCallerClassName("aaa"); query.setCallerMethodName("bbb"); From 1a9ce56cf402c4fc74f3becf8b8a823e5cc986d3 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:33:27 +0900 Subject: [PATCH 21/78] Suppress 'AssertBetweenInconvertibleTypes' --- .../doma/jdbc/criteria/expression/ExpressionsTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/expression/ExpressionsTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/expression/ExpressionsTest.java index 9f3bf05e7..a481040c2 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/expression/ExpressionsTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/expression/ExpressionsTest.java @@ -153,6 +153,7 @@ void testConcat() { assertNotEquals(concat(e.name, "a"), concat(e.name, "b")); } + @SuppressWarnings("AssertBetweenInconvertibleTypes") @Test void testAvg() { assertEquals(avg(e.id), avg(e.id)); @@ -163,6 +164,7 @@ void testAvg() { assertEquals(e.id, count(e.id).argument()); } + @SuppressWarnings("AssertBetweenInconvertibleTypes") @Test void testCount() { assertEquals(count(e.id), count(e.id)); @@ -173,6 +175,7 @@ void testCount() { assertEquals(e.id, count(e.id).argument()); } + @SuppressWarnings("AssertBetweenInconvertibleTypes") @Test void testCount_noArg() { assertEquals(count(), count()); @@ -182,6 +185,7 @@ void testCount_noArg() { assertEquals("*", count().argument().getName()); } + @SuppressWarnings("AssertBetweenInconvertibleTypes") @Test void testMax() { assertEquals(max(e.id), max(e.id)); @@ -192,6 +196,7 @@ void testMax() { assertEquals(e.id, max(e.id).argument()); } + @SuppressWarnings("AssertBetweenInconvertibleTypes") @Test void testMin() { assertEquals(min(e.id), min(e.id)); @@ -202,6 +207,7 @@ void testMin() { assertEquals(e.id, min(e.id).argument()); } + @SuppressWarnings("AssertBetweenInconvertibleTypes") @Test void testSum() { assertEquals(sum(e.id), sum(e.id)); From b8fdcdafd8365bb7d67bcfd34756268a7bd8af34 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 10:35:00 +0900 Subject: [PATCH 22/78] Simplify assertion --- .../doma/internal/expr/ExpressionEvaluatorTest.java | 4 ++-- .../seasar/doma/internal/jdbc/scalar/ScalarsTest.java | 2 +- .../doma/jdbc/builder/MapBatchInsertBuilderTest.java | 5 +++-- .../seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java | 4 ++-- .../seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java | 9 ++++----- .../seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java | 3 ++- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java index e4e7cd884..52a50ea19 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java @@ -55,7 +55,7 @@ public void testInvokeMethod_optional_empty() throws Exception { EvaluationResult result = evaluator.invokeMethod( location, method, person, Person.class, new Class[] {}, new Object[] {}); - assertEquals(null, result.getValue()); + assertNull(result.getValue()); assertEquals(String.class, result.getValueClass()); } @@ -265,7 +265,7 @@ public void testGetFieldValue_optional_empty() throws Exception { Person person = new Person(); person.optionalName = Optional.empty(); EvaluationResult result = evaluator.getFieldValue(location, field, person); - assertEquals(null, result.getValue()); + assertNull(result.getValue()); assertEquals(String.class, result.getValueClass()); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java index f37e09512..22defc977 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java @@ -276,7 +276,7 @@ public void testWrapDomain_option_null() throws Exception { Wrapper wrapper = scalar.getWrapper(); assertEquals(StringWrapper.class, wrapper.getClass()); - assertEquals(null, wrapper.get()); + assertNull(wrapper.get()); } public enum MyEnum { diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java index dbb0da2cd..d2c353ef4 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java @@ -1,6 +1,7 @@ package org.seasar.doma.jdbc.builder; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.fail; import java.util.ArrayList; @@ -118,14 +119,14 @@ public void testNullValue() throws Exception { assertEquals(expectedSql, sqls.get(0).getRawSql()); List parameters0 = sqls.get(0).getParameters(); assertEquals(2, parameters0.size()); - assertEquals(null, parameters0.get(0).getValue()); + assertNull(parameters0.get(0).getValue()); assertEquals(1000, parameters0.get(1).getValue()); assertEquals(expectedSql, sqls.get(1).getRawSql()); List parameters1 = sqls.get(1).getParameters(); assertEquals(2, parameters1.size()); assertEquals("ALLEN", parameters1.get(0).getValue()); - assertEquals(null, parameters1.get(1).getValue()); + assertNull(parameters1.get(1).getValue()); } @SuppressWarnings("serial") diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java index 96bc9be24..f77f869ae 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java @@ -1,7 +1,7 @@ package org.seasar.doma.jdbc.query; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNull; import example.entity.Emp; import example.entity.Salesman; @@ -78,7 +78,7 @@ public void testOption_default() throws Exception { List> parameters = sql.getParameters(); assertEquals(2, parameters.size()); assertEquals(10, parameters.get(0).getWrapper().get()); - assertTrue(parameters.get(1).getWrapper().get() == null); + assertNull(parameters.get(1).getWrapper().get()); sql = query.getSqls().get(1); assertEquals("delete from EMP where ID = ? and VERSION = ?", sql.getRawSql()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java index a15aec99a..fb73b5bea 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java @@ -3,7 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; import example.entity.Emp; import example.entity.Salesman; @@ -86,7 +85,7 @@ public void testOption_default() throws Exception { List> parameters = sql.getParameters(); assertEquals(5, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); - assertTrue(parameters.get(1).getWrapper().get() == null); + assertNull(parameters.get(1).getWrapper().get()); assertEquals(100, parameters.get(2).getWrapper().get()); assertEquals(10, parameters.get(3).getWrapper().get()); assertEquals(100, parameters.get(4).getWrapper().get()); @@ -97,7 +96,7 @@ public void testOption_default() throws Exception { sql.getRawSql()); parameters = sql.getParameters(); assertEquals(5, parameters.size()); - assertTrue(parameters.get(0).getWrapper().get() == null); + assertNull(parameters.get(0).getWrapper().get()); assertEquals(new BigDecimal(2000), parameters.get(1).getWrapper().get()); assertEquals(200, parameters.get(2).getWrapper().get()); assertEquals(20, parameters.get(3).getWrapper().get()); @@ -274,7 +273,7 @@ public void testTenantId() throws Exception { List> parameters = sql.getParameters(); assertEquals(6, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); - assertTrue(parameters.get(1).getWrapper().get() == null); + assertNull(parameters.get(1).getWrapper().get()); assertEquals(100, parameters.get(2).getWrapper().get()); assertEquals(10, parameters.get(3).getWrapper().get()); assertEquals(100, parameters.get(4).getWrapper().get()); @@ -286,7 +285,7 @@ public void testTenantId() throws Exception { sql.getRawSql()); parameters = sql.getParameters(); assertEquals(6, parameters.size()); - assertTrue(parameters.get(0).getWrapper().get() == null); + assertNull(parameters.get(0).getWrapper().get()); assertEquals(new BigDecimal(2000), parameters.get(1).getWrapper().get()); assertEquals(200, parameters.get(2).getWrapper().get()); assertEquals(20, parameters.get(3).getWrapper().get()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java index c2016fdbc..df31fd79c 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import example.entity.Emp; @@ -73,7 +74,7 @@ public void testPopulate() throws Exception { List> parameters = sql.getParameters(); assertEquals(4, parameters.size()); assertEquals("aaa", parameters.get(0).getWrapper().get()); - assertEquals(null, parameters.get(1).getWrapper().get()); + assertNull(parameters.get(1).getWrapper().get()); assertEquals(100, parameters.get(2).getWrapper().get()); assertEquals(10, parameters.get(3).getWrapper().get()); assertTrue(query.isExecutable()); From a09fb4311b25a7242f1b265e0a6230ac9f759c98 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 11:40:42 +0900 Subject: [PATCH 23/78] Remove explicit String creation --- .../java/org/seasar/doma/jdbc/command/InsertCommandTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java index 50d4f9b08..c2bf3aeec 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java @@ -51,7 +51,7 @@ public void testExecute() throws Exception { List bindValues = runtimeConfig.dataSource.connection.preparedStatement.bindValues; assertEquals(1, bindValues.get(0).getValue()); - assertEquals(new String("hoge"), bindValues.get(1).getValue()); + assertEquals("hoge", bindValues.get(1).getValue()); assertEquals(new BigDecimal(1000), bindValues.get(2).getValue()); assertEquals(10, bindValues.get(3).getValue()); } @@ -82,7 +82,7 @@ public void testExecute_defaultVersion() throws Exception { List bindValues = runtimeConfig.dataSource.connection.preparedStatement.bindValues; assertEquals(4, bindValues.size()); assertEquals(1, bindValues.get(0).getValue()); - assertEquals(new String("hoge"), bindValues.get(1).getValue()); + assertEquals("hoge", bindValues.get(1).getValue()); assertEquals(new BigDecimal(1000), bindValues.get(2).getValue()); assertEquals(1, bindValues.get(3).getValue()); } From e941cca1e586d393d04426e146d975de450f75b3 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 11:42:11 +0900 Subject: [PATCH 24/78] Remove explicit Array creation --- .../seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java | 6 ++---- .../seasar/doma/jdbc/builder/BatchInsertExecutorTest.java | 2 +- .../seasar/doma/jdbc/builder/BatchUpdateExecutorTest.java | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java index 526a6abf2..a02a32e2a 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java @@ -210,10 +210,8 @@ private static class Employee { public void testExecutor() throws Exception { List employees = Arrays.asList( - new Employee[] { - new Employee(10, "SMITH", new BigDecimal("1001")), - new Employee(20, "ALLEN", new BigDecimal("2001")) - }); + new Employee(10, "SMITH", new BigDecimal("1001")), + new Employee(20, "ALLEN", new BigDecimal("2001"))); BatchDeleteExecutor executor = BatchDeleteExecutor.newInstance(new MockConfig()); executor.execute( employees, diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchInsertExecutorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchInsertExecutorTest.java index 98b4d1ca7..e60860c8e 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchInsertExecutorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchInsertExecutorTest.java @@ -204,7 +204,7 @@ private static class Employee { @Test public void testExecutor() throws Exception { List employees = - Arrays.asList(new Employee[] {new Employee("SMITH", 100), new Employee("ALLEN", 200)}); + Arrays.asList(new Employee("SMITH", 100), new Employee("ALLEN", 200)); BatchInsertExecutor executor = BatchInsertExecutor.newInstance(new MockConfig()); executor.execute( employees, diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchUpdateExecutorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchUpdateExecutorTest.java index 7e3150e72..e36c9fa5a 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchUpdateExecutorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchUpdateExecutorTest.java @@ -233,10 +233,8 @@ private static class Employee { public void testExecutor() throws Exception { List employees = Arrays.asList( - new Employee[] { - new Employee(10, "SMITH", new BigDecimal("1001")), - new Employee(20, "ALLEN", new BigDecimal("2001")) - }); + new Employee(10, "SMITH", new BigDecimal("1001")), + new Employee(20, "ALLEN", new BigDecimal("2001"))); BatchUpdateExecutor executor = BatchUpdateExecutor.newInstance(new MockConfig()); executor.execute( employees, From a8ff3e82f8f3dc431eaf75c74b5ba446dc2ee693 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 11:44:52 +0900 Subject: [PATCH 25/78] Remove type arguments --- .../internal/expr/ExpressionEvaluator.java | 2 +- .../seasar/doma/jdbc/dialect/Db2Dialect.java | 8 +------ .../doma/jdbc/dialect/H212126Dialect.java | 15 ++----------- .../doma/jdbc/dialect/HsqldbDialect.java | 15 ++----------- .../doma/jdbc/dialect/MssqlDialect.java | 8 +------ .../doma/jdbc/dialect/Oracle11Dialect.java | 8 +------ .../doma/jdbc/dialect/PostgresDialect.java | 22 +++---------------- .../doma/jdbc/dialect/SqliteDialect.java | 8 +------ .../doma/jdbc/domain/AbstractDomainType.java | 4 ++-- .../doma/jdbc/entity/AbstractEntityType.java | 2 +- .../doma/jdbc/entity/DefaultPropertyType.java | 2 +- .../doma/jdbc/UtilLoggingJdbcLoggerTest.java | 7 +----- .../jdbc/query/AutoBatchUpdateQueryTest.java | 2 +- .../query/SqlFileBatchUpdateQueryTest.java | 2 +- 14 files changed, 19 insertions(+), 86 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java index 12815b7f3..36513ad6d 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java @@ -77,7 +77,7 @@ public ExpressionEvaluator() { } public ExpressionEvaluator(ExpressionFunctions expressionFunctions, ClassHelper classHelper) { - this(Collections.emptyMap(), expressionFunctions, classHelper); + this(Collections.emptyMap(), expressionFunctions, classHelper); } public ExpressionEvaluator( diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Db2Dialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Db2Dialect.java index 892996103..3562a24a1 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Db2Dialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Db2Dialect.java @@ -9,7 +9,6 @@ import org.seasar.doma.internal.jdbc.dialect.Db2ForUpdateTransformer; import org.seasar.doma.internal.jdbc.dialect.Db2PagingTransformer; import org.seasar.doma.internal.jdbc.sql.PreparedSqlBuilder; -import org.seasar.doma.jdbc.InParameter; import org.seasar.doma.jdbc.JdbcMappingVisitor; import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.ScriptBlockContext; @@ -95,12 +94,7 @@ public PreparedSql getSequenceNextValSql(String qualifiedSequenceName, long allo } String rawSql = "values nextval for " + qualifiedSequenceName; return new PreparedSql( - SqlKind.SELECT, - rawSql, - rawSql, - null, - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } @Override diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/H212126Dialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/H212126Dialect.java index c2a082ecb..5f1e64e99 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/H212126Dialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/H212126Dialect.java @@ -6,7 +6,6 @@ import org.seasar.doma.expr.ExpressionFunctions; import org.seasar.doma.internal.jdbc.dialect.H212126ForUpdateTransformer; import org.seasar.doma.internal.jdbc.dialect.H212126PagingTransformer; -import org.seasar.doma.jdbc.InParameter; import org.seasar.doma.jdbc.JdbcMappingVisitor; import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.SelectForUpdateType; @@ -81,12 +80,7 @@ public PreparedSql getIdentitySelectSql( } String rawSql = "call identity()"; return new PreparedSql( - SqlKind.SELECT, - rawSql, - rawSql, - null, - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } @Override @@ -96,12 +90,7 @@ public PreparedSql getSequenceNextValSql(String qualifiedSequenceName, long allo } String rawSql = "call next value for " + qualifiedSequenceName; return new PreparedSql( - SqlKind.SELECT, - rawSql, - rawSql, - null, - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } @Override diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/HsqldbDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/HsqldbDialect.java index 7b5d22fd6..0a6c1eedc 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/HsqldbDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/HsqldbDialect.java @@ -5,7 +5,6 @@ import org.seasar.doma.DomaNullPointerException; import org.seasar.doma.expr.ExpressionFunctions; import org.seasar.doma.internal.jdbc.dialect.HsqldbPagingTransformer; -import org.seasar.doma.jdbc.InParameter; import org.seasar.doma.jdbc.JdbcMappingVisitor; import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.SelectForUpdateType; @@ -77,12 +76,7 @@ public PreparedSql getIdentitySelectSql( } String rawSql = "call identity()"; return new PreparedSql( - SqlKind.SELECT, - rawSql, - rawSql, - null, - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } @Override @@ -95,12 +89,7 @@ public PreparedSql getSequenceNextValSql(String qualifiedSequenceName, long allo + qualifiedSequenceName + " from information_schema.system_tables where table_name = 'SYSTEM_TABLES'"; return new PreparedSql( - SqlKind.SELECT, - rawSql, - rawSql, - null, - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } @Override diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MssqlDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MssqlDialect.java index 08bd48584..7c05cebfb 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MssqlDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MssqlDialect.java @@ -5,7 +5,6 @@ import org.seasar.doma.expr.ExpressionFunctions; import org.seasar.doma.internal.jdbc.dialect.MssqlForUpdateTransformer; import org.seasar.doma.internal.jdbc.dialect.MssqlPagingTransformer; -import org.seasar.doma.jdbc.InParameter; import org.seasar.doma.jdbc.JdbcMappingVisitor; import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.ScriptBlockContext; @@ -101,12 +100,7 @@ public PreparedSql getSequenceNextValSql(String qualifiedSequenceName, long allo } String rawSql = "select next value for " + qualifiedSequenceName; return new PreparedSql( - SqlKind.SELECT, - rawSql, - rawSql, - null, - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } @Override diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java index 40bd0f878..9e6a20001 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java @@ -19,7 +19,6 @@ import org.seasar.doma.internal.jdbc.dialect.OraclePagingTransformer; import org.seasar.doma.internal.jdbc.sql.PreparedSqlBuilder; import org.seasar.doma.internal.util.AssertionUtil; -import org.seasar.doma.jdbc.InParameter; import org.seasar.doma.jdbc.JdbcMappingFunction; import org.seasar.doma.jdbc.JdbcMappingHint; import org.seasar.doma.jdbc.JdbcMappingVisitor; @@ -137,12 +136,7 @@ public PreparedSql getSequenceNextValSql(String qualifiedSequenceName, long allo } String rawSql = "select " + qualifiedSequenceName + ".nextval from dual"; return new PreparedSql( - SqlKind.SELECT, - rawSql, - rawSql, - null, - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } @Override diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/PostgresDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/PostgresDialect.java index 5e25285b6..29ff4705f 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/PostgresDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/PostgresDialect.java @@ -15,7 +15,6 @@ import org.seasar.doma.internal.jdbc.dialect.PostgresPagingTransformer; import org.seasar.doma.internal.jdbc.sql.PreparedSqlBuilder; import org.seasar.doma.internal.jdbc.util.DatabaseObjectUtil; -import org.seasar.doma.jdbc.InParameter; import org.seasar.doma.jdbc.JdbcMappingVisitor; import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.ScriptBlockContext; @@ -137,12 +136,7 @@ public PreparedSql getIdentitySelectSql( buf.append(")"); String rawSql = buf.toString(); return new PreparedSql( - SqlKind.SELECT, - rawSql, - rawSql, - null, - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } @Override @@ -176,12 +170,7 @@ public Sql getIdentityReservationSql( buf.append(")"); String rawSql = buf.toString(); return new PreparedSql( - SqlKind.SELECT, - rawSql, - rawSql, - null, - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } protected String createIdentitySequenceFunctionExpression( @@ -208,12 +197,7 @@ public PreparedSql getSequenceNextValSql(String qualifiedSequenceName, long allo } String rawSql = "select nextval('" + qualifiedSequenceName + "')"; return new PreparedSql( - SqlKind.SELECT, - rawSql, - rawSql, - null, - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } @Override diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/SqliteDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/SqliteDialect.java index cb12dccec..4d68873aa 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/SqliteDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/SqliteDialect.java @@ -5,7 +5,6 @@ import org.seasar.doma.DomaNullPointerException; import org.seasar.doma.expr.ExpressionFunctions; import org.seasar.doma.internal.jdbc.dialect.SqlitePagingTransformer; -import org.seasar.doma.jdbc.InParameter; import org.seasar.doma.jdbc.JdbcMappingVisitor; import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.SelectForUpdateType; @@ -74,12 +73,7 @@ public PreparedSql getIdentitySelectSql( } String rawSql = "select last_insert_rowid()"; return new PreparedSql( - SqlKind.SELECT, - rawSql, - rawSql, - null, - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } @Override diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/domain/AbstractDomainType.java b/doma-core/src/main/java/org/seasar/doma/jdbc/domain/AbstractDomainType.java index 9adb9d256..5f75cdaf7 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/domain/AbstractDomainType.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/domain/AbstractDomainType.java @@ -54,7 +54,7 @@ protected DomainScalar(Wrapper wrapper) { @Override public Optional> getDomainClass() { Class c = AbstractDomainType.this.getDomainClass(); - return Optional.>of(c); + return Optional.of(c); } @Override @@ -100,7 +100,7 @@ protected OptionalDomainScalar(Wrapper wrapper) { @Override public Optional> getDomainClass() { Class clazz = AbstractDomainType.this.getDomainClass(); - return Optional.>of(clazz); + return Optional.of(clazz); } @SuppressWarnings("unchecked") diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/AbstractEntityType.java b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/AbstractEntityType.java index b185091e6..a5aa6b7e0 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/AbstractEntityType.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/AbstractEntityType.java @@ -11,7 +11,7 @@ protected AbstractEntityType() {} @Override @Deprecated public String getQualifiedTableName() { - return getQualifiedTableName(Function.identity()); + return getQualifiedTableName(Function.identity()); } @Override diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/DefaultPropertyType.java b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/DefaultPropertyType.java index cc9ba9b94..c920a0721 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/DefaultPropertyType.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/DefaultPropertyType.java @@ -102,7 +102,7 @@ public String getName() { @Override public String getColumnName() { - return getColumnName(Function.identity()); + return getColumnName(Function.identity()); } @Override diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/UtilLoggingJdbcLoggerTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/UtilLoggingJdbcLoggerTest.java index 832026a42..f59af4c70 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/UtilLoggingJdbcLoggerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/UtilLoggingJdbcLoggerTest.java @@ -9,12 +9,7 @@ public class UtilLoggingJdbcLoggerTest { public void testLogSql() throws Exception { PreparedSql sql = new PreparedSql( - SqlKind.SELECT, - "aaa", - "bbb", - "ccc", - Collections.>emptyList(), - SqlLogType.FORMATTED); + SqlKind.SELECT, "aaa", "bbb", "ccc", Collections.emptyList(), SqlLogType.FORMATTED); UtilLoggingJdbcLogger logger = new UtilLoggingJdbcLogger(); logger.logSql("ddd", "eee", sql); } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java index fb73b5bea..5a9916b0d 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java @@ -237,7 +237,7 @@ public void testIsExecutable() throws Exception { query.setConfig(runtimeConfig); query.setCallerClassName("aaa"); query.setCallerMethodName("bbb"); - query.setEntities(Collections.emptyList()); + query.setEntities(Collections.emptyList()); query.prepare(); assertFalse(query.isExecutable()); } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java index b35b55487..c7c5d7ad2 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java @@ -108,7 +108,7 @@ public void testIsExecutable() throws Exception { query.setParameterName("e"); query.setCallerClassName("aaa"); query.setCallerMethodName("bbb"); - query.setElements(Collections.emptyList()); + query.setElements(Collections.emptyList()); query.prepare(); assertFalse(query.isExecutable()); } From 4960b8bdb4a89898229e7622777d4c90f7dceda4 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 11:50:37 +0900 Subject: [PATCH 26/78] Suppress unnecessary 'continue' and 'return' --- .../org/seasar/doma/internal/expr/ExpressionTokenizer.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java index 24a60ccd1..05aa6b0cd 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java @@ -204,19 +204,24 @@ protected void peekOneChar(char c) { } if (Character.isWhitespace(c)) { type = WHITESPACE; + //noinspection UnnecessaryReturnStatement return; } else if (c == ',') { type = COMMA_OPERATOR; + //noinspection UnnecessaryReturnStatement return; } else if (c == '(') { type = OPENED_PARENS; + //noinspection UnnecessaryReturnStatement return; } else if (c == ')') { type = CLOSED_PARENS; binaryOpAvailable = true; + //noinspection UnnecessaryReturnStatement return; } else if (c == '!') { type = NOT_OPERATOR; + //noinspection UnnecessaryReturnStatement return; } else if (c == '\'') { type = CHAR_LITERAL; @@ -381,6 +386,7 @@ protected void peekNumber() { buf.mark(); char c2 = buf.get(); if (Character.isDigit(c2)) { + //noinspection SingleStatementInBlock continue; } else if (c2 == '.') { if (decimal) { From cdafae95d62ab3909f0d575952374a60a0c67989 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 11:57:11 +0900 Subject: [PATCH 27/78] Replace StringBuilder with String --- .../doma/jdbc/dialect/PostgresDialect.java | 19 +++----- .../doma/jdbc/id/BuiltinTableIdGenerator.java | 48 +++++++++---------- .../jdbc/command/ScriptReaderTest.java | 47 +++++------------- 3 files changed, 42 insertions(+), 72 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/PostgresDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/PostgresDialect.java index 29ff4705f..c913bbea1 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/PostgresDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/PostgresDialect.java @@ -130,11 +130,7 @@ public PreparedSql getIdentitySelectSql( columnName, isQuoteRequired, isIdColumnQuoteRequired); - StringBuilder buf = new StringBuilder(64); - buf.append("select currval("); - buf.append(identitySeqFuncExpr); - buf.append(")"); - String rawSql = buf.toString(); + String rawSql = "select currval(" + identitySeqFuncExpr + ")"; return new PreparedSql( SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } @@ -162,13 +158,12 @@ public Sql getIdentityReservationSql( columnName, isQuoteRequired, isIdColumnQuoteRequired); - StringBuilder buf = new StringBuilder(64); - buf.append("select nextval("); - buf.append(identitySeqFuncExpr); - buf.append(") from generate_series(1, "); - buf.append(reservationSize); - buf.append(")"); - String rawSql = buf.toString(); + String rawSql = + "select nextval(" + + identitySeqFuncExpr + + ") from generate_series(1, " + + reservationSize + + ")"; return new PreparedSql( SqlKind.SELECT, rawSql, rawSql, null, Collections.emptyList(), SqlLogType.FORMATTED); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java b/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java index c1e234c20..151c335c0 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/id/BuiltinTableIdGenerator.java @@ -94,35 +94,31 @@ public void initialize() { } protected String createUpdateRawSql() { - StringBuilder buf = new StringBuilder(100); - buf.append("update "); - buf.append(qualifiedTableName); - buf.append(" set "); - buf.append(valueColumnName); - buf.append(" = "); - buf.append(valueColumnName); - buf.append(" + ? where "); - buf.append(pkColumnName); - buf.append(" = ?"); - return buf.toString(); + return "update " + + qualifiedTableName + + " set " + + valueColumnName + + " = " + + valueColumnName + + " + ? where " + + pkColumnName + + " = ?"; } protected String createUpdateFormattedSql() { - StringBuilder buf = new StringBuilder(100); - buf.append("update "); - buf.append(qualifiedTableName); - buf.append(" set "); - buf.append(valueColumnName); - buf.append(" = "); - buf.append(valueColumnName); - buf.append(" + "); - buf.append(allocationSize); - buf.append(" where "); - buf.append(pkColumnName); - buf.append(" = '"); - buf.append(pkColumnValue); - buf.append("'"); - return buf.toString(); + return "update " + + qualifiedTableName + + " set " + + valueColumnName + + " = " + + valueColumnName + + " + " + + allocationSize + + " where " + + pkColumnName + + " = '" + + pkColumnValue + + "'"; } protected String createSelectRawSql() { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptReaderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptReaderTest.java index 959774a58..639bc9d6f 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptReaderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptReaderTest.java @@ -41,13 +41,8 @@ public void testReadSql_delimiter() throws Exception { @Override protected BufferedReader createBufferedReader() throws IOException { - StringBuilder buf = new StringBuilder(); - buf.append("aaa;\n"); - buf.append("bbb\n"); - buf.append("go\n"); - buf.append("ccc\n"); - buf.append("ddd\n"); - StringReader reader = new StringReader(buf.toString()); + String script = "aaa;\nbbb\ngo\nccc\nddd\n"; + StringReader reader = new StringReader(script); return new BufferedReader(reader); } }; @@ -64,9 +59,7 @@ public void testReadSql_delimiterInLine() throws Exception { @Override protected BufferedReader createBufferedReader() throws IOException { - StringBuilder buf = new StringBuilder(); - buf.append("aaa; bbb; ccc;\n"); - StringReader reader = new StringReader(buf.toString()); + StringReader reader = new StringReader("aaa; bbb; ccc;\n"); return new BufferedReader(reader); } }; @@ -83,10 +76,8 @@ public void testReadSql_sqlBlock() throws Exception { @Override protected BufferedReader createBufferedReader() throws IOException { - StringBuilder buf = new StringBuilder(); - buf.append("begin aaa; end\n"); - buf.append("go\n"); - StringReader reader = new StringReader(buf.toString()); + String script = "begin aaa; end\n" + "go\n"; + StringReader reader = new StringReader(script); return new BufferedReader(reader); } }; @@ -101,10 +92,8 @@ public void testReadSql_sqlBlock_createTrigger() throws Exception { @Override protected BufferedReader createBufferedReader() throws IOException { - StringBuilder buf = new StringBuilder(); - buf.append("create trigger hoge begin aaa; end\n"); - buf.append("go\n"); - StringReader reader = new StringReader(buf.toString()); + String script = "create trigger hoge begin aaa; end\n" + "go\n"; + StringReader reader = new StringReader(script); return new BufferedReader(reader); } }; @@ -118,10 +107,8 @@ public void testReadSql_notSqlBlock() throws Exception { new ScriptReader(query) { @Override protected BufferedReader createBufferedReader() throws IOException { - StringBuilder buf = new StringBuilder(); - buf.append("start aaa; end\n"); - buf.append("go\n"); - StringReader reader = new StringReader(buf.toString()); + String script = "start aaa; end\n" + "go\n"; + StringReader reader = new StringReader(script); return new BufferedReader(reader); } }; @@ -136,10 +123,8 @@ public void testReadSql_commentBlock() throws Exception { @Override protected BufferedReader createBufferedReader() throws IOException { - StringBuilder buf = new StringBuilder(); - buf.append("select 1 ; /* aaa\n"); - buf.append("aaa */ select 2;"); - StringReader reader = new StringReader(buf.toString()); + String script = "select 1 ; /* aaa\n" + "aaa */ select 2;"; + StringReader reader = new StringReader(script); return new BufferedReader(reader); } }; @@ -155,14 +140,8 @@ public void testReadSql_lineNumber() throws Exception { @Override protected BufferedReader createBufferedReader() throws IOException { - StringBuilder buf = new StringBuilder(); - buf.append("/*\n"); - buf.append(" *\n"); - buf.append(" */\n"); - buf.append("select 1\n"); - buf.append("from \n"); - buf.append("hoge\n"); - StringReader reader = new StringReader(buf.toString()); + String script = "/*\n *\n */\nselect 1\nfrom \nhoge\n"; + StringReader reader = new StringReader(script); return new BufferedReader(reader); } }; From f7ab7cab306145114651a135943f058b5e19ed7e Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:07:05 +0900 Subject: [PATCH 28/78] Remove redundant suppression --- doma-core/src/main/java/org/seasar/doma/Entity.java | 1 - .../main/java/org/seasar/doma/jdbc/command/SelectCommand.java | 1 - .../org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java | 4 ---- 3 files changed, 6 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/Entity.java b/doma-core/src/main/java/org/seasar/doma/Entity.java index 84500d8ec..9eb07308d 100644 --- a/doma-core/src/main/java/org/seasar/doma/Entity.java +++ b/doma-core/src/main/java/org/seasar/doma/Entity.java @@ -86,7 +86,6 @@ * * @return the entity listener class */ - @SuppressWarnings("rawtypes") Class listener() default NullEntityListener.class; /** diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/command/SelectCommand.java b/doma-core/src/main/java/org/seasar/doma/jdbc/command/SelectCommand.java index eb85804a9..a9321e9d5 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/command/SelectCommand.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/command/SelectCommand.java @@ -112,7 +112,6 @@ protected void close(Supplier supplier, Runnable closeHandler) { if (supplier != null && query.isResultStream() && query.getFetchType() == FetchType.LAZY) { RESULT result = supplier.get(); if (result instanceof Stream) { - @SuppressWarnings("resource") Stream stream = (Stream) result; stream.onClose(closeHandler); } else { diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java index 5cdba028d..78605bd45 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java @@ -11,16 +11,12 @@ public class DefaultPropertyTypeTest { - @SuppressWarnings("unused") private String hoge; - @SuppressWarnings("unused") private Foo foo; - @SuppressWarnings("unused") private int primitiveInt; - @SuppressWarnings("unused") private Integer integer; @Test From 98714a9e79fe91d0280adc04b3b769e4b761b92b Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:09:18 +0900 Subject: [PATCH 29/78] Remove redundant suppression --- .../org/seasar/doma/internal/expr/ExpressionTokenizer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java index 05aa6b0cd..73fb722eb 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java @@ -386,9 +386,9 @@ protected void peekNumber() { buf.mark(); char c2 = buf.get(); if (Character.isDigit(c2)) { - //noinspection SingleStatementInBlock continue; - } else if (c2 == '.') { + } + if (c2 == '.') { if (decimal) { type = ILLEGAL_NUMBER_LITERAL; return; From 6cc44eab89cbe487cfa84bf4583a2904ece66d82 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:19:55 +0900 Subject: [PATCH 30/78] Suppress SameReturnValue --- .../seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java | 2 ++ .../src/main/java/org/seasar/doma/jdbc/SqlParameterVisitor.java | 1 + .../java/org/seasar/doma/jdbc/criteria/context/Operand.java | 1 + .../org/seasar/doma/jdbc/criteria/option/AssociationOption.java | 1 + .../org/seasar/doma/jdbc/criteria/option/DistinctOption.java | 1 + 5 files changed, 6 insertions(+) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java index 59272174e..858d440b7 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java @@ -232,6 +232,7 @@ public Void visitLiteralVariableNode(final LiteralVariableNode node, Context p) return visitValueNode(node, p, validator.andThen(p::addLiteralValue)); } + @SuppressWarnings("SameReturnValue") protected Void visitValueNode(ValueNode node, Context p, Consumer> valueHandler) { SqlLocation location = node.getLocation(); String name = node.getVariableName(); @@ -323,6 +324,7 @@ protected boolean startsWithClauseKeyword(String fragment) { return matcher.lookingAt(); } + @SuppressWarnings("SameReturnValue") protected Void handleSingleValueNode( ValueNode node, Context p, diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/SqlParameterVisitor.java b/doma-core/src/main/java/org/seasar/doma/jdbc/SqlParameterVisitor.java index 25177ece1..8840d97cf 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/SqlParameterVisitor.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/SqlParameterVisitor.java @@ -1,5 +1,6 @@ package org.seasar.doma.jdbc; +@SuppressWarnings("SameReturnValue") public interface SqlParameterVisitor { R visitInParameter(InParameter parameter, P p) throws TH; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Operand.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Operand.java index 613570494..3c9d7ee3a 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Operand.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Operand.java @@ -74,6 +74,7 @@ public int hashCode() { } } + @SuppressWarnings("SameReturnValue") interface Visitor { R visit(Param operand); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/AssociationOption.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/AssociationOption.java index 0a10e022c..de747937f 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/AssociationOption.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/AssociationOption.java @@ -1,6 +1,7 @@ package org.seasar.doma.jdbc.criteria.option; /** Represents the option about the associate and associateWith operators. */ +@SuppressWarnings("SameReturnValue") public interface AssociationOption { enum Kind implements AssociationOption { MANDATORY, diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/DistinctOption.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/DistinctOption.java index 6f68de272..0c11a4e43 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/DistinctOption.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/DistinctOption.java @@ -1,6 +1,7 @@ package org.seasar.doma.jdbc.criteria.option; /** Represents the option that decides whether to append the DISTINCT keyword or not. */ +@SuppressWarnings("SameReturnValue") public interface DistinctOption { enum Kind implements DistinctOption { NONE, From 64a79a87321db227757c93325540a859fd6ce401 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:26:23 +0900 Subject: [PATCH 31/78] Make final --- .../internal/jdbc/dialect/MssqlPagingTransformer.java | 2 +- .../java/org/seasar/doma/jdbc/dialect/MssqlDialect.java | 2 +- .../org/seasar/doma/jdbc/dialect/StandardDialect.java | 2 +- .../seasar/doma/jdbc/tx/TransactionIsolationLevel.java | 2 +- .../java/org/seasar/doma/jdbc/CallerCommenterTest.java | 2 +- .../seasar/doma/jdbc/criteria/query/AliasManagerTest.java | 8 ++++---- .../seasar/doma/jdbc/domain/DomainTypeFactoryTest.java | 2 +- .../seasar/doma/jdbc/entity/EntityTypeFactoryTest.java | 2 +- .../seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MssqlPagingTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MssqlPagingTransformer.java index b82ec7235..b3ca0a952 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MssqlPagingTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MssqlPagingTransformer.java @@ -9,7 +9,7 @@ public class MssqlPagingTransformer extends Mssql2008PagingTransformer { - private boolean forceOffsetFetch; + private final boolean forceOffsetFetch; public MssqlPagingTransformer(long offset, long limit, boolean forceOffsetFetch) { super(offset, limit); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MssqlDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MssqlDialect.java index 7c05cebfb..a67466966 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MssqlDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MssqlDialect.java @@ -18,7 +18,7 @@ public class MssqlDialect extends Mssql2008Dialect { /** whether this dialect forces to use the OFFSET FETCH Clause for a paging */ - private boolean pagingForceOffsetFetch; + private final boolean pagingForceOffsetFetch; public MssqlDialect() { this( diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java index 5f975d6cc..276e2b4d5 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java @@ -712,7 +712,7 @@ public String visitObjectWrapper(ObjectWrapper wrapper, SqlLogFormattingFunction public static class StandardExpressionFunctions implements ExpressionFunctions { /** the default escape character */ - private static char DEFAULT_ESCAPE_CHAR = '$'; + private static final char DEFAULT_ESCAPE_CHAR = '$'; /** the default wild card characters */ private static final char[] DEFAULT_WILDCARDS = {'%', '_'}; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionIsolationLevel.java b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionIsolationLevel.java index 0ff409daa..52a69605f 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionIsolationLevel.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/TransactionIsolationLevel.java @@ -20,7 +20,7 @@ public enum TransactionIsolationLevel { /** the default level */ DEFAULT(-1); - private int level; + private final int level; TransactionIsolationLevel(int level) { this.level = level; diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/CallerCommenterTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/CallerCommenterTest.java index 32974573c..8317eaa38 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/CallerCommenterTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/CallerCommenterTest.java @@ -7,7 +7,7 @@ public class CallerCommenterTest { - private CallerCommenter commenter = new CallerCommenter(); + private final CallerCommenter commenter = new CallerCommenter(); @Test public void testComment() throws Exception { diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/query/AliasManagerTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/query/AliasManagerTest.java index 4e2af642d..f0fcf5d61 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/query/AliasManagerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/query/AliasManagerTest.java @@ -11,10 +11,10 @@ import org.seasar.doma.jdbc.criteria.metamodel.EntityMetamodel; class AliasManagerTest { - private Emp_ e = new Emp_(); - private Dept_ d = new Dept_(); - private Emp_ e2 = new Emp_(); - private Dept_ d2 = new Dept_(); + private final Emp_ e = new Emp_(); + private final Dept_ d = new Dept_(); + private final Emp_ e2 = new Emp_(); + private final Dept_ d2 = new Dept_(); private static class ContextImpl implements Context { diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeFactoryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeFactoryTest.java index 7a2293b4d..6a7de22c1 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeFactoryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeFactoryTest.java @@ -10,7 +10,7 @@ public class DomainTypeFactoryTest { - private ClassHelper classHelper = new ClassHelper() {}; + private final ClassHelper classHelper = new ClassHelper() {}; @Test public void testGetDomainType() throws Exception { diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeFactoryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeFactoryTest.java index 0c8bd8b67..401278f42 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeFactoryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeFactoryTest.java @@ -10,7 +10,7 @@ public class EntityTypeFactoryTest { - private ClassHelper classHelper = new ClassHelper() {}; + private final ClassHelper classHelper = new ClassHelper() {}; @Test public void testGetEntityType() throws Exception { diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java index bd5dc1aa8..f0e27b74c 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java @@ -234,7 +234,7 @@ public static _NotTopLevelEntity__Hoge newInstance() { } private static class ListenerHolder { - private static org.seasar.doma.jdbc.entity.NullEntityListener listener = - new org.seasar.doma.jdbc.entity.NullEntityListener<>(); + private static final org.seasar.doma.jdbc.entity.NullEntityListener + listener = new org.seasar.doma.jdbc.entity.NullEntityListener<>(); } } From aa92f078cb03eb32aec4f61cadebc729ed08048b Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:29:50 +0900 Subject: [PATCH 32/78] Suppress CStyleArrayDeclaration --- .../java/org/seasar/doma/internal/expr/ExpressionEvaluator.java | 1 + .../src/main/java/org/seasar/doma/internal/util/StringUtil.java | 2 ++ .../src/main/java/org/seasar/doma/jdbc/AbstractJdbcLogger.java | 1 + 3 files changed, 4 insertions(+) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java index 36513ad6d..3f3d998ec 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java @@ -561,6 +561,7 @@ protected Method findMethodFromClasses( return findSuiteMethod(methods, target, targetClass, paramTypes); } + @SuppressWarnings("CStyleArrayDeclaration") protected Method findSuiteMethod( List methods, Object target, Class targetClass, Class[] argTypes) { CandidateMethod candidate = null; diff --git a/doma-core/src/main/java/org/seasar/doma/internal/util/StringUtil.java b/doma-core/src/main/java/org/seasar/doma/internal/util/StringUtil.java index 53c0b3a22..fdb16bf7b 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/util/StringUtil.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/util/StringUtil.java @@ -5,6 +5,7 @@ public final class StringUtil { + @SuppressWarnings("CStyleArrayDeclaration") public static String capitalize(String text) { if (isNullOrEmpty(text)) { return text; @@ -14,6 +15,7 @@ public static String capitalize(String text) { return new String(chars); } + @SuppressWarnings("CStyleArrayDeclaration") public static String decapitalize(String text) { if (isNullOrEmpty(text)) { return text; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/AbstractJdbcLogger.java b/doma-core/src/main/java/org/seasar/doma/jdbc/AbstractJdbcLogger.java index 67b2bf674..e6ff96a09 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/AbstractJdbcLogger.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/AbstractJdbcLogger.java @@ -55,6 +55,7 @@ public void logDaoMethodEntering( () -> Message.DOMA2220.getMessage(callerClassName, callerMethodName)); } + @SuppressWarnings("CStyleArrayDeclaration") protected void logDaoMethodEntering( String callerClassName, String callerMethodName, From 3baa07fc0c0fb731cc4520661ce044c5d5c51c62 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:30:59 +0900 Subject: [PATCH 33/78] Remove unnecessary semicolon --- .../java/org/seasar/doma/internal/expr/ExpressionTokenType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenType.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenType.java index 3da13cf01..0318ec9e9 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenType.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenType.java @@ -75,5 +75,5 @@ public enum ExpressionTokenType { OTHER, - EOE; + EOE } From 9b22d208734cd17a826c6726c0c52d2ecb5aca1d Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:34:46 +0900 Subject: [PATCH 34/78] Print a message instead of an exception --- .../org/seasar/doma/internal/jdbc/sql/SqlTokenizerTest.java | 2 +- .../src/test/java/org/seasar/doma/jdbc/ConfigExceptionTest.java | 2 +- doma-core/src/test/java/org/seasar/doma/jdbc/ConfigTest.java | 2 +- .../org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizerTest.java index f9d2aa937..19e7d90d5 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizerTest.java @@ -646,7 +646,7 @@ public void testIllegalDirective() throws Exception { tokenizer.next(); fail(); } catch (JdbcException expected) { - System.out.println(expected); + System.out.println(expected.getMessage()); assertEquals(Message.DOMA2119, expected.getMessageResource()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigExceptionTest.java index 2efb228e4..29e4a9307 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigExceptionTest.java @@ -9,7 +9,7 @@ public class ConfigExceptionTest { @Test public void test() throws Exception { ConfigException e = new ConfigException("aaa", "bbb"); - System.out.println(e); + System.out.println(e.getMessage()); assertEquals("aaa", e.getClassName()); assertEquals("bbb", e.getMethodName()); } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigTest.java index a505295d4..e53ebfa14 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigTest.java @@ -21,7 +21,7 @@ public void testGet_IllegalArgument() throws Exception { Config.get("hoge"); fail(); } catch (DomaIllegalArgumentException e) { - System.out.println(e); + System.out.println(e.getMessage()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java index 658adc3be..d684a9459 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java @@ -60,7 +60,7 @@ public void test_identityReservationSql() throws Exception { identityIdGenerator.generatePreInsert(idGenerationConfig); fail(); } catch (IllegalStateException ignored) { - System.out.println(ignored); + System.out.println(ignored.getMessage()); } } } From e906c525e52bb41fa2048fb5dd8d26cd6c1579ed Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:35:58 +0900 Subject: [PATCH 35/78] Replace with 'while' --- .../java/org/seasar/doma/internal/expr/ExpressionParser.java | 2 +- .../main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java index 9eb520e01..835463f62 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java @@ -412,7 +412,7 @@ protected void parseStaticFieldOperand() { protected void parseNewOperand() { StringBuilder buf = new StringBuilder(); - for (; tokenizer.next() != OPENED_PARENS; ) { + while (tokenizer.next() != OPENED_PARENS) { if (tokenType != WHITESPACE) { buf.append(tokenizer.getToken()); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java index 276e2b4d5..ec595a672 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java @@ -1048,7 +1048,7 @@ protected void check() { } Iterator startKeywordsIt = startKeywords.iterator(); Iterator keywordsIt = keywords.iterator(); - for (; startKeywordsIt.hasNext(); ) { + while (startKeywordsIt.hasNext()) { String word1 = startKeywordsIt.next(); String word2 = keywordsIt.next(); inBlock = word1.equalsIgnoreCase(word2); From 23f803af40019e3130acc7b3949f149fefa39e19 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:38:18 +0900 Subject: [PATCH 36/78] Replace with 'if' --- .../internal/expr/ExpressionTokenizer.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java index 73fb722eb..f5fe80bb5 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java @@ -31,17 +31,15 @@ public ExpressionTokenizer(String expression) { } public ExpressionTokenType next() { - switch (type) { - case EOE: - token = null; - type = EOE; - return EOE; - default: - ExpressionTokenType currentType = type; - prepareToken(); - peek(); - return currentType; + if (type == EOE) { + token = null; + type = EOE; + return EOE; } + ExpressionTokenType currentType = type; + prepareToken(); + peek(); + return currentType; } protected void prepareToken() { From 66ed25608393f2bb3e955aa62d6eeb82bb80e998 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:41:16 +0900 Subject: [PATCH 37/78] Inline variable --- .../command/AbstractSingleResultHandler.java | 22 +++++++++---------- .../seasar/doma/internal/util/ClassUtil.java | 3 +-- .../doma/jdbc/query/AutoBatchInsertQuery.java | 3 +-- .../doma/jdbc/query/AutoInsertQuery.java | 6 ++--- .../jdbc/entity/_NotTopLevelEntity__Hoge.java | 3 +-- .../jdbc/query/AutoBatchDeleteQueryTest.java | 3 +-- .../jdbc/query/AutoBatchInsertQueryTest.java | 5 ++--- .../jdbc/query/AutoBatchUpdateQueryTest.java | 3 +-- .../doma/jdbc/query/AutoDeleteQueryTest.java | 3 +-- .../jdbc/query/AutoFunctionQueryTest.java | 3 +-- .../doma/jdbc/query/AutoInsertQueryTest.java | 3 +-- .../doma/jdbc/query/AutoUpdateQueryTest.java | 3 +-- .../query/SqlFileBatchDeleteQueryTest.java | 3 +-- .../query/SqlFileBatchInsertQueryTest.java | 3 +-- .../query/SqlFileBatchUpdateQueryTest.java | 3 +-- .../jdbc/query/SqlFileUpdateQueryTest.java | 9 +++----- 16 files changed, 29 insertions(+), 49 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/AbstractSingleResultHandler.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/AbstractSingleResultHandler.java index 39396e4d3..cdfeac0bd 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/AbstractSingleResultHandler.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/AbstractSingleResultHandler.java @@ -24,17 +24,15 @@ public AbstractSingleResultHandler(ResultSetHandler handler) { public Supplier handle( ResultSet resultSet, SelectQuery query, ResultSetRowIndexConsumer consumer) throws SQLException { - Supplier result = - handler.handle( - resultSet, - query, - (index, next) -> { - consumer.accept(index, next); - if (index == 0 && next) { - Sql sql = query.getSql(); - throw new NonUniqueResultException(query.getConfig().getExceptionSqlLogType(), sql); - } - }); - return result; + return handler.handle( + resultSet, + query, + (index, next) -> { + consumer.accept(index, next); + if (index == 0 && next) { + Sql sql = query.getSql(); + throw new NonUniqueResultException(query.getConfig().getExceptionSqlLogType(), sql); + } + }); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java b/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java index 528f7c4ee..74dc627ab 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/util/ClassUtil.java @@ -141,7 +141,6 @@ public static R traverse(Class clazz, Function, R> f) { if (superclass == null) { return null; } - R result = traverse(superclass, f); - return result; + return traverse(superclass, f); } } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchInsertQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchInsertQuery.java index e0de88769..bc59d0143 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchInsertQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchInsertQuery.java @@ -123,9 +123,8 @@ protected void prepareTargetPropertyTypes() { protected void prepareIdValue() { if (generatedIdPropertyType != null && idGenerationConfig != null) { - ENTITY newEntity = + currentEntity = generatedIdPropertyType.preInsert(entityType, currentEntity, idGenerationConfig); - currentEntity = newEntity; } } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoInsertQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoInsertQuery.java index 3a69d8fc3..76736321d 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoInsertQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoInsertQuery.java @@ -103,8 +103,7 @@ protected void prepareTargetPropertyType() { protected void prepareIdValue() { if (generatedIdPropertyType != null && idGenerationConfig != null) { - ENTITY newEntity = generatedIdPropertyType.preInsert(entityType, entity, idGenerationConfig); - entity = newEntity; + entity = generatedIdPropertyType.preInsert(entityType, entity, idGenerationConfig); } } @@ -141,9 +140,8 @@ protected void prepareSql() { @Override public void generateId(Statement statement) { if (generatedIdPropertyType != null && idGenerationConfig != null) { - ENTITY newEntity = + entity = generatedIdPropertyType.postInsert(entityType, entity, idGenerationConfig, statement); - entity = newEntity; } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java index f0e27b74c..888e1bc0f 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java @@ -206,8 +206,7 @@ public void postDelete( public NotTopLevelEntity.Hoge newEntity( java.util.Map> __args) { - NotTopLevelEntity.Hoge entity = new NotTopLevelEntity.Hoge(); - return entity; + return new NotTopLevelEntity.Hoge(); } @Override diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java index f77f869ae..194ca4e0b 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java @@ -49,8 +49,7 @@ public void testPrepare() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - BatchDeleteQuery batchDeleteQuery = query; - assertEquals(2, batchDeleteQuery.getSqls().size()); + assertEquals(2, ((BatchDeleteQuery) query).getSqls().size()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java index 5d825a4dd..fcc3361e4 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java @@ -48,9 +48,8 @@ public void testPrepare() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - BatchInsertQuery batchInsertQuery = query; - assertTrue(batchInsertQuery.isBatchSupported()); - assertEquals(2, batchInsertQuery.getSqls().size()); + assertTrue(((BatchInsertQuery) query).isBatchSupported()); + assertEquals(2, ((BatchInsertQuery) query).getSqls().size()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java index 5a9916b0d..078ed2533 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java @@ -53,8 +53,7 @@ public void testPrepare() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - BatchUpdateQuery batchUpdateQuery = query; - assertEquals(2, batchUpdateQuery.getSqls().size()); + assertEquals(2, ((BatchUpdateQuery) query).getSqls().size()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java index 36a85f6c4..1945940ec 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java @@ -41,8 +41,7 @@ public void testPrepare() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - DeleteQuery deleteQuery = query; - assertNotNull(deleteQuery.getSql()); + assertNotNull(((DeleteQuery) query).getSql()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java index 1683b7bde..863b4a5bf 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java @@ -23,7 +23,6 @@ public void testPrepare() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - FunctionQuery functionQuery = query; - assertNotNull(functionQuery.getSql()); + assertNotNull(((FunctionQuery) query).getSql()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java index f1470b762..7925e6f61 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java @@ -43,8 +43,7 @@ public void testPrepare() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - InsertQuery insertQuery = query; - assertNotNull(insertQuery.getSql()); + assertNotNull(((InsertQuery) query).getSql()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java index a929d56b9..cd3d3dce0 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java @@ -47,8 +47,7 @@ public void testPrepare() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - UpdateQuery updateQuery = query; - assertNotNull(updateQuery.getSql()); + assertNotNull(((UpdateQuery) query).getSql()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java index 42829e890..3111911a8 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java @@ -49,8 +49,7 @@ public void testPrepare() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - BatchDeleteQuery batchDeleteQuery = query; - assertEquals(2, batchDeleteQuery.getSqls().size()); + assertEquals(2, ((BatchDeleteQuery) query).getSqls().size()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java index 31327f40f..2d1250fc0 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java @@ -51,8 +51,7 @@ public void testPrepare() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - BatchInsertQuery batchInsertQuery = query; - assertEquals(2, batchInsertQuery.getSqls().size()); + assertEquals(2, ((BatchInsertQuery) query).getSqls().size()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java index c7c5d7ad2..58bc5bb0c 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java @@ -55,8 +55,7 @@ public void testPrepare() throws Exception { query.setSqlLogType(SqlLogType.FORMATTED); query.prepare(); - BatchUpdateQuery batchUpdateQuery = query; - assertEquals(2, batchUpdateQuery.getSqls().size()); + assertEquals(2, ((BatchUpdateQuery) query).getSqls().size()); } @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java index df31fd79c..1a20b9860 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java @@ -64,8 +64,7 @@ public void testPopulate() throws Exception { query.addParameter("emp", Emp.class, emp); query.prepare(); - UpdateQuery updateQuery = query; - PreparedSql sql = updateQuery.getSql(); + PreparedSql sql = ((UpdateQuery) query).getSql(); assertEquals( "update aaa set NAME = ?, SALARY = ?, VERSION = ? + 1 where id = ?", sql.getRawSql()); assertEquals( @@ -299,8 +298,7 @@ public void testNonEntity() throws Exception { query.addParameter("version", Integer.class, 100); query.prepare(); - UpdateQuery updateQuery = query; - PreparedSql sql = updateQuery.getSql(); + PreparedSql sql = ((UpdateQuery) query).getSql(); assertEquals("update aaa set NAME = ?, VERSION = ? + 1 where id = ?", sql.getRawSql()); assertEquals( "update aaa set NAME = 'aaa', VERSION = 100 + 1 where id = 10", sql.getFormattedSql()); @@ -337,8 +335,7 @@ public void testOriginalStates_unchanged() throws Exception { query.addParameter("emp", Emp.class, emp); query.prepare(); - UpdateQuery updateQuery = query; - PreparedSql sql = updateQuery.getSql(); + PreparedSql sql = ((UpdateQuery) query).getSql(); assertEquals("update aaa set VERSION = ? + 1 where id = ?", sql.getRawSql()); assertEquals("update aaa set VERSION = 100 + 1 where id = 10", sql.getFormattedSql()); List> parameters = sql.getParameters(); From 6b0de00f5d3055db1136841b0f1cbccf10946843 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:46:43 +0900 Subject: [PATCH 38/78] Suppress BooleanMethodIsAlwaysInverted --- .../internal/jdbc/entity/AbstractEntityListenerContext.java | 1 + .../org/seasar/doma/jdbc/criteria/context/SelectSettings.java | 1 + .../java/org/seasar/doma/jdbc/entity/EntityPropertyType.java | 2 ++ .../main/java/org/seasar/doma/jdbc/query/BatchModifyQuery.java | 1 + 4 files changed, 5 insertions(+) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/entity/AbstractEntityListenerContext.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/entity/AbstractEntityListenerContext.java index 4a4835868..9ebed5665 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/entity/AbstractEntityListenerContext.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/entity/AbstractEntityListenerContext.java @@ -24,6 +24,7 @@ protected AbstractEntityListenerContext(EntityType entityType, Method method, this.config = config; } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") protected boolean isPropertyDefinedInternal(String propertyName) { assertNotNull(propertyName); return entityType.getEntityPropertyType(propertyName) != null; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectSettings.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectSettings.java index ce7d27379..644a473a8 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectSettings.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectSettings.java @@ -13,6 +13,7 @@ public class SelectSettings extends Settings { * * @return whether the empty WHERE clause is allowed or not. The default value is {@literal true}. */ + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean getAllowEmptyWhere() { return allowEmptyWhere; } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/EntityPropertyType.java b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/EntityPropertyType.java index 88bb02052..c602910e5 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/entity/EntityPropertyType.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/entity/EntityPropertyType.java @@ -87,6 +87,7 @@ String getColumnName( * * @return {@code true} if included in SQL INSERT statements. */ + @SuppressWarnings("BooleanMethodIsAlwaysInverted") boolean isInsertable(); /** @@ -94,6 +95,7 @@ String getColumnName( * * @return {@code true} if included in SQL UPDATE statements. */ + @SuppressWarnings("BooleanMethodIsAlwaysInverted") boolean isUpdatable(); /** diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/BatchModifyQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/BatchModifyQuery.java index f4341e9ef..ef583b63e 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/BatchModifyQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/BatchModifyQuery.java @@ -12,6 +12,7 @@ public interface BatchModifyQuery extends Query { @Override PreparedSql getSql(); + @SuppressWarnings("BooleanMethodIsAlwaysInverted") boolean isOptimisticLockCheckRequired(); boolean isAutoGeneratedKeysSupported(); From 7eac0ec3973905e69c4f5bbcaaeaf501d232aaea Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:52:28 +0900 Subject: [PATCH 39/78] Remove redundant 'extends Object' --- .../main/java/org/seasar/doma/jdbc/builder/BatchBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BatchBuilder.java b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BatchBuilder.java index 04fd813cf..24ce8a04c 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BatchBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/builder/BatchBuilder.java @@ -218,7 +218,7 @@ public BatchBuilder removeLast() { } @Override -

BatchBuilder appendParam(Class

paramClass, P param, boolean literal) { +

BatchBuilder appendParam(Class

paramClass, P param, boolean literal) { final String paramName = paramNameMap.get(paramIndex.getValue()); if (paramName == null) { throw new JdbcException(Message.DOMA2231); From c529f2c795834bf92bbe083cff21f4939c2fc99a Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:53:17 +0900 Subject: [PATCH 40/78] Suppress OptionalUsedAsFieldOrParameterType --- .../seasar/doma/internal/jdbc/sql/OptionalBasicInParameter.java | 1 + .../seasar/doma/internal/jdbc/sql/OptionalDomainInParameter.java | 1 + .../seasar/doma/internal/jdbc/sql/OptionalDoubleInParameter.java | 1 + .../seasar/doma/internal/jdbc/sql/OptionalIntInParameter.java | 1 + .../seasar/doma/internal/jdbc/sql/OptionalLongInParameter.java | 1 + doma-core/src/main/java/org/seasar/doma/jdbc/CommentContext.java | 1 + .../src/test/java/org/seasar/doma/internal/expr/Person.java | 1 + 7 files changed, 7 insertions(+) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInParameter.java index bf8d0875b..f4064ae06 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalBasicInParameter.java @@ -5,6 +5,7 @@ import org.seasar.doma.internal.jdbc.scalar.OptionalBasicScalar; import org.seasar.doma.wrapper.Wrapper; +@SuppressWarnings("OptionalUsedAsFieldOrParameterType") public class OptionalBasicInParameter extends ScalarInParameter> { public OptionalBasicInParameter(Supplier> supplier, Optional value) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainInParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainInParameter.java index d1a4de602..287b8cdb3 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainInParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDomainInParameter.java @@ -3,6 +3,7 @@ import java.util.Optional; import org.seasar.doma.jdbc.domain.DomainType; +@SuppressWarnings("OptionalUsedAsFieldOrParameterType") public class OptionalDomainInParameter extends ScalarInParameter> { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleInParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleInParameter.java index 26e4a9727..4f7f2c018 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleInParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalDoubleInParameter.java @@ -3,6 +3,7 @@ import java.util.OptionalDouble; import org.seasar.doma.internal.jdbc.scalar.OptionalDoubleScalar; +@SuppressWarnings("OptionalUsedAsFieldOrParameterType") public class OptionalDoubleInParameter extends ScalarInParameter { public OptionalDoubleInParameter(OptionalDouble value) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntInParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntInParameter.java index e0e514492..c862d8548 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntInParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalIntInParameter.java @@ -3,6 +3,7 @@ import java.util.OptionalInt; import org.seasar.doma.internal.jdbc.scalar.OptionalIntScalar; +@SuppressWarnings("OptionalUsedAsFieldOrParameterType") public class OptionalIntInParameter extends ScalarInParameter { public OptionalIntInParameter(OptionalInt value) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongInParameter.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongInParameter.java index fd604d5c6..2b5efd54f 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongInParameter.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/OptionalLongInParameter.java @@ -3,6 +3,7 @@ import java.util.OptionalLong; import org.seasar.doma.internal.jdbc.scalar.OptionalLongScalar; +@SuppressWarnings("OptionalUsedAsFieldOrParameterType") public class OptionalLongInParameter extends ScalarInParameter { public OptionalLongInParameter(OptionalLong value) { diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/CommentContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/CommentContext.java index 6d37f0da8..900b79dc0 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/CommentContext.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/CommentContext.java @@ -6,6 +6,7 @@ import org.seasar.doma.jdbc.builder.SelectBuilder; /** A context for a comment. */ +@SuppressWarnings("OptionalUsedAsFieldOrParameterType") public class CommentContext { protected final String className; diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java index cffed353d..2a1d68804 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java @@ -5,6 +5,7 @@ import java.util.OptionalInt; import java.util.OptionalLong; +@SuppressWarnings("OptionalUsedAsFieldOrParameterType") public class Person { public String name; From ff1a9df9859c425fc20f155e86b290cc0d08f891 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:55:35 +0900 Subject: [PATCH 41/78] Rename exception parameter name --- .../org/seasar/doma/jdbc/tx/LocalTransaction.java | 12 ++++++------ .../doma/internal/expr/ExpressionEvaluatorTest.java | 4 ++-- .../doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java index 1f5ed93db..774897653 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java @@ -256,8 +256,8 @@ protected void rollbackInternal(String callerMethodName) { try { connection.rollback(); jdbcLogger.logTransactionRolledback(className, callerMethodName, id); - } catch (SQLException ignored) { - jdbcLogger.logTransactionRollbackFailure(className, callerMethodName, id, ignored); + } catch (SQLException e) { + jdbcLogger.logTransactionRollbackFailure(className, callerMethodName, id, e); } finally { end(callerMethodName); } @@ -427,9 +427,9 @@ protected void release(LocalTransactionContext context, String callerMethodName) if (isolationLevel != Connection.TRANSACTION_NONE) { try { connection.setTransactionIsolation(isolationLevel); - } catch (SQLException ignored) { + } catch (SQLException e) { jdbcLogger.logTransactionIsolationSettingFailure( - className, callerMethodName, isolationLevel, ignored); + className, callerMethodName, isolationLevel, e); } } @@ -437,8 +437,8 @@ protected void release(LocalTransactionContext context, String callerMethodName) if (isAutoCommit) { try { connection.setAutoCommit(true); - } catch (SQLException ignored) { - jdbcLogger.logAutoCommitEnablingFailure(className, callerMethodName, ignored); + } catch (SQLException e) { + jdbcLogger.logAutoCommitEnablingFailure(className, callerMethodName, e); } } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java index 52a50ea19..ca4d071de 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java @@ -203,8 +203,8 @@ public void testForClassName_notFound() throws Exception { ExpressionEvaluator evaluator = new ExpressionEvaluator(); try { evaluator.forClassName(location, "inexistentClass"); - } catch (ExpressionException ignored) { - System.out.println(ignored.getMessage()); + } catch (ExpressionException e) { + System.out.println(e.getMessage()); } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java index d684a9459..5543b6bf7 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java @@ -59,8 +59,8 @@ public void test_identityReservationSql() throws Exception { try { identityIdGenerator.generatePreInsert(idGenerationConfig); fail(); - } catch (IllegalStateException ignored) { - System.out.println(ignored.getMessage()); + } catch (IllegalStateException e) { + System.out.println(e.getMessage()); } } } From fbd45c2e6152860aef4d0d6b479f0af839662ec3 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:56:35 +0900 Subject: [PATCH 42/78] Replace with expression lambda --- .../seasar/doma/jdbc/tx/LocalTransactionManagerTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java index f1c6e43b6..895587f6d 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java @@ -61,11 +61,7 @@ public void testRequired_blcok() throws Exception { @Test public void testRequired_supplier() throws Exception { LocalTransactionManager manager = new LocalTransactionManager(transaction); - String result = - manager.required( - () -> { - return "aaa"; - }); + String result = manager.required(() -> "aaa"); assertEquals("aaa", result); } From 32d7bb597a5ebf4a4585ed1c4253f933794ae4bd Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 12:57:23 +0900 Subject: [PATCH 43/78] Make 'static' --- .../org/seasar/doma/internal/jdbc/sql/CallableSqlBuilder.java | 2 +- .../java/org/seasar/doma/internal/util/GenericUtilTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/CallableSqlBuilder.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/CallableSqlBuilder.java index b8d7e0747..41fb1a364 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/CallableSqlBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/CallableSqlBuilder.java @@ -150,7 +150,7 @@ public Void visitResultListParameter(ResultListParameter para return null; } - protected class Context { + protected static class Context { private final StringBuilder rawSqlBuf = new StringBuilder(200); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/util/GenericUtilTest.java b/doma-core/src/test/java/org/seasar/doma/internal/util/GenericUtilTest.java index 0a594555a..467ba9052 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/util/GenericUtilTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/util/GenericUtilTest.java @@ -100,5 +100,5 @@ public Boolean m3(Boolean value) { } } - public class Ccc2 extends Bbb2 {} + public static class Ccc2 extends Bbb2 {} } From 1266abdef6aa3c7bcc58a73da28ea7d67ffdf12a Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:05:30 +0900 Subject: [PATCH 44/78] Suppress DuplicateBranchesInSwitch --- .../java/org/seasar/doma/internal/expr/ExpressionParser.java | 1 + .../doma/internal/jdbc/dialect/OracleForUpdateTransformer.java | 1 + 2 files changed, 2 insertions(+) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java index 835463f62..bc58f82ba 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java @@ -255,6 +255,7 @@ public ExpressionNode parse() { Message.DOMA3011, location.getExpression(), location.getPosition(), token); } case EOE: + //noinspection DuplicateBranchesInSwitch { break outer; } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/OracleForUpdateTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/OracleForUpdateTransformer.java index bae68762c..591ce64e3 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/OracleForUpdateTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/OracleForUpdateTransformer.java @@ -31,6 +31,7 @@ public SqlNode visitSelectStatementNode(SelectStatementNode node, Void p) { } switch (forUpdateType) { case NORMAL: + //noinspection DuplicateBranchesInSwitch { break; } From 76dd18e82400d4c28d9586bbed376e0702fafbdd Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:09:09 +0900 Subject: [PATCH 45/78] Remove redundant initializer --- .../java/org/seasar/doma/internal/expr/ExpressionEvaluator.java | 2 +- .../java/org/seasar/doma/internal/jdbc/dao/DaoImplSupport.java | 2 +- .../seasar/doma/internal/jdbc/dialect/Db2PagingTransformer.java | 2 +- .../doma/internal/jdbc/dialect/H212126PagingTransformer.java | 2 +- .../seasar/doma/internal/jdbc/dialect/H2PagingTransformer.java | 2 +- .../doma/internal/jdbc/dialect/HsqldbPagingTransformer.java | 2 +- .../doma/internal/jdbc/dialect/MysqlPagingTransformer.java | 2 +- .../doma/internal/jdbc/dialect/PostgresPagingTransformer.java | 2 +- .../doma/internal/jdbc/dialect/SqlitePagingTransformer.java | 2 +- .../java/org/seasar/doma/jdbc/command/SelectCommandTest.java | 2 -- 10 files changed, 9 insertions(+), 11 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java index 3f3d998ec..b94d12e83 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java @@ -449,7 +449,7 @@ protected Constructor findConstructor( protected EvaluationResult invokeConstructor( ExpressionLocation location, Class clazz, Constructor constructor, Object... params) { - Object value = null; + Object value; try { value = ConstructorUtil.newInstance(constructor, params); } catch (WrapException e) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupport.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupport.java index 4cfdd132c..8aa00a9cc 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupport.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupport.java @@ -34,7 +34,7 @@ public DaoImplSupport(Config config, Connection connection) { if (connection == null) { throw new DomaNullPointerException("connection"); } - DataSource dataSource = null; + DataSource dataSource; if (connection instanceof NeverClosedConnection) { dataSource = new NeverClosedConnectionProvider((NeverClosedConnection) connection); } else { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/Db2PagingTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/Db2PagingTransformer.java index d9d831db0..619aa9476 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/Db2PagingTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/Db2PagingTransformer.java @@ -32,7 +32,7 @@ public SqlNode visitSelectStatementNode(SelectStatementNode node, Void p) { processed = true; OrderByClauseNode originalOrderBy = node.getOrderByClauseNode(); - OrderByClauseNode orderBy = null; + OrderByClauseNode orderBy; if (originalOrderBy != null) { orderBy = new OrderByClauseNode(originalOrderBy.getWordNode()); for (SqlNode child : originalOrderBy.getChildren()) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/H212126PagingTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/H212126PagingTransformer.java index d989315b3..6096ffa78 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/H212126PagingTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/H212126PagingTransformer.java @@ -19,7 +19,7 @@ public SqlNode visitSelectStatementNode(SelectStatementNode node, Void p) { processed = true; OrderByClauseNode originalOrderBy = node.getOrderByClauseNode(); - OrderByClauseNode orderBy = node.getOrderByClauseNode(); + OrderByClauseNode orderBy; if (originalOrderBy != null) { orderBy = new OrderByClauseNode(originalOrderBy.getWordNode()); for (SqlNode child : originalOrderBy.getChildren()) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformer.java index b3d1b480c..e1ec8ffa0 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformer.java @@ -19,7 +19,7 @@ public SqlNode visitSelectStatementNode(SelectStatementNode node, Void p) { processed = true; OrderByClauseNode originalOrderBy = node.getOrderByClauseNode(); - OrderByClauseNode orderBy = node.getOrderByClauseNode(); + OrderByClauseNode orderBy; if (originalOrderBy != null) { orderBy = new OrderByClauseNode(originalOrderBy.getWordNode()); for (SqlNode child : originalOrderBy.getChildren()) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/HsqldbPagingTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/HsqldbPagingTransformer.java index 03becebd1..61d9059c8 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/HsqldbPagingTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/HsqldbPagingTransformer.java @@ -19,7 +19,7 @@ public SqlNode visitSelectStatementNode(SelectStatementNode node, Void p) { processed = true; OrderByClauseNode originalOrderBy = node.getOrderByClauseNode(); - OrderByClauseNode orderBy = node.getOrderByClauseNode(); + OrderByClauseNode orderBy; if (originalOrderBy != null) { orderBy = new OrderByClauseNode(originalOrderBy.getWordNode()); for (SqlNode child : originalOrderBy.getChildren()) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformer.java index 206e4ddf2..156d892f9 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformer.java @@ -21,7 +21,7 @@ public SqlNode visitSelectStatementNode(SelectStatementNode node, Void p) { processed = true; OrderByClauseNode originalOrderBy = node.getOrderByClauseNode(); - OrderByClauseNode orderBy = node.getOrderByClauseNode(); + OrderByClauseNode orderBy; if (originalOrderBy != null) { orderBy = new OrderByClauseNode(originalOrderBy.getWordNode()); for (SqlNode child : originalOrderBy.getChildren()) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/PostgresPagingTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/PostgresPagingTransformer.java index 1beb9a5e8..3305fcd5c 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/PostgresPagingTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/PostgresPagingTransformer.java @@ -19,7 +19,7 @@ public SqlNode visitSelectStatementNode(SelectStatementNode node, Void p) { processed = true; OrderByClauseNode originalOrderBy = node.getOrderByClauseNode(); - OrderByClauseNode orderBy = node.getOrderByClauseNode(); + OrderByClauseNode orderBy; if (originalOrderBy != null) { orderBy = new OrderByClauseNode(originalOrderBy.getWordNode()); for (SqlNode child : originalOrderBy.getChildren()) { diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformer.java index 2584a4637..a4e5046b4 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformer.java @@ -21,7 +21,7 @@ public SqlNode visitSelectStatementNode(SelectStatementNode node, Void p) { processed = true; OrderByClauseNode originalOrderBy = node.getOrderByClauseNode(); - OrderByClauseNode orderBy = node.getOrderByClauseNode(); + OrderByClauseNode orderBy; if (originalOrderBy != null) { orderBy = new OrderByClauseNode(originalOrderBy.getWordNode()); for (SqlNode child : originalOrderBy.getChildren()) { diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java index 1afbbedc1..f638b937b 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java @@ -134,7 +134,6 @@ public void testExecute_resultList() throws Exception { List bindValues = runtimeConfig.dataSource.connection.preparedStatement.bindValues; BindValue bindValue = bindValues.get(0); - bindValue = bindValues.get(0); assertEquals(new BigDecimal(5000), bindValue.getValue()); assertEquals(1, bindValue.getIndex()); } @@ -222,7 +221,6 @@ public void testExecute_resultStream() throws Exception { List bindValues = runtimeConfig.dataSource.connection.preparedStatement.bindValues; BindValue bindValue = bindValues.get(0); - bindValue = bindValues.get(0); assertEquals(new BigDecimal(5000), bindValue.getValue()); assertEquals(1, bindValue.getIndex()); From 9d4a40b4622b46249b45808f41e4ef60aff1ae54 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:13:16 +0900 Subject: [PATCH 46/78] Suppress ImplicitArrayToString --- doma-core/src/main/java/org/seasar/doma/jdbc/type/BytesType.java | 1 + 1 file changed, 1 insertion(+) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/type/BytesType.java b/doma-core/src/main/java/org/seasar/doma/jdbc/type/BytesType.java index fb0445c96..983265a22 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/type/BytesType.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/type/BytesType.java @@ -25,6 +25,7 @@ protected byte[] doGetValue(CallableStatement callableStatement, int index) thro return callableStatement.getBytes(index); } + @SuppressWarnings("ImplicitArrayToString") @Override protected String doConvertToLogFormat(byte[] value) { return value.toString(); From c8f13f6d77cbc04ccf464d5abc96e5a95f3af794 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:17:41 +0900 Subject: [PATCH 47/78] Suppress OptionalGetWithoutIsPresent --- .../doma/internal/jdbc/command/BasicResultListHandlerTest.java | 1 + .../doma/internal/jdbc/command/BasicSingleResultHandlerTest.java | 1 + .../doma/internal/jdbc/command/DomainResultListHandlerTest.java | 1 + .../internal/jdbc/command/DomainSingleResultHandlerTest.java | 1 + .../doma/internal/jdbc/command/EntityIterationHandlerTest.java | 1 + .../doma/internal/jdbc/command/EntityResultListHandlerTest.java | 1 + .../internal/jdbc/command/EntitySingleResultHandlerTest.java | 1 + .../seasar/doma/internal/jdbc/command/ScalarProviderTest.java | 1 + .../java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java | 1 + .../seasar/doma/internal/jdbc/sql/ScalarInOutParameterTest.java | 1 + .../org/seasar/doma/internal/jdbc/sql/ScalarInParameterTest.java | 1 + .../java/org/seasar/doma/jdbc/AbstractSqlFileRepositoryTest.java | 1 + .../src/test/java/org/seasar/doma/jdbc/CommentContextTest.java | 1 + .../org/seasar/doma/jdbc/GreedyCacheSqlFileRepositoryTest.java | 1 + .../src/test/java/org/seasar/doma/jdbc/JdbcExceptionTest.java | 1 + .../org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java | 1 + .../org/seasar/doma/jdbc/command/BatchInsertCommandTest.java | 1 + .../org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java | 1 + .../java/org/seasar/doma/jdbc/command/DeleteCommandTest.java | 1 + .../java/org/seasar/doma/jdbc/command/InsertCommandTest.java | 1 + .../java/org/seasar/doma/jdbc/command/ScriptCommandTest.java | 1 + .../java/org/seasar/doma/jdbc/command/SelectCommandTest.java | 1 + .../java/org/seasar/doma/jdbc/command/UpdateCommandTest.java | 1 + .../org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java | 1 + .../org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java | 1 + .../org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java | 1 + .../java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java | 1 + .../java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java | 1 + .../java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java | 1 + .../org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java | 1 + .../org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java | 1 + .../org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java | 1 + .../java/org/seasar/doma/jdbc/query/SqlFileScriptQueryTest.java | 1 + .../java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java | 1 + 34 files changed, 34 insertions(+) diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java index e121b9697..be35eca4e 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java @@ -19,6 +19,7 @@ import org.seasar.doma.jdbc.query.SqlFileSelectQuery; import org.seasar.doma.wrapper.StringWrapper; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class BasicResultListHandlerTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java index 20385a73f..c0f698c81 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java @@ -19,6 +19,7 @@ import org.seasar.doma.jdbc.query.SqlFileSelectQuery; import org.seasar.doma.wrapper.StringWrapper; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class BasicSingleResultHandlerTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java index b35fef6cb..2550c220c 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java @@ -18,6 +18,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.SqlFileSelectQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class DomainResultListHandlerTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java index 6cc5a63ec..e9e4e9868 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java @@ -19,6 +19,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.SqlFileSelectQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class DomainSingleResultHandlerTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityIterationHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityIterationHandlerTest.java index 676376ba8..ac6bf2eb7 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityIterationHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityIterationHandlerTest.java @@ -19,6 +19,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.SqlFileSelectQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class EntityIterationHandlerTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java index 7e017e035..ada50dfd8 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java @@ -18,6 +18,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.SqlFileSelectQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class EntityResultListHandlerTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java index a16593482..c84fdf640 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java @@ -19,6 +19,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.SqlFileSelectQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class EntitySingleResultHandlerTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java index 4a24d660a..bfdb36d67 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScalarProviderTest.java @@ -21,6 +21,7 @@ import org.seasar.doma.jdbc.query.SelectQuery; import org.seasar.doma.wrapper.StringWrapper; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class ScalarProviderTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java index 22defc977..14ca9a947 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java @@ -30,6 +30,7 @@ import org.seasar.doma.wrapper.StringWrapper; import org.seasar.doma.wrapper.Wrapper; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class ScalarsTest { private final ClassHelper classHelper = new ClassHelper() {}; diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameterTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameterTest.java index 99dd0fff6..d84a43971 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameterTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameterTest.java @@ -11,6 +11,7 @@ import org.seasar.doma.jdbc.domain.DomainType; import org.seasar.doma.jdbc.domain.DomainTypeFactory; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class ScalarInOutParameterTest { @Test diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameterTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameterTest.java index 16dc19ddc..089c8bb1c 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameterTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameterTest.java @@ -10,6 +10,7 @@ import org.seasar.doma.jdbc.domain.DomainType; import org.seasar.doma.jdbc.domain.DomainTypeFactory; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class ScalarInParameterTest { @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/AbstractSqlFileRepositoryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/AbstractSqlFileRepositoryTest.java index 305212faa..738d82d4e 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/AbstractSqlFileRepositoryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/AbstractSqlFileRepositoryTest.java @@ -11,6 +11,7 @@ import org.seasar.doma.jdbc.dialect.Dialect; import org.seasar.doma.jdbc.dialect.StandardDialect; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class AbstractSqlFileRepositoryTest { @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/CommentContextTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/CommentContextTest.java index 4d950cfef..d72ffacfc 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/CommentContextTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/CommentContextTest.java @@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test; import org.seasar.doma.internal.jdbc.mock.MockConfig; +@SuppressWarnings("OptionalGetWithoutIsPresent") class CommentContextTest { @Test diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/GreedyCacheSqlFileRepositoryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/GreedyCacheSqlFileRepositoryTest.java index 1c8ab4e39..129222042 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/GreedyCacheSqlFileRepositoryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/GreedyCacheSqlFileRepositoryTest.java @@ -13,6 +13,7 @@ import org.seasar.doma.jdbc.dialect.PostgresDialect; import org.seasar.doma.jdbc.dialect.StandardDialect; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class GreedyCacheSqlFileRepositoryTest { private Method method; diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcExceptionTest.java index 4c1df2b7b..c72ac5f07 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcExceptionTest.java @@ -18,6 +18,7 @@ import org.seasar.doma.jdbc.dialect.StandardDialect; import org.seasar.doma.message.Message; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class JdbcExceptionTest { private final MockConfig config = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java index 2f1b3279b..31dd5b549 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java @@ -13,6 +13,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.AutoBatchDeleteQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class BatchDeleteCommandTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java index 5e83915e7..ca4de9125 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java @@ -11,6 +11,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.AutoBatchInsertQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class BatchInsertCommandTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java index b658df4da..c54c84596 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java @@ -16,6 +16,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.AutoBatchUpdateQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class BatchUpdateCommandTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java index 56a604a0c..7940853da 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java @@ -19,6 +19,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.AutoDeleteQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class DeleteCommandTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java index c2bf3aeec..4bb7f9ad2 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java @@ -15,6 +15,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.AutoInsertQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class InsertCommandTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/ScriptCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/ScriptCommandTest.java index 916e9623f..c14270ef1 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/ScriptCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/ScriptCommandTest.java @@ -14,6 +14,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.SqlFileScriptQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class ScriptCommandTest { private Method method; diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java index f638b937b..73f71a08b 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java @@ -33,6 +33,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.SqlFileSelectQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class SelectCommandTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java index 556e064cf..091e2cd30 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java @@ -17,6 +17,7 @@ import org.seasar.doma.jdbc.SqlLogType; import org.seasar.doma.jdbc.query.AutoUpdateQuery; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class UpdateCommandTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java index 194ca4e0b..1fa3bdbbb 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java @@ -19,6 +19,7 @@ import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.SqlLogType; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class AutoBatchDeleteQueryTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java index fcc3361e4..37e544b96 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java @@ -18,6 +18,7 @@ import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.SqlLogType; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class AutoBatchInsertQueryTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java index 078ed2533..39474cd8f 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java @@ -21,6 +21,7 @@ import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.SqlLogType; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class AutoBatchUpdateQueryTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java index 1945940ec..e9507466b 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java @@ -17,6 +17,7 @@ import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.SqlLogType; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class AutoDeleteQueryTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java index 7925e6f61..616320108 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java @@ -17,6 +17,7 @@ import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.SqlLogType; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class AutoInsertQueryTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java index cd3d3dce0..25f4772c3 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java @@ -20,6 +20,7 @@ import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.SqlLogType; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class AutoUpdateQueryTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java index 3111911a8..5620840d9 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java @@ -15,6 +15,7 @@ import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.SqlLogType; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class SqlFileBatchDeleteQueryTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java index 2d1250fc0..124c7afca 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java @@ -17,6 +17,7 @@ import org.seasar.doma.jdbc.PreparedSql; import org.seasar.doma.jdbc.SqlLogType; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class SqlFileBatchInsertQueryTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java index 58bc5bb0c..6f4b88ccb 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java @@ -21,6 +21,7 @@ import org.seasar.doma.jdbc.Sql; import org.seasar.doma.jdbc.SqlLogType; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class SqlFileBatchUpdateQueryTest { private final MockConfig runtimeConfig = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileScriptQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileScriptQueryTest.java index 17689dfe5..926f102ff 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileScriptQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileScriptQueryTest.java @@ -17,6 +17,7 @@ import org.seasar.doma.jdbc.ScriptFileNotFoundException; import org.seasar.doma.jdbc.dialect.Mssql2008Dialect; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class SqlFileScriptQueryTest { private final MockConfig config = new MockConfig(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java index 1a20b9860..0529970ab 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java @@ -34,6 +34,7 @@ import org.seasar.doma.jdbc.entity.TenantIdPropertyType; import org.seasar.doma.jdbc.entity.VersionPropertyType; +@SuppressWarnings("OptionalGetWithoutIsPresent") public class SqlFileUpdateQueryTest { private final MockConfig runtimeConfig = new MockConfig(); From 376c2a95ee7afe33d5ce81453a4a8f5793213216 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:18:37 +0900 Subject: [PATCH 48/78] Suppress ResultOfMethodCallIgnored --- .../main/java/org/seasar/doma/jdbc/command/SelectCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/command/SelectCommand.java b/doma-core/src/main/java/org/seasar/doma/jdbc/command/SelectCommand.java index a9321e9d5..51b51fde1 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/command/SelectCommand.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/command/SelectCommand.java @@ -113,6 +113,7 @@ protected void close(Supplier supplier, Runnable closeHandler) { RESULT result = supplier.get(); if (result instanceof Stream) { Stream stream = (Stream) result; + //noinspection ResultOfMethodCallIgnored stream.onClose(closeHandler); } else { closeHandler.run(); From 298c46b5fdfd1b3f38433663b031cf96ac95cabd Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:20:03 +0900 Subject: [PATCH 49/78] Replace with 'while' --- .../doma/internal/jdbc/command/ScriptTokenizer.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java index dddf4213a..67c007119 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java @@ -164,12 +164,16 @@ public ScriptTokenType nextToken() { return QUOTE; case WORD: int wordStartPos = pos; - for (; type == WORD && pos < length; peek(nextPos)) {} + while (type == WORD && pos < length) { + peek(nextPos); + } token = line.substring(wordStartPos, pos); return WORD; case OTHER: int otherStartPos = pos; - for (; type == OTHER && pos < length; peek(nextPos)) {} + while (type == OTHER && pos < length) { + peek(nextPos); + } token = line.substring(otherStartPos, pos); return OTHER; default: From 6bcda1129a79db30d7bcdba81e3d0c67e62aefa3 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:21:21 +0900 Subject: [PATCH 50/78] Suppress UnusedAssignment --- .../java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java | 1 + .../java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java | 1 + .../main/java/org/seasar/doma/jdbc/query/AutoDeleteQuery.java | 1 + .../main/java/org/seasar/doma/jdbc/query/AutoUpdateQuery.java | 1 + 4 files changed, 4 insertions(+) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java index 5c98200f7..9fa4da7e4 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java @@ -110,6 +110,7 @@ protected void prepareSql() { builder.appendSql(" and "); } else { builder.appendSql(" where "); + //noinspection UnusedAssignment whereClauseAppended = true; } Property property = tenantIdPropertyType.createProperty(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java index 6c2aa9864..84c7c40b2 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java @@ -131,6 +131,7 @@ protected void prepareSql() { builder.appendSql(" and "); } else { builder.appendSql(" where "); + //noinspection UnusedAssignment whereClauseAppended = true; } Property property = tenantIdPropertyType.createProperty(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoDeleteQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoDeleteQuery.java index f204c1cd9..4680423cf 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoDeleteQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoDeleteQuery.java @@ -92,6 +92,7 @@ protected void prepareSql() { builder.appendSql(" and "); } else { builder.appendSql(" where "); + //noinspection UnusedAssignment whereClauseAppended = true; } Property property = tenantIdPropertyType.createProperty(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoUpdateQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoUpdateQuery.java index 0e80d41a5..044a721c3 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoUpdateQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoUpdateQuery.java @@ -127,6 +127,7 @@ protected void prepareSql() { builder.appendSql(" and "); } else { builder.appendSql(" where "); + //noinspection UnusedAssignment whereClauseAppended = true; } Property property = tenantIdPropertyType.createProperty(); From e7922ffb377bec2acaf023a397518ff6042468ad Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:23:19 +0900 Subject: [PATCH 51/78] Suppress SuspiciousInvocationHandlerImplementation --- .../org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java index aa5051c53..26a6099ee 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java @@ -73,6 +73,7 @@ public void testConstructorParameter5() throws Exception { } } + @SuppressWarnings("SuspiciousInvocationHandlerImplementation") private T mock(Class aClass) { ClassLoader loader = Thread.currentThread().getContextClassLoader(); Class[] interfaces = {aClass}; From 3bc4c29f0bc45c00ccb0740d282af8b61e569d14 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:28:03 +0900 Subject: [PATCH 52/78] Remove unnecessary test class --- .../doma/internal/jdbc/sql/node/WhitespaceNodeTest.java | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/node/WhitespaceNodeTest.java diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/node/WhitespaceNodeTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/node/WhitespaceNodeTest.java deleted file mode 100644 index 540d6910d..000000000 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/node/WhitespaceNodeTest.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.seasar.doma.internal.jdbc.sql.node; - -import org.junit.jupiter.api.Test; - -public class WhitespaceNodeTest { - - @Test - public void test() throws Exception {} -} From 1d4193211a1c56a92cacce44a8a7298442e1b713 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:28:37 +0900 Subject: [PATCH 53/78] Suppress EmptyMethod --- .../jdbc/criteria/statement/EntityqlBatchDeleteStatement.java | 1 + .../jdbc/criteria/statement/EntityqlBatchInsertStatement.java | 1 + .../jdbc/criteria/statement/EntityqlBatchUpdateStatement.java | 1 + .../doma/jdbc/criteria/statement/EntityqlDeleteStatement.java | 1 + .../doma/jdbc/criteria/statement/EntityqlInsertStatement.java | 1 + .../doma/jdbc/criteria/statement/EntityqlSelectTerminal.java | 1 + .../doma/jdbc/criteria/statement/EntityqlUpdateStatement.java | 1 + .../doma/jdbc/criteria/statement/NativeSqlDeleteTerminal.java | 1 + .../doma/jdbc/criteria/statement/NativeSqlInsertTerminal.java | 1 + .../doma/jdbc/criteria/statement/NativeSqlSelectTerminal.java | 1 + .../doma/jdbc/criteria/statement/NativeSqlSetTerminal.java | 1 + .../doma/jdbc/criteria/statement/NativeSqlUpdateTerminal.java | 1 + .../org/seasar/doma/jdbc/criteria/statement/StreamMappable.java | 1 + .../main/java/org/seasar/doma/jdbc/id/SequenceIdGenerator.java | 1 + 14 files changed, 14 insertions(+) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchDeleteStatement.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchDeleteStatement.java index e04224ab8..996d3530d 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchDeleteStatement.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchDeleteStatement.java @@ -41,6 +41,7 @@ public EntityqlBatchDeleteStatement( * {@literal 0} * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public BatchResult execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchInsertStatement.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchInsertStatement.java index 6dfda5b70..ef855eb4e 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchInsertStatement.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchInsertStatement.java @@ -39,6 +39,7 @@ public EntityqlBatchInsertStatement( * @throws org.seasar.doma.jdbc.UniqueConstraintException if an unique constraint is violated * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public BatchResult execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchUpdateStatement.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchUpdateStatement.java index 704d933dc..36190e18e 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchUpdateStatement.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchUpdateStatement.java @@ -42,6 +42,7 @@ public EntityqlBatchUpdateStatement( * @throws org.seasar.doma.jdbc.UniqueConstraintException if an unique constraint is violated * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public BatchResult execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlDeleteStatement.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlDeleteStatement.java index 3e4b8c98e..e9de42eb6 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlDeleteStatement.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlDeleteStatement.java @@ -39,6 +39,7 @@ public EntityqlDeleteStatement( * {@literal 0} * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public Result execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlInsertStatement.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlInsertStatement.java index 5410a9a24..315f67f43 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlInsertStatement.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlInsertStatement.java @@ -35,6 +35,7 @@ public EntityqlInsertStatement( * @throws org.seasar.doma.jdbc.UniqueConstraintException if an unique constraint is violated * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public Result execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlSelectTerminal.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlSelectTerminal.java index 28bea915a..099d40034 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlSelectTerminal.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlSelectTerminal.java @@ -34,6 +34,7 @@ public EntityqlSelectTerminal( * {@literal false} and the WHERE clause is empty * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public List execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlUpdateStatement.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlUpdateStatement.java index 1d777cd92..1ca87b639 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlUpdateStatement.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlUpdateStatement.java @@ -40,6 +40,7 @@ public EntityqlUpdateStatement( * @throws org.seasar.doma.jdbc.UniqueConstraintException if an unique constraint is violated * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public Result execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlDeleteTerminal.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlDeleteTerminal.java index baaa470d7..169ddfdcc 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlDeleteTerminal.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlDeleteTerminal.java @@ -28,6 +28,7 @@ public NativeSqlDeleteTerminal(Config config, DeleteDeclaration declaration) { * {@literal false} and the WHERE clause is empty * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public Integer execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlInsertTerminal.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlInsertTerminal.java index 193d496fa..701eabc26 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlInsertTerminal.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlInsertTerminal.java @@ -27,6 +27,7 @@ public NativeSqlInsertTerminal(Config config, InsertDeclaration declaration) { * @throws org.seasar.doma.jdbc.UniqueConstraintException if an unique constraint is violated * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public Integer execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSelectTerminal.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSelectTerminal.java index 0f6920c6d..0db1fbf74 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSelectTerminal.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSelectTerminal.java @@ -32,6 +32,7 @@ public NativeSqlSelectTerminal( * {@literal false} and the WHERE clause is empty * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public RESULT execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSetTerminal.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSetTerminal.java index daa1e1050..9a910cc9f 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSetTerminal.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSetTerminal.java @@ -29,6 +29,7 @@ public NativeSqlSetTerminal( * * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public RESULT execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlUpdateTerminal.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlUpdateTerminal.java index 7ca7c7051..6d68fb096 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlUpdateTerminal.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlUpdateTerminal.java @@ -37,6 +37,7 @@ public Statement where(Consumer block) { * @throws org.seasar.doma.jdbc.UniqueConstraintException if an unique constraint is violated * @throws org.seasar.doma.jdbc.JdbcException if a JDBC related error occurs */ + @SuppressWarnings("EmptyMethod") @Override public Integer execute() { return super.execute(); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/StreamMappable.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/StreamMappable.java index 7998c5d57..8992c4080 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/StreamMappable.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/StreamMappable.java @@ -34,6 +34,7 @@ default RESULT collect(Collector collector) { return mapStream(s -> s.collect(collector)); } + @SuppressWarnings("EmptyMethod") @Override StreamMappable peek(Consumer> consumer); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/id/SequenceIdGenerator.java b/doma-core/src/main/java/org/seasar/doma/jdbc/id/SequenceIdGenerator.java index d14577cb3..afb9ce504 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/id/SequenceIdGenerator.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/id/SequenceIdGenerator.java @@ -31,5 +31,6 @@ public interface SequenceIdGenerator extends IdGenerator { * * @throws JdbcException if the initialization is failed */ + @SuppressWarnings("EmptyMethod") void initialize(); } From 5e1bddf856f3d4370531f1f172854967e0ba9a71 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:30:24 +0900 Subject: [PATCH 54/78] Convert octal literal to decimal literal --- .../org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java index 14ca9a947..21e2ea2db 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java @@ -61,10 +61,10 @@ public void testWrapBasic() throws Exception { Scalars.wrap( Timestamp.valueOf("2009-01-23 12:34:56"), Timestamp.class, false, classHelper)); assertNotNull(Scalars.wrap(new java.util.Date(), java.util.Date.class, false, classHelper)); - assertNotNull(Scalars.wrap(LocalDate.of(2009, 01, 23), LocalDate.class, false, classHelper)); + assertNotNull(Scalars.wrap(LocalDate.of(2009, 1, 23), LocalDate.class, false, classHelper)); assertNotNull( Scalars.wrap( - LocalDateTime.of(2009, 01, 23, 12, 34, 56), LocalDateTime.class, false, classHelper)); + LocalDateTime.of(2009, 1, 23, 12, 34, 56), LocalDateTime.class, false, classHelper)); assertNotNull(Scalars.wrap(LocalTime.of(12, 34, 56), LocalTime.class, false, classHelper)); assertNotNull(Scalars.wrap(null, Array.class, false, classHelper)); assertNotNull(Scalars.wrap(null, Blob.class, false, classHelper)); From e88a9e1696dce8c02e4f8c871cee550ec216facf Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:33:03 +0900 Subject: [PATCH 55/78] Remove unnecessary condition --- .../java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java index da02e126f..27d2b0fb7 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java @@ -489,7 +489,7 @@ protected void peekTwoChars(char c, char c2) { if (c3 == '*' && c4 == '/') { return; } - if ((c3 == '\r' && c4 == '\n') || (c3 == '\r' || c3 == '\n')) { + if ((c3 == '\r' || c3 == '\n')) { currentLineNumber++; } buf.reset(); From 135b561d5d37e41ac412602ac0826627acac48f8 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 13:57:27 +0900 Subject: [PATCH 56/78] Make 'final' --- .../internal/jdbc/command/ScriptReader.java | 8 +++--- .../jdbc/command/ScriptTokenizer.java | 2 +- .../jdbc/dialect/MysqlPagingTransformer.java | 2 +- .../jdbc/dialect/SqlitePagingTransformer.java | 2 +- .../dialect/StandardForUpdateTransformer.java | 4 +-- .../jdbc/sql/EntityResultListParameter.java | 4 +-- .../internal/jdbc/sql/node/IfBlockNode.java | 2 +- .../internal/jdbc/sql/node/ParensNode.java | 2 +- .../org/seasar/doma/jdbc/ConfigSupport.java | 27 ++++++++++--------- .../doma/jdbc/command/ModuleCommand.java | 2 +- .../doma/jdbc/dialect/Oracle11Dialect.java | 16 +++++------ .../doma/jdbc/dialect/StandardDialect.java | 4 +-- .../id/AbstractPreGenerateIdGenerator.java | 2 +- .../jdbc/query/SqlFileBatchDeleteQuery.java | 4 +-- .../jdbc/query/SqlFileBatchInsertQuery.java | 2 +- .../jdbc/query/SqlFileBatchUpdateQuery.java | 4 +-- .../doma/jdbc/query/SqlFileDeleteQuery.java | 6 ++--- .../doma/jdbc/query/SqlFileInsertQuery.java | 4 +-- .../doma/jdbc/query/SqlFileUpdateQuery.java | 6 ++--- .../seasar/doma/wrapper/AbstractWrapper.java | 2 +- .../src/test/java/example/dao/EmpDaoImpl.java | 17 ++++++------ .../test/java/example/dao/ExampleConfig.java | 4 +-- .../src/test/java/example/entity/_Dept.java | 2 +- .../src/test/java/example/entity/_Emp.java | 2 +- .../java/example/entity/_IdGeneratedEmp.java | 2 +- .../java/example/entity/_ImmutableEmp.java | 2 +- .../test/java/example/entity/_Salesman.java | 2 +- .../expr/ExpressionEvaluatorTest.java | 2 +- .../org/seasar/doma/internal/expr/Person.java | 4 +-- .../expr/node/AndOperatorNodeTest.java | 9 ++++--- .../expr/node/MethodOperatorNodeTest.java | 2 +- .../expr/node/NotOperatorNodeTest.java | 9 ++++--- .../expr/node/OrOperatorNodeTest.java | 9 ++++--- .../doma/internal/jdbc/mock/MockConfig.java | 12 ++++----- .../doma/jdbc/criteria/entity/_Dept.java | 2 +- .../doma/jdbc/criteria/entity/_Emp.java | 2 +- .../doma/jdbc/criteria/entity/_NoIdEmp.java | 2 +- .../jdbc/tx/LocalTransactionContextTest.java | 2 +- 38 files changed, 99 insertions(+), 92 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptReader.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptReader.java index b9eecf8b1..600e1bb24 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptReader.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptReader.java @@ -14,9 +14,9 @@ public class ScriptReader { - protected ScriptQuery query; + protected final ScriptQuery query; - protected ScriptTokenizer tokenizer; + protected final ScriptTokenizer tokenizer; protected BufferedReader reader; @@ -92,11 +92,11 @@ protected class SqlBuilder { protected boolean completed; - protected StringBuilder buf = new StringBuilder(300); + protected final StringBuilder buf = new StringBuilder(300); protected List wordList = new ArrayList<>(); - protected ScriptBlockContext sqlBlockContext; + protected final ScriptBlockContext sqlBlockContext; protected boolean lineChanged; diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java index 67c007119..f566c4edf 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java @@ -5,7 +5,7 @@ public class ScriptTokenizer { - protected String blockDelimiter; + protected final String blockDelimiter; protected String line; diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformer.java index 156d892f9..3c667f9f4 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformer.java @@ -7,7 +7,7 @@ public class MysqlPagingTransformer extends StandardPagingTransformer { - public static String MAXIMUM_LIMIT = "18446744073709551615"; + public static final String MAXIMUM_LIMIT = "18446744073709551615"; public MysqlPagingTransformer(long offset, long limit) { super(offset, limit); diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformer.java index a4e5046b4..3fc2f73a3 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformer.java @@ -7,7 +7,7 @@ public class SqlitePagingTransformer extends StandardPagingTransformer { - protected static String MAXIMUM_LIMIT = String.valueOf(Long.MAX_VALUE); + protected static final String MAXIMUM_LIMIT = String.valueOf(Long.MAX_VALUE); public SqlitePagingTransformer(long offset, long limit) { super(offset, limit); diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/StandardForUpdateTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/StandardForUpdateTransformer.java index 0eccb8723..d3b3c3574 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/StandardForUpdateTransformer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/StandardForUpdateTransformer.java @@ -11,9 +11,9 @@ public class StandardForUpdateTransformer extends SimpleSqlNodeVisitor extends AbstractResultListParameter { - EntityType entityType; - boolean resultMappingEnsured; + final EntityType entityType; + final boolean resultMappingEnsured; public EntityResultListParameter(EntityType entityType, boolean resultMappingEnsured) { super(new ArrayList<>()); diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/IfBlockNode.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/IfBlockNode.java index 74f0854b3..b06530eca 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/IfBlockNode.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/IfBlockNode.java @@ -11,7 +11,7 @@ public class IfBlockNode extends AbstractSqlNode implements BlockNode { protected IfNode ifNode; - protected List elseifNodes = new ArrayList<>(); + protected final List elseifNodes = new ArrayList<>(); protected ElseNode elseNode; diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/ParensNode.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/ParensNode.java index 8a024e54b..142e6d211 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/ParensNode.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/node/ParensNode.java @@ -13,7 +13,7 @@ public class ParensNode extends AbstractSqlNode { protected boolean empty = true; - protected OtherNode openedParensNode; + protected final OtherNode openedParensNode; protected OtherNode closedParensNode; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/ConfigSupport.java b/doma-core/src/main/java/org/seasar/doma/jdbc/ConfigSupport.java index c3ee6eb78..0368c33c7 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/ConfigSupport.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/ConfigSupport.java @@ -3,28 +3,31 @@ /** Default values for {@link Config} objects. */ public final class ConfigSupport { - public static SqlFileRepository defaultSqlFileRepository = new GreedyCacheSqlFileRepository(); + public static final SqlFileRepository defaultSqlFileRepository = + new GreedyCacheSqlFileRepository(); - public static ScriptFileLoader defaultScriptFileLoader = new ScriptFileLoader() {}; + public static final ScriptFileLoader defaultScriptFileLoader = new ScriptFileLoader() {}; - public static JdbcLogger defaultJdbcLogger = new UtilLoggingJdbcLogger(); + public static final JdbcLogger defaultJdbcLogger = new UtilLoggingJdbcLogger(); - public static RequiresNewController defaultRequiresNewController = new RequiresNewController() {}; + public static final RequiresNewController defaultRequiresNewController = + new RequiresNewController() {}; - public static ClassHelper defaultClassHelper = new ClassHelper() {}; + public static final ClassHelper defaultClassHelper = new ClassHelper() {}; - public static CommandImplementors defaultCommandImplementors = new CommandImplementors() {}; + public static final CommandImplementors defaultCommandImplementors = new CommandImplementors() {}; - public static QueryImplementors defaultQueryImplementors = new QueryImplementors() {}; + public static final QueryImplementors defaultQueryImplementors = new QueryImplementors() {}; - public static UnknownColumnHandler defaultUnknownColumnHandler = new UnknownColumnHandler() {}; + public static final UnknownColumnHandler defaultUnknownColumnHandler = + new UnknownColumnHandler() {}; - public static Naming defaultNaming = Naming.DEFAULT; + public static final Naming defaultNaming = Naming.DEFAULT; - public static MapKeyNaming defaultMapKeyNaming = new MapKeyNaming() {}; + public static final MapKeyNaming defaultMapKeyNaming = new MapKeyNaming() {}; - public static Commenter defaultCommenter = new Commenter() {}; + public static final Commenter defaultCommenter = new Commenter() {}; - public static EntityListenerProvider defaultEntityListenerProvider = + public static final EntityListenerProvider defaultEntityListenerProvider = new EntityListenerProvider() {}; } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/command/ModuleCommand.java b/doma-core/src/main/java/org/seasar/doma/jdbc/command/ModuleCommand.java index d6d181370..af4380493 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/command/ModuleCommand.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/command/ModuleCommand.java @@ -18,7 +18,7 @@ public abstract class ModuleCommand implement protected final QUERY query; - protected CallableSql sql; + protected final CallableSql sql; protected ModuleCommand(QUERY query) { assertNotNull(query); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java index 9e6a20001..b425f1278 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/Oracle11Dialect.java @@ -181,7 +181,7 @@ public CriteriaBuilder getCriteriaBuilder() { public static class OracleResultSetType extends AbstractResultSetType { - protected static int CURSOR = -10; + protected static final int CURSOR = -10; public OracleResultSetType() { super(CURSOR); @@ -200,26 +200,26 @@ public Void visitBooleanWrapper( public static class Oracle11SqlLogFormattingVisitor extends StandardSqlLogFormattingVisitor { /** the formatter for {@link Date} */ - protected DateFormatter dateFormatter = new DateFormatter(); + protected final DateFormatter dateFormatter = new DateFormatter(); /** the formatter for {@link Time} */ - protected TimeFormatter timeFormatter = new TimeFormatter(); + protected final TimeFormatter timeFormatter = new TimeFormatter(); /** the formatter for {@link Timestamp} */ - protected TimestampFormatter timestampFormatter = new TimestampFormatter(); + protected final TimestampFormatter timestampFormatter = new TimestampFormatter(); /** the formatter for {@link java.util.Date} */ - protected UtilDateFormatter utilDateFormatter = new UtilDateFormatter(); + protected final UtilDateFormatter utilDateFormatter = new UtilDateFormatter(); /** the formatter for {@link LocalDate} */ - protected LocalDateFormatter localDateFormatter = new LocalDateFormatter(dateFormatter); + protected final LocalDateFormatter localDateFormatter = new LocalDateFormatter(dateFormatter); /** the formatter for {@link LocalDateTime} */ - protected LocalDateTimeFormatter localDateTimeFormatter = + protected final LocalDateTimeFormatter localDateTimeFormatter = new LocalDateTimeFormatter(timestampFormatter); /** the formatter for {@link LocalTime} */ - protected LocalTimeFormatter localTimeFormatter = new LocalTimeFormatter(timeFormatter); + protected final LocalTimeFormatter localTimeFormatter = new LocalTimeFormatter(timeFormatter); @Override public String visitBooleanWrapper(BooleanWrapper wrapper, SqlLogFormattingFunction p, Void q) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java index ec595a672..8726d14db 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardDialect.java @@ -1024,10 +1024,10 @@ public boolean isNotBlank(CharSequence charSequence) { public static class StandardScriptBlockContext implements ScriptBlockContext { /** the key wards that represents the start of a block */ - protected List> sqlBlockStartKeywordsList = new ArrayList<>(); + protected final List> sqlBlockStartKeywordsList = new ArrayList<>(); /** the key words */ - protected List keywords = new ArrayList<>(); + protected final List keywords = new ArrayList<>(); /** {@code true} if this context is inside of a block */ protected boolean inBlock; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/id/AbstractPreGenerateIdGenerator.java b/doma-core/src/main/java/org/seasar/doma/jdbc/id/AbstractPreGenerateIdGenerator.java index f3b115b18..3d594bcb2 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/id/AbstractPreGenerateIdGenerator.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/id/AbstractPreGenerateIdGenerator.java @@ -13,7 +13,7 @@ public abstract class AbstractPreGenerateIdGenerator extends AbstractIdGenerator protected long allocationSize; // the keys are data source names and the values are identity contexts - protected ConcurrentMap idContextMap = new ConcurrentHashMap<>(); + protected final ConcurrentMap idContextMap = new ConcurrentHashMap<>(); /** * Sets the initial value. diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQuery.java index f23bedeb2..200e07a8d 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQuery.java @@ -88,9 +88,9 @@ public void setOptimisticLockExceptionSuppressed(boolean optimisticLockException protected class EntityHandler { - protected EntityType entityType; + protected final EntityType entityType; - protected VersionPropertyType versionPropertyType; + protected final VersionPropertyType versionPropertyType; protected EntityHandler(EntityType entityType) { assertNotNull(entityType); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQuery.java index 54d6bd95c..619ef191b 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQuery.java @@ -77,7 +77,7 @@ public boolean isBatchSupported() { protected class EntityHandler { - protected EntityType entityType; + protected final EntityType entityType; protected EntityHandler(EntityType entityType) { assertNotNull(entityType); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQuery.java index aae424b8a..3811a0536 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQuery.java @@ -125,9 +125,9 @@ public void setOptimisticLockExceptionSuppressed(boolean optimisticLockException protected class EntityHandler { - protected EntityType entityType; + protected final EntityType entityType; - protected VersionPropertyType versionPropertyType; + protected final VersionPropertyType versionPropertyType; protected List> targetPropertyTypes; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileDeleteQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileDeleteQuery.java index e9702876c..49f9ee9ff 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileDeleteQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileDeleteQuery.java @@ -81,13 +81,13 @@ public E getEntity(Class entityType) { protected class EntityHandler { - protected String name; + protected final String name; protected E entity; - protected EntityType entityType; + protected final EntityType entityType; - protected VersionPropertyType versionPropertyType; + protected final VersionPropertyType versionPropertyType; protected EntityHandler(String name, E entity, EntityType entityType) { assertNotNull(name, entity, entityType); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileInsertQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileInsertQuery.java index 004cf7c21..45d735328 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileInsertQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileInsertQuery.java @@ -71,11 +71,11 @@ public void setNullExcluded(boolean nullExcluded) { protected class EntityHandler { - protected String name; + protected final String name; protected E entity; - protected EntityType entityType; + protected final EntityType entityType; protected EntityHandler(String name, E entity, EntityType entityType) { assertNotNull(name, entity, entityType); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileUpdateQuery.java b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileUpdateQuery.java index 7cfc137be..6fb837f6c 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileUpdateQuery.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileUpdateQuery.java @@ -128,13 +128,13 @@ public void setUnchangedPropertyIncluded(Boolean unchangedPropertyIncluded) { protected class EntityHandler { - protected String name; + protected final String name; protected E entity; - protected EntityType entityType; + protected final EntityType entityType; - protected VersionPropertyType versionPropertyType; + protected final VersionPropertyType versionPropertyType; protected List> targetPropertyTypes; diff --git a/doma-core/src/main/java/org/seasar/doma/wrapper/AbstractWrapper.java b/doma-core/src/main/java/org/seasar/doma/wrapper/AbstractWrapper.java index dc4c263c4..ec8d1c67d 100644 --- a/doma-core/src/main/java/org/seasar/doma/wrapper/AbstractWrapper.java +++ b/doma-core/src/main/java/org/seasar/doma/wrapper/AbstractWrapper.java @@ -7,7 +7,7 @@ */ public abstract class AbstractWrapper implements Wrapper { - protected Class basicClass; + protected final Class basicClass; protected BASIC value; diff --git a/doma-core/src/test/java/example/dao/EmpDaoImpl.java b/doma-core/src/test/java/example/dao/EmpDaoImpl.java index afd130ce9..c290fd9c3 100644 --- a/doma-core/src/test/java/example/dao/EmpDaoImpl.java +++ b/doma-core/src/test/java/example/dao/EmpDaoImpl.java @@ -33,11 +33,11 @@ @Generated("") public class EmpDaoImpl implements EmpDao, ConfigProvider { - private static Method method0 = + private static final Method method0 = DaoImplSupport.getDeclaredMethod( EmpDaoImpl.class, "selectById", Integer.class, SelectOptions.class); - private static Method method1 = + private static final Method method1 = DaoImplSupport.getDeclaredMethod( EmpDaoImpl.class, "selectByNameAndSalary", @@ -45,22 +45,23 @@ public class EmpDaoImpl implements EmpDao, ConfigProvider { BigDecimal.class, SelectOptions.class); - private static Method method2 = + private static final Method method2 = DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "selectByExample", Emp.class); - private static Method method3 = + private static final Method method3 = DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "insert", Emp.class); - private static Method method4 = + private static final Method method4 = DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "update", Emp.class); - private static Method method5 = + private static final Method method5 = DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "delete", Emp.class); - private static Method method6 = + private static final Method method6 = DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "iterate", IterationCallback.class); - private static Method method7 = DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "execute"); + private static final Method method7 = + DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "execute"); private final DaoImplSupport __support; diff --git a/doma-core/src/test/java/example/dao/ExampleConfig.java b/doma-core/src/test/java/example/dao/ExampleConfig.java index 519156b71..164f8c217 100644 --- a/doma-core/src/test/java/example/dao/ExampleConfig.java +++ b/doma-core/src/test/java/example/dao/ExampleConfig.java @@ -8,9 +8,9 @@ public class ExampleConfig implements Config { - protected MockDataSource dataSource = new MockDataSource(); + protected final MockDataSource dataSource = new MockDataSource(); - protected StandardDialect dialect = new StandardDialect(); + protected final StandardDialect dialect = new StandardDialect(); @Override public DataSource getDataSource() { diff --git a/doma-core/src/test/java/example/entity/_Dept.java b/doma-core/src/test/java/example/entity/_Dept.java index 7d659cf91..b068486a7 100644 --- a/doma-core/src/test/java/example/entity/_Dept.java +++ b/doma-core/src/test/java/example/entity/_Dept.java @@ -29,7 +29,7 @@ @Generated("") public class _Dept extends AbstractEntityType { - private static _Dept singleton = new _Dept(); + private static final _Dept singleton = new _Dept(); private final NamingType __namingType = NamingType.SNAKE_UPPER_CASE; diff --git a/doma-core/src/test/java/example/entity/_Emp.java b/doma-core/src/test/java/example/entity/_Emp.java index b481b46e1..36ded859b 100644 --- a/doma-core/src/test/java/example/entity/_Emp.java +++ b/doma-core/src/test/java/example/entity/_Emp.java @@ -31,7 +31,7 @@ @Generated("") public class _Emp extends AbstractEntityType { - private static _Emp singleton = new _Emp(); + private static final _Emp singleton = new _Emp(); private static final org.seasar.doma.jdbc.entity.OriginalStatesAccessor __originalStatesAccessor = diff --git a/doma-core/src/test/java/example/entity/_IdGeneratedEmp.java b/doma-core/src/test/java/example/entity/_IdGeneratedEmp.java index 59103ae42..cae42c10a 100644 --- a/doma-core/src/test/java/example/entity/_IdGeneratedEmp.java +++ b/doma-core/src/test/java/example/entity/_IdGeneratedEmp.java @@ -31,7 +31,7 @@ @Generated("") public class _IdGeneratedEmp extends AbstractEntityType { - private static _IdGeneratedEmp singleton = new _IdGeneratedEmp(); + private static final _IdGeneratedEmp singleton = new _IdGeneratedEmp(); private static final org.seasar.doma.jdbc.entity.OriginalStatesAccessor __originalStatesAccessor = diff --git a/doma-core/src/test/java/example/entity/_ImmutableEmp.java b/doma-core/src/test/java/example/entity/_ImmutableEmp.java index 50fb58180..ee18d1fa1 100644 --- a/doma-core/src/test/java/example/entity/_ImmutableEmp.java +++ b/doma-core/src/test/java/example/entity/_ImmutableEmp.java @@ -31,7 +31,7 @@ @Generated("") public class _ImmutableEmp extends AbstractEntityType { - private static _ImmutableEmp singleton = new _ImmutableEmp(); + private static final _ImmutableEmp singleton = new _ImmutableEmp(); private final NamingType __namingType = NamingType.UPPER_CASE; diff --git a/doma-core/src/test/java/example/entity/_Salesman.java b/doma-core/src/test/java/example/entity/_Salesman.java index 38716a9b4..ce46e7a96 100644 --- a/doma-core/src/test/java/example/entity/_Salesman.java +++ b/doma-core/src/test/java/example/entity/_Salesman.java @@ -31,7 +31,7 @@ @Generated("") public class _Salesman extends AbstractEntityType { - private static _Salesman singleton = new _Salesman(); + private static final _Salesman singleton = new _Salesman(); private final NamingType __namingType = NamingType.UPPER_CASE; diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java index ca4d071de..bcfbf48d0 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java @@ -19,7 +19,7 @@ public class ExpressionEvaluatorTest { - protected ExpressionLocation location = new ExpressionLocation("dummy expression", 0); + protected final ExpressionLocation location = new ExpressionLocation("dummy expression", 0); @Test public void testInvokeMethod() throws Exception { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java index 2a1d68804..cc7fd6e96 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java @@ -10,11 +10,11 @@ public class Person { public String name; - public static String staticName = "hoge"; + public static final String staticName = "hoge"; public Optional optionalName; - public static Optional staticOptionalName = Optional.of("foo"); + public static final Optional staticOptionalName = Optional.of("foo"); public Optional getOptionalName() { return optionalName; diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/AndOperatorNodeTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/AndOperatorNodeTest.java index aec2770aa..8554784fb 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/AndOperatorNodeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/AndOperatorNodeTest.java @@ -9,13 +9,14 @@ public class AndOperatorNodeTest { - protected ExpressionLocation location = new ExpressionLocation("", 0); + protected final ExpressionLocation location = new ExpressionLocation("", 0); - protected LiteralNode trueLiteral = new LiteralNode(location, "true", true, boolean.class); + protected final LiteralNode trueLiteral = new LiteralNode(location, "true", true, boolean.class); - protected LiteralNode falseLiteral = new LiteralNode(location, "false", false, boolean.class); + protected final LiteralNode falseLiteral = + new LiteralNode(location, "false", false, boolean.class); - protected LiteralNode nullLiteral = new LiteralNode(location, "null", null, Object.class); + protected final LiteralNode nullLiteral = new LiteralNode(location, "null", null, Object.class); @Test public void test_true_true() throws Exception { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/MethodOperatorNodeTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/MethodOperatorNodeTest.java index b94f1796a..766801bc0 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/MethodOperatorNodeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/MethodOperatorNodeTest.java @@ -9,7 +9,7 @@ public class MethodOperatorNodeTest { - protected ExpressionLocation location = new ExpressionLocation("", 0); + protected final ExpressionLocation location = new ExpressionLocation("", 0); @Test public void testOneParameter() throws Exception { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/NotOperatorNodeTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/NotOperatorNodeTest.java index 5fcb33c7d..478c10d17 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/NotOperatorNodeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/NotOperatorNodeTest.java @@ -9,13 +9,14 @@ public class NotOperatorNodeTest { - protected ExpressionLocation location = new ExpressionLocation("", 0); + protected final ExpressionLocation location = new ExpressionLocation("", 0); - protected LiteralNode trueLiteral = new LiteralNode(location, "true", true, boolean.class); + protected final LiteralNode trueLiteral = new LiteralNode(location, "true", true, boolean.class); - protected LiteralNode falseLiteral = new LiteralNode(location, "false", false, boolean.class); + protected final LiteralNode falseLiteral = + new LiteralNode(location, "false", false, boolean.class); - protected LiteralNode nullLiteral = new LiteralNode(location, "null", null, Object.class); + protected final LiteralNode nullLiteral = new LiteralNode(location, "null", null, Object.class); @Test public void test_true() throws Exception { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/OrOperatorNodeTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/OrOperatorNodeTest.java index 4b08dd62c..7c917208c 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/OrOperatorNodeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/OrOperatorNodeTest.java @@ -9,13 +9,14 @@ public class OrOperatorNodeTest { - protected ExpressionLocation location = new ExpressionLocation("", 0); + protected final ExpressionLocation location = new ExpressionLocation("", 0); - protected LiteralNode trueLiteral = new LiteralNode(location, "true", true, boolean.class); + protected final LiteralNode trueLiteral = new LiteralNode(location, "true", true, boolean.class); - protected LiteralNode falseLiteral = new LiteralNode(location, "false", false, boolean.class); + protected final LiteralNode falseLiteral = + new LiteralNode(location, "false", false, boolean.class); - protected LiteralNode nullLiteral = new LiteralNode(location, "null", null, Object.class); + protected final LiteralNode nullLiteral = new LiteralNode(location, "null", null, Object.class); @Test public void test_true_true() throws Exception { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/mock/MockConfig.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/mock/MockConfig.java index 262a5644b..210eb86f1 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/mock/MockConfig.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/mock/MockConfig.java @@ -20,17 +20,17 @@ public class MockConfig implements Config { public Dialect dialect = new StandardDialect(); - protected SqlFileRepository sqlFileRepository = new GreedyCacheSqlFileRepository(); + protected final SqlFileRepository sqlFileRepository = new GreedyCacheSqlFileRepository(); - protected JdbcLogger sqlLogger = new UtilLoggingJdbcLogger(); + protected final JdbcLogger sqlLogger = new UtilLoggingJdbcLogger(); - protected RequiresNewController requiresNewController = new RequiresNewController() {}; + protected final RequiresNewController requiresNewController = new RequiresNewController() {}; - protected ClassHelper classHelper = new ClassHelper() {}; + protected final ClassHelper classHelper = new ClassHelper() {}; - protected CommandImplementors commandImplementors = new CommandImplementors() {}; + protected final CommandImplementors commandImplementors = new CommandImplementors() {}; - protected QueryImplementors queryImplementors = new QueryImplementors() {}; + protected final QueryImplementors queryImplementors = new QueryImplementors() {}; protected SqlLogType exceptionSqlLogType = SqlLogType.FORMATTED; diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_Dept.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_Dept.java index 380539bcd..f873241ec 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_Dept.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_Dept.java @@ -29,7 +29,7 @@ @Generated("") public class _Dept extends AbstractEntityType { - private static _Dept singleton = new _Dept(); + private static final _Dept singleton = new _Dept(); private final NamingType __namingType = NamingType.SNAKE_UPPER_CASE; diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_Emp.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_Emp.java index 2bf3a79b3..9757fec4a 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_Emp.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_Emp.java @@ -32,7 +32,7 @@ @Generated("") public class _Emp extends AbstractEntityType { - private static _Emp singleton = new _Emp(); + private static final _Emp singleton = new _Emp(); private static final org.seasar.doma.jdbc.entity.OriginalStatesAccessor __originalStatesAccessor = diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_NoIdEmp.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_NoIdEmp.java index 9f725d8fe..a8f2e3bb3 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_NoIdEmp.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/_NoIdEmp.java @@ -30,7 +30,7 @@ @Generated("") public class _NoIdEmp extends AbstractEntityType { - private static _NoIdEmp singleton = new _NoIdEmp(); + private static final _NoIdEmp singleton = new _NoIdEmp(); private final NamingType __namingType = NamingType.SNAKE_UPPER_CASE; diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java index ac7d1416c..eaf9be4d8 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java @@ -37,7 +37,7 @@ public void testReleaseAndGetSavepoint() throws Exception { static class MySavepoint implements Savepoint { - String name; + final String name; public MySavepoint(String name) { this.name = name; From da352ae84c96c1b67e962f9b9cfe17aa694d0462 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:00:36 +0900 Subject: [PATCH 57/78] Suppress SameParameterValue --- .../doma/internal/jdbc/sql/NodePreparedSqlBuilder.java | 2 +- .../java/org/seasar/doma/jdbc/OptimisticLockException.java | 5 ++++- .../java/org/seasar/doma/jdbc/SqlExecutionException.java | 4 ++-- .../java/org/seasar/doma/jdbc/UniqueConstraintException.java | 2 +- .../doma/jdbc/criteria/expression/StringExpression.java | 5 ++++- .../main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java | 3 ++- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java index 858d440b7..d0bba43a3 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java @@ -860,7 +860,7 @@ protected List> getParameters() { return parameters; } - void setAvailable(boolean available) { + void setAvailable(@SuppressWarnings("SameParameterValue") boolean available) { this.available = available; } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/OptimisticLockException.java b/doma-core/src/main/java/org/seasar/doma/jdbc/OptimisticLockException.java index c8d1f5bc8..828082869 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/OptimisticLockException.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/OptimisticLockException.java @@ -30,7 +30,10 @@ public OptimisticLockException( } protected OptimisticLockException( - MessageResource messageCode, SqlKind kind, String rawSql, String sqlFilePath) { + @SuppressWarnings("SameParameterValue") MessageResource messageCode, + SqlKind kind, + String rawSql, + String sqlFilePath) { super(messageCode, sqlFilePath, rawSql); this.kind = kind; this.rawSql = rawSql; diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/SqlExecutionException.java b/doma-core/src/main/java/org/seasar/doma/jdbc/SqlExecutionException.java index 12d68789d..f953eb83a 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/SqlExecutionException.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/SqlExecutionException.java @@ -53,10 +53,10 @@ public SqlExecutionException( } protected SqlExecutionException( - MessageResource messageCode, + @SuppressWarnings("SameParameterValue") MessageResource messageCode, SqlKind kind, String rawSql, - String formattedSql, + @SuppressWarnings("SameParameterValue") String formattedSql, String sqlFilePath, Throwable cause, Throwable rootCause) { diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/UniqueConstraintException.java b/doma-core/src/main/java/org/seasar/doma/jdbc/UniqueConstraintException.java index 09d31d17d..ca3d54533 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/UniqueConstraintException.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/UniqueConstraintException.java @@ -41,7 +41,7 @@ public UniqueConstraintException( } protected UniqueConstraintException( - MessageResource messageCode, + @SuppressWarnings("SameParameterValue") MessageResource messageCode, SqlKind kind, String rawSql, String sqlFilePath, diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/expression/StringExpression.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/expression/StringExpression.java index ec69c88bb..93ee64d1c 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/expression/StringExpression.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/expression/StringExpression.java @@ -52,7 +52,10 @@ abstract class TwoArgumentsStringExpression implements StringExpressio public final Operand second; protected TwoArgumentsStringExpression( - String name, PropertyMetamodel propertyMetamodel, Operand first, Operand second) { + @SuppressWarnings("SameParameterValue") String name, + PropertyMetamodel propertyMetamodel, + Operand first, + Operand second) { this.name = Objects.requireNonNull(name); this.propertyMetamodel = Objects.requireNonNull(propertyMetamodel); this.first = Objects.requireNonNull(first); diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java index 774897653..dbc453bf8 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java @@ -118,7 +118,8 @@ public void begin(TransactionIsolationLevel transactionIsolationLevel) { } protected void beginInternal( - TransactionIsolationLevel transactionIsolationLevel, String callerMethodName) { + TransactionIsolationLevel transactionIsolationLevel, + @SuppressWarnings("SameParameterValue") String callerMethodName) { assertNotNull(callerMethodName); LocalTransactionContext context = localTxContextHolder.get(); if (isActiveInternal(context)) { From 07d838e1879b055dee35f71654be9ff140770c9c Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:01:23 +0900 Subject: [PATCH 58/78] Replace with 'BigDecimal.valueOf' --- .../main/java/org/seasar/doma/wrapper/BigDecimalWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doma-core/src/main/java/org/seasar/doma/wrapper/BigDecimalWrapper.java b/doma-core/src/main/java/org/seasar/doma/wrapper/BigDecimalWrapper.java index 66aaa6313..79d7e2606 100644 --- a/doma-core/src/main/java/org/seasar/doma/wrapper/BigDecimalWrapper.java +++ b/doma-core/src/main/java/org/seasar/doma/wrapper/BigDecimalWrapper.java @@ -23,7 +23,7 @@ public void set(Number v) { } else if (v instanceof BigInteger) { super.set(new BigDecimal((BigInteger) v)); } else { - super.set(new BigDecimal(v.doubleValue())); + super.set(BigDecimal.valueOf(v.doubleValue())); } } From 2d1964b30164b8c052f129fa54b640d1b58d4bd9 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:02:29 +0900 Subject: [PATCH 59/78] Suppress BigDecimalMethodWithoutRoundingCalled --- .../java/org/seasar/doma/internal/expr/ExpressionEvaluator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java index b94d12e83..ba41a3556 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java @@ -955,6 +955,7 @@ protected EvaluationResult multiply(Number other) { protected EvaluationResult divide(Number other) { BigDecimal newValue = null; try { + //noinspection BigDecimalMethodWithoutRoundingCalled newValue = numberValue.divide(other.numberValue); } catch (ArithmeticException e) { handleArithmeticException(e); From fde7a5c1abda3cb1bfeda4bf5fac8d7184343844 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:03:14 +0900 Subject: [PATCH 60/78] Suppress MismatchedQueryAndUpdateOfCollection --- .../org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java | 1 + 1 file changed, 1 insertion(+) diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java index 888e1bc0f..88e593d64 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java @@ -36,6 +36,7 @@ public final class _NotTopLevelEntity__Hoge String, org.seasar.doma.jdbc.entity.EntityPropertyType> __entityPropertyTypeMap; + @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") private _NotTopLevelEntity__Hoge() { __listenerSupplier = () -> ListenerHolder.listener; __immutable = false; From d0b6c10f65db473052eb78bb8c4452d72579a5c3 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:04:05 +0900 Subject: [PATCH 61/78] Suppress CopyConstructorMissesField --- .../seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java index d0bba43a3..3c1cc7f7a 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java @@ -777,6 +777,7 @@ protected static class Context { private boolean available; + @SuppressWarnings("CopyConstructorMissesField") protected Context(Context context) { this(context.config, context.evaluator); } From a067e6e7d97ebf8d79cc6adeb15734e66589b3ea Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:10:56 +0900 Subject: [PATCH 62/78] Suppress SameReturnValue --- .../src/test/java/org/seasar/doma/internal/expr/Person.java | 1 + 1 file changed, 1 insertion(+) diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java index cc7fd6e96..1aeb6692b 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/Person.java @@ -20,6 +20,7 @@ public Optional getOptionalName() { return optionalName; } + @SuppressWarnings("SameReturnValue") public static Optional getStaticOptionalName() { return staticOptionalName; } From 2a9ff8686d7ce986bb8213ef5a0502c13e72f432 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:16:55 +0900 Subject: [PATCH 63/78] Suppress NullableProblems --- .../src/main/java/org/seasar/doma/internal/ClassName.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/ClassName.java b/doma-core/src/main/java/org/seasar/doma/internal/ClassName.java index e4ecac97a..5c8705c0f 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/ClassName.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/ClassName.java @@ -1,5 +1,6 @@ package org.seasar.doma.internal; +import java.util.Objects; import org.seasar.doma.internal.util.ClassUtil; public class ClassName implements CharSequence { @@ -7,7 +8,7 @@ public class ClassName implements CharSequence { private final String qualifiedName; public ClassName(String qualifiedName) { - this.qualifiedName = qualifiedName; + this.qualifiedName = Objects.requireNonNull(qualifiedName); } public String getPackageName() { @@ -33,6 +34,7 @@ public CharSequence subSequence(int start, int end) { return qualifiedName.subSequence(start, end); } + @SuppressWarnings("NullableProblems") @Override public String toString() { return qualifiedName; From 7ec627bad46afdf1eb5ced0d6b609533857246b1 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:19:18 +0900 Subject: [PATCH 64/78] Replace with 'null' --- .../org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java index 88e593d64..2f9194269 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/_NotTopLevelEntity__Hoge.java @@ -58,7 +58,7 @@ private _NotTopLevelEntity__Hoge() { @Override public org.seasar.doma.jdbc.entity.NamingType getNamingType() { - return __namingType; + return null; } @Override @@ -92,7 +92,7 @@ public String getTableName( java.util.function.BiFunction namingFunction) { if (__tableName.isEmpty()) { - return namingFunction.apply(__namingType, __name); + return namingFunction.apply(null, __name); } return __tableName; } From b9bfab44fc98c1085e33d8e1d83b6bce6acf6d9e Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:19:38 +0900 Subject: [PATCH 65/78] Suppress ConstantConditions --- .../seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java | 5 +++++ .../test/java/org/seasar/doma/jdbc/SelectOptionsTest.java | 3 +++ .../org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java | 2 ++ 3 files changed, 10 insertions(+) diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java index 26a6099ee..d89673672 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java @@ -14,6 +14,7 @@ /** @author backpaper0 */ public class DaoImplSupportTest { + @SuppressWarnings("ConstantConditions") @Test public void testConstructorParameter1() throws Exception { Config config = null; @@ -25,6 +26,7 @@ public void testConstructorParameter1() throws Exception { } } + @SuppressWarnings("ConstantConditions") @Test public void testConstructorParameter2() throws Exception { Config config = null; @@ -37,6 +39,7 @@ public void testConstructorParameter2() throws Exception { } } + @SuppressWarnings("ConstantConditions") @Test public void testConstructorParameter3() throws Exception { Config config = mock(Config.class); @@ -49,6 +52,7 @@ public void testConstructorParameter3() throws Exception { } } + @SuppressWarnings("ConstantConditions") @Test public void testConstructorParameter4() throws Exception { Config config = null; @@ -61,6 +65,7 @@ public void testConstructorParameter4() throws Exception { } } + @SuppressWarnings("ConstantConditions") @Test public void testConstructorParameter5() throws Exception { Config config = mock(Config.class); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/SelectOptionsTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/SelectOptionsTest.java index 6c540a276..1582730f8 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/SelectOptionsTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/SelectOptionsTest.java @@ -10,6 +10,7 @@ /** @author backpaper0 */ public class SelectOptionsTest { + @SuppressWarnings("ConstantConditions") @Test public void testForUpdateParameter() throws Exception { String[] aliases = null; @@ -21,6 +22,7 @@ public void testForUpdateParameter() throws Exception { } } + @SuppressWarnings("ConstantConditions") @Test public void testForUpdateNowaitParameter() throws Exception { String[] aliases = null; @@ -57,6 +59,7 @@ public void testForUpdateWaitParameter2() throws Exception { } } + @SuppressWarnings("ConstantConditions") @Test public void testForUpdateWaitParameter3() throws Exception { int waitSeconds = 1; diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java index 78605bd45..15d44ba93 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java @@ -19,6 +19,7 @@ public class DefaultPropertyTypeTest { private Integer integer; + @SuppressWarnings("ConstantConditions") @Test public void testIsQuoteRequired_true() throws Exception { boolean isQuoteRequired = true; @@ -36,6 +37,7 @@ public void testIsQuoteRequired_true() throws Exception { assertEquals("[hoge]", propertyType.getColumnName((n, t) -> t, s -> "[" + s + "]")); } + @SuppressWarnings("ConstantConditions") @Test public void testIsQuoteRequired_false() throws Exception { boolean isQuoteRequired = false; From a3dbe1431f3ce7ec9a352cef8d897ce3aa454d42 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:30:24 +0900 Subject: [PATCH 66/78] Remove redundant assignment --- .../java/org/seasar/doma/internal/expr/ExpressionTokenizer.java | 1 - .../org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java | 2 -- .../java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java | 1 - 3 files changed, 4 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java index f5fe80bb5..88e7e3d00 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java @@ -33,7 +33,6 @@ public ExpressionTokenizer(String expression) { public ExpressionTokenType next() { if (type == EOE) { token = null; - type = EOE; return EOE; } ExpressionTokenType currentType = type; diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java index f566c4edf..eee4edf91 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizer.java @@ -95,11 +95,9 @@ public ScriptTokenType nextToken() { switch (type) { case END_OF_FILE: token = null; - type = END_OF_FILE; return END_OF_FILE; case END_OF_LINE: token = ""; - type = END_OF_LINE; return END_OF_LINE; case BLOCK_DELIMITER: token = line; diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java index 27d2b0fb7..a9c2630dd 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java @@ -79,7 +79,6 @@ public SqlTokenType next() { switch (type) { case EOF: token = null; - type = EOF; return EOF; case EOL: lineStartPosition = buf.position(); From 7fc401b3ab281ad1498b457f022e93e0d8a6162a Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:31:35 +0900 Subject: [PATCH 67/78] Remove redundant if statement --- .../main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java index dbc453bf8..c05260ccf 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java @@ -414,9 +414,6 @@ protected void endInternal(LocalTransactionContext context, String callerMethodN */ protected void release(LocalTransactionContext context, String callerMethodName) { assertNotNull(context, callerMethodName); - if (context == null) { - return; - } localTxContextHolder.set(null); if (!context.hasConnection()) { return; From 303a045ce2370e4a0e789d6940cc69ffa7f1c0ad Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:32:28 +0900 Subject: [PATCH 68/78] Split exception creation and exception throwing --- .../internal/expr/ExpressionEvaluator.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java index ba41a3556..1fd9f153a 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java @@ -253,11 +253,11 @@ public EvaluationResult visitAddOperatorNode(AddOperatorNode node, Void p) { Number leftNumber = createNumber(node, leftNode, leftResult); if (leftNumber == null) { - throwNotNumberException(node, leftNode, leftResult); + throw newNotNumberException(node, leftNode, leftResult); } Number rightNumber = createNumber(node, rightNode, rightResult); if (rightNumber == null) { - throwNotNumberException(node, rightNode, rightResult); + throw newNotNumberException(node, rightNode, rightResult); } return leftNumber.add(rightNumber); } @@ -290,11 +290,11 @@ public EvaluationResult visitSubtractOperatorNode(SubtractOperatorNode node, Voi EvaluationResult rightResult = evaluateNotNullableOperandNode(node, rightNode, p); Number leftNumber = createNumber(node, leftNode, leftResult); if (leftNumber == null) { - throwNotNumberException(node, leftNode, leftResult); + throw newNotNumberException(node, leftNode, leftResult); } Number rightNumber = createNumber(node, rightNode, rightResult); if (rightNumber == null) { - throwNotNumberException(node, rightNode, rightResult); + throw newNotNumberException(node, rightNode, rightResult); } return leftNumber.subtract(rightNumber); } @@ -307,11 +307,11 @@ public EvaluationResult visitMultiplyOperatorNode(MultiplyOperatorNode node, Voi EvaluationResult rightResult = evaluateNotNullableOperandNode(node, rightNode, p); Number leftNumber = createNumber(node, leftNode, leftResult); if (leftNumber == null) { - throwNotNumberException(node, leftNode, leftResult); + throw newNotNumberException(node, leftNode, leftResult); } Number rightNumber = createNumber(node, rightNode, rightResult); if (rightNumber == null) { - throwNotNumberException(node, rightNode, rightResult); + throw newNotNumberException(node, rightNode, rightResult); } return leftNumber.multiply(rightNumber); } @@ -324,11 +324,11 @@ public EvaluationResult visitDivideOperatorNode(DivideOperatorNode node, Void p) EvaluationResult rightResult = evaluateNotNullableOperandNode(node, rightNode, p); Number leftNumber = createNumber(node, leftNode, leftResult); if (leftNumber == null) { - throwNotNumberException(node, leftNode, leftResult); + throw newNotNumberException(node, leftNode, leftResult); } Number rightNumber = createNumber(node, rightNode, rightResult); if (rightNumber == null) { - throwNotNumberException(node, rightNode, rightResult); + throw newNotNumberException(node, rightNode, rightResult); } return leftNumber.divide(rightNumber); } @@ -341,11 +341,11 @@ public EvaluationResult visitModOperatorNode(ModOperatorNode node, Void p) { EvaluationResult rightResult = evaluateNotNullableOperandNode(node, rightNode, p); Number leftNumber = createNumber(node, leftNode, leftResult); if (leftNumber == null) { - throwNotNumberException(node, leftNode, leftResult); + throw newNotNumberException(node, leftNode, leftResult); } Number rightNumber = createNumber(node, rightNode, rightResult); if (rightNumber == null) { - throwNotNumberException(node, rightNode, rightResult); + throw newNotNumberException(node, rightNode, rightResult); } return leftNumber.mod(rightNumber); } @@ -360,12 +360,12 @@ protected Number createNumber( return new Number(operatoNode, evaluationResult.getValue(), evaluationResult.getValueClass()); } - protected void throwNotNumberException( + protected ExpressionException newNotNumberException( ArithmeticOperatorNode operatorNode, ExpressionNode operandNode, EvaluationResult evaluationResult) { ExpressionLocation location = operandNode.getLocation(); - throw new ExpressionException( + return new ExpressionException( Message.DOMA3013, location.getExpression(), location.getPosition(), From de9fbeac6871255972fb13c0025ce2eab27dcb78 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 14:33:36 +0900 Subject: [PATCH 69/78] Use 'new HashSet()' instead of 'Collections.emptySet()' because the Set is mutable --- .../org/seasar/doma/internal/jdbc/command/EntityProvider.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntityProvider.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntityProvider.java index 983663025..2d0931359 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntityProvider.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/EntityProvider.java @@ -7,7 +7,6 @@ import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -76,7 +75,7 @@ protected ENTITY build(ResultSet resultSet) throws SQLException { HashMap> indexMap = new HashMap<>(); HashMap> columnNameMap = createColumnNameMap(entityType); Set> unmappedPropertySet = - resultMappingEnsured ? new HashSet<>(columnNameMap.values()) : Collections.emptySet(); + resultMappingEnsured ? new HashSet<>(columnNameMap.values()) : new HashSet<>(); int count = resultSetMeta.getColumnCount(); for (int i = 1; i < count + 1; i++) { String columnName = resultSetMeta.getColumnLabel(i); From e5b40c79b8787bcc4cd4cd2b2db3c928cc5245af Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 15:13:00 +0900 Subject: [PATCH 70/78] Remove unnecessary 'throws' declarations --- .../DomaIllegalArgumentExceptionTest.java | 2 +- .../doma/DomaNullPointerExceptionTest.java | 4 +- .../seasar/doma/internal/ArtifactTest.java | 8 +- .../doma/internal/RuntimeConfigTest.java | 4 +- .../expr/ExpressionEvaluatorTest.java | 26 ++-- .../expr/ExpressionExceptionTest.java | 36 ++--- .../internal/expr/ExpressionParserTest.java | 134 +++++++++--------- .../expr/ExpressionTokenizerTest.java | 46 +++--- .../expr/node/AndOperatorNodeTest.java | 14 +- .../expr/node/MethodOperatorNodeTest.java | 2 +- .../expr/node/NotOperatorNodeTest.java | 6 +- .../expr/node/OrOperatorNodeTest.java | 14 +- .../command/BasicResultListHandlerTest.java | 2 +- .../command/BasicSingleResultHandlerTest.java | 2 +- .../command/DomainResultListHandlerTest.java | 2 +- .../DomainSingleResultHandlerTest.java | 2 +- .../command/EntityIterationHandlerTest.java | 2 +- .../command/EntityResultListHandlerTest.java | 2 +- .../EntitySingleResultHandlerTest.java | 2 +- .../jdbc/command/ScriptReaderTest.java | 29 ++-- .../jdbc/command/ScriptTokenizerTest.java | 12 +- .../internal/jdbc/dao/DaoImplSupportTest.java | 10 +- .../dialect/Db2ForUpdateTransformerTest.java | 2 +- .../dialect/Db2PagingTransformerTest.java | 6 +- .../dialect/H212126PagingTransformerTest.java | 8 +- .../dialect/H2ForUpdateTransformerTest.java | 2 +- .../jdbc/dialect/H2PagingTransformerTest.java | 8 +- .../Mssql2008ForUpdateTransformerTest.java | 6 +- .../Mssql2008PagingTransformerTest.java | 6 +- .../dialect/MssqlPagingTransformerTest.java | 20 +-- .../MysqlCountCalculatingTransformerTest.java | 2 +- .../MysqlForUpdateTransformerTest.java | 2 +- .../dialect/MysqlPagingTransformerTest.java | 8 +- .../OracleForUpdateTransformerTest.java | 8 +- .../dialect/OraclePagingTransformerTest.java | 8 +- .../PostgresForUpdateTransformerTest.java | 8 +- .../PostgresPagingTransformerTest.java | 8 +- .../dialect/SqlitePagingTransformerTest.java | 8 +- .../StandardCountGettingTransformerTest.java | 4 +- .../StandardPagingTransformerTest.java | 12 +- .../jdbc/entity/PropertyFieldTest.java | 30 ++-- .../internal/jdbc/scalar/ScalarsTest.java | 30 ++-- .../jdbc/sql/NodePreparedSqlBuilderTest.java | 32 ++--- .../jdbc/sql/PreparedSqlBuilderTest.java | 4 +- .../jdbc/sql/ScalarInOutParameterTest.java | 4 +- .../jdbc/sql/ScalarInParameterTest.java | 4 +- .../doma/internal/jdbc/sql/SqlParserTest.java | 119 ++++++++-------- .../internal/jdbc/sql/SqlTokenizerTest.java | 90 ++++++------ .../jdbc/util/DatabaseObjectUtilTest.java | 8 +- .../internal/util/CharSequenceUtilTest.java | 8 +- .../doma/internal/util/ClassUtilTest.java | 8 +- .../seasar/doma/internal/util/IOUtilTest.java | 6 +- .../doma/internal/util/ResourceUtilTest.java | 4 +- .../doma/internal/util/SqlFileUtilTest.java | 4 +- .../doma/internal/util/StringUtilTest.java | 14 +- .../jdbc/AbstractSqlFileRepositoryTest.java | 6 +- .../BatchOptimisticLockExceptionTest.java | 2 +- .../jdbc/BatchSqlExecutionExceptionTest.java | 2 +- .../BatchUniqueConstraintExceptionTest.java | 2 +- .../seasar/doma/jdbc/CallerCommenterTest.java | 2 +- .../seasar/doma/jdbc/ConfigExceptionTest.java | 2 +- .../java/org/seasar/doma/jdbc/ConfigTest.java | 4 +- .../jdbc/DaoMethodNotFoundExceptionTest.java | 2 +- .../GreedyCacheSqlFileRepositoryTest.java | 10 +- .../seasar/doma/jdbc/JdbcExceptionTest.java | 22 +-- ...JdbcUnsupportedOperationExceptionTest.java | 2 +- .../java/org/seasar/doma/jdbc/NamingTest.java | 4 +- .../jdbc/NonSingleColumnExceptionTest.java | 2 +- .../jdbc/NonUniqueResultExceptionTest.java | 2 +- .../jdbc/OptimisticLockExceptionTest.java | 2 +- .../doma/jdbc/ResultMappingExceptionTest.java | 2 +- .../seasar/doma/jdbc/SelectOptionsTest.java | 14 +- .../doma/jdbc/SimpleDataSourceTest.java | 4 +- .../doma/jdbc/SqlExecutionExceptionTest.java | 2 +- .../jdbc/SqlFileNotFoundExceptionTest.java | 2 +- .../jdbc/UniqueConstraintExceptionTest.java | 2 +- .../doma/jdbc/UnknownColumnExceptionTest.java | 2 +- .../doma/jdbc/UtilLoggingJdbcLoggerTest.java | 8 +- .../jdbc/builder/BatchDeleteExecutorTest.java | 14 +- .../jdbc/builder/BatchInsertExecutorTest.java | 16 +-- .../jdbc/builder/BatchUpdateExecutorTest.java | 14 +- .../doma/jdbc/builder/DeleteBuilderTest.java | 6 +- .../doma/jdbc/builder/InsertBuilderTest.java | 6 +- .../builder/MapBatchInsertBuilderTest.java | 16 +-- .../jdbc/builder/MapInsertBuilderTest.java | 8 +- .../doma/jdbc/builder/SelectBuilderTest.java | 34 ++--- .../doma/jdbc/builder/UpdateBuilderTest.java | 6 +- .../jdbc/command/BatchDeleteCommandTest.java | 2 +- .../jdbc/command/BatchInsertCommandTest.java | 2 +- .../jdbc/command/BatchUpdateCommandTest.java | 8 +- .../doma/jdbc/command/DeleteCommandTest.java | 8 +- .../jdbc/command/FunctionCommandTest.java | 2 +- .../doma/jdbc/command/InsertCommandTest.java | 2 +- .../doma/jdbc/command/ScriptCommandTest.java | 6 +- .../doma/jdbc/command/SelectCommandTest.java | 2 +- .../doma/jdbc/command/UpdateCommandTest.java | 2 +- .../doma/jdbc/dialect/Db2DialectTest.java | 6 +- .../jdbc/dialect/Mssql2008DialectTest.java | 4 +- .../jdbc/dialect/Oracle11DialectTest.java | 12 +- .../doma/jdbc/dialect/OracleDialectTest.java | 6 +- .../jdbc/dialect/PostgresDialectTest.java | 8 +- .../jdbc/dialect/StandardDialectTest.java | 80 +++++------ .../jdbc/domain/DomainTypeFactoryTest.java | 10 +- .../DomainTypeNotFoundExceptionTest.java | 2 +- .../jdbc/entity/DefaultPropertyTypeTest.java | 26 ++-- .../EntityPropertyAccessExceptionTest.java | 2 +- .../EntityPropertyNotFoundExceptionTest.java | 2 +- .../jdbc/entity/EntityTypeFactoryTest.java | 8 +- .../EntityTypeNotFoundExceptionTest.java | 2 +- .../doma/jdbc/entity/EntityTypeTest.java | 14 +- .../OriginalStatesAccessExceptionTest.java | 2 +- .../entity/OriginalStatesAccessorTest.java | 4 +- .../OriginalStatesNotFoundExceptionTest.java | 2 +- .../id/BuiltinIdentityIdGeneratorTest.java | 4 +- .../id/BuiltinSequenceIdGeneratorTest.java | 2 +- .../jdbc/id/BuiltinTableIdGeneratorTest.java | 5 +- .../doma/jdbc/query/ArrayCreateQueryTest.java | 2 +- .../jdbc/query/AutoBatchDeleteQueryTest.java | 10 +- .../jdbc/query/AutoBatchInsertQueryTest.java | 6 +- .../jdbc/query/AutoBatchUpdateQueryTest.java | 16 +-- .../doma/jdbc/query/AutoDeleteQueryTest.java | 10 +- .../jdbc/query/AutoFunctionQueryTest.java | 2 +- .../doma/jdbc/query/AutoInsertQueryTest.java | 12 +- .../doma/jdbc/query/AutoUpdateQueryTest.java | 18 +-- .../query/SqlFileBatchDeleteQueryTest.java | 6 +- .../query/SqlFileBatchInsertQueryTest.java | 6 +- .../query/SqlFileBatchUpdateQueryTest.java | 16 +-- .../jdbc/query/SqlFileScriptQueryTest.java | 8 +- .../jdbc/query/SqlFileUpdateQueryTest.java | 22 +-- .../tx/KeepAliveLocalTransactionTest.java | 40 +++--- .../jdbc/tx/LocalTransactionContextTest.java | 5 +- .../jdbc/tx/LocalTransactionManagerTest.java | 16 +-- .../doma/jdbc/tx/LocalTransactionTest.java | 36 ++--- .../org/seasar/doma/message/MessageTest.java | 6 +- 134 files changed, 771 insertions(+), 775 deletions(-) diff --git a/doma-core/src/test/java/org/seasar/doma/DomaIllegalArgumentExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/DomaIllegalArgumentExceptionTest.java index 2d3e39645..67ec75b7a 100644 --- a/doma-core/src/test/java/org/seasar/doma/DomaIllegalArgumentExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/DomaIllegalArgumentExceptionTest.java @@ -7,7 +7,7 @@ public class DomaIllegalArgumentExceptionTest { @Test - public void test() throws Exception { + public void test() { DomaIllegalArgumentException e = new DomaIllegalArgumentException("aaa", "aaa < 0"); assertEquals("aaa", e.getParameterName()); assertEquals("aaa < 0", e.getDescription()); diff --git a/doma-core/src/test/java/org/seasar/doma/DomaNullPointerExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/DomaNullPointerExceptionTest.java index e256833d2..618dcde9d 100644 --- a/doma-core/src/test/java/org/seasar/doma/DomaNullPointerExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/DomaNullPointerExceptionTest.java @@ -7,13 +7,13 @@ public class DomaNullPointerExceptionTest { @Test - public void test() throws Exception { + public void test() { DomaNullPointerException e = new DomaNullPointerException("aaa"); assertEquals("aaa", e.getParameterName()); } @Test - public void testGenerics() throws Exception { + public void testGenerics() { hoge(new A()); hoge(new B()); hoge(new C()); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/ArtifactTest.java b/doma-core/src/test/java/org/seasar/doma/internal/ArtifactTest.java index ac78a519f..b353a1e8a 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/ArtifactTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/ArtifactTest.java @@ -11,22 +11,22 @@ public class ArtifactTest { @Test - public void testGetName() throws Exception { + public void testGetName() { assertEquals("Doma", Artifact.getName()); } @Test - public void testGetVersion() throws Exception { + public void testGetVersion() { assertNotNull(Artifact.getVersion()); } @Test - public void testValidateVersion() throws Exception { + public void testValidateVersion() { Artifact.validateVersion(Artifact.getVersion()); } @Test - public void testValidateVersion_conflicted() throws Exception { + public void testValidateVersion_conflicted() { try { Artifact.validateVersion("hoge"); fail(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/RuntimeConfigTest.java b/doma-core/src/test/java/org/seasar/doma/internal/RuntimeConfigTest.java index 578c99069..d2a133818 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/RuntimeConfigTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/RuntimeConfigTest.java @@ -18,7 +18,7 @@ public class RuntimeConfigTest { @Test - public void testGetEntityListener() throws Exception { + public void testGetEntityListener() { Config originalConfig = new MockConfig() { @@ -38,7 +38,7 @@ public EntityListenerProvider getEntityListenerProvider() { } @Test - public void testGetEntityListenerNullCheck() throws Exception { + public void testGetEntityListenerNullCheck() { Config originalConfig = new MockConfig() { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java index bcfbf48d0..0a0b9b6cf 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionEvaluatorTest.java @@ -121,7 +121,7 @@ public void testInvokeMethod_static_optionalInt_empty() throws Exception { } @Test - public void testFindMethod() throws Exception { + public void testFindMethod() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = evaluator.findMethod("add", new ArrayList<>(), ArrayList.class, new Class[] {Object.class}); @@ -130,7 +130,7 @@ public void testFindMethod() throws Exception { } @Test - public void testFindMethod_String_is_subtype_of_Object() throws Exception { + public void testFindMethod_String_is_subtype_of_Object() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = evaluator.findMethod("add", new ArrayList<>(), ArrayList.class, new Class[] {String.class}); @@ -139,7 +139,7 @@ public void testFindMethod_String_is_subtype_of_Object() throws Exception { } @Test - public void testFindMethod_List_is_subtype_of_Object() throws Exception { + public void testFindMethod_List_is_subtype_of_Object() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = evaluator.findMethod("add", new ArrayList<>(), ArrayList.class, new Class[] {List.class}); @@ -148,7 +148,7 @@ public void testFindMethod_List_is_subtype_of_Object() throws Exception { } @Test - public void testFindMethod_List_is_subtype_of_Collection() throws Exception { + public void testFindMethod_List_is_subtype_of_Collection() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = evaluator.findMethod( @@ -158,7 +158,7 @@ public void testFindMethod_List_is_subtype_of_Collection() throws Exception { } @Test - public void testFindMethod_overload_int() throws Exception { + public void testFindMethod_overload_int() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = evaluator.findMethod("indexOf", "string", String.class, new Class[] {int.class}); @@ -167,7 +167,7 @@ public void testFindMethod_overload_int() throws Exception { } @Test - public void testFindMethod_overload_string() throws Exception { + public void testFindMethod_overload_string() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = evaluator.findMethod("indexOf", "string", String.class, new Class[] {String.class}); @@ -176,7 +176,7 @@ public void testFindMethod_overload_string() throws Exception { } @Test - public void testFindMethod_autoBoxing() throws Exception { + public void testFindMethod_autoBoxing() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = evaluator.findMethod("compareTo", 1, Integer.class, new Class[] {int.class}); assertNotNull(method); @@ -184,7 +184,7 @@ public void testFindMethod_autoBoxing() throws Exception { } @Test - public void testFindMethod_notFound() throws Exception { + public void testFindMethod_notFound() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Method method = evaluator.findMethod("inexistentMethod", "aaa", String.class, new Class[] {String.class}); @@ -192,14 +192,14 @@ public void testFindMethod_notFound() throws Exception { } @Test - public void testForClassName() throws Exception { + public void testForClassName() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Class clazz = evaluator.forClassName(location, "java.lang.String"); assertNotNull(clazz); } @Test - public void testForClassName_notFound() throws Exception { + public void testForClassName_notFound() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); try { evaluator.forClassName(location, "inexistentClass"); @@ -209,7 +209,7 @@ public void testForClassName_notFound() throws Exception { } @Test - public void testFindConstructor() throws Exception { + public void testFindConstructor() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Constructor constructor = evaluator.findConstructor(location, String.class, char[].class, int.class, int.class); @@ -217,7 +217,7 @@ public void testFindConstructor() throws Exception { } @Test - public void testFindConstructor_notFound() throws Exception { + public void testFindConstructor_notFound() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Constructor constructor = evaluator.findConstructor(location, String.class, int.class, int.class); @@ -225,7 +225,7 @@ public void testFindConstructor_notFound() throws Exception { } @Test - public void testInvokeConstructor() throws Exception { + public void testInvokeConstructor() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); Constructor constructor = evaluator.findConstructor(location, String.class, char[].class, int.class, int.class); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionExceptionTest.java index 2718dae40..ede401afd 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionExceptionTest.java @@ -10,7 +10,7 @@ public class ExpressionExceptionTest { @Test - public void testMethodInvocationFailed() throws Exception { + public void testMethodInvocationFailed() { ExpressionParser parser = new ExpressionParser("new java.util.ArrayList().get(0)"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -24,7 +24,7 @@ public void testMethodInvocationFailed() throws Exception { } @Test - public void testMethodNotFound() throws Exception { + public void testMethodNotFound() { ExpressionParser parser = new ExpressionParser("\"aaa\".bbb()"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -38,7 +38,7 @@ public void testMethodNotFound() throws Exception { } @Test - public void testVariableUnresolvable() throws Exception { + public void testVariableUnresolvable() { ExpressionParser parser = new ExpressionParser("aaa.eq(100)"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -52,7 +52,7 @@ public void testVariableUnresolvable() throws Exception { } @Test - public void testDoubleQuotationNotClosed() throws Exception { + public void testDoubleQuotationNotClosed() { ExpressionParser parser = new ExpressionParser("\"bbb\" == \"bbb"); try { parser.parse(); @@ -64,7 +64,7 @@ public void testDoubleQuotationNotClosed() throws Exception { } @Test - public void testClassNotFound() throws Exception { + public void testClassNotFound() { ExpressionParser parser = new ExpressionParser("new MyString()"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -78,7 +78,7 @@ public void testClassNotFound() throws Exception { } @Test - public void testConstructorNotFound() throws Exception { + public void testConstructorNotFound() { ExpressionParser parser = new ExpressionParser("new java.lang.String(10B)"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -92,7 +92,7 @@ public void testConstructorNotFound() throws Exception { } @Test - public void testConstructorInvocationFailed() throws Exception { + public void testConstructorInvocationFailed() { ExpressionParser parser = new ExpressionParser("new java.util.ArrayList(-1)"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -106,7 +106,7 @@ public void testConstructorInvocationFailed() throws Exception { } @Test - public void testComparisonFailed_incomparable() throws Exception { + public void testComparisonFailed_incomparable() { ExpressionParser parser = new ExpressionParser("1 > true"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -120,7 +120,7 @@ public void testComparisonFailed_incomparable() throws Exception { } @Test - public void testComparisonFailed_null() throws Exception { + public void testComparisonFailed_null() { ExpressionParser parser = new ExpressionParser("1 > null"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -134,7 +134,7 @@ public void testComparisonFailed_null() throws Exception { } @Test - public void testOperandNotFound() throws Exception { + public void testOperandNotFound() { ExpressionParser parser = new ExpressionParser("true &&"); try { parser.parse(); @@ -146,7 +146,7 @@ public void testOperandNotFound() throws Exception { } @Test - public void testUnsupportedTokenFound() throws Exception { + public void testUnsupportedTokenFound() { ExpressionParser parser = new ExpressionParser("5 & 5"); try { parser.parse(); @@ -158,7 +158,7 @@ public void testUnsupportedTokenFound() throws Exception { } @Test - public void testUnsupportedNumberLiteralFound() throws Exception { + public void testUnsupportedNumberLiteralFound() { ExpressionParser parser = new ExpressionParser("5aaa"); try { parser.parse(); @@ -170,7 +170,7 @@ public void testUnsupportedNumberLiteralFound() throws Exception { } @Test - public void testOperandNotNumber() throws Exception { + public void testOperandNotNumber() { ExpressionParser parser = new ExpressionParser("5 + \"10\""); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -184,7 +184,7 @@ public void testOperandNotNumber() throws Exception { } @Test - public void testOperandNotText() throws Exception { + public void testOperandNotText() { ExpressionParser parser = new ExpressionParser("\"10\" + 5"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -198,7 +198,7 @@ public void testOperandNotText() throws Exception { } @Test - public void testArithmeticOperationFailed() throws Exception { + public void testArithmeticOperationFailed() { ExpressionParser parser = new ExpressionParser("5 / 0"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -212,7 +212,7 @@ public void testArithmeticOperationFailed() throws Exception { } @Test - public void testArithmeticOperationFailed_null() throws Exception { + public void testArithmeticOperationFailed_null() { ExpressionParser parser = new ExpressionParser("5 / null"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -226,7 +226,7 @@ public void testArithmeticOperationFailed_null() throws Exception { } @Test - public void testQuotationNotClosed() throws Exception { + public void testQuotationNotClosed() { ExpressionParser parser = new ExpressionParser(" 'aaa"); try { parser.parse(); @@ -238,7 +238,7 @@ public void testQuotationNotClosed() throws Exception { } @Test - public void testFieldNotFound() throws Exception { + public void testFieldNotFound() { ExpressionParser parser = new ExpressionParser("\"aaa\".bbb"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java index 4cdc8822f..1bbaa6674 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java @@ -13,7 +13,7 @@ public class ExpressionParserTest { @Test - public void testTrue() throws Exception { + public void testTrue() { ExpressionParser parser = new ExpressionParser("true"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -22,7 +22,7 @@ public void testTrue() throws Exception { } @Test - public void testFalse() throws Exception { + public void testFalse() { ExpressionParser parser = new ExpressionParser("false"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -31,7 +31,7 @@ public void testFalse() throws Exception { } @Test - public void testNot() throws Exception { + public void testNot() { ExpressionParser parser = new ExpressionParser("!true"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -40,7 +40,7 @@ public void testNot() throws Exception { } @Test - public void testNot2() throws Exception { + public void testNot2() { ExpressionParser parser = new ExpressionParser("!false"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -49,7 +49,7 @@ public void testNot2() throws Exception { } @Test - public void testAnd() throws Exception { + public void testAnd() { ExpressionParser parser = new ExpressionParser("!false && !false"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -58,7 +58,7 @@ public void testAnd() throws Exception { } @Test - public void testAnd2() throws Exception { + public void testAnd2() { ExpressionParser parser = new ExpressionParser("(true || false) && (true || false)"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -67,7 +67,7 @@ public void testAnd2() throws Exception { } @Test - public void testAnd3() throws Exception { + public void testAnd3() { ExpressionParser parser = new ExpressionParser("(true || false ) && !( true || false)"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -76,7 +76,7 @@ public void testAnd3() throws Exception { } @Test - public void testAnd4() throws Exception { + public void testAnd4() { ExpressionParser parser = new ExpressionParser("(true || false ) && true"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -85,7 +85,7 @@ public void testAnd4() throws Exception { } @Test - public void testOr() throws Exception { + public void testOr() { ExpressionParser parser = new ExpressionParser("false || true"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -94,7 +94,7 @@ public void testOr() throws Exception { } @Test - public void testOr2() throws Exception { + public void testOr2() { ExpressionParser parser = new ExpressionParser("false || false"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -103,7 +103,7 @@ public void testOr2() throws Exception { } @Test - public void testOr44() throws Exception { + public void testOr44() { ExpressionParser parser = new ExpressionParser("false || true && false"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -112,7 +112,7 @@ public void testOr44() throws Exception { } @Test - public void testOr3() throws Exception { + public void testOr3() { ExpressionParser parser = new ExpressionParser("true && true || true && true"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -121,7 +121,7 @@ public void testOr3() throws Exception { } @Test - public void testOr4() throws Exception { + public void testOr4() { ExpressionParser parser = new ExpressionParser("true && false || true && true"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -130,7 +130,7 @@ public void testOr4() throws Exception { } @Test - public void testNoParamMethod() throws Exception { + public void testNoParamMethod() { ExpressionParser parser = new ExpressionParser("hoge.length()"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -140,7 +140,7 @@ public void testNoParamMethod() throws Exception { } @Test - public void testMethod() throws Exception { + public void testMethod() { ExpressionParser parser = new ExpressionParser("hoge.length()"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -150,7 +150,7 @@ public void testMethod() throws Exception { } @Test - public void testMethod2() throws Exception { + public void testMethod2() { ExpressionParser parser = new ExpressionParser("hoge.substring(2, 4)"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -160,7 +160,7 @@ public void testMethod2() throws Exception { } @Test - public void testMethod3() throws Exception { + public void testMethod3() { ExpressionParser parser = new ExpressionParser("hoge.foo.substring(2, 4)"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -170,7 +170,7 @@ public void testMethod3() throws Exception { } @Test - public void testMethod4() throws Exception { + public void testMethod4() { ExpressionParser parser = new ExpressionParser("hoge.bar(2, 4).length()"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -180,7 +180,7 @@ public void testMethod4() throws Exception { } @Test - public void testMethod5() throws Exception { + public void testMethod5() { ExpressionParser parser = new ExpressionParser("hoge.bar(hoge.bar(2, 4).length(), 4).length()"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -190,7 +190,7 @@ public void testMethod5() throws Exception { } @Test - public void testMethod6() throws Exception { + public void testMethod6() { ExpressionParser parser = new ExpressionParser("bbb.method(bbb.method(bbb.value))"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -203,7 +203,7 @@ public void testMethod6() throws Exception { } @Test - public void testMethod_targetObjectIsNull() throws Exception { + public void testMethod_targetObjectIsNull() { ExpressionParser parser = new ExpressionParser("null.length()"); try { ExpressionNode expression = parser.parse(); @@ -217,7 +217,7 @@ public void testMethod_targetObjectIsNull() throws Exception { } @Test - public void testStatictMethod() throws Exception { + public void testStatictMethod() { ExpressionParser parser = new ExpressionParser("@java.lang.String@valueOf(1)"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -226,7 +226,7 @@ public void testStatictMethod() throws Exception { } @Test - public void testStatictMethod_classNotFound() throws Exception { + public void testStatictMethod_classNotFound() { ExpressionParser parser = new ExpressionParser("@java.lang.Xxx@valueOf(1)"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -239,7 +239,7 @@ public void testStatictMethod_classNotFound() throws Exception { } @Test - public void testStatictMethod_methodNotFound() throws Exception { + public void testStatictMethod_methodNotFound() { ExpressionParser parser = new ExpressionParser("@java.lang.String@xxx(1)"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -252,7 +252,7 @@ public void testStatictMethod_methodNotFound() throws Exception { } @Test - public void testField() throws Exception { + public void testField() { ExpressionParser parser = new ExpressionParser("bbb.value"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -265,7 +265,7 @@ public void testField() throws Exception { } @Test - public void testStatictField() throws Exception { + public void testStatictField() { ExpressionParser parser = new ExpressionParser("@java.lang.String@CASE_INSENSITIVE_ORDER"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -274,7 +274,7 @@ public void testStatictField() throws Exception { } @Test - public void testStatictField_classNotFound() throws Exception { + public void testStatictField_classNotFound() { ExpressionParser parser = new ExpressionParser("@java.lang.Xxx@CASE_INSENSITIVE_ORDER"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -287,7 +287,7 @@ public void testStatictField_classNotFound() throws Exception { } @Test - public void testStatictField_fieldNotFound() throws Exception { + public void testStatictField_fieldNotFound() { ExpressionParser parser = new ExpressionParser("@java.lang.String@hoge"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -300,7 +300,7 @@ public void testStatictField_fieldNotFound() throws Exception { } @Test - public void testFunction() throws Exception { + public void testFunction() { ExpressionParser parser = new ExpressionParser("@prefix(\"aaa\")"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -309,7 +309,7 @@ public void testFunction() throws Exception { } @Test - public void testFunction_notFound() throws Exception { + public void testFunction_notFound() { ExpressionParser parser = new ExpressionParser("@hoge(\"aaa\")"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -322,7 +322,7 @@ public void testFunction_notFound() throws Exception { } @Test - public void testParens_notClosed() throws Exception { + public void testParens_notClosed() { ExpressionParser parser = new ExpressionParser("hoge.bar(2, 4"); try { parser.parse(); @@ -334,7 +334,7 @@ public void testParens_notClosed() throws Exception { } @Test - public void testNew() throws Exception { + public void testNew() { ExpressionParser parser = new ExpressionParser("new java.lang.Integer(10)"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -343,7 +343,7 @@ public void testNew() throws Exception { } @Test - public void testEq() throws Exception { + public void testEq() { ExpressionParser parser = new ExpressionParser("10 == 10"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -352,7 +352,7 @@ public void testEq() throws Exception { } @Test - public void testNotEq() throws Exception { + public void testNotEq() { ExpressionParser parser = new ExpressionParser("11 == 10"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -361,7 +361,7 @@ public void testNotEq() throws Exception { } @Test - public void testEq_null() throws Exception { + public void testEq_null() { ExpressionParser parser = new ExpressionParser("null == null"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -382,7 +382,7 @@ public void testEq_null() throws Exception { } @Test - public void testNe() throws Exception { + public void testNe() { ExpressionParser parser = new ExpressionParser("1 != 2"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -391,7 +391,7 @@ public void testNe() throws Exception { } @Test - public void testNotNe() throws Exception { + public void testNotNe() { ExpressionParser parser = new ExpressionParser("11 != 11"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -400,7 +400,7 @@ public void testNotNe() throws Exception { } @Test - public void testNe_null() throws Exception { + public void testNe_null() { ExpressionParser parser = new ExpressionParser("null != null"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -421,7 +421,7 @@ public void testNe_null() throws Exception { } @Test - public void testGe() throws Exception { + public void testGe() { ExpressionParser parser = new ExpressionParser("11 >= 10"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -435,7 +435,7 @@ public void testGe() throws Exception { } @Test - public void testNotGe() throws Exception { + public void testNotGe() { ExpressionParser parser = new ExpressionParser("9 >= 10"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -444,7 +444,7 @@ public void testNotGe() throws Exception { } @Test - public void testGe_null() throws Exception { + public void testGe_null() { ExpressionParser parser = new ExpressionParser("null >= null"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -476,7 +476,7 @@ public void testGe_null() throws Exception { } @Test - public void testLe() throws Exception { + public void testLe() { ExpressionParser parser = new ExpressionParser("10 <= 11"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -490,7 +490,7 @@ public void testLe() throws Exception { } @Test - public void testNotLe() throws Exception { + public void testNotLe() { ExpressionParser parser = new ExpressionParser("10 <= 9"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -499,7 +499,7 @@ public void testNotLe() throws Exception { } @Test - public void testLe_null() throws Exception { + public void testLe_null() { ExpressionParser parser = new ExpressionParser("null <= null"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -532,7 +532,7 @@ public void testLe_null() throws Exception { } @Test - public void testGt() throws Exception { + public void testGt() { ExpressionParser parser = new ExpressionParser("11 > 10"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -541,7 +541,7 @@ public void testGt() throws Exception { } @Test - public void testNotGt() throws Exception { + public void testNotGt() { ExpressionParser parser = new ExpressionParser("10 > 10"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -556,7 +556,7 @@ public void testNotGt() throws Exception { } @Test - public void testGt_null() throws Exception { + public void testGt_null() { ExpressionParser parser = new ExpressionParser("null > null"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -589,7 +589,7 @@ public void testGt_null() throws Exception { } @Test - public void testLt() throws Exception { + public void testLt() { ExpressionParser parser = new ExpressionParser("10 < 11"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -598,7 +598,7 @@ public void testLt() throws Exception { } @Test - public void testNotLt() throws Exception { + public void testNotLt() { ExpressionParser parser = new ExpressionParser("10 < 10"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -613,7 +613,7 @@ public void testNotLt() throws Exception { } @Test - public void testLt_null() throws Exception { + public void testLt_null() { ExpressionParser parser = new ExpressionParser("null < null"); ExpressionNode expression = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -646,7 +646,7 @@ public void testLt_null() throws Exception { } @Test - public void testUnsupportedToken() throws Exception { + public void testUnsupportedToken() { ExpressionParser parser = new ExpressionParser("5 ? 5"); try { parser.parse(); @@ -657,7 +657,7 @@ public void testUnsupportedToken() throws Exception { } @Test - public void testIllegalNumberLiteral() throws Exception { + public void testIllegalNumberLiteral() { ExpressionParser parser = new ExpressionParser("2.length"); try { parser.parse(); @@ -668,7 +668,7 @@ public void testIllegalNumberLiteral() throws Exception { } @Test - public void testInt() throws Exception { + public void testInt() { ExpressionParser parser = new ExpressionParser("2"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -689,7 +689,7 @@ public void testInt() throws Exception { } @Test - public void testLong() throws Exception { + public void testLong() { ExpressionParser parser = new ExpressionParser("2L"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -710,7 +710,7 @@ public void testLong() throws Exception { } @Test - public void testFloat() throws Exception { + public void testFloat() { ExpressionParser parser = new ExpressionParser("2.5F"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -731,7 +731,7 @@ public void testFloat() throws Exception { } @Test - public void testDouble() throws Exception { + public void testDouble() { ExpressionParser parser = new ExpressionParser("2.5D"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -752,7 +752,7 @@ public void testDouble() throws Exception { } @Test - public void testBigDecimal() throws Exception { + public void testBigDecimal() { ExpressionParser parser = new ExpressionParser("2.5B"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -773,7 +773,7 @@ public void testBigDecimal() throws Exception { } @Test - public void testChar() throws Exception { + public void testChar() { ExpressionParser parser = new ExpressionParser("'a'"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -782,7 +782,7 @@ public void testChar() throws Exception { } @Test - public void testAdd() throws Exception { + public void testAdd() { ExpressionParser parser = new ExpressionParser("1 + 1B"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -791,7 +791,7 @@ public void testAdd() throws Exception { } @Test - public void testSubtract() throws Exception { + public void testSubtract() { ExpressionParser parser = new ExpressionParser("10 - 2B"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -800,7 +800,7 @@ public void testSubtract() throws Exception { } @Test - public void testMultiply() throws Exception { + public void testMultiply() { ExpressionParser parser = new ExpressionParser("10 * 2B"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -809,7 +809,7 @@ public void testMultiply() throws Exception { } @Test - public void testDivide() throws Exception { + public void testDivide() { ExpressionParser parser = new ExpressionParser("10 / 2B"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -818,7 +818,7 @@ public void testDivide() throws Exception { } @Test - public void testMod() throws Exception { + public void testMod() { ExpressionParser parser = new ExpressionParser("10 % 7B"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -827,7 +827,7 @@ public void testMod() throws Exception { } @Test - public void testArithmeticOperators() throws Exception { + public void testArithmeticOperators() { ExpressionParser parser = new ExpressionParser("5 + 3 * 4 - 9 / 3"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -836,7 +836,7 @@ public void testArithmeticOperators() throws Exception { } @Test - public void testArithmeticOperators2() throws Exception { + public void testArithmeticOperators2() { ExpressionParser parser = new ExpressionParser("5+3*4-9/3"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -845,7 +845,7 @@ public void testArithmeticOperators2() throws Exception { } @Test - public void testArithmeticOperators3() throws Exception { + public void testArithmeticOperators3() { ExpressionParser parser = new ExpressionParser("1+-2*+2"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -854,7 +854,7 @@ public void testArithmeticOperators3() throws Exception { } @Test - public void testConcat() throws Exception { + public void testConcat() { ExpressionParser parser = new ExpressionParser("\"ab\" + \"cd\" + 'e'"); ExpressionNode node = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionTokenizerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionTokenizerTest.java index b2dcd502e..ab6411879 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionTokenizerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionTokenizerTest.java @@ -11,7 +11,7 @@ public class ExpressionTokenizerTest { @Test - public void testVariableOperand() throws Exception { + public void testVariableOperand() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("name"); assertEquals(VARIABLE, tokenizer.next()); assertEquals("name", tokenizer.getToken()); @@ -20,7 +20,7 @@ public void testVariableOperand() throws Exception { } @Test - public void testStringLiteral() throws Exception { + public void testStringLiteral() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("\"aaa bbb\""); assertEquals(STRING_LITERAL, tokenizer.next()); assertEquals("\"aaa bbb\"", tokenizer.getToken()); @@ -29,7 +29,7 @@ public void testStringLiteral() throws Exception { } @Test - public void testIntLiteral() throws Exception { + public void testIntLiteral() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("+13"); assertEquals(INT_LITERAL, tokenizer.next()); assertEquals("+13", tokenizer.getToken()); @@ -38,7 +38,7 @@ public void testIntLiteral() throws Exception { } @Test - public void testLongLiteral() throws Exception { + public void testLongLiteral() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("+13L"); assertEquals(LONG_LITERAL, tokenizer.next()); assertEquals("+13L", tokenizer.getToken()); @@ -47,7 +47,7 @@ public void testLongLiteral() throws Exception { } @Test - public void testFloatLiteral() throws Exception { + public void testFloatLiteral() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("+13F"); assertEquals(FLOAT_LITERAL, tokenizer.next()); assertEquals("+13F", tokenizer.getToken()); @@ -56,7 +56,7 @@ public void testFloatLiteral() throws Exception { } @Test - public void testDoubleLiteral() throws Exception { + public void testDoubleLiteral() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("+13D"); assertEquals(DOUBLE_LITERAL, tokenizer.next()); assertEquals("+13D", tokenizer.getToken()); @@ -65,7 +65,7 @@ public void testDoubleLiteral() throws Exception { } @Test - public void testBigDecimalLiteral() throws Exception { + public void testBigDecimalLiteral() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("+13B"); assertEquals(BIGDECIMAL_LITERAL, tokenizer.next()); assertEquals("+13B", tokenizer.getToken()); @@ -74,7 +74,7 @@ public void testBigDecimalLiteral() throws Exception { } @Test - public void testNullLiteral() throws Exception { + public void testNullLiteral() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("null"); assertEquals(NULL_LITERAL, tokenizer.next()); assertEquals("null", tokenizer.getToken()); @@ -83,7 +83,7 @@ public void testNullLiteral() throws Exception { } @Test - public void testTrueLiteral() throws Exception { + public void testTrueLiteral() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("true"); assertEquals(TRUE_LITERAL, tokenizer.next()); assertEquals("true", tokenizer.getToken()); @@ -92,7 +92,7 @@ public void testTrueLiteral() throws Exception { } @Test - public void testFalseLiteral() throws Exception { + public void testFalseLiteral() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("false"); assertEquals(FALSE_LITERAL, tokenizer.next()); assertEquals("false", tokenizer.getToken()); @@ -101,7 +101,7 @@ public void testFalseLiteral() throws Exception { } @Test - public void testExpression() throws Exception { + public void testExpression() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("manager.eq(true) && name.eq(\"aaa\")"); assertEquals(VARIABLE, tokenizer.next()); assertEquals("manager", tokenizer.getToken()); @@ -134,7 +134,7 @@ public void testExpression() throws Exception { } @Test - public void testGetPosition() throws Exception { + public void testGetPosition() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("aaa bbb ccc"); assertEquals(0, tokenizer.getPosition()); assertEquals(VARIABLE, tokenizer.next()); @@ -155,7 +155,7 @@ public void testGetPosition() throws Exception { } @Test - public void testFieldOperator() throws Exception { + public void testFieldOperator() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("aaa.bbb"); assertEquals(VARIABLE, tokenizer.next()); assertEquals("aaa", tokenizer.getToken()); @@ -166,7 +166,7 @@ public void testFieldOperator() throws Exception { } @Test - public void testFieldOperator_identifierNotFound() throws Exception { + public void testFieldOperator_identifierNotFound() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("aaa."); try { tokenizer.next(); @@ -178,7 +178,7 @@ public void testFieldOperator_identifierNotFound() throws Exception { } @Test - public void testFieldOperator_illegalJavaIdentifierStart() throws Exception { + public void testFieldOperator_illegalJavaIdentifierStart() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("aaa.!"); try { tokenizer.next(); @@ -190,7 +190,7 @@ public void testFieldOperator_illegalJavaIdentifierStart() throws Exception { } @Test - public void testMethodOperator() throws Exception { + public void testMethodOperator() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("aaa.bbb(\"ccc\")"); assertEquals(VARIABLE, tokenizer.next()); assertEquals("aaa", tokenizer.getToken()); @@ -207,7 +207,7 @@ public void testMethodOperator() throws Exception { } @Test - public void testParans() throws Exception { + public void testParans() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("aaa.bbb(2, 3)"); assertEquals(VARIABLE, tokenizer.next()); assertEquals("aaa", tokenizer.getToken()); @@ -228,7 +228,7 @@ public void testParans() throws Exception { } @Test - public void testFunctionOperator() throws Exception { + public void testFunctionOperator() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("@startWith(aaa)"); assertEquals(FUNCTION_OPERATOR, tokenizer.next()); assertEquals("@startWith", tokenizer.getToken()); @@ -241,7 +241,7 @@ public void testFunctionOperator() throws Exception { } @Test - public void testBuiltinFunctionOperator_nameNotFound() throws Exception { + public void testBuiltinFunctionOperator_nameNotFound() { try { new ExpressionTokenizer("@"); fail(); @@ -252,7 +252,7 @@ public void testBuiltinFunctionOperator_nameNotFound() throws Exception { } @Test - public void testBuiltinFunctionOperator_illegalJavaIdentifierStart() throws Exception { + public void testBuiltinFunctionOperator_illegalJavaIdentifierStart() { try { new ExpressionTokenizer("@!"); fail(); @@ -263,7 +263,7 @@ public void testBuiltinFunctionOperator_illegalJavaIdentifierStart() throws Exce } @Test - public void testStaticMethodOperator() throws Exception { + public void testStaticMethodOperator() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("@java.lang.String@valueOf(aaa)"); assertEquals(STATIC_METHOD_OPERATOR, tokenizer.next()); assertEquals("@java.lang.String@valueOf", tokenizer.getToken()); @@ -276,7 +276,7 @@ public void testStaticMethodOperator() throws Exception { } @Test - public void testStaticMethodOperator_simpleClassName() throws Exception { + public void testStaticMethodOperator_simpleClassName() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("@Aaa@valueOf(aaa)"); assertEquals(STATIC_METHOD_OPERATOR, tokenizer.next()); assertEquals("@Aaa@valueOf", tokenizer.getToken()); @@ -289,7 +289,7 @@ public void testStaticMethodOperator_simpleClassName() throws Exception { } @Test - public void testStaticFieldOperator() throws Exception { + public void testStaticFieldOperator() { ExpressionTokenizer tokenizer = new ExpressionTokenizer("@java.lang.String@CASE_INSENSITIVE_ORDER "); assertEquals(STATIC_FIELD_OPERATOR, tokenizer.next()); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/AndOperatorNodeTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/AndOperatorNodeTest.java index 8554784fb..bc191db1b 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/AndOperatorNodeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/AndOperatorNodeTest.java @@ -19,7 +19,7 @@ public class AndOperatorNodeTest { protected final LiteralNode nullLiteral = new LiteralNode(location, "null", null, Object.class); @Test - public void test_true_true() throws Exception { + public void test_true_true() { AndOperatorNode node = new AndOperatorNode(location, "&&"); node.setLeftNode(trueLiteral); node.setRightNode(trueLiteral); @@ -29,7 +29,7 @@ public void test_true_true() throws Exception { } @Test - public void test_true_false() throws Exception { + public void test_true_false() { AndOperatorNode node = new AndOperatorNode(location, "&&"); node.setLeftNode(trueLiteral); node.setRightNode(falseLiteral); @@ -39,7 +39,7 @@ public void test_true_false() throws Exception { } @Test - public void test_false_true() throws Exception { + public void test_false_true() { AndOperatorNode node = new AndOperatorNode(location, "&&"); node.setLeftNode(falseLiteral); node.setRightNode(trueLiteral); @@ -49,7 +49,7 @@ public void test_false_true() throws Exception { } @Test - public void test_false_false() throws Exception { + public void test_false_false() { AndOperatorNode node = new AndOperatorNode(location, "&&"); node.setLeftNode(falseLiteral); node.setRightNode(falseLiteral); @@ -59,7 +59,7 @@ public void test_false_false() throws Exception { } @Test - public void test_null_null() throws Exception { + public void test_null_null() { AndOperatorNode node = new AndOperatorNode(location, "&&"); node.setLeftNode(nullLiteral); node.setRightNode(nullLiteral); @@ -69,7 +69,7 @@ public void test_null_null() throws Exception { } @Test - public void test_null_notNull() throws Exception { + public void test_null_notNull() { AndOperatorNode node = new AndOperatorNode(location, "&&"); node.setLeftNode(nullLiteral); node.setRightNode(trueLiteral); @@ -79,7 +79,7 @@ public void test_null_notNull() throws Exception { } @Test - public void test_notNull_null() throws Exception { + public void test_notNull_null() { AndOperatorNode node = new AndOperatorNode(location, "&&"); node.setLeftNode(trueLiteral); node.setRightNode(nullLiteral); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/MethodOperatorNodeTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/MethodOperatorNodeTest.java index 766801bc0..96ad16b3a 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/MethodOperatorNodeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/MethodOperatorNodeTest.java @@ -12,7 +12,7 @@ public class MethodOperatorNodeTest { protected final ExpressionLocation location = new ExpressionLocation("", 0); @Test - public void testOneParameter() throws Exception { + public void testOneParameter() { MethodOperatorNode node = new MethodOperatorNode(location, ".equals", "equals"); node.setTargetObjectNode(new VariableNode(location, "hoge")); CommaOperatorNode commaOperatorNode = new CommaOperatorNode(location, ","); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/NotOperatorNodeTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/NotOperatorNodeTest.java index 478c10d17..826cc27ff 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/NotOperatorNodeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/NotOperatorNodeTest.java @@ -19,7 +19,7 @@ public class NotOperatorNodeTest { protected final LiteralNode nullLiteral = new LiteralNode(location, "null", null, Object.class); @Test - public void test_true() throws Exception { + public void test_true() { NotOperatorNode node = new NotOperatorNode(location, "!"); node.setNode(trueLiteral); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -28,7 +28,7 @@ public void test_true() throws Exception { } @Test - public void test_false() throws Exception { + public void test_false() { NotOperatorNode node = new NotOperatorNode(location, "!"); node.setNode(falseLiteral); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -37,7 +37,7 @@ public void test_false() throws Exception { } @Test - public void test_null() throws Exception { + public void test_null() { NotOperatorNode node = new NotOperatorNode(location, "!"); node.setNode(nullLiteral); ExpressionEvaluator evaluator = new ExpressionEvaluator(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/OrOperatorNodeTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/OrOperatorNodeTest.java index 7c917208c..7cb51d811 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/expr/node/OrOperatorNodeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/node/OrOperatorNodeTest.java @@ -19,7 +19,7 @@ public class OrOperatorNodeTest { protected final LiteralNode nullLiteral = new LiteralNode(location, "null", null, Object.class); @Test - public void test_true_true() throws Exception { + public void test_true_true() { OrOperatorNode node = new OrOperatorNode(location, "||"); node.setLeftNode(trueLiteral); node.setRightNode(trueLiteral); @@ -29,7 +29,7 @@ public void test_true_true() throws Exception { } @Test - public void test_true_false() throws Exception { + public void test_true_false() { OrOperatorNode node = new OrOperatorNode(location, "||"); node.setLeftNode(trueLiteral); node.setRightNode(falseLiteral); @@ -39,7 +39,7 @@ public void test_true_false() throws Exception { } @Test - public void test_false_true() throws Exception { + public void test_false_true() { OrOperatorNode node = new OrOperatorNode(location, "||"); node.setLeftNode(falseLiteral); node.setRightNode(trueLiteral); @@ -49,7 +49,7 @@ public void test_false_true() throws Exception { } @Test - public void test_false_false() throws Exception { + public void test_false_false() { OrOperatorNode node = new OrOperatorNode(location, "||"); node.setLeftNode(falseLiteral); node.setRightNode(falseLiteral); @@ -59,7 +59,7 @@ public void test_false_false() throws Exception { } @Test - public void test_null_null() throws Exception { + public void test_null_null() { OrOperatorNode node = new OrOperatorNode(location, "||"); node.setLeftNode(nullLiteral); node.setRightNode(nullLiteral); @@ -69,7 +69,7 @@ public void test_null_null() throws Exception { } @Test - public void test_null_true() throws Exception { + public void test_null_true() { OrOperatorNode node = new OrOperatorNode(location, "||"); node.setLeftNode(nullLiteral); node.setRightNode(trueLiteral); @@ -79,7 +79,7 @@ public void test_null_true() throws Exception { } @Test - public void test_true_null() throws Exception { + public void test_true_null() { OrOperatorNode node = new OrOperatorNode(location, "||"); node.setLeftNode(trueLiteral); node.setRightNode(nullLiteral); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java index be35eca4e..b5459f765 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandlerTest.java @@ -27,7 +27,7 @@ public class BasicResultListHandlerTest { private Method method; @BeforeEach - void setUp(TestInfo testInfo) throws Exception { + void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java index c0f698c81..cf3b51730 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandlerTest.java @@ -27,7 +27,7 @@ public class BasicSingleResultHandlerTest { private Method method; @BeforeEach - void setUp(TestInfo testInfo) throws Exception { + void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java index 2550c220c..3d9066906 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainResultListHandlerTest.java @@ -26,7 +26,7 @@ public class DomainResultListHandlerTest { private Method method; @BeforeEach - void setUp(TestInfo testInfo) throws Exception { + void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java index e9e4e9868..4b42b4d9f 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/DomainSingleResultHandlerTest.java @@ -27,7 +27,7 @@ public class DomainSingleResultHandlerTest { private Method method; @BeforeEach - void setUp(TestInfo testInfo) throws Exception { + void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityIterationHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityIterationHandlerTest.java index ac6bf2eb7..8d71792e9 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityIterationHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityIterationHandlerTest.java @@ -27,7 +27,7 @@ public class EntityIterationHandlerTest { private Method method; @BeforeEach - void setUp(TestInfo testInfo) throws Exception { + void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java index ada50dfd8..345b7d415 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntityResultListHandlerTest.java @@ -26,7 +26,7 @@ public class EntityResultListHandlerTest { private Method method; @BeforeEach - void setUp(TestInfo testInfo) throws Exception { + void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java index c84fdf640..f464f5e74 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/EntitySingleResultHandlerTest.java @@ -27,7 +27,7 @@ public class EntitySingleResultHandlerTest { private Method method; @BeforeEach - void setUp(TestInfo testInfo) throws Exception { + void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptReaderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptReaderTest.java index 639bc9d6f..776b20a25 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptReaderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptReaderTest.java @@ -5,7 +5,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import java.io.BufferedReader; -import java.io.IOException; import java.io.StringReader; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -35,12 +34,12 @@ public void prepare() {} } @Test - public void testReadSql_delimiter() throws Exception { + public void testReadSql_delimiter() { ScriptReader reader = new ScriptReader(query) { @Override - protected BufferedReader createBufferedReader() throws IOException { + protected BufferedReader createBufferedReader() { String script = "aaa;\nbbb\ngo\nccc\nddd\n"; StringReader reader = new StringReader(script); return new BufferedReader(reader); @@ -53,12 +52,12 @@ protected BufferedReader createBufferedReader() throws IOException { } @Test - public void testReadSql_delimiterInLine() throws Exception { + public void testReadSql_delimiterInLine() { ScriptReader reader = new ScriptReader(query) { @Override - protected BufferedReader createBufferedReader() throws IOException { + protected BufferedReader createBufferedReader() { StringReader reader = new StringReader("aaa; bbb; ccc;\n"); return new BufferedReader(reader); } @@ -70,12 +69,12 @@ protected BufferedReader createBufferedReader() throws IOException { } @Test - public void testReadSql_sqlBlock() throws Exception { + public void testReadSql_sqlBlock() { ScriptReader reader = new ScriptReader(query) { @Override - protected BufferedReader createBufferedReader() throws IOException { + protected BufferedReader createBufferedReader() { String script = "begin aaa; end\n" + "go\n"; StringReader reader = new StringReader(script); return new BufferedReader(reader); @@ -86,12 +85,12 @@ protected BufferedReader createBufferedReader() throws IOException { } @Test - public void testReadSql_sqlBlock_createTrigger() throws Exception { + public void testReadSql_sqlBlock_createTrigger() { ScriptReader reader = new ScriptReader(query) { @Override - protected BufferedReader createBufferedReader() throws IOException { + protected BufferedReader createBufferedReader() { String script = "create trigger hoge begin aaa; end\n" + "go\n"; StringReader reader = new StringReader(script); return new BufferedReader(reader); @@ -102,11 +101,11 @@ protected BufferedReader createBufferedReader() throws IOException { } @Test - public void testReadSql_notSqlBlock() throws Exception { + public void testReadSql_notSqlBlock() { ScriptReader reader = new ScriptReader(query) { @Override - protected BufferedReader createBufferedReader() throws IOException { + protected BufferedReader createBufferedReader() { String script = "start aaa; end\n" + "go\n"; StringReader reader = new StringReader(script); return new BufferedReader(reader); @@ -117,12 +116,12 @@ protected BufferedReader createBufferedReader() throws IOException { } @Test - public void testReadSql_commentBlock() throws Exception { + public void testReadSql_commentBlock() { ScriptReader reader = new ScriptReader(query) { @Override - protected BufferedReader createBufferedReader() throws IOException { + protected BufferedReader createBufferedReader() { String script = "select 1 ; /* aaa\n" + "aaa */ select 2;"; StringReader reader = new StringReader(script); return new BufferedReader(reader); @@ -134,12 +133,12 @@ protected BufferedReader createBufferedReader() throws IOException { } @Test - public void testReadSql_lineNumber() throws Exception { + public void testReadSql_lineNumber() { ScriptReader reader = new ScriptReader(query) { @Override - protected BufferedReader createBufferedReader() throws IOException { + protected BufferedReader createBufferedReader() { String script = "/*\n *\n */\nselect 1\nfrom \nhoge\n"; StringReader reader = new StringReader(script); return new BufferedReader(reader); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizerTest.java index 96bbfa55a..73d4ee441 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/command/ScriptTokenizerTest.java @@ -12,7 +12,7 @@ public class ScriptTokenizerTest { private ScriptTokenizer tokenizer; @BeforeEach - public void setUp() throws Exception { + public void setUp() { tokenizer = new ScriptTokenizer("/"); } @@ -99,7 +99,7 @@ public void testGetToken_blockCommentsInOneLine() { } @Test - public void testGetToken_statementDelimiter() throws Exception { + public void testGetToken_statementDelimiter() { tokenizer.addLine("select * from aaa; "); assertEquals(WORD, tokenizer.nextToken()); assertEquals("select", tokenizer.getToken()); @@ -119,7 +119,7 @@ public void testGetToken_statementDelimiter() throws Exception { } @Test - public void testGetToken_blockDelimiter() throws Exception { + public void testGetToken_blockDelimiter() { tokenizer.addLine("aaa go"); assertEquals(WORD, tokenizer.nextToken()); assertEquals("aaa", tokenizer.getToken()); @@ -137,7 +137,7 @@ public void testGetToken_blockDelimiter() throws Exception { } @Test - public void testGetToken_wordAndOther() throws Exception { + public void testGetToken_wordAndOther() { tokenizer.addLine("select,"); assertEquals(WORD, tokenizer.nextToken()); assertEquals("select", tokenizer.getToken()); @@ -153,7 +153,7 @@ public void testGetToken_wordAndOther() throws Exception { } @Test - public void testGetToken_quote() throws Exception { + public void testGetToken_quote() { tokenizer.addLine("'aaa'"); assertEquals(QUOTE, tokenizer.nextToken()); assertEquals("'aaa'", tokenizer.getToken()); @@ -161,7 +161,7 @@ public void testGetToken_quote() throws Exception { } @Test - public void testGetToken_quoteNotClosed() throws Exception { + public void testGetToken_quoteNotClosed() { tokenizer.addLine("'aaa"); assertEquals(QUOTE, tokenizer.nextToken()); assertEquals("'aaa", tokenizer.getToken()); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java index d89673672..6fcd1ca97 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java @@ -16,7 +16,7 @@ public class DaoImplSupportTest { @SuppressWarnings("ConstantConditions") @Test - public void testConstructorParameter1() throws Exception { + public void testConstructorParameter1() { Config config = null; try { new DaoImplSupport(config) {}; @@ -28,7 +28,7 @@ public void testConstructorParameter1() throws Exception { @SuppressWarnings("ConstantConditions") @Test - public void testConstructorParameter2() throws Exception { + public void testConstructorParameter2() { Config config = null; Connection connection = mock(Connection.class); try { @@ -41,7 +41,7 @@ public void testConstructorParameter2() throws Exception { @SuppressWarnings("ConstantConditions") @Test - public void testConstructorParameter3() throws Exception { + public void testConstructorParameter3() { Config config = mock(Config.class); Connection connection = null; try { @@ -54,7 +54,7 @@ public void testConstructorParameter3() throws Exception { @SuppressWarnings("ConstantConditions") @Test - public void testConstructorParameter4() throws Exception { + public void testConstructorParameter4() { Config config = null; DataSource dataSource = mock(DataSource.class); try { @@ -67,7 +67,7 @@ public void testConstructorParameter4() throws Exception { @SuppressWarnings("ConstantConditions") @Test - public void testConstructorParameter5() throws Exception { + public void testConstructorParameter5() { Config config = mock(Config.class); DataSource dataSource = null; try { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Db2ForUpdateTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Db2ForUpdateTransformerTest.java index afd844add..3d52b9518 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Db2ForUpdateTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Db2ForUpdateTransformerTest.java @@ -15,7 +15,7 @@ public class Db2ForUpdateTransformerTest { @Test - public void testForUpdateNormal() throws Exception { + public void testForUpdateNormal() { String expected = "select * from emp order by emp.id for update with rs"; Db2ForUpdateTransformer transformer = new Db2ForUpdateTransformer(SelectForUpdateType.NORMAL, 0); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Db2PagingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Db2PagingTransformerTest.java index 3b84117f9..1cfc57299 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Db2PagingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Db2PagingTransformerTest.java @@ -14,7 +14,7 @@ public class Db2PagingTransformerTest { @Test - public void testOffsetLimit() throws Exception { + public void testOffsetLimit() { String expected = "select * from ( select temp_.*, row_number() over( order by temp_.id ) as doma_rownumber_ from ( select emp.id from emp ) as temp_ ) as temp2_ where doma_rownumber_ > 5 and doma_rownumber_ <= 15"; Db2PagingTransformer transformer = new Db2PagingTransformer(5, 10); @@ -27,7 +27,7 @@ public void testOffsetLimit() throws Exception { } @Test - public void testOffsetOnly() throws Exception { + public void testOffsetOnly() { String expected = "select * from ( select temp_.*, row_number() over( order by temp_.id ) as doma_rownumber_ from ( select emp.id from emp ) as temp_ ) as temp2_ where doma_rownumber_ > 5"; Db2PagingTransformer transformer = new Db2PagingTransformer(5, -1); @@ -40,7 +40,7 @@ public void testOffsetOnly() throws Exception { } @Test - public void testLimitOnly() throws Exception { + public void testLimitOnly() { String expected = "select emp.id from emp order by emp.id fetch first 10 rows only"; Db2PagingTransformer transformer = new Db2PagingTransformer(-1, 10); SqlParser parser = new SqlParser("select emp.id from emp order by emp.id"); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H212126PagingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H212126PagingTransformerTest.java index 1beb61a37..de07507c4 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H212126PagingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H212126PagingTransformerTest.java @@ -14,7 +14,7 @@ public class H212126PagingTransformerTest { @Test - public void testOffsetLimit() throws Exception { + public void testOffsetLimit() { String expected = "select * from emp order by emp.id limit 10 offset 5"; H212126PagingTransformer transformer = new H212126PagingTransformer(5, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id"); @@ -26,7 +26,7 @@ public void testOffsetLimit() throws Exception { } @Test - public void testOffsetLimit_forUpdate() throws Exception { + public void testOffsetLimit_forUpdate() { String expected = "select * from emp order by emp.id limit 10 offset 5 for update"; H212126PagingTransformer transformer = new H212126PagingTransformer(5, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id for update"); @@ -38,7 +38,7 @@ public void testOffsetLimit_forUpdate() throws Exception { } @Test - public void testOffsetOnly() throws Exception { + public void testOffsetOnly() { String expected = "select * from emp order by emp.id limit 0 offset 5"; H212126PagingTransformer transformer = new H212126PagingTransformer(5, -1); SqlParser parser = new SqlParser("select * from emp order by emp.id"); @@ -50,7 +50,7 @@ public void testOffsetOnly() throws Exception { } @Test - public void testLimitOnly() throws Exception { + public void testLimitOnly() { String expected = "select * from emp order by emp.id limit 10"; H212126PagingTransformer transformer = new H212126PagingTransformer(-1, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id"); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2ForUpdateTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2ForUpdateTransformerTest.java index 6b52abb55..5e8cf2722 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2ForUpdateTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2ForUpdateTransformerTest.java @@ -15,7 +15,7 @@ public class H2ForUpdateTransformerTest { @Test - public void testForUpdateNormal() throws Exception { + public void testForUpdateNormal() { String expected = "select * from emp order by emp.id for update"; H2ForUpdateTransformer transformer = new H2ForUpdateTransformer(SelectForUpdateType.NORMAL, 0); SqlParser parser = new SqlParser("select * from emp order by emp.id"); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformerTest.java index 2cf58bb2c..8c39d0778 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformerTest.java @@ -14,7 +14,7 @@ public class H2PagingTransformerTest { @Test - public void testOffsetLimit() throws Exception { + public void testOffsetLimit() { String expected = "select * from emp order by emp.id limit 10 offset 5"; H2PagingTransformer transformer = new H2PagingTransformer(5, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id"); @@ -26,7 +26,7 @@ public void testOffsetLimit() throws Exception { } @Test - public void testOffsetLimit_forUpdate() throws Exception { + public void testOffsetLimit_forUpdate() { String expected = "select * from emp order by emp.id limit 10 offset 5 for update"; H2PagingTransformer transformer = new H2PagingTransformer(5, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id for update"); @@ -38,7 +38,7 @@ public void testOffsetLimit_forUpdate() throws Exception { } @Test - public void testOffsetOnly() throws Exception { + public void testOffsetOnly() { String expected = "select * from emp order by emp.id limit -1 offset 5"; H2PagingTransformer transformer = new H2PagingTransformer(5, -1); SqlParser parser = new SqlParser("select * from emp order by emp.id"); @@ -50,7 +50,7 @@ public void testOffsetOnly() throws Exception { } @Test - public void testLimitOnly() throws Exception { + public void testLimitOnly() { String expected = "select * from emp order by emp.id limit 10"; H2PagingTransformer transformer = new H2PagingTransformer(-1, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id"); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Mssql2008ForUpdateTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Mssql2008ForUpdateTransformerTest.java index 9a2a72122..570e6184e 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Mssql2008ForUpdateTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Mssql2008ForUpdateTransformerTest.java @@ -15,7 +15,7 @@ public class Mssql2008ForUpdateTransformerTest { @Test - public void testForUpdateNormal() throws Exception { + public void testForUpdateNormal() { String expected = "select * from emp with (updlock, rowlock) order by emp.id"; Mssql2008ForUpdateTransformer transformer = new Mssql2008ForUpdateTransformer(SelectForUpdateType.NORMAL, 0); @@ -28,7 +28,7 @@ public void testForUpdateNormal() throws Exception { } @Test - public void testForUpdateNormal_originalSqlNodeUnchanged() throws Exception { + public void testForUpdateNormal_originalSqlNodeUnchanged() { String original = "select * from emp order by emp.id"; Mssql2008ForUpdateTransformer transformer = new Mssql2008ForUpdateTransformer(SelectForUpdateType.NORMAL, 0); @@ -44,7 +44,7 @@ public void testForUpdateNormal_originalSqlNodeUnchanged() throws Exception { } @Test - public void testForUpdateNowait() throws Exception { + public void testForUpdateNowait() { String expected = "select * from emp with (updlock, rowlock, nowait) order by emp.id"; Mssql2008ForUpdateTransformer transformer = new Mssql2008ForUpdateTransformer(SelectForUpdateType.NOWAIT, 0); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Mssql2008PagingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Mssql2008PagingTransformerTest.java index d5c979726..f245a3d04 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Mssql2008PagingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/Mssql2008PagingTransformerTest.java @@ -14,7 +14,7 @@ public class Mssql2008PagingTransformerTest { @Test - public void testOffsetLimit() throws Exception { + public void testOffsetLimit() { String expected = "select * from ( select temp_.*, row_number() over( order by temp_.id ) as doma_rownumber_ from ( select emp.id from emp ) as temp_ ) as temp2_ where doma_rownumber_ > 5 and doma_rownumber_ <= 15"; Mssql2008PagingTransformer transformer = new Mssql2008PagingTransformer(5, 10); @@ -27,7 +27,7 @@ public void testOffsetLimit() throws Exception { } @Test - public void testOffsetOnly() throws Exception { + public void testOffsetOnly() { String expected = "select * from ( select temp_.*, row_number() over( order by temp_.id ) as doma_rownumber_ from ( select emp.id from emp ) as temp_ ) as temp2_ where doma_rownumber_ > 5"; Mssql2008PagingTransformer transformer = new Mssql2008PagingTransformer(5, -1); @@ -40,7 +40,7 @@ public void testOffsetOnly() throws Exception { } @Test - public void testLimitOnly() throws Exception { + public void testLimitOnly() { String expected = "select top (10) emp.id from emp order by emp.id"; Mssql2008PagingTransformer transformer = new Mssql2008PagingTransformer(-1, 10); SqlParser parser = new SqlParser("select emp.id from emp order by emp.id"); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MssqlPagingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MssqlPagingTransformerTest.java index 508443ed8..587f1e5a0 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MssqlPagingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MssqlPagingTransformerTest.java @@ -15,7 +15,7 @@ public class MssqlPagingTransformerTest { @Test - public void testOffsetLimit() throws Exception { + public void testOffsetLimit() { String expected = "select emp.id from emp order by emp.id offset 5 rows fetch next 10 rows only"; MssqlPagingTransformer transformer = new MssqlPagingTransformer(5, 10, false); @@ -28,7 +28,7 @@ public void testOffsetLimit() throws Exception { } @Test - public void testOffsetLimit_forceOffsetFetch() throws Exception { + public void testOffsetLimit_forceOffsetFetch() { String expected = "select emp.id from emp order by emp.id offset 5 rows fetch next 10 rows only"; MssqlPagingTransformer transformer = new MssqlPagingTransformer(5, 10, true); @@ -41,7 +41,7 @@ public void testOffsetLimit_forceOffsetFetch() throws Exception { } @Test - public void testOffsetLimit_option() throws Exception { + public void testOffsetLimit_option() { String expected = "select emp.id from emp order by emp.id offset 5 rows fetch next 10 rows only option (maxrecursion 0)"; MssqlPagingTransformer transformer = new MssqlPagingTransformer(5, 10, false); @@ -55,7 +55,7 @@ public void testOffsetLimit_option() throws Exception { } @Test - public void testOffsetOnly() throws Exception { + public void testOffsetOnly() { String expected = "select emp.id from emp order by emp.id offset 5 rows"; MssqlPagingTransformer transformer = new MssqlPagingTransformer(5, -1, false); SqlParser parser = new SqlParser("select emp.id from emp order by emp.id"); @@ -67,7 +67,7 @@ public void testOffsetOnly() throws Exception { } @Test - public void testOffsetOnly_forceOffsetFetch() throws Exception { + public void testOffsetOnly_forceOffsetFetch() { String expected = "select emp.id from emp order by emp.id offset 5 rows"; MssqlPagingTransformer transformer = new MssqlPagingTransformer(5, -1, true); SqlParser parser = new SqlParser("select emp.id from emp order by emp.id"); @@ -79,7 +79,7 @@ public void testOffsetOnly_forceOffsetFetch() throws Exception { } @Test - public void testOffsetOnly_option() throws Exception { + public void testOffsetOnly_option() { String expected = "select emp.id from emp order by emp.id offset 5 rows option (maxrecursion 0)"; MssqlPagingTransformer transformer = new MssqlPagingTransformer(5, -1, false); @@ -93,7 +93,7 @@ public void testOffsetOnly_option() throws Exception { } @Test - public void testLimitOnly() throws Exception { + public void testLimitOnly() { String expected = "select top (10) emp.id from emp order by emp.id"; MssqlPagingTransformer transformer = new MssqlPagingTransformer(-1, 10, false); SqlParser parser = new SqlParser("select emp.id from emp order by emp.id"); @@ -105,7 +105,7 @@ public void testLimitOnly() throws Exception { } @Test - public void testLimitOnly_forceOffsetFetch() throws Exception { + public void testLimitOnly_forceOffsetFetch() { String expected = "select emp.id from emp order by emp.id offset 0 rows fetch next 10 rows only"; MssqlPagingTransformer transformer = new MssqlPagingTransformer(-1, 10, true); @@ -118,7 +118,7 @@ public void testLimitOnly_forceOffsetFetch() throws Exception { } @Test - public void testLimitOnly_option() throws Exception { + public void testLimitOnly_option() { String expected = "select top (10) emp.id from emp order by emp.id option (maxrecursion 0)"; MssqlPagingTransformer transformer = new MssqlPagingTransformer(-1, 10, false); SqlParser parser = @@ -131,7 +131,7 @@ public void testLimitOnly_option() throws Exception { } @Test - public void testLimitOnly_option_forceOffsetFetch() throws Exception { + public void testLimitOnly_option_forceOffsetFetch() { String expected = "select emp.id from emp order by emp.id offset 0 rows fetch next 10 rows only option (maxrecursion 0)"; MssqlPagingTransformer transformer = new MssqlPagingTransformer(-1, 10, true); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlCountCalculatingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlCountCalculatingTransformerTest.java index f40abbd2d..5f924dfb4 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlCountCalculatingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlCountCalculatingTransformerTest.java @@ -14,7 +14,7 @@ public class MysqlCountCalculatingTransformerTest { @Test - public void test() throws Exception { + public void test() { String expected = "select sql_calc_found_rows * from emp"; MysqlCountCalculatingTransformer transformer = new MysqlCountCalculatingTransformer(); SqlParser parser = new SqlParser("select * from emp"); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlForUpdateTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlForUpdateTransformerTest.java index c5090c4b5..4bd7f411a 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlForUpdateTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlForUpdateTransformerTest.java @@ -15,7 +15,7 @@ public class MysqlForUpdateTransformerTest { @Test - public void testForUpdateNormal() throws Exception { + public void testForUpdateNormal() { String expected = "select * from emp order by emp.id for update"; MysqlForUpdateTransformer transformer = new MysqlForUpdateTransformer(SelectForUpdateType.NORMAL, 0); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformerTest.java index 1f6ba12dc..a777326ad 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/MysqlPagingTransformerTest.java @@ -14,7 +14,7 @@ public class MysqlPagingTransformerTest { @Test - public void testOffsetLimit() throws Exception { + public void testOffsetLimit() { String expected = "select * from emp order by emp.id limit 5, 10"; MysqlPagingTransformer transformer = new MysqlPagingTransformer(5, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id"); @@ -26,7 +26,7 @@ public void testOffsetLimit() throws Exception { } @Test - public void testOffsetLimit_forUpdate() throws Exception { + public void testOffsetLimit_forUpdate() { String expected = "select * from emp order by emp.id limit 5, 10 for update"; MysqlPagingTransformer transformer = new MysqlPagingTransformer(5, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id for update"); @@ -38,7 +38,7 @@ public void testOffsetLimit_forUpdate() throws Exception { } @Test - public void testOffsetOnly() throws Exception { + public void testOffsetOnly() { String expected = "select * from emp order by emp.id limit 5, 18446744073709551615"; MysqlPagingTransformer transformer = new MysqlPagingTransformer(5, -1); SqlParser parser = new SqlParser("select * from emp order by emp.id"); @@ -50,7 +50,7 @@ public void testOffsetOnly() throws Exception { } @Test - public void testLimitOnly() throws Exception { + public void testLimitOnly() { String expected = "select * from emp order by emp.id limit 0, 10"; MysqlPagingTransformer transformer = new MysqlPagingTransformer(-1, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id"); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/OracleForUpdateTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/OracleForUpdateTransformerTest.java index cd2e8f6b7..a14c12f3e 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/OracleForUpdateTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/OracleForUpdateTransformerTest.java @@ -15,7 +15,7 @@ public class OracleForUpdateTransformerTest { @Test - public void testForUpdateNormal() throws Exception { + public void testForUpdateNormal() { String expected = "select * from emp order by emp.id for update"; OracleForUpdateTransformer transformer = new OracleForUpdateTransformer(SelectForUpdateType.NORMAL, 0); @@ -28,7 +28,7 @@ public void testForUpdateNormal() throws Exception { } @Test - public void testForUpdateNormal_alias() throws Exception { + public void testForUpdateNormal_alias() { String expected = "select * from emp order by emp.id for update of emp.name, emp.salary"; OracleForUpdateTransformer transformer = new OracleForUpdateTransformer(SelectForUpdateType.NORMAL, 0, "emp.name", "emp.salary"); @@ -41,7 +41,7 @@ public void testForUpdateNormal_alias() throws Exception { } @Test - public void testForUpdateNowait() throws Exception { + public void testForUpdateNowait() { String expected = "select * from emp order by emp.id for update nowait"; OracleForUpdateTransformer transformer = new OracleForUpdateTransformer(SelectForUpdateType.NOWAIT, 0); @@ -54,7 +54,7 @@ public void testForUpdateNowait() throws Exception { } @Test - public void testForUpdateWait() throws Exception { + public void testForUpdateWait() { String expected = "select * from emp order by emp.id for update wait 10"; OracleForUpdateTransformer transformer = new OracleForUpdateTransformer(SelectForUpdateType.WAIT, 10); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/OraclePagingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/OraclePagingTransformerTest.java index 4e2326fc3..454508a90 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/OraclePagingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/OraclePagingTransformerTest.java @@ -14,7 +14,7 @@ public class OraclePagingTransformerTest { @Test - public void testOffsetLimit() throws Exception { + public void testOffsetLimit() { String expected = "select * from ( select temp_.*, rownum doma_rownumber_ from ( select * from emp order by emp.id ) temp_ ) where doma_rownumber_ > 5 and doma_rownumber_ <= 15"; OraclePagingTransformer transformer = new OraclePagingTransformer(5, 10); @@ -27,7 +27,7 @@ public void testOffsetLimit() throws Exception { } @Test - public void testOffsetLimit_forUpdate() throws Exception { + public void testOffsetLimit_forUpdate() { String expected = "select * from ( select temp_.*, rownum doma_rownumber_ from ( select * from emp order by emp.id ) temp_ ) where doma_rownumber_ > 5 and doma_rownumber_ <= 15 for update"; OraclePagingTransformer transformer = new OraclePagingTransformer(5, 10); @@ -40,7 +40,7 @@ public void testOffsetLimit_forUpdate() throws Exception { } @Test - public void testOffsetOnly() throws Exception { + public void testOffsetOnly() { String expected = "select * from ( select temp_.*, rownum doma_rownumber_ from ( select * from emp order by emp.id ) temp_ ) where doma_rownumber_ > 5"; OraclePagingTransformer transformer = new OraclePagingTransformer(5, -1); @@ -53,7 +53,7 @@ public void testOffsetOnly() throws Exception { } @Test - public void testLimitOnly() throws Exception { + public void testLimitOnly() { String expected = "select * from ( select temp_.*, rownum doma_rownumber_ from ( select * from emp order by emp.id ) temp_ ) where doma_rownumber_ <= 10"; OraclePagingTransformer transformer = new OraclePagingTransformer(-1, 10); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/PostgresForUpdateTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/PostgresForUpdateTransformerTest.java index 7828c2423..7af96d35e 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/PostgresForUpdateTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/PostgresForUpdateTransformerTest.java @@ -15,7 +15,7 @@ public class PostgresForUpdateTransformerTest { @Test - public void testForUpdateNormal() throws Exception { + public void testForUpdateNormal() { String expected = "select * from emp order by emp.id for update"; PostgresForUpdateTransformer transformer = new PostgresForUpdateTransformer(SelectForUpdateType.NORMAL, 0); @@ -28,7 +28,7 @@ public void testForUpdateNormal() throws Exception { } @Test - public void testForUpdateNormal_alias() throws Exception { + public void testForUpdateNormal_alias() { String expected = "select * from emp order by emp.id for update of emp"; PostgresForUpdateTransformer transformer = new PostgresForUpdateTransformer(SelectForUpdateType.NORMAL, 0, "emp"); @@ -41,7 +41,7 @@ public void testForUpdateNormal_alias() throws Exception { } @Test - public void testForUpdateNowait() throws Exception { + public void testForUpdateNowait() { String expected = "select * from emp order by emp.id for update nowait"; PostgresForUpdateTransformer transformer = new PostgresForUpdateTransformer(SelectForUpdateType.NOWAIT, 0); @@ -54,7 +54,7 @@ public void testForUpdateNowait() throws Exception { } @Test - public void testForUpdateNowait_alias() throws Exception { + public void testForUpdateNowait_alias() { String expected = "select * from emp order by emp.id for update of emp nowait"; PostgresForUpdateTransformer transformer = new PostgresForUpdateTransformer(SelectForUpdateType.NOWAIT, 0, "emp"); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/PostgresPagingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/PostgresPagingTransformerTest.java index c305663c7..7627ceb6a 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/PostgresPagingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/PostgresPagingTransformerTest.java @@ -14,7 +14,7 @@ public class PostgresPagingTransformerTest { @Test - public void testOffsetLimit() throws Exception { + public void testOffsetLimit() { String expected = "select * from emp order by emp.id limit 10 offset 5"; PostgresPagingTransformer transformer = new PostgresPagingTransformer(5, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id"); @@ -26,7 +26,7 @@ public void testOffsetLimit() throws Exception { } @Test - public void testOffsetLimit_forUpdate() throws Exception { + public void testOffsetLimit_forUpdate() { String expected = "select * from emp order by emp.id limit 10 offset 5 for update"; PostgresPagingTransformer transformer = new PostgresPagingTransformer(5, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id for update"); @@ -38,7 +38,7 @@ public void testOffsetLimit_forUpdate() throws Exception { } @Test - public void testOffsetOnly() throws Exception { + public void testOffsetOnly() { String expected = "select * from emp order by emp.id offset 5"; PostgresPagingTransformer transformer = new PostgresPagingTransformer(5, -1); SqlParser parser = new SqlParser("select * from emp order by emp.id"); @@ -50,7 +50,7 @@ public void testOffsetOnly() throws Exception { } @Test - public void testLimitOnly() throws Exception { + public void testLimitOnly() { String expected = "select * from emp order by emp.id limit 10"; PostgresPagingTransformer transformer = new PostgresPagingTransformer(-1, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id"); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformerTest.java index 888f0f590..6e25365bd 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/SqlitePagingTransformerTest.java @@ -14,7 +14,7 @@ public class SqlitePagingTransformerTest { @Test - public void testOffsetLimit() throws Exception { + public void testOffsetLimit() { String expected = "select * from emp order by emp.id limit 10 offset 5"; SqlitePagingTransformer transformer = new SqlitePagingTransformer(5, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id"); @@ -26,7 +26,7 @@ public void testOffsetLimit() throws Exception { } @Test - public void testOffsetLimit_forUpdate() throws Exception { + public void testOffsetLimit_forUpdate() { String expected = "select * from emp order by emp.id limit 10 offset 5 for update"; SqlitePagingTransformer transformer = new SqlitePagingTransformer(5, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id for update"); @@ -38,7 +38,7 @@ public void testOffsetLimit_forUpdate() throws Exception { } @Test - public void testOffsetOnly() throws Exception { + public void testOffsetOnly() { String expected = "select * from emp order by emp.id limit 9223372036854775807 offset 5"; SqlitePagingTransformer transformer = new SqlitePagingTransformer(5, -1); SqlParser parser = new SqlParser("select * from emp order by emp.id"); @@ -50,7 +50,7 @@ public void testOffsetOnly() throws Exception { } @Test - public void testLimitOnly() throws Exception { + public void testLimitOnly() { String expected = "select * from emp order by emp.id limit 10 offset 0"; SqlitePagingTransformer transformer = new SqlitePagingTransformer(-1, 10); SqlParser parser = new SqlParser("select * from emp order by emp.id"); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/StandardCountGettingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/StandardCountGettingTransformerTest.java index 82f0cacb6..8a9b8cf1a 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/StandardCountGettingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/StandardCountGettingTransformerTest.java @@ -14,7 +14,7 @@ public class StandardCountGettingTransformerTest { @Test - public void test() throws Exception { + public void test() { String expected = "select count(*) from ( select * from emp) t_"; StandardCountGettingTransformer transformer = new StandardCountGettingTransformer(); SqlParser parser = new SqlParser("select * from emp"); @@ -26,7 +26,7 @@ public void test() throws Exception { } @Test - public void testOrderBy() throws Exception { + public void testOrderBy() { String expected = "select count(*) from ( select * from emp ) t_"; StandardCountGettingTransformer transformer = new StandardCountGettingTransformer(); SqlParser parser = new SqlParser("select * from emp order by emp.id"); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/StandardPagingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/StandardPagingTransformerTest.java index e977b680e..ce39e46a7 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/StandardPagingTransformerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/StandardPagingTransformerTest.java @@ -18,7 +18,7 @@ public class StandardPagingTransformerTest { @Test - public void testOffsetLimit() throws Exception { + public void testOffsetLimit() { String expected = "select * from ( select temp_.*, row_number() over( order by temp_.id ) as doma_rownumber_ from ( select emp.id from emp ) as temp_ ) as temp2_ where doma_rownumber_ > 5 and doma_rownumber_ <= 15"; StandardPagingTransformer transformer = new StandardPagingTransformer(5, 10); @@ -31,7 +31,7 @@ public void testOffsetLimit() throws Exception { } @Test - public void testOffsetLimit_ifNode() throws Exception { + public void testOffsetLimit_ifNode() { String expected = "select * from ( select temp_.*, row_number() over( order by temp_.name desc, temp_.id ) as doma_rownumber_ from ( select emp.id from emp ) as temp_ ) as temp2_ where doma_rownumber_ > 5 and doma_rownumber_ <= 15"; StandardPagingTransformer transformer = new StandardPagingTransformer(5, 10); @@ -45,7 +45,7 @@ public void testOffsetLimit_ifNode() throws Exception { } @Test - public void testOffsetLimit_forNode() throws Exception { + public void testOffsetLimit_forNode() { String expected = "select * from ( select temp_.*, row_number() over( order by temp_.name1, temp_.name2, temp_.id ) as doma_rownumber_ from ( select emp.id from emp ) as temp_ ) as temp2_ where doma_rownumber_ > 5 and doma_rownumber_ <= 15"; StandardPagingTransformer transformer = new StandardPagingTransformer(5, 10); @@ -63,7 +63,7 @@ public void testOffsetLimit_forNode() throws Exception { } @Test - public void testOffsetOnly() throws Exception { + public void testOffsetOnly() { String expected = "select * from ( select temp_.*, row_number() over( order by temp_.id ) as doma_rownumber_ from ( select emp.id from emp ) as temp_ ) as temp2_ where doma_rownumber_ > 5"; StandardPagingTransformer transformer = new StandardPagingTransformer(5, -1); @@ -76,7 +76,7 @@ public void testOffsetOnly() throws Exception { } @Test - public void testLimitOnly() throws Exception { + public void testLimitOnly() { String expected = "select * from ( select temp_.*, row_number() over( order by temp_.id ) as doma_rownumber_ from ( select emp.id from emp ) as temp_ ) as temp2_ where doma_rownumber_ <= 10"; StandardPagingTransformer transformer = new StandardPagingTransformer(-1, 10); @@ -89,7 +89,7 @@ public void testLimitOnly() throws Exception { } @Test - public void testOrderByClauseUnspecified() throws Exception { + public void testOrderByClauseUnspecified() { StandardPagingTransformer transformer = new StandardPagingTransformer(5, 10); SqlParser parser = new SqlParser("select * from emp"); try { diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/entity/PropertyFieldTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/entity/PropertyFieldTest.java index b419022ac..631221fc1 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/entity/PropertyFieldTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/entity/PropertyFieldTest.java @@ -12,37 +12,37 @@ public class PropertyFieldTest { @Test - public void testConstructor_simplePath() throws Exception { + public void testConstructor_simplePath() { PropertyField path = new PropertyField<>("name", Person.class); assertEquals(1, path.fields.size()); } @Test - public void testConstructor_parentPath() throws Exception { + public void testConstructor_parentPath() { PropertyField path = new PropertyField<>("kind", Person.class); assertEquals(1, path.fields.size()); } @Test - public void testConstructor_grandParentPath() throws Exception { + public void testConstructor_grandParentPath() { PropertyField path = new PropertyField<>("weight", Person.class); assertEquals(1, path.fields.size()); } @Test - public void testConstructor_nestedPath() throws Exception { + public void testConstructor_nestedPath() { PropertyField path = new PropertyField<>("address.city", Person.class); assertEquals(2, path.fields.size()); } @Test - public void testConstructor_nestedParentPath() throws Exception { + public void testConstructor_nestedParentPath() { PropertyField path = new PropertyField<>("address.kind", Person.class); assertEquals(2, path.fields.size()); } @Test - public void testGetValue_simplePath() throws Exception { + public void testGetValue_simplePath() { Person person = new Person(); person.name = "hoge"; PropertyField path = new PropertyField<>("name", Person.class); @@ -50,7 +50,7 @@ public void testGetValue_simplePath() throws Exception { } @Test - public void testGetValue_parentPath() throws Exception { + public void testGetValue_parentPath() { Person person = new Person(); person.kind = "hoge"; PropertyField path = new PropertyField<>("kind", Person.class); @@ -58,7 +58,7 @@ public void testGetValue_parentPath() throws Exception { } @Test - public void testGetValue_nestedPath() throws Exception { + public void testGetValue_nestedPath() { Person person = new Person(); person.address = new Address("island", "Tokyo", "Yaesu"); PropertyField path = new PropertyField<>("address.city", Person.class); @@ -66,14 +66,14 @@ public void testGetValue_nestedPath() throws Exception { } @Test - public void testGetValue_nestedPath_null() throws Exception { + public void testGetValue_nestedPath_null() { Person person = new Person(); PropertyField path = new PropertyField<>("address.city", Person.class); assertNull(path.getValue(person)); } @Test - public void testGetValue_nestedParentPath() throws Exception { + public void testGetValue_nestedParentPath() { Person person = new Person(); person.address = new Address("island", "Tokyo", "Yaesu"); PropertyField path = new PropertyField<>("address.kind", Person.class); @@ -81,7 +81,7 @@ public void testGetValue_nestedParentPath() throws Exception { } @Test - public void testSetValue_simplePath() throws Exception { + public void testSetValue_simplePath() { Person person = new Person(); PropertyField path = new PropertyField<>("name", Person.class); path.setValue(person, "foo"); @@ -89,7 +89,7 @@ public void testSetValue_simplePath() throws Exception { } @Test - public void testSetValue_parentPath() throws Exception { + public void testSetValue_parentPath() { Person person = new Person(); PropertyField path = new PropertyField<>("kind", Person.class); path.setValue(person, "foo"); @@ -97,7 +97,7 @@ public void testSetValue_parentPath() throws Exception { } @Test - public void testSetValue_nestedPath() throws Exception { + public void testSetValue_nestedPath() { Person person = new Person(); PropertyField path = new PropertyField<>("address.city", Person.class); try { @@ -108,7 +108,7 @@ public void testSetValue_nestedPath() throws Exception { } @Test - public void testSetValue_nestedParentPath() throws Exception { + public void testSetValue_nestedParentPath() { Person person = new Person(); PropertyField path = new PropertyField<>("address.kind", Person.class); try { @@ -119,7 +119,7 @@ public void testSetValue_nestedParentPath() throws Exception { } @Test - public void testIsPrimitive() throws Exception { + public void testIsPrimitive() { PropertyField age = new PropertyField<>("age", Person.class); assertTrue(age.isPrimitive()); PropertyField name = new PropertyField<>("name", Person.class); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java index 21e2ea2db..259e374d7 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/scalar/ScalarsTest.java @@ -36,7 +36,7 @@ public class ScalarsTest { private final ClassHelper classHelper = new ClassHelper() {}; @Test - public void testWrapBasic() throws Exception { + public void testWrapBasic() { assertNotNull(Scalars.wrap(true, boolean.class, false, classHelper)); assertNotNull(Scalars.wrap(true, Boolean.class, false, classHelper)); assertNotNull(Scalars.wrap((byte) 1, byte.class, false, classHelper)); @@ -73,7 +73,7 @@ public void testWrapBasic() throws Exception { } @Test - public void testWrapBasic_primitiveType() throws Exception { + public void testWrapBasic_primitiveType() { Supplier> supplier = Scalars.wrap(10, int.class, false, classHelper); assertNotNull(supplier); @@ -86,7 +86,7 @@ public void testWrapBasic_primitiveType() throws Exception { } @Test - public void testWrapBasic_primitiveType_null() throws Exception { + public void testWrapBasic_primitiveType_null() { Supplier> supplier = Scalars.wrap(null, int.class, false, classHelper); assertNotNull(supplier); @@ -99,7 +99,7 @@ public void testWrapBasic_primitiveType_null() throws Exception { } @Test - public void testWrapBasic_null() throws Exception { + public void testWrapBasic_null() { Supplier> supplier = Scalars.wrap(null, Integer.class, false, classHelper); assertNotNull(supplier); @@ -113,7 +113,7 @@ public void testWrapBasic_null() throws Exception { @SuppressWarnings("unchecked") @Test - public void testWrapBasic_optional() throws Exception { + public void testWrapBasic_optional() { Supplier> supplier = Scalars.wrap(10, Integer.class, true, classHelper); assertNotNull(supplier); @@ -129,7 +129,7 @@ public void testWrapBasic_optional() throws Exception { @SuppressWarnings("unchecked") @Test - public void testWrapBasic_optional_null() throws Exception { + public void testWrapBasic_optional_null() { Supplier> supplier = Scalars.wrap(null, Integer.class, true, classHelper); assertNotNull(supplier); @@ -144,7 +144,7 @@ public void testWrapBasic_optional_null() throws Exception { } @Test - public void testWrapEnum() throws Exception { + public void testWrapEnum() { Supplier> supplier = Scalars.wrap(MyEnum.AAA, MyEnum.class, false, classHelper); assertNotNull(supplier); @@ -157,7 +157,7 @@ public void testWrapEnum() throws Exception { } @Test - public void testWrapEnum_null() throws Exception { + public void testWrapEnum_null() { Supplier> supplier = Scalars.wrap(null, MyEnum.class, false, classHelper); assertNotNull(supplier); @@ -171,7 +171,7 @@ public void testWrapEnum_null() throws Exception { @SuppressWarnings("unchecked") @Test - public void testWrapEnum_optional() throws Exception { + public void testWrapEnum_optional() { Supplier> supplier = Scalars.wrap(MyEnum.AAA, MyEnum.class, true, classHelper); assertNotNull(supplier); @@ -187,7 +187,7 @@ public void testWrapEnum_optional() throws Exception { @SuppressWarnings("unchecked") @Test - public void testWrapEnum_optional_null() throws Exception { + public void testWrapEnum_optional_null() { Supplier> supplier = Scalars.wrap(null, MyEnum.class, true, classHelper); assertNotNull(supplier); @@ -202,7 +202,7 @@ public void testWrapEnum_optional_null() throws Exception { } @Test - public void testWrapDomain() throws Exception { + public void testWrapDomain() { PhoneNumber phoneNumber = new PhoneNumber("123-456-789"); Supplier> supplier = Scalars.wrap(phoneNumber, PhoneNumber.class, false, classHelper); @@ -217,7 +217,7 @@ public void testWrapDomain() throws Exception { } @Test - public void testWrapDomain_subclass() throws Exception { + public void testWrapDomain_subclass() { PhoneNumber phoneNumber = new InternationalPhoneNumber("123-456-789"); Supplier> supplier = Scalars.wrap(phoneNumber, InternationalPhoneNumber.class, false, classHelper); @@ -232,7 +232,7 @@ public void testWrapDomain_subclass() throws Exception { } @Test - public void testWrapDomain_null() throws Exception { + public void testWrapDomain_null() { Supplier> supplier = Scalars.wrap(null, PhoneNumber.class, false, classHelper); assertNotNull(supplier); @@ -248,7 +248,7 @@ public void testWrapDomain_null() throws Exception { @SuppressWarnings("unchecked") @Test - public void testWrapDomain_option() throws Exception { + public void testWrapDomain_option() { PhoneNumber phoneNumber = new PhoneNumber("123-456-789"); Supplier> supplier = Scalars.wrap(phoneNumber, PhoneNumber.class, true, classHelper); @@ -266,7 +266,7 @@ public void testWrapDomain_option() throws Exception { @SuppressWarnings("unchecked") @Test - public void testWrapDomain_option_null() throws Exception { + public void testWrapDomain_option_null() { Supplier> supplier = Scalars.wrap(null, PhoneNumber.class, true, classHelper); assertNotNull(supplier); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilderTest.java index f244daffc..39638983b 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilderTest.java @@ -38,7 +38,7 @@ public class NodePreparedSqlBuilderTest { private final MockConfig config = new MockConfig(); @Test - public void testBindVariableNode() throws Exception { + public void testBindVariableNode() { SelectClauseNode select = new SelectClauseNode("select"); select.appendNode(OtherNode.of(" * ")); FromClauseNode from = new FromClauseNode("from"); @@ -82,7 +82,7 @@ public void testBindVariableNode() throws Exception { } @Test - public void testIfNode_true() throws Exception { + public void testIfNode_true() { SelectClauseNode select = new SelectClauseNode("select"); select.appendNode(OtherNode.of(" * ")); FromClauseNode from = new FromClauseNode("from"); @@ -116,7 +116,7 @@ public void testIfNode_true() throws Exception { } @Test - public void testIfNode_false() throws Exception { + public void testIfNode_false() { SelectClauseNode select = new SelectClauseNode("select"); select.appendNode(OtherNode.of(" * ")); FromClauseNode from = new FromClauseNode("from"); @@ -150,7 +150,7 @@ public void testIfNode_false() throws Exception { } @Test - public void testElseNode() throws Exception { + public void testElseNode() { SelectClauseNode select = new SelectClauseNode("select"); select.appendNode(OtherNode.of(" * ")); FromClauseNode from = new FromClauseNode("from"); @@ -190,7 +190,7 @@ public void testElseNode() throws Exception { } @Test - public void testWhere() throws Exception { + public void testWhere() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); String testSql = "select * from aaa where /*%if false*/ename = 'aaa'/*%end */"; SqlParser parser = new SqlParser(testSql); @@ -203,7 +203,7 @@ public void testWhere() throws Exception { } @Test - public void testWhere_embeddedVariable() throws Exception { + public void testWhere_embeddedVariable() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("embedded", new Value(String.class, "bbb = ccc")); String testSql = "select * from aaa where /*%if false*/ename = 'aaa'/*%end */ /*#embedded*/"; @@ -217,7 +217,7 @@ public void testWhere_embeddedVariable() throws Exception { } @Test - public void testWhere_embeddedVariable_orderBy() throws Exception { + public void testWhere_embeddedVariable_orderBy() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("embedded", new Value(String.class, "order by bbb")); String testSql = "select * from aaa where /*%if false*/ename = 'aaa'/*%end */ /*#embedded*/"; @@ -231,7 +231,7 @@ public void testWhere_embeddedVariable_orderBy() throws Exception { } @Test - public void testWhere_embeddedVariable_orderBy_followedByForUpdate() throws Exception { + public void testWhere_embeddedVariable_orderBy_followedByForUpdate() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("embedded", new Value(String.class, "order by bbb")); String testSql = @@ -246,7 +246,7 @@ public void testWhere_embeddedVariable_orderBy_followedByForUpdate() throws Exce } @Test - public void testAndNode() throws Exception { + public void testAndNode() { SelectClauseNode select = new SelectClauseNode("select"); select.appendNode(OtherNode.of(" * ")); FromClauseNode from = new FromClauseNode("from"); @@ -294,7 +294,7 @@ public void testAndNode() throws Exception { } @Test - public void testAndNode_remove() throws Exception { + public void testAndNode_remove() { SelectClauseNode select = new SelectClauseNode("select"); select.appendNode(OtherNode.of(" * ")); FromClauseNode from = new FromClauseNode("from"); @@ -342,7 +342,7 @@ public void testAndNode_remove() throws Exception { } @Test - public void testEmbeddedVariable_containsSingleQuote() throws Exception { + public void testEmbeddedVariable_containsSingleQuote() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); evaluator.add("salary", new Value(BigDecimal.class, new BigDecimal(10000))); @@ -363,7 +363,7 @@ public void testEmbeddedVariable_containsSingleQuote() throws Exception { } @Test - public void testEmbeddedVariable_containsSemicolon() throws Exception { + public void testEmbeddedVariable_containsSemicolon() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); evaluator.add("salary", new Value(BigDecimal.class, new BigDecimal(10000))); @@ -384,7 +384,7 @@ public void testEmbeddedVariable_containsSemicolon() throws Exception { } @Test - public void testEmbeddedVariable_lineComment() throws Exception { + public void testEmbeddedVariable_lineComment() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); evaluator.add("salary", new Value(BigDecimal.class, new BigDecimal(10000))); @@ -405,7 +405,7 @@ public void testEmbeddedVariable_lineComment() throws Exception { } @Test - public void testEmbeddedVariable_blockComment() throws Exception { + public void testEmbeddedVariable_blockComment() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); evaluator.add("salary", new Value(BigDecimal.class, new BigDecimal(10000))); @@ -426,7 +426,7 @@ public void testEmbeddedVariable_blockComment() throws Exception { } @Test - public void testEmbeddedVariable_issue_95() throws Exception { + public void testEmbeddedVariable_issue_95() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("envPrefix", new Value(String.class, "prefix_")); String testSql = "select * from /*#envPrefix*/SCHEMA.TABLE"; @@ -440,7 +440,7 @@ public void testEmbeddedVariable_issue_95() throws Exception { } @Test - public void testLiteralVariable_containsSingleQuote() throws Exception { + public void testLiteralVariable_containsSingleQuote() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hog'e")); evaluator.add("salary", new Value(BigDecimal.class, new BigDecimal(10000))); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilderTest.java index e0adb0db0..9effd3646 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilderTest.java @@ -22,7 +22,7 @@ public class PreparedSqlBuilderTest { private final MockConfig config = new MockConfig(); @Test - public void testAppend() throws Exception { + public void testAppend() { PreparedSqlBuilder builder = new PreparedSqlBuilder(config, SqlKind.SELECT, SqlLogType.FORMATTED); builder.appendSql("select * from aaa where name = "); @@ -37,7 +37,7 @@ public void testAppend() throws Exception { } @Test - public void testAppendParameter_domain() throws Exception { + public void testAppendParameter_domain() { PreparedSqlBuilder builder = new PreparedSqlBuilder(config, SqlKind.SELECT, SqlLogType.FORMATTED); builder.appendSql("select * from aaa where phoneNumber = "); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameterTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameterTest.java index d84a43971..1300aab0c 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameterTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameterTest.java @@ -15,7 +15,7 @@ public class ScalarInOutParameterTest { @Test - public void testGetDomainClass() throws Exception { + public void testGetDomainClass() { DomainType domainType = DomainTypeFactory.getDomainType(PhoneNumber.class, new ClassHelper() {}); Scalar scalar = domainType.createScalar(); @@ -26,7 +26,7 @@ public void testGetDomainClass() throws Exception { } @Test - public void testGetDomainClass_optional() throws Exception { + public void testGetDomainClass_optional() { DomainType domainType = DomainTypeFactory.getDomainType(PhoneNumber.class, new ClassHelper() {}); Scalar> scalar = domainType.createOptionalScalar(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameterTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameterTest.java index 089c8bb1c..7850aa0e3 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameterTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameterTest.java @@ -14,7 +14,7 @@ public class ScalarInParameterTest { @Test - public void testGetDomainClass() throws Exception { + public void testGetDomainClass() { DomainType domainType = DomainTypeFactory.getDomainType(PhoneNumber.class, new ClassHelper() {}); Scalar scalar = domainType.createScalar(); @@ -24,7 +24,7 @@ public void testGetDomainClass() throws Exception { } @Test - public void testGetDomainClass_optional() throws Exception { + public void testGetDomainClass_optional() { DomainType domainType = DomainTypeFactory.getDomainType(PhoneNumber.class, new ClassHelper() {}); Scalar> scalar = domainType.createOptionalScalar(); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java index 539e640dd..48286a97b 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.function.Function; import org.junit.jupiter.api.Test; +import org.seasar.doma.internal.WrapException; import org.seasar.doma.internal.expr.ExpressionEvaluator; import org.seasar.doma.internal.expr.Value; import org.seasar.doma.internal.jdbc.mock.MockConfig; @@ -28,7 +29,7 @@ public class SqlParserTest { private final MockConfig config = new MockConfig(); @Test - public void testBindVariable() throws Exception { + public void testBindVariable() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); evaluator.add("salary", new Value(BigDecimal.class, new BigDecimal(10000))); @@ -47,7 +48,7 @@ public void testBindVariable() throws Exception { } @Test - public void testBindVariable_domain() throws Exception { + public void testBindVariable_domain() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("phone", new Value(PhoneNumber.class, new PhoneNumber("01-2345-6789"))); String testSql = "select * from aaa where phone = /*phone*/'111'"; @@ -64,7 +65,7 @@ public void testBindVariable_domain() throws Exception { } @Test - public void testBindVariable_in_iterable() throws Exception { + public void testBindVariable_in_iterable() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(List.class, Arrays.asList("hoge", "foo"))); String testSql = "select * from aaa where ename in /*name*/('aaa', 'bbb')"; @@ -82,7 +83,7 @@ public void testBindVariable_in_iterable() throws Exception { } @Test - public void testBindVariable_in_array() throws Exception { + public void testBindVariable_in_array() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String[].class, new String[] {"hoge", "foo"})); String testSql = "select * from aaa where ename in /*name*/('aaa', 'bbb')"; @@ -100,7 +101,7 @@ public void testBindVariable_in_array() throws Exception { } @Test - public void testBindVariable_in_empty_iterable() throws Exception { + public void testBindVariable_in_empty_iterable() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(List.class, Collections.emptyList())); String testSql = "select * from aaa where ename in /*name*/('aaa', 'bbb')"; @@ -116,7 +117,7 @@ public void testBindVariable_in_empty_iterable() throws Exception { } @Test - public void testBindVariable_endsWithBindVariableComment() throws Exception { + public void testBindVariable_endsWithBindVariableComment() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); String testSql = "select * from aaa where ename = /*name*/"; @@ -131,7 +132,7 @@ public void testBindVariable_endsWithBindVariableComment() throws Exception { } @Test - public void testBindVariable_emptyName() throws Exception { + public void testBindVariable_emptyName() { String testSql = "select * from aaa where ename = /* */'aaa'"; SqlParser parser = new SqlParser(testSql); try { @@ -144,7 +145,7 @@ public void testBindVariable_emptyName() throws Exception { } @Test - public void testBindVariable_stringLiteral() throws Exception { + public void testBindVariable_stringLiteral() { String testSql = "select * from aaa where ename = /*name*/'bbb'"; SqlParser parser = new SqlParser(testSql); SqlNode node = parser.parse(); @@ -152,7 +153,7 @@ public void testBindVariable_stringLiteral() throws Exception { } @Test - public void testBindVariable_intLiteral() throws Exception { + public void testBindVariable_intLiteral() { String testSql = "select * from aaa where ename = /*name*/10"; SqlParser parser = new SqlParser(testSql); SqlNode node = parser.parse(); @@ -160,7 +161,7 @@ public void testBindVariable_intLiteral() throws Exception { } @Test - public void testBindVariable_floatLiteral() throws Exception { + public void testBindVariable_floatLiteral() { String testSql = "select * from aaa where ename = /*name*/.0"; SqlParser parser = new SqlParser(testSql); SqlNode node = parser.parse(); @@ -168,7 +169,7 @@ public void testBindVariable_floatLiteral() throws Exception { } @Test - public void testBindVariable_booleanTrueLiteral() throws Exception { + public void testBindVariable_booleanTrueLiteral() { String testSql = "select * from aaa where ename = /*name*/true"; SqlParser parser = new SqlParser(testSql); SqlNode node = parser.parse(); @@ -176,7 +177,7 @@ public void testBindVariable_booleanTrueLiteral() throws Exception { } @Test - public void testBindVariable_booleanFalseLiteral() throws Exception { + public void testBindVariable_booleanFalseLiteral() { String testSql = "select * from aaa where ename = /*name*/false"; SqlParser parser = new SqlParser(testSql); SqlNode node = parser.parse(); @@ -184,7 +185,7 @@ public void testBindVariable_booleanFalseLiteral() throws Exception { } @Test - public void testBindVariable_nullLiteral() throws Exception { + public void testBindVariable_nullLiteral() { String testSql = "select * from aaa where ename = /*name*/null"; SqlParser parser = new SqlParser(testSql); SqlNode node = parser.parse(); @@ -192,7 +193,7 @@ public void testBindVariable_nullLiteral() throws Exception { } @Test - public void testBindVariable_illegalLiteral() throws Exception { + public void testBindVariable_illegalLiteral() { String testSql = "select * from aaa where ename = /*name*/bbb"; SqlParser parser = new SqlParser(testSql); try { @@ -205,7 +206,7 @@ public void testBindVariable_illegalLiteral() throws Exception { } @Test - public void testBindVariable_enum() throws Exception { + public void testBindVariable_enum() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(MyEnum.class, MyEnum.BBB)); evaluator.add("salary", new Value(BigDecimal.class, new BigDecimal(10000))); @@ -224,7 +225,7 @@ public void testBindVariable_enum() throws Exception { } @Test - public void testLiteralVariable() throws Exception { + public void testLiteralVariable() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); evaluator.add("salary", new Value(BigDecimal.class, new BigDecimal(10000))); @@ -241,7 +242,7 @@ public void testLiteralVariable() throws Exception { } @Test - public void testLiteralVariable_emptyName() throws Exception { + public void testLiteralVariable_emptyName() { String testSql = "select * from aaa where ename = /*^ */'aaa'"; SqlParser parser = new SqlParser(testSql); try { @@ -254,7 +255,7 @@ public void testLiteralVariable_emptyName() throws Exception { } @Test - public void testLiteralVariable_in() throws Exception { + public void testLiteralVariable_in() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(List.class, Arrays.asList("hoge", "foo"))); String testSql = "select * from aaa where ename in /*^name*/('aaa', 'bbb')"; @@ -270,7 +271,7 @@ public void testLiteralVariable_in() throws Exception { } @Test - public void testLiteralVariable_endsWithLiteralVariableComment() throws Exception { + public void testLiteralVariable_endsWithLiteralVariableComment() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); String testSql = "select * from aaa where ename = /*^name*/"; @@ -285,7 +286,7 @@ public void testLiteralVariable_endsWithLiteralVariableComment() throws Exceptio } @Test - public void testLiteralVariable_illegalLiteral() throws Exception { + public void testLiteralVariable_illegalLiteral() { String testSql = "select * from aaa where ename = /*^name*/bbb"; SqlParser parser = new SqlParser(testSql); try { @@ -298,7 +299,7 @@ public void testLiteralVariable_illegalLiteral() throws Exception { } @Test - public void testEmbeddedVariable() throws Exception { + public void testEmbeddedVariable() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); evaluator.add("salary", new Value(BigDecimal.class, new BigDecimal(10000))); @@ -322,7 +323,7 @@ public void testEmbeddedVariable() throws Exception { } @Test - public void testEmbeddedVariable_inside() throws Exception { + public void testEmbeddedVariable_inside() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); evaluator.add("salary", new Value(BigDecimal.class, new BigDecimal(10000))); @@ -343,7 +344,7 @@ public void testEmbeddedVariable_inside() throws Exception { } @Test - public void testEmbeddedVariable_emptyName() throws Exception { + public void testEmbeddedVariable_emptyName() { String testSql = "select * from aaa where ename = /*# */'aaa'"; SqlParser parser = new SqlParser(testSql); try { @@ -356,7 +357,7 @@ public void testEmbeddedVariable_emptyName() throws Exception { } @Test - public void testExpand() throws Exception { + public void testExpand() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); String testSql = "select /*%expand*/* from aaa"; SqlParser parser = new SqlParser(testSql); @@ -375,7 +376,7 @@ public void testExpand() throws Exception { } @Test - public void testExpand_withSpace() throws Exception { + public void testExpand_withSpace() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); String testSql = "select /*%expand */* from aaa"; SqlParser parser = new SqlParser(testSql); @@ -394,7 +395,7 @@ public void testExpand_withSpace() throws Exception { } @Test - public void testExpand_alias() throws Exception { + public void testExpand_alias() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); String testSql = "select /*%expand \"a\"*/* from aaa a"; SqlParser parser = new SqlParser(testSql); @@ -413,7 +414,7 @@ public void testExpand_alias() throws Exception { } @Test - public void testExpand_notAsteriskChar() throws Exception { + public void testExpand_notAsteriskChar() { String testSql = "select /*%expand*/+ from aaa"; SqlParser parser = new SqlParser(testSql); try { @@ -426,7 +427,7 @@ public void testExpand_notAsteriskChar() throws Exception { } @Test - public void testExpand_word() throws Exception { + public void testExpand_word() { String testSql = "select /*%expand*/'hoge' from aaa"; SqlParser parser = new SqlParser(testSql); try { @@ -439,7 +440,7 @@ public void testExpand_word() throws Exception { } @Test - public void testIf() throws Exception { + public void testIf() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); String testSql = "select * from aaa where /*%if name != null*/bbb = /*name*/'ccc' /*%end*/"; @@ -456,7 +457,7 @@ public void testIf() throws Exception { } @Test - public void testIf_fromClause() throws Exception { + public void testIf_fromClause() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("type", new Value(String.class, "a")); String testSql = "select * from /*%if type == \"a\"*/aaa/*%else*/ bbb/*%end*/"; @@ -471,7 +472,7 @@ public void testIf_fromClause() throws Exception { } @Test - public void testIf_selectClause() throws Exception { + public void testIf_selectClause() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("type", new Value(String.class, "a")); String testSql = "select /*%if type == \"a\"*/aaa /*%else*/ bbb /*%end*/from ccc"; @@ -486,7 +487,7 @@ public void testIf_selectClause() throws Exception { } @Test - public void testIf_removeWhere() throws Exception { + public void testIf_removeWhere() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, null)); String testSql = "select * from aaa where /*%if name != null*/bbb = /*name*/'ccc' /*%end*/"; @@ -502,7 +503,7 @@ public void testIf_removeWhere() throws Exception { } @Test - public void testIf_removeOrderBy() throws Exception { + public void testIf_removeOrderBy() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, null)); String testSql = "select * from aaa order by /*%if name != null*/bbb/*%end*/"; @@ -518,7 +519,7 @@ public void testIf_removeOrderBy() throws Exception { } @Test - public void testIf_removeGroupBy() throws Exception { + public void testIf_removeGroupBy() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, null)); String testSql = "select * from aaa group by /*%if name != null*/bbb/*%end*/"; @@ -534,7 +535,7 @@ public void testIf_removeGroupBy() throws Exception { } @Test - public void testIf_removeAnd() throws Exception { + public void testIf_removeAnd() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, null)); String testSql = @@ -551,7 +552,7 @@ public void testIf_removeAnd() throws Exception { } @Test - public void testIf_nest() throws Exception { + public void testIf_nest() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); String testSql = @@ -568,7 +569,7 @@ public void testIf_nest() throws Exception { } @Test - public void testIf_nestContinuously() throws Exception { + public void testIf_nestContinuously() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); evaluator.add("name2", new Value(String.class, null)); @@ -586,7 +587,7 @@ public void testIf_nestContinuously() throws Exception { } @Test - public void testElseifBlock() throws Exception { + public void testElseifBlock() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "")); String testSql = @@ -604,7 +605,7 @@ public void testElseifBlock() throws Exception { } @Test - public void testElseBlock() throws Exception { + public void testElseBlock() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); String testSql = @@ -622,7 +623,7 @@ public void testElseBlock() throws Exception { } @Test - public void testUnion() throws Exception { + public void testUnion() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); String testSql = "select * from aaa where /*%if false*//*%end*/union all select * from bbb"; SqlParser parser = new SqlParser(testSql); @@ -635,7 +636,7 @@ public void testUnion() throws Exception { } @Test - public void testSelect() throws Exception { + public void testSelect() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, "hoge")); evaluator.add("count", new Value(Integer.class, 5)); @@ -659,7 +660,7 @@ public void testSelect() throws Exception { } @Test - public void testUpdate() throws Exception { + public void testUpdate() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("no", new Value(Integer.class, 10)); evaluator.add("name", new Value(String.class, "hoge")); @@ -680,7 +681,7 @@ public void testUpdate() throws Exception { } @Test - public void testFor() throws Exception { + public void testFor() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); ArrayList list = new ArrayList<>(); list.add("aaa"); @@ -706,7 +707,7 @@ public void testFor() throws Exception { } @Test - public void testFor_array() throws Exception { + public void testFor_array() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); String[] array = new String[] {"aaa", "bbb", "ccc"}; evaluator.add("names", new Value(String[].class, array)); @@ -729,7 +730,7 @@ public void testFor_array() throws Exception { } @Test - public void testFor_removeWhere() throws Exception { + public void testFor_removeWhere() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); ArrayList list = new ArrayList<>(); evaluator.add("names", new Value(List.class, list)); @@ -747,7 +748,7 @@ public void testFor_removeWhere() throws Exception { } @Test - public void testFor_removeOrderBy() throws Exception { + public void testFor_removeOrderBy() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); ArrayList list = new ArrayList<>(); evaluator.add("names", new Value(List.class, list)); @@ -765,7 +766,7 @@ public void testFor_removeOrderBy() throws Exception { } @Test - public void testFor_removeGroupBy() throws Exception { + public void testFor_removeGroupBy() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); ArrayList list = new ArrayList<>(); evaluator.add("names", new Value(List.class, list)); @@ -783,7 +784,7 @@ public void testFor_removeGroupBy() throws Exception { } @Test - public void testFor_removeOr() throws Exception { + public void testFor_removeOr() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); ArrayList list = new ArrayList<>(); evaluator.add("names", new Value(List.class, list)); @@ -801,7 +802,7 @@ public void testFor_removeOr() throws Exception { } @Test - public void testFor_index() throws Exception { + public void testFor_index() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); ArrayList list = new ArrayList<>(); list.add("aaa"); @@ -827,7 +828,7 @@ public void testFor_index() throws Exception { } @Test - public void testValidate_ifEnd() throws Exception { + public void testValidate_ifEnd() { SqlParser parser = new SqlParser("select * from aaa /*%if true*/"); try { parser.parse(); @@ -839,7 +840,7 @@ public void testValidate_ifEnd() throws Exception { } @Test - public void testValidate_ifEnd_selectClause() throws Exception { + public void testValidate_ifEnd_selectClause() { SqlParser parser = new SqlParser("select /*%if true*/* from aaa"); try { parser.parse(); @@ -851,7 +852,7 @@ public void testValidate_ifEnd_selectClause() throws Exception { } @Test - public void testValidate_ifEnd_subquery() throws Exception { + public void testValidate_ifEnd_subquery() { SqlParser parser = new SqlParser("select *, (select /*%if true */ from aaa) x from aaa"); try { parser.parse(); @@ -863,7 +864,7 @@ public void testValidate_ifEnd_subquery() throws Exception { } @Test - public void testValidate_forEnd() throws Exception { + public void testValidate_forEnd() { SqlParser parser = new SqlParser("select * from aaa /*%for name : names*/"); try { parser.parse(); @@ -875,7 +876,7 @@ public void testValidate_forEnd() throws Exception { } @Test - public void testValidate_unclosedParens() throws Exception { + public void testValidate_unclosedParens() { SqlParser parser = new SqlParser("select * from (select * from bbb"); try { parser.parse(); @@ -887,13 +888,13 @@ public void testValidate_unclosedParens() throws Exception { } @Test - public void testValidate_enclosedParensByIfBlock() throws Exception { + public void testValidate_enclosedParensByIfBlock() { SqlParser parser = new SqlParser("select * from /*%if true*/(select * from bbb)/*%end*/"); parser.parse(); } @Test - public void testParens_removeAnd() throws Exception { + public void testParens_removeAnd() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); evaluator.add("name", new Value(String.class, null)); String testSql = @@ -910,7 +911,7 @@ public void testParens_removeAnd() throws Exception { } @Test - public void testEmptyParens() throws Exception { + public void testEmptyParens() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); SqlParser parser = new SqlParser("select rank()"); SqlNode sqlNode = parser.parse(); @@ -922,7 +923,7 @@ public void testEmptyParens() throws Exception { } @Test - public void testEmptyParens_whiteSpace() throws Exception { + public void testEmptyParens_whiteSpace() { ExpressionEvaluator evaluator = new ExpressionEvaluator(); SqlParser parser = new SqlParser("select rank( )"); SqlNode sqlNode = parser.parse(); @@ -934,7 +935,7 @@ public void testEmptyParens_whiteSpace() throws Exception { } @Test - public void testManyEol() throws Exception { + public void testManyEol() throws WrapException { String path = "META-INF/" + getClass().getName().replace('.', '/') + "/manyEol.sql"; String sql = ResourceUtil.getResourceAsString(path); SqlParser parser = new SqlParser(sql); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizerTest.java index 19e7d90d5..ca9389232 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizerTest.java @@ -48,18 +48,18 @@ public class SqlTokenizerTest { private String lineSeparator; @BeforeEach - protected void setUp() throws Exception { + protected void setUp() { lineSeparator = System.getProperty("line.separator"); System.setProperty("line.separator", "\r\n"); } @AfterEach - protected void tearDown() throws Exception { + protected void tearDown() { System.setProperty("line.separator", lineSeparator); } @Test - public void testEof() throws Exception { + public void testEof() { SqlTokenizer tokenizer = new SqlTokenizer("where"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -70,7 +70,7 @@ public void testEof() throws Exception { } @Test - public void testDelimiter() throws Exception { + public void testDelimiter() { SqlTokenizer tokenizer = new SqlTokenizer("where;"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -81,7 +81,7 @@ public void testDelimiter() throws Exception { } @Test - public void testLineComment() throws Exception { + public void testLineComment() { SqlTokenizer tokenizer = new SqlTokenizer("where--aaa\r\nbbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -96,7 +96,7 @@ public void testLineComment() throws Exception { } @Test - public void testBlockComment() throws Exception { + public void testBlockComment() { SqlTokenizer tokenizer = new SqlTokenizer("where /*+aaa*/bbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -111,7 +111,7 @@ public void testBlockComment() throws Exception { } @Test - public void testBlockComment_empty() throws Exception { + public void testBlockComment_empty() { SqlTokenizer tokenizer = new SqlTokenizer("where /**/bbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -126,7 +126,7 @@ public void testBlockComment_empty() throws Exception { } @Test - public void testQuote() throws Exception { + public void testQuote() { SqlTokenizer tokenizer = new SqlTokenizer("where 'aaa'"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -139,7 +139,7 @@ public void testQuote() throws Exception { } @Test - public void testQuote_escaped() throws Exception { + public void testQuote_escaped() { SqlTokenizer tokenizer = new SqlTokenizer("where 'aaa'''"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -152,7 +152,7 @@ public void testQuote_escaped() throws Exception { } @Test - public void testQuote_notClosed() throws Exception { + public void testQuote_notClosed() { SqlTokenizer tokenizer = new SqlTokenizer("where 'aaa"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -164,7 +164,7 @@ public void testQuote_notClosed() throws Exception { } @Test - public void testQuote_escaped_notClosed() throws Exception { + public void testQuote_escaped_notClosed() { SqlTokenizer tokenizer = new SqlTokenizer("where 'aaa''bbb''"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -176,7 +176,7 @@ public void testQuote_escaped_notClosed() throws Exception { } @Test - public void testUnion() throws Exception { + public void testUnion() { SqlTokenizer tokenizer = new SqlTokenizer("union"); assertEquals(UNION_WORD, tokenizer.next()); assertEquals("union", tokenizer.getToken()); @@ -185,7 +185,7 @@ public void testUnion() throws Exception { } @Test - public void testExcept() throws Exception { + public void testExcept() { SqlTokenizer tokenizer = new SqlTokenizer("except"); assertEquals(EXCEPT_WORD, tokenizer.next()); assertEquals("except", tokenizer.getToken()); @@ -194,7 +194,7 @@ public void testExcept() throws Exception { } @Test - public void testMinus() throws Exception { + public void testMinus() { SqlTokenizer tokenizer = new SqlTokenizer("minus"); assertEquals(MINUS_WORD, tokenizer.next()); assertEquals("minus", tokenizer.getToken()); @@ -203,7 +203,7 @@ public void testMinus() throws Exception { } @Test - public void testIntersect() throws Exception { + public void testIntersect() { SqlTokenizer tokenizer = new SqlTokenizer("intersect"); assertEquals(INTERSECT_WORD, tokenizer.next()); assertEquals("intersect", tokenizer.getToken()); @@ -212,7 +212,7 @@ public void testIntersect() throws Exception { } @Test - public void testSelect() throws Exception { + public void testSelect() { SqlTokenizer tokenizer = new SqlTokenizer("select"); assertEquals(SELECT_WORD, tokenizer.next()); assertEquals("select", tokenizer.getToken()); @@ -221,7 +221,7 @@ public void testSelect() throws Exception { } @Test - public void testFrom() throws Exception { + public void testFrom() { SqlTokenizer tokenizer = new SqlTokenizer("from"); assertEquals(FROM_WORD, tokenizer.next()); assertEquals("from", tokenizer.getToken()); @@ -230,7 +230,7 @@ public void testFrom() throws Exception { } @Test - public void testWhere() throws Exception { + public void testWhere() { SqlTokenizer tokenizer = new SqlTokenizer("where"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -239,7 +239,7 @@ public void testWhere() throws Exception { } @Test - public void testGroupBy() throws Exception { + public void testGroupBy() { SqlTokenizer tokenizer = new SqlTokenizer("group by"); assertEquals(GROUP_BY_WORD, tokenizer.next()); assertEquals("group by", tokenizer.getToken()); @@ -248,7 +248,7 @@ public void testGroupBy() throws Exception { } @Test - public void testHaving() throws Exception { + public void testHaving() { SqlTokenizer tokenizer = new SqlTokenizer("having"); assertEquals(HAVING_WORD, tokenizer.next()); assertEquals("having", tokenizer.getToken()); @@ -257,7 +257,7 @@ public void testHaving() throws Exception { } @Test - public void testOrderBy() throws Exception { + public void testOrderBy() { SqlTokenizer tokenizer = new SqlTokenizer("order by"); assertEquals(ORDER_BY_WORD, tokenizer.next()); assertEquals("order by", tokenizer.getToken()); @@ -266,7 +266,7 @@ public void testOrderBy() throws Exception { } @Test - public void testForUpdateBy() throws Exception { + public void testForUpdateBy() { SqlTokenizer tokenizer = new SqlTokenizer("for update"); assertEquals(FOR_UPDATE_WORD, tokenizer.next()); assertEquals("for update", tokenizer.getToken()); @@ -275,7 +275,7 @@ public void testForUpdateBy() throws Exception { } @Test - public void testOption() throws Exception { + public void testOption() { SqlTokenizer tokenizer = new SqlTokenizer("option ("); assertEquals(OPTION_WORD, tokenizer.next()); assertEquals("option", tokenizer.getToken()); @@ -288,7 +288,7 @@ public void testOption() throws Exception { } @Test - public void testUpdate() throws Exception { + public void testUpdate() { SqlTokenizer tokenizer = new SqlTokenizer("update"); assertEquals(UPDATE_WORD, tokenizer.next()); assertEquals("update", tokenizer.getToken()); @@ -297,7 +297,7 @@ public void testUpdate() throws Exception { } @Test - public void testSet() throws Exception { + public void testSet() { SqlTokenizer tokenizer = new SqlTokenizer("set"); assertEquals(SET_WORD, tokenizer.next()); assertEquals("set", tokenizer.getToken()); @@ -306,7 +306,7 @@ public void testSet() throws Exception { } @Test - public void testAnd() throws Exception { + public void testAnd() { SqlTokenizer tokenizer = new SqlTokenizer("and"); assertEquals(AND_WORD, tokenizer.next()); assertEquals("and", tokenizer.getToken()); @@ -315,7 +315,7 @@ public void testAnd() throws Exception { } @Test - public void testOr() throws Exception { + public void testOr() { SqlTokenizer tokenizer = new SqlTokenizer("or"); assertEquals(OR_WORD, tokenizer.next()); assertEquals("or", tokenizer.getToken()); @@ -324,7 +324,7 @@ public void testOr() throws Exception { } @Test - public void testBindBlockComment() throws Exception { + public void testBindBlockComment() { SqlTokenizer tokenizer = new SqlTokenizer("where /*aaa*/bbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -339,7 +339,7 @@ public void testBindBlockComment() throws Exception { } @Test - public void testBindBlockComment_followingQuote() throws Exception { + public void testBindBlockComment_followingQuote() { SqlTokenizer tokenizer = new SqlTokenizer("where /*aaa*/'2001-01-01 12:34:56'"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -354,7 +354,7 @@ public void testBindBlockComment_followingQuote() throws Exception { } @Test - public void testBindBlockComment_followingWordAndQuote() throws Exception { + public void testBindBlockComment_followingWordAndQuote() { SqlTokenizer tokenizer = new SqlTokenizer("where /*aaa*/timestamp'2001-01-01 12:34:56' and"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -373,7 +373,7 @@ public void testBindBlockComment_followingWordAndQuote() throws Exception { } @Test - public void testBindBlockComment_spaceIncluded() throws Exception { + public void testBindBlockComment_spaceIncluded() { SqlTokenizer tokenizer = new SqlTokenizer("where /* aaa */bbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -388,7 +388,7 @@ public void testBindBlockComment_spaceIncluded() throws Exception { } @Test - public void testBindBlockComment_startWithStringLiteral() throws Exception { + public void testBindBlockComment_startWithStringLiteral() { SqlTokenizer tokenizer = new SqlTokenizer("where /*\"aaa\"*/bbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -403,7 +403,7 @@ public void testBindBlockComment_startWithStringLiteral() throws Exception { } @Test - public void testBindBlockComment_startWithCharLiteral() throws Exception { + public void testBindBlockComment_startWithCharLiteral() { SqlTokenizer tokenizer = new SqlTokenizer("where /*'a'*/bbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -418,7 +418,7 @@ public void testBindBlockComment_startWithCharLiteral() throws Exception { } @Test - public void testLiteralBlockComment() throws Exception { + public void testLiteralBlockComment() { SqlTokenizer tokenizer = new SqlTokenizer("where /*^aaa*/bbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -433,7 +433,7 @@ public void testLiteralBlockComment() throws Exception { } @Test - public void testLiteralBlockComment_followingQuote() throws Exception { + public void testLiteralBlockComment_followingQuote() { SqlTokenizer tokenizer = new SqlTokenizer("where /*^aaa*/'2001-01-01 12:34:56'"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -448,7 +448,7 @@ public void testLiteralBlockComment_followingQuote() throws Exception { } @Test - public void testLiteralBlockComment_spaceIncluded() throws Exception { + public void testLiteralBlockComment_spaceIncluded() { SqlTokenizer tokenizer = new SqlTokenizer("where /*^ aaa */bbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -463,7 +463,7 @@ public void testLiteralBlockComment_spaceIncluded() throws Exception { } @Test - public void testIfBlockComment() throws Exception { + public void testIfBlockComment() { SqlTokenizer tokenizer = new SqlTokenizer("where /*%if true*/bbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -478,7 +478,7 @@ public void testIfBlockComment() throws Exception { } @Test - public void testForBlockComment() throws Exception { + public void testForBlockComment() { SqlTokenizer tokenizer = new SqlTokenizer("where /*%for element : list*/bbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -493,7 +493,7 @@ public void testForBlockComment() throws Exception { } @Test - public void testEndBlockComment() throws Exception { + public void testEndBlockComment() { SqlTokenizer tokenizer = new SqlTokenizer("where bbb/*%end*/"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); @@ -508,7 +508,7 @@ public void testEndBlockComment() throws Exception { } @Test - public void testExpandBlockComment() throws Exception { + public void testExpandBlockComment() { SqlTokenizer tokenizer = new SqlTokenizer("select /*%expand*/* from"); assertEquals(SELECT_WORD, tokenizer.next()); assertEquals("select", tokenizer.getToken()); @@ -527,7 +527,7 @@ public void testExpandBlockComment() throws Exception { } @Test - public void testExpandBlockComment_alias() throws Exception { + public void testExpandBlockComment_alias() { SqlTokenizer tokenizer = new SqlTokenizer("select /*%expand e*/* from"); assertEquals(SELECT_WORD, tokenizer.next()); assertEquals("select", tokenizer.getToken()); @@ -546,7 +546,7 @@ public void testExpandBlockComment_alias() throws Exception { } @Test - public void testPopulateBlockComment() throws Exception { + public void testPopulateBlockComment() { SqlTokenizer tokenizer = new SqlTokenizer("set /*%populate*/ id = id"); assertEquals(SET_WORD, tokenizer.next()); assertEquals("set", tokenizer.getToken()); @@ -571,7 +571,7 @@ public void testPopulateBlockComment() throws Exception { } @Test - public void testLineNumber() throws Exception { + public void testLineNumber() { SqlTokenizer tokenizer = new SqlTokenizer("aaa\nbbb\nccc\n/* \nddd\n */"); assertEquals(1, tokenizer.getLineNumber()); assertEquals(WORD, tokenizer.next()); @@ -600,7 +600,7 @@ public void testLineNumber() throws Exception { } @Test - public void testColumnNumber() throws Exception { + public void testColumnNumber() { SqlTokenizer tokenizer = new SqlTokenizer("aaa bbb\nc\nd eee\n"); assertEquals(0, tokenizer.getPosition()); assertEquals(WORD, tokenizer.next()); @@ -638,7 +638,7 @@ public void testColumnNumber() throws Exception { } @Test - public void testIllegalDirective() throws Exception { + public void testIllegalDirective() { SqlTokenizer tokenizer = new SqlTokenizer("where /*%*/bbb"); assertEquals(WHERE_WORD, tokenizer.next()); assertEquals("where", tokenizer.getToken()); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/util/DatabaseObjectUtilTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/util/DatabaseObjectUtilTest.java index ebda1b3ee..2c085fc2a 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/util/DatabaseObjectUtilTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/util/DatabaseObjectUtilTest.java @@ -7,25 +7,25 @@ public class DatabaseObjectUtilTest { @Test - public void testGetQualifiedName() throws Exception { + public void testGetQualifiedName() { String name = DatabaseObjectUtil.getQualifiedName(s -> "[" + s + "]", "aaa", "bbb", "ccc"); assertEquals("[aaa].[bbb].[ccc]", name); } @Test - public void testGetQualifiedName_catalogIsNull() throws Exception { + public void testGetQualifiedName_catalogIsNull() { String name = DatabaseObjectUtil.getQualifiedName(s -> "[" + s + "]", null, "bbb", "ccc"); assertEquals("[bbb].[ccc]", name); } @Test - public void testGetQualifiedName_schemaIsNull() throws Exception { + public void testGetQualifiedName_schemaIsNull() { String name = DatabaseObjectUtil.getQualifiedName(s -> "[" + s + "]", "aaa", null, "ccc"); assertEquals("[aaa].[ccc]", name); } @Test - public void testGetQualifiedName_catalogAndSchemaIsNull() throws Exception { + public void testGetQualifiedName_catalogAndSchemaIsNull() { String name = DatabaseObjectUtil.getQualifiedName(s -> "[" + s + "]", null, null, "ccc"); assertEquals("[ccc]", name); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/util/CharSequenceUtilTest.java b/doma-core/src/test/java/org/seasar/doma/internal/util/CharSequenceUtilTest.java index 3509bccc6..a23eef9d5 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/util/CharSequenceUtilTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/util/CharSequenceUtilTest.java @@ -8,7 +8,7 @@ public class CharSequenceUtilTest { @Test - public void testIsEmpty() throws Exception { + public void testIsEmpty() { assertTrue(CharSequenceUtil.isEmpty(null)); assertTrue(CharSequenceUtil.isEmpty("")); assertFalse(CharSequenceUtil.isEmpty(" ")); @@ -18,7 +18,7 @@ public void testIsEmpty() throws Exception { } @Test - public void testIsNotEmpty() throws Exception { + public void testIsNotEmpty() { assertFalse(CharSequenceUtil.isNotEmpty(null)); assertFalse(CharSequenceUtil.isNotEmpty("")); assertTrue(CharSequenceUtil.isNotEmpty(" ")); @@ -28,7 +28,7 @@ public void testIsNotEmpty() throws Exception { } @Test - public void testIsBlank() throws Exception { + public void testIsBlank() { assertTrue(CharSequenceUtil.isBlank(null)); assertTrue(CharSequenceUtil.isBlank("")); assertTrue(CharSequenceUtil.isBlank(" ")); @@ -38,7 +38,7 @@ public void testIsBlank() throws Exception { } @Test - public void testIsNotBlank() throws Exception { + public void testIsNotBlank() { assertFalse(CharSequenceUtil.isNotBlank(null)); assertFalse(CharSequenceUtil.isNotBlank("")); assertFalse(CharSequenceUtil.isNotBlank(" ")); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/util/ClassUtilTest.java b/doma-core/src/test/java/org/seasar/doma/internal/util/ClassUtilTest.java index b69560999..172e6f0b1 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/util/ClassUtilTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/util/ClassUtilTest.java @@ -28,19 +28,19 @@ public void testGetDeclaredField() throws Exception { } @Test - public void testGetSimpleName() throws Exception { + public void testGetSimpleName() { String name = ClassUtil.getSimpleName("aaa.bbb.Ccc"); assertEquals("Ccc", name); } @Test - public void testGetSimpleName_noPackage() throws Exception { + public void testGetSimpleName_noPackage() { String name = ClassUtil.getSimpleName("Aaa"); assertEquals("Aaa", name); } @Test - public void testGetSimpleName_nestedClass() throws Exception { + public void testGetSimpleName_nestedClass() { String name = ClassUtil.getSimpleName("aaa.bbb.Ccc$Ddd$Eee"); assertEquals("Eee", name); } @@ -66,7 +66,7 @@ public void testGetEnclosingNames_nestedClass() { } @Test - public void testTraverse() throws Exception { + public void testTraverse() { List> list = new ArrayList<>(); ClassUtil.traverse( Ccc.class, diff --git a/doma-core/src/test/java/org/seasar/doma/internal/util/IOUtilTest.java b/doma-core/src/test/java/org/seasar/doma/internal/util/IOUtilTest.java index bb3619e43..6c479d599 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/util/IOUtilTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/util/IOUtilTest.java @@ -10,7 +10,7 @@ public class IOUtilTest { @Test - public void test() throws Exception { + public void test() { IOUtil.close( () -> { throw new IOException(); @@ -18,14 +18,14 @@ public void test() throws Exception { } @Test - public void testEndWith_true() throws Exception { + public void testEndWith_true() { File file = new File("/fuga/META-INF/piyo/HogeDao/selectById.sql"); String pathname = "META-INF/piyo/HogeDao/selectById.sql"; assertTrue(IOUtil.endsWith(file, pathname)); } @Test - public void testEndWith_false() throws Exception { + public void testEndWith_false() { File file = new File("/fuga/META-INF/piyo/hogeDao/selectById.sql"); String pathname = "META-INF/piyo/HogeDao/selectById.sql"; assertFalse(IOUtil.endsWith(file, pathname)); diff --git a/doma-core/src/test/java/org/seasar/doma/internal/util/ResourceUtilTest.java b/doma-core/src/test/java/org/seasar/doma/internal/util/ResourceUtilTest.java index 269445d4b..89e3bd740 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/util/ResourceUtilTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/util/ResourceUtilTest.java @@ -10,14 +10,14 @@ public class ResourceUtilTest { @Test - public void testGetResourceAsStream() throws Exception { + public void testGetResourceAsStream() { String path = getClass().getName().replace(".", "/") + ".txt"; InputStream inputStream = ResourceUtil.getResourceAsStream(path); assertNotNull(inputStream); } @Test - public void testGetResourceAsStream_nonexistentPath() throws Exception { + public void testGetResourceAsStream_nonexistentPath() { InputStream inputStream = ResourceUtil.getResourceAsStream("nonexistentPath"); assertNull(inputStream); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/util/SqlFileUtilTest.java b/doma-core/src/test/java/org/seasar/doma/internal/util/SqlFileUtilTest.java index cae43ebf5..67c652dd4 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/util/SqlFileUtilTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/util/SqlFileUtilTest.java @@ -8,13 +8,13 @@ public class SqlFileUtilTest { @Test - public void testBuildPath() throws Exception { + public void testBuildPath() { String path = SqlFileUtil.buildPath("aaa.bbb.Ccc", "ddd"); assertEquals("META-INF/aaa/bbb/Ccc/ddd.sql", path); } @Test - public void testBuildPath_defaultPackage() throws Exception { + public void testBuildPath_defaultPackage() { String path = SqlFileUtil.buildPath("Ccc", "ddd"); assertEquals("META-INF/Ccc/ddd.sql", path); } diff --git a/doma-core/src/test/java/org/seasar/doma/internal/util/StringUtilTest.java b/doma-core/src/test/java/org/seasar/doma/internal/util/StringUtilTest.java index b5bbb7ca3..a07c477b4 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/util/StringUtilTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/util/StringUtilTest.java @@ -9,17 +9,17 @@ public class StringUtilTest { @Test - public void testCapitalize() throws Exception { + public void testCapitalize() { assertEquals("Aaa", StringUtil.capitalize("aaa")); } @Test - public void testDecapitalize() throws Exception { + public void testDecapitalize() { assertEquals("aAA", StringUtil.decapitalize("AAA")); } @Test - public void testFromSnakeCaseToCamelCase() throws Exception { + public void testFromSnakeCaseToCamelCase() { assertEquals("aaaBbbCcc", StringUtil.fromSnakeCaseToCamelCase("AAA_BBB_CCC")); assertEquals("aaaBbbCcc", StringUtil.fromSnakeCaseToCamelCase("aaa_bbb_ccc")); assertEquals("abc", StringUtil.fromSnakeCaseToCamelCase("ABC")); @@ -27,21 +27,21 @@ public void testFromSnakeCaseToCamelCase() throws Exception { } @Test - public void testFromCamelCaseToSnakeCase() throws Exception { + public void testFromCamelCaseToSnakeCase() { assertEquals("aaa_bbb_ccc", StringUtil.fromCamelCaseToSnakeCase("aaaBbbCcc")); assertEquals("abc", StringUtil.fromCamelCaseToSnakeCase("abc")); assertEquals("aa1_bbb_ccc", StringUtil.fromCamelCaseToSnakeCase("aa1BbbCcc")); } @Test - public void testFromCamelCaseToSnakeCaseWithLenient() throws Exception { + public void testFromCamelCaseToSnakeCaseWithLenient() { assertEquals("aaa_bbb_ccc", StringUtil.fromCamelCaseToSnakeCaseWithLenient("aaaBbbCcc")); assertEquals("abc", StringUtil.fromCamelCaseToSnakeCaseWithLenient("abc")); assertEquals("aa1bbb_ccc", StringUtil.fromCamelCaseToSnakeCaseWithLenient("aa1BbbCcc")); } @Test - public void testIsWhitespace() throws Exception { + public void testIsWhitespace() { assertFalse(StringUtil.isWhitespace("")); assertTrue(StringUtil.isWhitespace(" ")); assertTrue(StringUtil.isWhitespace(" ")); @@ -49,7 +49,7 @@ public void testIsWhitespace() throws Exception { } @Test - public void testTrimWhitespace() throws Exception { + public void testTrimWhitespace() { assertEquals("aaa", StringUtil.trimWhitespace(" aaa ")); assertEquals("aaa", StringUtil.trimWhitespace("aaa ")); assertEquals("aaa", StringUtil.trimWhitespace("\raaa\n\t")); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/AbstractSqlFileRepositoryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/AbstractSqlFileRepositoryTest.java index 738d82d4e..72444bccb 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/AbstractSqlFileRepositoryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/AbstractSqlFileRepositoryTest.java @@ -15,7 +15,7 @@ public class AbstractSqlFileRepositoryTest { @Test - public void testGetSqlFile(TestInfo testInfo) throws Exception { + public void testGetSqlFile(TestInfo testInfo) { SqlFileRepository repository = new MySqlFileRepository(); Method method = testInfo.getTestMethod().get(); String path = String.format("META-INF/%s.sql", getClass().getName().replace(".", "/")); @@ -25,7 +25,7 @@ public void testGetSqlFile(TestInfo testInfo) throws Exception { } @Test - public void testGetSqlFile_illegalPath(TestInfo testInfo) throws Exception { + public void testGetSqlFile_illegalPath(TestInfo testInfo) { SqlFileRepository repository = new MySqlFileRepository(); Method method = testInfo.getTestMethod().get(); String path = method.getName(); @@ -39,7 +39,7 @@ public void testGetSqlFile_illegalPath(TestInfo testInfo) throws Exception { @Sql("select * from address") @Test - public void testGetSqlFile_SqlAnnotation(TestInfo testInfo) throws Exception { + public void testGetSqlFile_SqlAnnotation(TestInfo testInfo) { SqlFileRepository repository = new MySqlFileRepository(); Method method = testInfo.getTestMethod().get(); String path = method.getName(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/BatchOptimisticLockExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/BatchOptimisticLockExceptionTest.java index 91d92da32..2e0495171 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/BatchOptimisticLockExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/BatchOptimisticLockExceptionTest.java @@ -9,7 +9,7 @@ public class BatchOptimisticLockExceptionTest { @Test - public void test() throws Exception { + public void test() { BatchOptimisticLockException e = new BatchOptimisticLockException(SqlLogType.FORMATTED, SqlKind.UPDATE, "aaa", "bbb"); System.out.println(e.getMessage()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/BatchSqlExecutionExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/BatchSqlExecutionExceptionTest.java index 9f10cf56b..a1a5592f6 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/BatchSqlExecutionExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/BatchSqlExecutionExceptionTest.java @@ -10,7 +10,7 @@ public class BatchSqlExecutionExceptionTest { @Test - public void test() throws Exception { + public void test() { BatchSqlExecutionException e = new BatchSqlExecutionException( SqlLogType.FORMATTED, diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/BatchUniqueConstraintExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/BatchUniqueConstraintExceptionTest.java index 6ae2bf9a4..f337716f2 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/BatchUniqueConstraintExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/BatchUniqueConstraintExceptionTest.java @@ -9,7 +9,7 @@ public class BatchUniqueConstraintExceptionTest { @Test - public void test() throws Exception { + public void test() { BatchUniqueConstraintException e = new BatchUniqueConstraintException( SqlLogType.FORMATTED, SqlKind.UPDATE, "aaa", "bbb", new Exception()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/CallerCommenterTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/CallerCommenterTest.java index 8317eaa38..2bbd86005 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/CallerCommenterTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/CallerCommenterTest.java @@ -10,7 +10,7 @@ public class CallerCommenterTest { private final CallerCommenter commenter = new CallerCommenter(); @Test - public void testComment() throws Exception { + public void testComment() { CommentContext context = new CommentContext("class", "method", new MockConfig(), null, null); String actual = commenter.comment("select * from emp", context); assertEquals("/** class.method */" + System.lineSeparator() + "select * from emp", actual); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigExceptionTest.java index 29e4a9307..65b44d927 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigExceptionTest.java @@ -7,7 +7,7 @@ public class ConfigExceptionTest { @Test - public void test() throws Exception { + public void test() { ConfigException e = new ConfigException("aaa", "bbb"); System.out.println(e.getMessage()); assertEquals("aaa", e.getClassName()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigTest.java index e53ebfa14..6db64f261 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/ConfigTest.java @@ -10,13 +10,13 @@ public class ConfigTest { @Test - public void testGet() throws Exception { + public void testGet() { Config config = Config.get(new Provider()); assertNotNull(config); } @Test - public void testGet_IllegalArgument() throws Exception { + public void testGet_IllegalArgument() { try { Config.get("hoge"); fail(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/DaoMethodNotFoundExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/DaoMethodNotFoundExceptionTest.java index e57980060..dc5f105e0 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/DaoMethodNotFoundExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/DaoMethodNotFoundExceptionTest.java @@ -8,7 +8,7 @@ public class DaoMethodNotFoundExceptionTest { @Test - public void test() throws Exception { + public void test() { Exception cause = new Exception("hoge"); DaoMethodNotFoundException e = new DaoMethodNotFoundException(cause, "aaa", "bbb"); System.out.println(e.getMessage()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/GreedyCacheSqlFileRepositoryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/GreedyCacheSqlFileRepositoryTest.java index 129222042..e9dbf765f 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/GreedyCacheSqlFileRepositoryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/GreedyCacheSqlFileRepositoryTest.java @@ -19,12 +19,12 @@ public class GreedyCacheSqlFileRepositoryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testGetSqlFile() throws Exception { + public void testGetSqlFile() { StandardDialect dialect = new StandardDialect(); String path = "META-INF/" + getClass().getName().replace(".", "/") + ".sql"; GreedyCacheSqlFileRepository repository = new GreedyCacheSqlFileRepository(); @@ -36,7 +36,7 @@ public void testGetSqlFile() throws Exception { } @Test - public void testGetSqlFile_oracle() throws Exception { + public void testGetSqlFile_oracle() { OracleDialect dialect = new OracleDialect(); String path = "META-INF/" + getClass().getName().replace(".", "/") + ".sql"; GreedyCacheSqlFileRepository repository = new GreedyCacheSqlFileRepository(); @@ -46,7 +46,7 @@ public void testGetSqlFile_oracle() throws Exception { } @Test - public void testGetSqlFile_postgres() throws Exception { + public void testGetSqlFile_postgres() { PostgresDialect dialect = new PostgresDialect(); String path = "META-INF/" + getClass().getName().replace(".", "/") + ".sql"; GreedyCacheSqlFileRepository repository = new GreedyCacheSqlFileRepository(); @@ -55,7 +55,7 @@ public void testGetSqlFile_postgres() throws Exception { } @Test - public void testClearCache() throws Exception { + public void testClearCache() { StandardDialect dialect = new StandardDialect(); String path = "META-INF/" + getClass().getName().replace(".", "/") + ".sql"; GreedyCacheSqlFileRepository repository = new GreedyCacheSqlFileRepository(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcExceptionTest.java index c72ac5f07..4dde65917 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcExceptionTest.java @@ -26,12 +26,12 @@ public class JdbcExceptionTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testSqlFileNotFound() throws Exception { + public void testSqlFileNotFound() { GreedyCacheSqlFileRepository repository = new GreedyCacheSqlFileRepository(); try { repository.getSqlFile(method, "META-INF/aaa/bbb.sql", new StandardDialect()); @@ -43,7 +43,7 @@ public void testSqlFileNotFound() throws Exception { } @Test - public void testQuotationNotClosed() throws Exception { + public void testQuotationNotClosed() { SqlParser parser = new SqlParser("select * from 'aaa"); try { parser.parse(); @@ -55,7 +55,7 @@ public void testQuotationNotClosed() throws Exception { } @Test - public void testBlockCommentNotClosed() throws Exception { + public void testBlockCommentNotClosed() { SqlParser parser = new SqlParser("select * from aaa /*aaa"); try { parser.parse(); @@ -67,7 +67,7 @@ public void testBlockCommentNotClosed() throws Exception { } @Test - public void testIfCommentNotFoundForEndComment() throws Exception { + public void testIfCommentNotFoundForEndComment() { SqlParser parser = new SqlParser("select * from aaa/*%end*/ "); try { parser.parse(); @@ -79,7 +79,7 @@ public void testIfCommentNotFoundForEndComment() throws Exception { } @Test - public void testIfCommentNotFoundForSecondEndComment() throws Exception { + public void testIfCommentNotFoundForSecondEndComment() { SqlParser parser = new SqlParser("select * from aaa where/*%if true*//*%end*/ /*%end*/"); try { parser.parse(); @@ -91,7 +91,7 @@ public void testIfCommentNotFoundForSecondEndComment() throws Exception { } @Test - public void testOpenedParensNotFound() throws Exception { + public void testOpenedParensNotFound() { SqlParser parser = new SqlParser("select * from aaa where )"); try { parser.parse(); @@ -103,7 +103,7 @@ public void testOpenedParensNotFound() throws Exception { } @Test - public void testTestLiteralNotFound() throws Exception { + public void testTestLiteralNotFound() { SqlParser parser = new SqlParser("select * from aaa where bbb = /*bbb*/ 'ccc')"); try { parser.parse(); @@ -115,7 +115,7 @@ public void testTestLiteralNotFound() throws Exception { } @Test - public void testSqlBuildingFailed() throws Exception { + public void testSqlBuildingFailed() { SqlParser parser = new SqlParser("select * from aaa where bbb = \n/*bbb*/'ccc'"); SqlNode sqlNode = parser.parse(); NodePreparedSqlBuilder builder = @@ -130,7 +130,7 @@ public void testSqlBuildingFailed() throws Exception { } @Test - public void testBindValueTypeNotIterable() throws Exception { + public void testBindValueTypeNotIterable() { SqlParser parser = new SqlParser("select * from aaa where bbb in /*bbb*/(1,2,3)"); SqlNode sqlNode = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); @@ -148,7 +148,7 @@ public void testBindValueTypeNotIterable() throws Exception { } @Test - public void testCollectionOfBindValueContainsNull() throws Exception { + public void testCollectionOfBindValueContainsNull() { SqlParser parser = new SqlParser("select * from aaa where bbb in /*bbb*/(1,2,3)"); SqlNode sqlNode = parser.parse(); ExpressionEvaluator evaluator = new ExpressionEvaluator(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcUnsupportedOperationExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcUnsupportedOperationExceptionTest.java index 0cedaa40b..8444a3a21 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcUnsupportedOperationExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/JdbcUnsupportedOperationExceptionTest.java @@ -7,7 +7,7 @@ public class JdbcUnsupportedOperationExceptionTest { @Test - public void test() throws Exception { + public void test() { JdbcUnsupportedOperationException e = new JdbcUnsupportedOperationException("aaa", "bbb"); System.out.println(e.getMessage()); assertEquals("aaa", e.getClassName()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/NamingTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/NamingTest.java index b9fc36119..37a870512 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/NamingTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/NamingTest.java @@ -8,7 +8,7 @@ public class NamingTest { @Test - public void testNONE() throws Exception { + public void testNONE() { Naming naming = Naming.NONE; assertEquals("hogeFoo", naming.apply(null, "hogeFoo")); @@ -19,7 +19,7 @@ public void testNONE() throws Exception { } @Test - public void testSNAKE_UPPER_CASE() throws Exception { + public void testSNAKE_UPPER_CASE() { Naming naming = Naming.SNAKE_UPPER_CASE; assertEquals("HOGE_FOO", naming.apply(null, "hogeFoo")); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/NonSingleColumnExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/NonSingleColumnExceptionTest.java index 4b57481a9..84a6a2d48 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/NonSingleColumnExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/NonSingleColumnExceptionTest.java @@ -8,7 +8,7 @@ public class NonSingleColumnExceptionTest { @Test - public void test() throws Exception { + public void test() { NonSingleColumnException e = new NonSingleColumnException(SqlLogType.FORMATTED, SqlKind.SELECT, "aaa", "bbb", "ccc"); System.out.println(e.getMessage()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/NonUniqueResultExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/NonUniqueResultExceptionTest.java index 779e060ac..be20c748c 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/NonUniqueResultExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/NonUniqueResultExceptionTest.java @@ -8,7 +8,7 @@ public class NonUniqueResultExceptionTest { @Test - public void test() throws Exception { + public void test() { NonUniqueResultException e = new NonUniqueResultException(SqlLogType.FORMATTED, SqlKind.SELECT, "aaa", "bbb", "ccc"); System.out.println(e.getMessage()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/OptimisticLockExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/OptimisticLockExceptionTest.java index e5f5c1942..0c760f79f 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/OptimisticLockExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/OptimisticLockExceptionTest.java @@ -8,7 +8,7 @@ public class OptimisticLockExceptionTest { @Test - public void test() throws Exception { + public void test() { OptimisticLockException e = new OptimisticLockException(SqlLogType.FORMATTED, SqlKind.UPDATE, "aaa", "bbb", "ccc"); System.out.println(e.getMessage()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/ResultMappingExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/ResultMappingExceptionTest.java index 55b8eba73..cca066c11 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/ResultMappingExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/ResultMappingExceptionTest.java @@ -10,7 +10,7 @@ public class ResultMappingExceptionTest { @Test - public void test() throws Exception { + public void test() { ResultMappingException e = new ResultMappingException( SqlLogType.FORMATTED, diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/SelectOptionsTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/SelectOptionsTest.java index 1582730f8..90df0956c 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/SelectOptionsTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/SelectOptionsTest.java @@ -12,7 +12,7 @@ public class SelectOptionsTest { @SuppressWarnings("ConstantConditions") @Test - public void testForUpdateParameter() throws Exception { + public void testForUpdateParameter() { String[] aliases = null; try { SelectOptions.get().forUpdate(aliases); @@ -24,7 +24,7 @@ public void testForUpdateParameter() throws Exception { @SuppressWarnings("ConstantConditions") @Test - public void testForUpdateNowaitParameter() throws Exception { + public void testForUpdateNowaitParameter() { String[] aliases = null; try { SelectOptions.get().forUpdateNowait(aliases); @@ -35,7 +35,7 @@ public void testForUpdateNowaitParameter() throws Exception { } @Test - public void testForUpdateWaitParameter1() throws Exception { + public void testForUpdateWaitParameter1() { int waitSeconds = -1; try { SelectOptions.get().forUpdateWait(waitSeconds); @@ -47,7 +47,7 @@ public void testForUpdateWaitParameter1() throws Exception { } @Test - public void testForUpdateWaitParameter2() throws Exception { + public void testForUpdateWaitParameter2() { int waitSeconds = -1; String[] aliases = {"a"}; try { @@ -61,7 +61,7 @@ public void testForUpdateWaitParameter2() throws Exception { @SuppressWarnings("ConstantConditions") @Test - public void testForUpdateWaitParameter3() throws Exception { + public void testForUpdateWaitParameter3() { int waitSeconds = 1; String[] aliases = null; try { @@ -73,7 +73,7 @@ public void testForUpdateWaitParameter3() throws Exception { } @Test - public void testOffsetParameter() throws Exception { + public void testOffsetParameter() { int offset = -1; try { SelectOptions.get().offset(offset); @@ -85,7 +85,7 @@ public void testOffsetParameter() throws Exception { } @Test - public void testLimitParameter() throws Exception { + public void testLimitParameter() { int limit = -1; try { SelectOptions.get().limit(limit); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/SimpleDataSourceTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/SimpleDataSourceTest.java index b8a8d76be..0d9802db2 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/SimpleDataSourceTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/SimpleDataSourceTest.java @@ -12,7 +12,7 @@ public class SimpleDataSourceTest { @Test - public void testUrlIsNull() throws Exception { + public void testUrlIsNull() { SimpleDataSource dataSource = new SimpleDataSource(); dataSource.setUser("user"); dataSource.setPassword("password"); @@ -25,7 +25,7 @@ public void testUrlIsNull() throws Exception { } @Test - public void testNoSuitableDriverFound() throws Exception { + public void testNoSuitableDriverFound() { SimpleDataSource dataSource = new SimpleDataSource(); dataSource.setUser("user"); dataSource.setPassword("password"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/SqlExecutionExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/SqlExecutionExceptionTest.java index 88b5fd641..824d8533f 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/SqlExecutionExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/SqlExecutionExceptionTest.java @@ -9,7 +9,7 @@ public class SqlExecutionExceptionTest { @Test - public void test() throws Exception { + public void test() { SqlExecutionException e = new SqlExecutionException( SqlLogType.FORMATTED, diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/SqlFileNotFoundExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/SqlFileNotFoundExceptionTest.java index 160cb750f..07cda218a 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/SqlFileNotFoundExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/SqlFileNotFoundExceptionTest.java @@ -7,7 +7,7 @@ public class SqlFileNotFoundExceptionTest { @Test - public void test() throws Exception { + public void test() { SqlFileNotFoundException e = new SqlFileNotFoundException("aaa"); assertEquals("aaa", e.getPath()); System.out.println(e.getMessage()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/UniqueConstraintExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/UniqueConstraintExceptionTest.java index 7bc35dd10..a33f77793 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/UniqueConstraintExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/UniqueConstraintExceptionTest.java @@ -8,7 +8,7 @@ public class UniqueConstraintExceptionTest { @Test - public void test() throws Exception { + public void test() { Exception cause = new Exception(); UniqueConstraintException e = new UniqueConstraintException( diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/UnknownColumnExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/UnknownColumnExceptionTest.java index e3551fd1d..ee000c008 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/UnknownColumnExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/UnknownColumnExceptionTest.java @@ -8,7 +8,7 @@ public class UnknownColumnExceptionTest { @Test - public void test() throws Exception { + public void test() { UnknownColumnException e = new UnknownColumnException( SqlLogType.FORMATTED, "aaa", "bbb", "ccc", SqlKind.SELECT, "ddd", "eee", "fff"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/UtilLoggingJdbcLoggerTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/UtilLoggingJdbcLoggerTest.java index f59af4c70..14d915333 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/UtilLoggingJdbcLoggerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/UtilLoggingJdbcLoggerTest.java @@ -6,7 +6,7 @@ public class UtilLoggingJdbcLoggerTest { @Test - public void testLogSql() throws Exception { + public void testLogSql() { PreparedSql sql = new PreparedSql( SqlKind.SELECT, "aaa", "bbb", "ccc", Collections.emptyList(), SqlLogType.FORMATTED); @@ -15,19 +15,19 @@ public void testLogSql() throws Exception { } @Test - public void testLogLocalTransactionBegun() throws Exception { + public void testLogLocalTransactionBegun() { UtilLoggingJdbcLogger logger = new UtilLoggingJdbcLogger(); logger.logTransactionBegun("ddd", "eee", "fff"); } @Test - public void testLogLocalTransactionCommitted() throws Exception { + public void testLogLocalTransactionCommitted() { UtilLoggingJdbcLogger logger = new UtilLoggingJdbcLogger(); logger.logTransactionCommitted("ddd", "eee", "fff"); } @Test - public void testLogLocalTransactionRolledback() throws Exception { + public void testLogLocalTransactionRolledback() { UtilLoggingJdbcLogger logger = new UtilLoggingJdbcLogger(); logger.logTransactionRolledback("ddd", "eee", "fff"); } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java index a02a32e2a..cb8b43c85 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java @@ -27,7 +27,7 @@ private SqlBatchDeleteQuery mockQuery() { } @Test - public void testBuilder() throws Exception { + public void testBuilder() { SqlBatchDeleteQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("delete from Emp"); @@ -47,7 +47,7 @@ public void testBuilder() throws Exception { } @Test - public void testGetSql() throws Exception { + public void testGetSql() { SqlBatchDeleteQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("delete from Emp"); @@ -84,7 +84,7 @@ public void testGetSql() throws Exception { } @Test - public void testLiteral() throws Exception { + public void testLiteral() { SqlBatchDeleteQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("delete from Emp"); @@ -120,7 +120,7 @@ public void testLiteral() throws Exception { } @Test - public void testNotEqualParamCall() throws Exception { + public void testNotEqualParamCall() { SqlBatchDeleteQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("delete from Emp"); @@ -144,7 +144,7 @@ public void testNotEqualParamCall() throws Exception { } @Test - public void testChangeType() throws Exception { + public void testChangeType() { SqlBatchDeleteQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("delete from Emp"); @@ -170,7 +170,7 @@ public void testChangeType() throws Exception { } @Test - public void testParamToLiteral() throws Exception { + public void testParamToLiteral() { SqlBatchDeleteQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("delete from Emp"); @@ -207,7 +207,7 @@ private static class Employee { } @Test - public void testExecutor() throws Exception { + public void testExecutor() { List employees = Arrays.asList( new Employee(10, "SMITH", new BigDecimal("1001")), diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchInsertExecutorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchInsertExecutorTest.java index e60860c8e..aa9d19a41 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchInsertExecutorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchInsertExecutorTest.java @@ -28,7 +28,7 @@ private SqlBatchInsertQuery mockQuery() { } @Test - public void testBuilder() throws Exception { + public void testBuilder() { SqlBatchInsertQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("insert into Emp"); @@ -48,7 +48,7 @@ public void testBuilder() throws Exception { } @Test - public void testGetSql() throws Exception { + public void testGetSql() { SqlBatchInsertQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("insert into Emp"); @@ -83,7 +83,7 @@ public void testGetSql() throws Exception { } @Test - public void testLiteral() throws Exception { + public void testLiteral() { SqlBatchInsertQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("insert into Emp"); @@ -119,7 +119,7 @@ public void testLiteral() throws Exception { } @Test - public void testNotEqualParamCall() throws Exception { + public void testNotEqualParamCall() { SqlBatchInsertQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("insert into Emp"); @@ -144,7 +144,7 @@ public void testNotEqualParamCall() throws Exception { } @Test - public void testChangeType() throws Exception { + public void testChangeType() { SqlBatchInsertQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("insert into Emp"); @@ -168,7 +168,7 @@ public void testChangeType() throws Exception { } @Test - public void testParamToLiteral() throws Exception { + public void testParamToLiteral() { SqlBatchInsertQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("insert into Emp"); @@ -202,7 +202,7 @@ private static class Employee { } @Test - public void testExecutor() throws Exception { + public void testExecutor() { List employees = Arrays.asList(new Employee("SMITH", 100), new Employee("ALLEN", 200)); BatchInsertExecutor executor = BatchInsertExecutor.newInstance(new MockConfig()); @@ -219,7 +219,7 @@ public void testExecutor() throws Exception { @SuppressWarnings("serial") @Test - public void testExecutorByMap() throws Exception { + public void testExecutorByMap() { List> employees = new ArrayList>() { { diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchUpdateExecutorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchUpdateExecutorTest.java index e36c9fa5a..58d63a166 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchUpdateExecutorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/BatchUpdateExecutorTest.java @@ -27,7 +27,7 @@ private SqlBatchUpdateQuery mockQuery() { } @Test - public void testBuilder() throws Exception { + public void testBuilder() { SqlBatchUpdateQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("update Emp"); @@ -49,7 +49,7 @@ public void testBuilder() throws Exception { } @Test - public void testGetSql() throws Exception { + public void testGetSql() { SqlBatchUpdateQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("update Emp"); @@ -91,7 +91,7 @@ public void testGetSql() throws Exception { } @Test - public void testLiteral() throws Exception { + public void testLiteral() { SqlBatchUpdateQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("update Emp"); @@ -141,7 +141,7 @@ public void testLiteral() throws Exception { } @Test - public void testNotEqualParamCall() throws Exception { + public void testNotEqualParamCall() { SqlBatchUpdateQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("update Emp"); @@ -167,7 +167,7 @@ public void testNotEqualParamCall() throws Exception { } @Test - public void testChangeType() throws Exception { + public void testChangeType() { SqlBatchUpdateQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("update Emp"); @@ -193,7 +193,7 @@ public void testChangeType() throws Exception { } @Test - public void testParamToLiteral() throws Exception { + public void testParamToLiteral() { SqlBatchUpdateQuery query = mockQuery(); BatchBuilder builder = BatchBuilder.newInstance(query); builder.sql("update Emp"); @@ -230,7 +230,7 @@ private static class Employee { } @Test - public void testExecutor() throws Exception { + public void testExecutor() { List employees = Arrays.asList( new Employee(10, "SMITH", new BigDecimal("1001")), diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/DeleteBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/DeleteBuilderTest.java index 0265a9222..7dc20248f 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/DeleteBuilderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/DeleteBuilderTest.java @@ -8,7 +8,7 @@ public class DeleteBuilderTest { @Test - public void test() throws Exception { + public void test() { DeleteBuilder builder = DeleteBuilder.newInstance(new MockConfig()); builder.sql("delete from Emp"); builder.sql("where"); @@ -19,7 +19,7 @@ public void test() throws Exception { } @Test - public void testGetSql() throws Exception { + public void testGetSql() { DeleteBuilder builder = DeleteBuilder.newInstance(new MockConfig()); builder.sql("delete from Emp"); builder.sql("where"); @@ -35,7 +35,7 @@ public void testGetSql() throws Exception { } @Test - public void testLiterall() throws Exception { + public void testLiterall() { DeleteBuilder builder = DeleteBuilder.newInstance(new MockConfig()); builder.sql("delete from Emp"); builder.sql("where"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/InsertBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/InsertBuilderTest.java index c6023b7cc..e8b2fcb32 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/InsertBuilderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/InsertBuilderTest.java @@ -8,7 +8,7 @@ public class InsertBuilderTest { @Test - public void test() throws Exception { + public void test() { InsertBuilder builder = InsertBuilder.newInstance(new MockConfig()); builder.sql("insert into Emp"); builder.sql("(name, salary)"); @@ -19,7 +19,7 @@ public void test() throws Exception { } @Test - public void testGetSql() throws Exception { + public void testGetSql() { InsertBuilder builder = InsertBuilder.newInstance(new MockConfig()); builder.sql("insert into Emp"); builder.sql("(name, salary)"); @@ -34,7 +34,7 @@ public void testGetSql() throws Exception { } @Test - public void testLiteral() throws Exception { + public void testLiteral() { InsertBuilder builder = InsertBuilder.newInstance(new MockConfig()); builder.sql("insert into Emp"); builder.sql("(name, salary)"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java index d2c353ef4..44382ed9c 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java @@ -21,7 +21,7 @@ public class MapBatchInsertBuilderTest { @SuppressWarnings("serial") @Test - public void test() throws Exception { + public void test() { MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp"); builder.callerClassName(getClass().getName()); builder.callerMethodName("test"); @@ -49,7 +49,7 @@ public void test() throws Exception { @SuppressWarnings("serial") @Test - public void testGetSqls() throws Exception { + public void testGetSqls() { MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp"); List> employees = new ArrayList>() { @@ -90,7 +90,7 @@ public void testGetSqls() throws Exception { @SuppressWarnings("serial") @Test - public void testNullValue() throws Exception { + public void testNullValue() { MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp"); List> employees = new ArrayList>() { @@ -131,7 +131,7 @@ public void testNullValue() throws Exception { @SuppressWarnings("serial") @Test - public void testChangeType() throws Exception { + public void testChangeType() { MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp"); List> employees = new ArrayList>() { @@ -170,7 +170,7 @@ public void testChangeType() throws Exception { @SuppressWarnings("serial") @Test - public void testNotEqualMapSize() throws Exception { + public void testNotEqualMapSize() { MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp"); List> employees = new ArrayList>() { @@ -201,7 +201,7 @@ public void testNotEqualMapSize() throws Exception { @SuppressWarnings("serial") @Test - public void testHashMap() throws Exception { + public void testHashMap() { MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp"); List> employees = new ArrayList>() { @@ -241,7 +241,7 @@ public void testHashMap() throws Exception { } @Test - public void testEmptyList() throws Exception { + public void testEmptyList() { MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp"); List> employees = new ArrayList<>(); try { @@ -255,7 +255,7 @@ public void testEmptyList() throws Exception { @SuppressWarnings("serial") @Test - public void testDifferentKey() throws Exception { + public void testDifferentKey() { MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp"); builder.callerClassName(getClass().getName()); builder.callerMethodName("test"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapInsertBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapInsertBuilderTest.java index 93e7d8fc9..a94b4f587 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapInsertBuilderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapInsertBuilderTest.java @@ -13,7 +13,7 @@ public class MapInsertBuilderTest { @SuppressWarnings("serial") @Test - public void test() throws Exception { + public void test() { MapInsertBuilder builder = MapInsertBuilder.newInstance(new MockConfig(), "Emp"); builder.execute( new LinkedHashMap() { @@ -26,7 +26,7 @@ public void test() throws Exception { @SuppressWarnings("serial") @Test - public void testGetSql() throws Exception { + public void testGetSql() { MapInsertBuilder builder = MapInsertBuilder.newInstance(new MockConfig(), "Emp"); builder.execute( @@ -48,7 +48,7 @@ public void testGetSql() throws Exception { @SuppressWarnings("serial") @Test - public void testNullValue() throws Exception { + public void testNullValue() { MapInsertBuilder builder = MapInsertBuilder.newInstance(new MockConfig(), "Emp"); builder.execute( new LinkedHashMap() { @@ -69,7 +69,7 @@ public void testNullValue() throws Exception { @SuppressWarnings("serial") @Test - public void testLastNullValue() throws Exception { + public void testLastNullValue() { MapInsertBuilder builder = MapInsertBuilder.newInstance(new MockConfig(), "Emp"); builder.execute( new LinkedHashMap() { diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/SelectBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/SelectBuilderTest.java index 26b950c46..c4452b896 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/SelectBuilderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/SelectBuilderTest.java @@ -23,7 +23,7 @@ public class SelectBuilderTest { @Test - public void testGetSql() throws Exception { + public void testGetSql() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select"); builder.sql("id").sql(","); @@ -53,7 +53,7 @@ public void testGetSql() throws Exception { } @Test - public void testRmoveLast() throws Exception { + public void testRmoveLast() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("aaa").sql("bbb"); builder.removeLast(); @@ -61,7 +61,7 @@ public void testRmoveLast() throws Exception { } @Test - public void testSingleResult_Entity() throws Exception { + public void testSingleResult_Entity() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select"); builder.sql("id").sql(","); @@ -77,7 +77,7 @@ public void testSingleResult_Entity() throws Exception { } @Test - public void testSingleResult_Map() throws Exception { + public void testSingleResult_Map() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select"); builder.sql("id").sql(","); @@ -93,7 +93,7 @@ public void testSingleResult_Map() throws Exception { } @Test - public void testSingleResult_Domain() throws Exception { + public void testSingleResult_Domain() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select ccc from Emp"); builder.sql("where"); @@ -105,7 +105,7 @@ public void testSingleResult_Domain() throws Exception { } @Test - public void testSingleResult_Basic() throws Exception { + public void testSingleResult_Basic() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select ccc from Emp"); builder.sql("where"); @@ -117,7 +117,7 @@ public void testSingleResult_Basic() throws Exception { } @Test - public void testSingleResult_DomaIllegalArgumentException() throws Exception { + public void testSingleResult_DomaIllegalArgumentException() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select"); builder.sql("aaa").sql(","); @@ -136,7 +136,7 @@ public void testSingleResult_DomaIllegalArgumentException() throws Exception { } @Test - public void testGetResultList_Entity() throws Exception { + public void testGetResultList_Entity() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select * from Emp"); builder.sql("where"); @@ -148,7 +148,7 @@ public void testGetResultList_Entity() throws Exception { } @Test - public void testGetResultList_Map() throws Exception { + public void testGetResultList_Map() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select * from Emp"); builder.sql("where"); @@ -160,7 +160,7 @@ public void testGetResultList_Map() throws Exception { } @Test - public void testGetResultList_Domain() throws Exception { + public void testGetResultList_Domain() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select ccc from Emp"); builder.sql("where"); @@ -172,7 +172,7 @@ public void testGetResultList_Domain() throws Exception { } @Test - public void testGetResultList_Basic() throws Exception { + public void testGetResultList_Basic() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select ccc from Emp"); builder.sql("where"); @@ -184,7 +184,7 @@ public void testGetResultList_Basic() throws Exception { } @Test - public void testLiteral() throws Exception { + public void testLiteral() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select"); builder.sql("id").sql(","); @@ -210,7 +210,7 @@ public void testLiteral() throws Exception { } @Test - public void testLiteral_singleQuoteIncluded() throws Exception { + public void testLiteral_singleQuoteIncluded() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select"); builder.sql("id").sql(","); @@ -229,7 +229,7 @@ public void testLiteral_singleQuoteIncluded() throws Exception { } @Test - public void testParams() throws Exception { + public void testParams() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select ccc from Emp"); builder.sql("where"); @@ -246,7 +246,7 @@ public void testParams() throws Exception { } @Test - public void testParams_empty() throws Exception { + public void testParams_empty() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select ccc from Emp"); builder.sql("where"); @@ -260,7 +260,7 @@ public void testParams_empty() throws Exception { } @Test - public void testLiterals() throws Exception { + public void testLiterals() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select ccc from Emp"); builder.sql("where"); @@ -274,7 +274,7 @@ public void testLiterals() throws Exception { } @Test - public void testLiterals_empty() throws Exception { + public void testLiterals_empty() { SelectBuilder builder = SelectBuilder.newInstance(new MockConfig()); builder.sql("select ccc from Emp"); builder.sql("where"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/UpdateBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/UpdateBuilderTest.java index e63f1c71b..d57fe91f6 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/UpdateBuilderTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/UpdateBuilderTest.java @@ -9,7 +9,7 @@ public class UpdateBuilderTest { @Test - public void test() throws Exception { + public void test() { UpdateBuilder builder = UpdateBuilder.newInstance(new MockConfig()); builder.sql("update Emp"); builder.sql("set"); @@ -21,7 +21,7 @@ public void test() throws Exception { } @Test - public void testGetSql() throws Exception { + public void testGetSql() { UpdateBuilder builder = UpdateBuilder.newInstance(new MockConfig()); builder.sql("update Emp"); builder.sql("set"); @@ -39,7 +39,7 @@ public void testGetSql() throws Exception { } @Test - public void testLiteral() throws Exception { + public void testLiteral() { UpdateBuilder builder = UpdateBuilder.newInstance(new MockConfig()); builder.sql("update Emp"); builder.sql("set"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java index 31dd5b549..0f0524bc4 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchDeleteCommandTest.java @@ -21,7 +21,7 @@ public class BatchDeleteCommandTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java index ca4de9125..972deba25 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchInsertCommandTest.java @@ -17,7 +17,7 @@ public class BatchInsertCommandTest { private final MockConfig runtimeConfig = new MockConfig(); @Test - public void testExecute(TestInfo testInfo) throws Exception { + public void testExecute(TestInfo testInfo) { Emp emp1 = new Emp(); emp1.setId(1); emp1.setName("hoge"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java index c54c84596..36a7f8720 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/BatchUpdateCommandTest.java @@ -24,12 +24,12 @@ public class BatchUpdateCommandTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testExecute() throws Exception { + public void testExecute() { Emp emp1 = new Emp(); emp1.setId(1); emp1.setName("hoge"); @@ -60,7 +60,7 @@ public void testExecute() throws Exception { } @Test - public void testExecute_throwsOptimisticLockException() throws Exception { + public void testExecute_throwsOptimisticLockException() { Emp emp = new Emp(); emp.setId(1); emp.setName("hoge"); @@ -85,7 +85,7 @@ public void testExecute_throwsOptimisticLockException() throws Exception { } @Test - public void testExecute_suppressesOptimisticLockException() throws Exception { + public void testExecute_suppressesOptimisticLockException() { Emp emp = new Emp(); emp.setId(1); emp.setName("hoge"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java index 7940853da..edab27cba 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/DeleteCommandTest.java @@ -27,12 +27,12 @@ public class DeleteCommandTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testExecute() throws Exception { + public void testExecute() { Emp emp = new Emp(); emp.setId(1); emp.setName("hoge"); @@ -61,7 +61,7 @@ public void testExecute() throws Exception { } @Test - public void testExecute_throwsOptimisticLockException() throws Exception { + public void testExecute_throwsOptimisticLockException() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -87,7 +87,7 @@ public void testExecute_throwsOptimisticLockException() throws Exception { } @Test - public void testExecute_suppressesOptimisticLockException() throws Exception { + public void testExecute_suppressesOptimisticLockException() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java index df8a684bd..a32318a9e 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/FunctionCommandTest.java @@ -20,7 +20,7 @@ public class FunctionCommandTest { private final MockConfig runtimeConfig = new MockConfig(); @Test - public void testExecute() throws Exception { + public void testExecute() { List outParameters = runtimeConfig.dataSource.connection.callableStatement.outParameters; outParameters.add(10); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java index 4bb7f9ad2..9635331d1 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/InsertCommandTest.java @@ -23,7 +23,7 @@ public class InsertCommandTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/ScriptCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/ScriptCommandTest.java index c14270ef1..a1d54d0b3 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/ScriptCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/ScriptCommandTest.java @@ -20,12 +20,12 @@ public class ScriptCommandTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testExecute() throws Exception { + public void testExecute() { SqlFileScriptQuery query = new SqlFileScriptQuery(); query.setConfig(new MockConfig()); query.setMethod(method); @@ -40,7 +40,7 @@ public void testExecute() throws Exception { } @Test - public void testExecute_ScriptException() throws Exception { + public void testExecute_ScriptException() { MockConfig config = new MockConfig(); config.dataSource.connection.statement = new MockStatement() { diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java index 73f71a08b..67c19a17b 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/SelectCommandTest.java @@ -41,7 +41,7 @@ public class SelectCommandTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java index 091e2cd30..4db43d201 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/command/UpdateCommandTest.java @@ -25,7 +25,7 @@ public class UpdateCommandTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Db2DialectTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Db2DialectTest.java index 328010bd6..875c750b4 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Db2DialectTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Db2DialectTest.java @@ -8,21 +8,21 @@ public class Db2DialectTest { @Test - public void testExpressionFunctions_prefix() throws Exception { + public void testExpressionFunctions_prefix() { Db2Dialect dialect = new Db2Dialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a$$a$%a$_a$％a$＿%", functions.prefix("a$a%a_a％a＿")); } @Test - public void testExpressionFunctions_prefix_escape() throws Exception { + public void testExpressionFunctions_prefix_escape() { Db2Dialect dialect = new Db2Dialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a!!a!%a!_a!％a!＿%", functions.prefix("a!a%a_a％a＿", '!')); } @Test - public void testExpressionFunctions_prefix_escapeWithDefault() throws Exception { + public void testExpressionFunctions_prefix_escapeWithDefault() { Db2Dialect dialect = new Db2Dialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a\\\\a\\%a\\_a\\％a\\＿%", functions.prefix("a\\a%a_a％a＿", '\\')); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Mssql2008DialectTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Mssql2008DialectTest.java index 6dc95b330..9272a73f7 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Mssql2008DialectTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Mssql2008DialectTest.java @@ -8,14 +8,14 @@ public class Mssql2008DialectTest { @Test - public void testExpressionFunctions_prefix() throws Exception { + public void testExpressionFunctions_prefix() { Mssql2008Dialect dialect = new Mssql2008Dialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a$$a$%a$_a$[%", functions.prefix("a$a%a_a[")); } @Test - public void testExpressionFunctions_prefix_escape() throws Exception { + public void testExpressionFunctions_prefix_escape() { Mssql2008Dialect dialect = new Mssql2008Dialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a!!a!%a!_a![%", functions.prefix("a!a%a_a[", '!')); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Oracle11DialectTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Oracle11DialectTest.java index 195db950b..c5d9f41a6 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Oracle11DialectTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/Oracle11DialectTest.java @@ -18,28 +18,28 @@ public class Oracle11DialectTest { @Test - public void testExpressionFunctions_prefix() throws Exception { + public void testExpressionFunctions_prefix() { Oracle11Dialect dialect = new Oracle11Dialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a$$a$%a$_a$％a$＿%", functions.prefix("a$a%a_a％a＿")); } @Test - public void testExpressionFunctions_prefix_escape() throws Exception { + public void testExpressionFunctions_prefix_escape() { Oracle11Dialect dialect = new Oracle11Dialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a!!a!%a!_a!％a!＿%", functions.prefix("a!a%a_a％a＿", '!')); } @Test - public void testExpressionFunctions_prefix_escapeWithBackslash() throws Exception { + public void testExpressionFunctions_prefix_escapeWithBackslash() { Oracle11Dialect dialect = new Oracle11Dialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a\\\\a\\%a\\_a\\％a\\＿%", functions.prefix("a\\a%a_a％a＿", '\\')); } @Test - public void testDateFormat() throws Exception { + public void testDateFormat() { Oracle11Dialect dialect = new Oracle11Dialect(); SqlLogFormattingVisitor visitor = dialect.getSqlLogFormattingVisitor(); DateWrapper wrapper = new DateWrapper(Date.valueOf("2009-01-23")); @@ -48,7 +48,7 @@ public void testDateFormat() throws Exception { } @Test - public void testTimeFormat() throws Exception { + public void testTimeFormat() { Oracle11Dialect dialect = new Oracle11Dialect(); SqlLogFormattingVisitor visitor = dialect.getSqlLogFormattingVisitor(); TimeWrapper wrapper = new TimeWrapper(Time.valueOf("01:23:45")); @@ -56,7 +56,7 @@ public void testTimeFormat() throws Exception { } @Test - public void testTimestampFormat() throws Exception { + public void testTimestampFormat() { Oracle11Dialect dialect = new Oracle11Dialect(); SqlLogFormattingVisitor visitor = dialect.getSqlLogFormattingVisitor(); TimestampWrapper wrapper = diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/OracleDialectTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/OracleDialectTest.java index c0c1b57c3..de067901e 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/OracleDialectTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/OracleDialectTest.java @@ -8,21 +8,21 @@ public class OracleDialectTest { @Test - public void testExpressionFunctions_prefix() throws Exception { + public void testExpressionFunctions_prefix() { OracleDialect dialect = new OracleDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a$$a$%a$_a％a＿%", functions.prefix("a$a%a_a％a＿")); } @Test - public void testExpressionFunctions_prefix_escape() throws Exception { + public void testExpressionFunctions_prefix_escape() { OracleDialect dialect = new OracleDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a!!a!%a!_a％a＿%", functions.prefix("a!a%a_a％a＿", '!')); } @Test - public void testExpressionFunctions_prefix_escapeWithBackslash() throws Exception { + public void testExpressionFunctions_prefix_escapeWithBackslash() { OracleDialect dialect = new OracleDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a\\\\a\\%a\\_a％a＿%", functions.prefix("a\\a%a_a％a＿", '\\')); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/PostgresDialectTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/PostgresDialectTest.java index f12235352..4438a49f4 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/PostgresDialectTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/PostgresDialectTest.java @@ -8,7 +8,7 @@ public class PostgresDialectTest { @Test - public void testGetIdentitySelectSql_quoteNotRequired_idQuoteNotRequired() throws Exception { + public void testGetIdentitySelectSql_quoteNotRequired_idQuoteNotRequired() { PostgresDialect dialect = new PostgresDialect(); PreparedSql sql = dialect.getIdentitySelectSql("aaa", "bbb", "ccc", "DDD", false, false); assertEquals( @@ -16,7 +16,7 @@ public void testGetIdentitySelectSql_quoteNotRequired_idQuoteNotRequired() throw } @Test - public void testGetIdentitySelectSql_quoteRequired_idQuoteNotRequired() throws Exception { + public void testGetIdentitySelectSql_quoteRequired_idQuoteNotRequired() { PostgresDialect dialect = new PostgresDialect(); PreparedSql sql = dialect.getIdentitySelectSql("aaa", "bbb", "ccc", "DDD", true, false); assertEquals( @@ -25,7 +25,7 @@ public void testGetIdentitySelectSql_quoteRequired_idQuoteNotRequired() throws E } @Test - public void testGetIdentitySelectSql_quoteNotRequired_idQuoteRequired() throws Exception { + public void testGetIdentitySelectSql_quoteNotRequired_idQuoteRequired() { PostgresDialect dialect = new PostgresDialect(); PreparedSql sql = dialect.getIdentitySelectSql("aaa", "bbb", "ccc", "DDD", false, true); assertEquals( @@ -33,7 +33,7 @@ public void testGetIdentitySelectSql_quoteNotRequired_idQuoteRequired() throws E } @Test - public void testGetIdentitySelectSql_quoteRequired_idQuoteRequired() throws Exception { + public void testGetIdentitySelectSql_quoteRequired_idQuoteRequired() { PostgresDialect dialect = new PostgresDialect(); PreparedSql sql = dialect.getIdentitySelectSql("aaa", "bbb", "ccc", "DDD", true, true); assertEquals( diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/StandardDialectTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/StandardDialectTest.java index 421b9715c..e00bd072e 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/StandardDialectTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/StandardDialectTest.java @@ -34,91 +34,91 @@ public void testRemoveQuote() { } @Test - public void testExpressionFunctions_escape() throws Exception { + public void testExpressionFunctions_escape() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a$$a$%a$_", functions.escape("a$a%a_")); } @Test - public void testExpressionFunctions_escape_withExclamation() throws Exception { + public void testExpressionFunctions_escape_withExclamation() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a!!a!%a!_", functions.escape("a!a%a_", '!')); } @Test - public void testExpressionFunctions_escape_withBackslash() throws Exception { + public void testExpressionFunctions_escape_withBackslash() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a\\\\a\\%a\\_", functions.escape("a\\a%a_", '\\')); } @Test - public void testExpressionFunctions_prefix() throws Exception { + public void testExpressionFunctions_prefix() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a$$a$%a$_%", functions.prefix("a$a%a_")); } @Test - public void testExpressionFunctions_prefix_escape() throws Exception { + public void testExpressionFunctions_prefix_escape() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a!!a!%a!_%", functions.prefix("a!a%a_", '!')); } @Test - public void testExpressionFunctions_prefix_escapeWithBackslash() throws Exception { + public void testExpressionFunctions_prefix_escapeWithBackslash() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("a\\\\a\\%a\\_%", functions.prefix("a\\a%a_", '\\')); } @Test - public void testExpressionFunctions_suffix() throws Exception { + public void testExpressionFunctions_suffix() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("%a$$a$%a$_", functions.suffix("a$a%a_")); } @Test - public void testExpressionFunctions_suffix_escape() throws Exception { + public void testExpressionFunctions_suffix_escape() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("%a!!a!%a!_", functions.suffix("a!a%a_", '!')); } @Test - public void testExpressionFunctions_suffix_escapeWithBackslash() throws Exception { + public void testExpressionFunctions_suffix_escapeWithBackslash() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("%a\\\\a\\%a\\_", functions.suffix("a\\a%a_", '\\')); } @Test - public void testExpressionFunctions_infix() throws Exception { + public void testExpressionFunctions_infix() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("%a$$a$%a$_%", functions.infix("a$a%a_")); } @Test - public void testExpressionFunctions_infix_escape() throws Exception { + public void testExpressionFunctions_infix_escape() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("%a!!a!%a!_%", functions.infix("a!a%a_", '!')); } @Test - public void testExpressionFunctions_infix_escapeWithBackslash() throws Exception { + public void testExpressionFunctions_infix_escapeWithBackslash() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertEquals("%a\\\\a\\%a\\_%", functions.infix("a\\a%a_", '\\')); } @Test - public void testExpressionFunctions_roundDonwTimePart_forUtilDate() throws Exception { + public void testExpressionFunctions_roundDonwTimePart_forUtilDate() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); Calendar calendar = Calendar.getInstance(); @@ -128,7 +128,7 @@ public void testExpressionFunctions_roundDonwTimePart_forUtilDate() throws Excep } @Test - public void testExpressionFunctions_roundDonwTimePart_forDate() throws Exception { + public void testExpressionFunctions_roundDonwTimePart_forDate() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); Calendar calendar = Calendar.getInstance(); @@ -138,7 +138,7 @@ public void testExpressionFunctions_roundDonwTimePart_forDate() throws Exception } @Test - public void testExpressionFunctions_roundDonwTimePart_forTimestamp() throws Exception { + public void testExpressionFunctions_roundDonwTimePart_forTimestamp() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); Timestamp timestamp = Timestamp.valueOf("2009-01-23 12:34:56.123456789"); @@ -147,7 +147,7 @@ public void testExpressionFunctions_roundDonwTimePart_forTimestamp() throws Exce } @Test - public void testExpressionFunctions_roundDonwTimePart_forLocalDateTime() throws Exception { + public void testExpressionFunctions_roundDonwTimePart_forLocalDateTime() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); LocalDateTime localDateTime = LocalDateTime.of(2009, 1, 23, 12, 34, 56, 123456789); @@ -156,7 +156,7 @@ public void testExpressionFunctions_roundDonwTimePart_forLocalDateTime() throws } @Test - public void testExpressionFunctions_roundUpTimePart_forUtilDate() throws Exception { + public void testExpressionFunctions_roundUpTimePart_forUtilDate() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); Calendar calendar = Calendar.getInstance(); @@ -166,7 +166,7 @@ public void testExpressionFunctions_roundUpTimePart_forUtilDate() throws Excepti } @Test - public void testExpressionFunctions_roundUpTimePart_forDate() throws Exception { + public void testExpressionFunctions_roundUpTimePart_forDate() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); Calendar calendar = Calendar.getInstance(); @@ -176,7 +176,7 @@ public void testExpressionFunctions_roundUpTimePart_forDate() throws Exception { } @Test - public void testExpressionFunctions_roundUpTimePart_forDate_endOfMonth() throws Exception { + public void testExpressionFunctions_roundUpTimePart_forDate_endOfMonth() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); Calendar calendar = Calendar.getInstance(); @@ -186,7 +186,7 @@ public void testExpressionFunctions_roundUpTimePart_forDate_endOfMonth() throws } @Test - public void testExpressionFunctions_roundUpTimePart_forDate_endOfYear() throws Exception { + public void testExpressionFunctions_roundUpTimePart_forDate_endOfYear() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); Calendar calendar = Calendar.getInstance(); @@ -196,7 +196,7 @@ public void testExpressionFunctions_roundUpTimePart_forDate_endOfYear() throws E } @Test - public void testExpressionFunctions_roundUpTimePart_forTimestamp() throws Exception { + public void testExpressionFunctions_roundUpTimePart_forTimestamp() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); Timestamp timestamp = Timestamp.valueOf("2009-01-23 12:34:56.123456789"); @@ -205,7 +205,7 @@ public void testExpressionFunctions_roundUpTimePart_forTimestamp() throws Except } @Test - public void testExpressionFunctions_roundUpTimePart_forTimestamp_endOfMonth() throws Exception { + public void testExpressionFunctions_roundUpTimePart_forTimestamp_endOfMonth() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); Timestamp timestamp = Timestamp.valueOf("2009-03-31 00:00:00.000000000"); @@ -214,7 +214,7 @@ public void testExpressionFunctions_roundUpTimePart_forTimestamp_endOfMonth() th } @Test - public void testExpressionFunctions_roundUpTimePart_forTimestamp_endOfYear() throws Exception { + public void testExpressionFunctions_roundUpTimePart_forTimestamp_endOfYear() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); Timestamp timestamp = Timestamp.valueOf("2009-12-31 00:00:00.000000000"); @@ -223,7 +223,7 @@ public void testExpressionFunctions_roundUpTimePart_forTimestamp_endOfYear() thr } @Test - public void testExpressionFunctions_roundUpTimePart_forLocalDate() throws Exception { + public void testExpressionFunctions_roundUpTimePart_forLocalDate() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); LocalDate localDate = LocalDate.of(2009, 1, 23); @@ -231,7 +231,7 @@ public void testExpressionFunctions_roundUpTimePart_forLocalDate() throws Except } @Test - public void testExpressionFunctions_roundUpTimePart_forLocalDate_endOfMonth() throws Exception { + public void testExpressionFunctions_roundUpTimePart_forLocalDate_endOfMonth() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); LocalDate localDate = LocalDate.of(2009, 3, 31); @@ -239,7 +239,7 @@ public void testExpressionFunctions_roundUpTimePart_forLocalDate_endOfMonth() th } @Test - public void testExpressionFunctions_roundUpTimePart_forLocalDate_endOfYear() throws Exception { + public void testExpressionFunctions_roundUpTimePart_forLocalDate_endOfYear() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); LocalDate localDate = LocalDate.of(2009, 12, 31); @@ -247,7 +247,7 @@ public void testExpressionFunctions_roundUpTimePart_forLocalDate_endOfYear() thr } @Test - public void testExpressionFunctions_roundUpTimePart_forLocalDateTime() throws Exception { + public void testExpressionFunctions_roundUpTimePart_forLocalDateTime() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); LocalDateTime localDateTime = LocalDateTime.of(2009, 1, 23, 12, 34, 56, 123456789); @@ -256,8 +256,7 @@ public void testExpressionFunctions_roundUpTimePart_forLocalDateTime() throws Ex } @Test - public void testExpressionFunctions_roundUpTimePart_forLocalDateTime_endOfMonth() - throws Exception { + public void testExpressionFunctions_roundUpTimePart_forLocalDateTime_endOfMonth() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); LocalDateTime localDateTime = LocalDateTime.of(2009, 3, 31, 12, 34, 56, 123456789); @@ -266,8 +265,7 @@ public void testExpressionFunctions_roundUpTimePart_forLocalDateTime_endOfMonth( } @Test - public void testExpressionFunctions_roundUpTimePart_forLocalDateTime_endOfYear() - throws Exception { + public void testExpressionFunctions_roundUpTimePart_forLocalDateTime_endOfYear() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); LocalDateTime localDateTime = LocalDateTime.of(2009, 12, 31, 12, 34, 56, 123456789); @@ -276,7 +274,7 @@ public void testExpressionFunctions_roundUpTimePart_forLocalDateTime_endOfYear() } @Test - public void testExpressionFunctions_isEmpty() throws Exception { + public void testExpressionFunctions_isEmpty() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertTrue(functions.isEmpty(null)); @@ -288,7 +286,7 @@ public void testExpressionFunctions_isEmpty() throws Exception { } @Test - public void testExpressionFunctions_isNotEmpty() throws Exception { + public void testExpressionFunctions_isNotEmpty() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertFalse(functions.isNotEmpty(null)); @@ -300,7 +298,7 @@ public void testExpressionFunctions_isNotEmpty() throws Exception { } @Test - public void testExpressionFunctions_isBlank() throws Exception { + public void testExpressionFunctions_isBlank() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertTrue(functions.isBlank(null)); @@ -312,7 +310,7 @@ public void testExpressionFunctions_isBlank() throws Exception { } @Test - public void testExpressionFunctions_isNotBlank() throws Exception { + public void testExpressionFunctions_isNotBlank() { StandardDialect dialect = new StandardDialect(); ExpressionFunctions functions = dialect.getExpressionFunctions(); assertFalse(functions.isNotBlank(null)); @@ -324,7 +322,7 @@ public void testExpressionFunctions_isNotBlank() throws Exception { } @Test - public void testTransformSelectSqlNode_forUpdate() throws Exception { + public void testTransformSelectSqlNode_forUpdate() { StandardDialect dialect = new StandardDialect(); SqlParser parser = new SqlParser("select * from emp order by emp.id"); SqlNode sqlNode = parser.parse(); @@ -339,7 +337,7 @@ public void testTransformSelectSqlNode_forUpdate() throws Exception { } @Test - public void testTransformSelectSqlNode_forUpdateWait() throws Exception { + public void testTransformSelectSqlNode_forUpdateWait() { StandardDialect dialect = new StandardDialect(); SqlParser parser = new SqlParser("select * from emp order by emp.id"); SqlNode sqlNode = parser.parse(); @@ -354,7 +352,7 @@ public void testTransformSelectSqlNode_forUpdateWait() throws Exception { } @Test - public void testTransformSelectSqlNode_forUpdateNowait() throws Exception { + public void testTransformSelectSqlNode_forUpdateNowait() { StandardDialect dialect = new StandardDialect(); SqlParser parser = new SqlParser("select * from emp order by emp.id"); SqlNode sqlNode = parser.parse(); @@ -369,7 +367,7 @@ public void testTransformSelectSqlNode_forUpdateNowait() throws Exception { } @Test - public void testTransformSelectSqlNode_forUpdate_alias() throws Exception { + public void testTransformSelectSqlNode_forUpdate_alias() { StandardDialect dialect = new StandardDialectStab(); SqlParser parser = new SqlParser("select * from emp order by emp.id"); SqlNode sqlNode = parser.parse(); @@ -384,7 +382,7 @@ public void testTransformSelectSqlNode_forUpdate_alias() throws Exception { } @Test - public void testTransformSelectSqlNode_forUpdateWait_alias() throws Exception { + public void testTransformSelectSqlNode_forUpdateWait_alias() { StandardDialect dialect = new StandardDialectStab(); SqlParser parser = new SqlParser("select * from emp order by emp.id"); SqlNode sqlNode = parser.parse(); @@ -399,7 +397,7 @@ public void testTransformSelectSqlNode_forUpdateWait_alias() throws Exception { } @Test - public void testTransformSelectSqlNode_forUpdateNowait_alias() throws Exception { + public void testTransformSelectSqlNode_forUpdateNowait_alias() { StandardDialect dialect = new StandardDialectStab(); SqlParser parser = new SqlParser("select * from emp order by emp.id"); SqlNode sqlNode = parser.parse(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeFactoryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeFactoryTest.java index 6a7de22c1..a5d5092d3 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeFactoryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeFactoryTest.java @@ -13,14 +13,14 @@ public class DomainTypeFactoryTest { private final ClassHelper classHelper = new ClassHelper() {}; @Test - public void testGetDomainType() throws Exception { + public void testGetDomainType() { DomainType type = DomainTypeFactory.getDomainType(PhoneNumber.class, classHelper); assertNotNull(type); } @Test - public void testGetDomainType_DomaIllegalArgumentException() throws Exception { + public void testGetDomainType_DomaIllegalArgumentException() { try { DomainTypeFactory.getDomainType(Object.class, classHelper); fail(); @@ -30,7 +30,7 @@ public void testGetDomainType_DomaIllegalArgumentException() throws Exception { } @Test - public void testGetDomainType_DomainTypeNotFoundException() throws Exception { + public void testGetDomainType_DomainTypeNotFoundException() { try { DomainTypeFactory.getDomainType(Money.class, classHelper); fail(); @@ -40,13 +40,13 @@ public void testGetDomainType_DomainTypeNotFoundException() throws Exception { } @Test - public void testGetExternalDomainType() throws Exception { + public void testGetExternalDomainType() { DomainType type = DomainTypeFactory.getExternalDomainType(Job.class, classHelper); assertNotNull(type); } @Test - public void testGetExternalDomainType_array() throws Exception { + public void testGetExternalDomainType_array() { DomainType type = DomainTypeFactory.getExternalDomainType(String[].class, classHelper); assertNotNull(type); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeNotFoundExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeNotFoundExceptionTest.java index acee475cc..82049465a 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeNotFoundExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/domain/DomainTypeNotFoundExceptionTest.java @@ -7,7 +7,7 @@ public class DomainTypeNotFoundExceptionTest { @Test - public void test() throws Exception { + public void test() { DomainTypeNotFoundException e = new DomainTypeNotFoundException(new Exception(), "aaa", "bbb"); System.out.println(e.getMessage()); assertEquals("aaa", e.getDomainClassName()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java index 15d44ba93..a528b7aea 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java @@ -21,7 +21,7 @@ public class DefaultPropertyTypeTest { @SuppressWarnings("ConstantConditions") @Test - public void testIsQuoteRequired_true() throws Exception { + public void testIsQuoteRequired_true() { boolean isQuoteRequired = true; DefaultPropertyType propertyType = new DefaultPropertyType<>( @@ -39,7 +39,7 @@ public void testIsQuoteRequired_true() throws Exception { @SuppressWarnings("ConstantConditions") @Test - public void testIsQuoteRequired_false() throws Exception { + public void testIsQuoteRequired_false() { boolean isQuoteRequired = false; DefaultPropertyType propertyType = new DefaultPropertyType<>( @@ -56,7 +56,7 @@ public void testIsQuoteRequired_false() throws Exception { } @Test - public void testGetColumnName_naming_columnNameDefined() throws Exception { + public void testGetColumnName_naming_columnNameDefined() { DefaultPropertyType propertyType = new DefaultPropertyType<>( DefaultPropertyTypeTest.class, @@ -71,7 +71,7 @@ public void testGetColumnName_naming_columnNameDefined() throws Exception { } @Test - public void testGetColumnName_columnDefined() throws Exception { + public void testGetColumnName_columnDefined() { DefaultPropertyType propertyType = new DefaultPropertyType<>( DefaultPropertyTypeTest.class, @@ -86,7 +86,7 @@ public void testGetColumnName_columnDefined() throws Exception { } @Test - public void testGetColumnName_columnNotDefined() throws Exception { + public void testGetColumnName_columnNotDefined() { DefaultPropertyType propertyType = new DefaultPropertyType<>( DefaultPropertyTypeTest.class, @@ -101,7 +101,7 @@ public void testGetColumnName_columnNotDefined() throws Exception { } @Test - public void testGetColumnName_columnNotDefined_embeddableProeprty() throws Exception { + public void testGetColumnName_columnNotDefined_embeddableProeprty() { DefaultPropertyType propertyType = new DefaultPropertyType<>( DefaultPropertyTypeTest.class, @@ -116,7 +116,7 @@ public void testGetColumnName_columnNotDefined_embeddableProeprty() throws Excep } @Test - public void testGetColumnName_quote_quoteRequired() throws Exception { + public void testGetColumnName_quote_quoteRequired() { DefaultPropertyType propertyType = new DefaultPropertyType<>( DefaultPropertyTypeTest.class, @@ -131,7 +131,7 @@ public void testGetColumnName_quote_quoteRequired() throws Exception { } @Test - public void testGetColumnName_quote_quoteNotRequired() throws Exception { + public void testGetColumnName_quote_quoteNotRequired() { DefaultPropertyType propertyType = new DefaultPropertyType<>( DefaultPropertyTypeTest.class, @@ -146,7 +146,7 @@ public void testGetColumnName_quote_quoteNotRequired() throws Exception { } @Test - public void testGetColumnName_naiming_columnNotDefined() throws Exception { + public void testGetColumnName_naiming_columnNotDefined() { DefaultPropertyType propertyType = new DefaultPropertyType<>( DefaultPropertyTypeTest.class, @@ -161,7 +161,7 @@ public void testGetColumnName_naiming_columnNotDefined() throws Exception { } @Test - public void testGetColumnName_naiming_quote_quoteRequired() throws Exception { + public void testGetColumnName_naiming_quote_quoteRequired() { DefaultPropertyType propertyType = new DefaultPropertyType<>( DefaultPropertyTypeTest.class, @@ -176,7 +176,7 @@ public void testGetColumnName_naiming_quote_quoteRequired() throws Exception { } @Test - public void testGetColumnName_naiming_quote_quoteNotRequired() throws Exception { + public void testGetColumnName_naiming_quote_quoteNotRequired() { DefaultPropertyType propertyType = new DefaultPropertyType<>( DefaultPropertyTypeTest.class, @@ -191,7 +191,7 @@ public void testGetColumnName_naiming_quote_quoteNotRequired() throws Exception } @Test - public void testPrimitivePropertyDefaultValue() throws Exception { + public void testPrimitivePropertyDefaultValue() { DefaultPropertyType propertyType = new DefaultPropertyType<>( DefaultPropertyTypeTest.class, @@ -207,7 +207,7 @@ public void testPrimitivePropertyDefaultValue() throws Exception { } @Test - public void testWrapperPropertyDefaultValue() throws Exception { + public void testWrapperPropertyDefaultValue() { DefaultPropertyType propertyType = new DefaultPropertyType<>( DefaultPropertyTypeTest.class, diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityPropertyAccessExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityPropertyAccessExceptionTest.java index 0dc5d97d0..e044e759a 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityPropertyAccessExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityPropertyAccessExceptionTest.java @@ -7,7 +7,7 @@ public class EntityPropertyAccessExceptionTest { @Test - public void test() throws Exception { + public void test() { EntityPropertyAccessException e = new EntityPropertyAccessException(new Exception(), "aaa", "bbb"); System.out.println(e.getMessage()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityPropertyNotFoundExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityPropertyNotFoundExceptionTest.java index 9c8764f61..0efe9b46d 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityPropertyNotFoundExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityPropertyNotFoundExceptionTest.java @@ -7,7 +7,7 @@ public class EntityPropertyNotFoundExceptionTest { @Test - public void test() throws Exception { + public void test() { EntityPropertyNotFoundException e = new EntityPropertyNotFoundException("aaa", "bbb"); System.out.println(e.getMessage()); assertEquals("aaa", e.getEntityClassName()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeFactoryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeFactoryTest.java index 401278f42..c07b548cc 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeFactoryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeFactoryTest.java @@ -13,20 +13,20 @@ public class EntityTypeFactoryTest { private final ClassHelper classHelper = new ClassHelper() {}; @Test - public void testGetEntityType() throws Exception { + public void testGetEntityType() { EntityType type = EntityTypeFactory.getEntityType(Emp.class, classHelper); assertNotNull(type); } @Test - public void testGetEntityType_forNestedEntity() throws Exception { + public void testGetEntityType_forNestedEntity() { EntityType type = EntityTypeFactory.getEntityType(NotTopLevelEntity.Hoge.class, classHelper); assertNotNull(type); } @Test - public void testGetEntityType_DomaIllegalArgumentException() throws Exception { + public void testGetEntityType_DomaIllegalArgumentException() { try { EntityTypeFactory.getEntityType(Object.class, classHelper); fail(); @@ -36,7 +36,7 @@ public void testGetEntityType_DomaIllegalArgumentException() throws Exception { } @Test - public void testGetEntityType_EntityTypeNotFoundException() throws Exception { + public void testGetEntityType_EntityTypeNotFoundException() { try { EntityTypeFactory.getEntityType(Dept.class, classHelper); fail(); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeNotFoundExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeNotFoundExceptionTest.java index 266ac50ec..16bd7e248 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeNotFoundExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeNotFoundExceptionTest.java @@ -7,7 +7,7 @@ public class EntityTypeNotFoundExceptionTest { @Test - public void test() throws Exception { + public void test() { EntityTypeNotFoundException e = new EntityTypeNotFoundException(new Exception(), "aaa", "bbb"); System.out.println(e.getMessage()); assertEquals("aaa", e.getEntityClassName()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeTest.java index 6977f753d..2d550e447 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/EntityTypeTest.java @@ -17,13 +17,13 @@ public class EntityTypeTest { @Test - public void test() throws Exception { + public void test() { EntityType entityType = _Emp.getSingletonInternal(); entityType.getName(); } @Test - public void testImmutable_newEntity() throws Exception { + public void testImmutable_newEntity() { ImmutableEmp emp = new ImmutableEmp(99, "hoge", BigDecimal.ONE, 1); EntityType entityType = _ImmutableEmp.getSingletonInternal(); Map> args = new HashMap<>(); @@ -48,33 +48,33 @@ public void testImmutable_newEntity() throws Exception { @SuppressWarnings("deprecation") @Test - public void testGetTableName() throws Exception { + public void testGetTableName() { EntityType entityType = _Dept.getSingletonInternal(); assertEquals("DEPT", entityType.getTableName()); } @Test - public void testGetTableName_naming() throws Exception { + public void testGetTableName_naming() { EntityType entityType = _Dept.getSingletonInternal(); assertEquals("dept", entityType.getTableName((namingType, text) -> text.toLowerCase())); } @SuppressWarnings("deprecation") @Test - public void testGetQualifiedName() throws Exception { + public void testGetQualifiedName() { EntityType entityType = _Dept.getSingletonInternal(); assertEquals("CATA.DEPT", entityType.getQualifiedTableName()); } @SuppressWarnings("deprecation") @Test - public void testGetQualifiedName_quote() throws Exception { + public void testGetQualifiedName_quote() { EntityType entityType = _Dept.getSingletonInternal(); assertEquals("[CATA].[DEPT]", entityType.getQualifiedTableName(text -> "[" + text + "]")); } @Test - public void testGetQualifiedName_naming_quote() throws Exception { + public void testGetQualifiedName_naming_quote() { EntityType entityType = _Dept.getSingletonInternal(); assertEquals( "[CATA].[dept]", diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessExceptionTest.java index 2b654ee79..08ce34047 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessExceptionTest.java @@ -7,7 +7,7 @@ public class OriginalStatesAccessExceptionTest { @Test - public void test() throws Exception { + public void test() { OriginalStatesAccessException e = new OriginalStatesAccessException(new Exception(), "aaa", "bbb"); System.out.println(e.getMessage()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessorTest.java index bed952663..7f6d66262 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesAccessorTest.java @@ -7,7 +7,7 @@ public class OriginalStatesAccessorTest { @Test - public void testGet() throws Exception { + public void testGet() { Hoge states = new Hoge(); Hoge hoge = new Hoge(); hoge.setOriginalStates(states); @@ -17,7 +17,7 @@ public void testGet() throws Exception { } @Test - public void testSet() throws Exception { + public void testSet() { Hoge states = new Hoge(); Hoge hoge = new Hoge(); OriginalStatesAccessor accessor = diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesNotFoundExceptionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesNotFoundExceptionTest.java index ad3f127fb..469687e56 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesNotFoundExceptionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/OriginalStatesNotFoundExceptionTest.java @@ -7,7 +7,7 @@ public class OriginalStatesNotFoundExceptionTest { @Test - public void test() throws Exception { + public void test() { OriginalStatesNotFoundException e = new OriginalStatesNotFoundException(new Exception(), "aaa", "bbb"); System.out.println(e.getMessage()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java index 5543b6bf7..df1293c19 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinIdentityIdGeneratorTest.java @@ -15,7 +15,7 @@ public class BuiltinIdentityIdGeneratorTest { @Test - public void test_identitySelectSql() throws Exception { + public void test_identitySelectSql() { MockConfig config = new MockConfig(); config.setDialect(new PostgresDialect()); MockResultSet resultSet = config.dataSource.connection.preparedStatement.resultSet; @@ -34,7 +34,7 @@ public void test_identitySelectSql() throws Exception { } @Test - public void test_identityReservationSql() throws Exception { + public void test_identityReservationSql() { MockConfig config = new MockConfig(); config.setDialect(new PostgresDialect()); MockResultSet resultSet = config.dataSource.connection.preparedStatement.resultSet; diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinSequenceIdGeneratorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinSequenceIdGeneratorTest.java index bc74653dd..26ca775f4 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinSequenceIdGeneratorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinSequenceIdGeneratorTest.java @@ -12,7 +12,7 @@ public class BuiltinSequenceIdGeneratorTest { @Test - public void test() throws Exception { + public void test() { MockConfig config = new MockConfig(); config.setDialect(new PostgresDialect()); MockResultSet resultSet = config.dataSource.connection.preparedStatement.resultSet; diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinTableIdGeneratorTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinTableIdGeneratorTest.java index fec5558dc..c91cc5fc8 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinTableIdGeneratorTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/id/BuiltinTableIdGeneratorTest.java @@ -4,7 +4,6 @@ import example.entity._IdGeneratedEmp; import java.sql.Connection; -import java.sql.SQLException; import java.util.LinkedList; import org.junit.jupiter.api.Test; import org.seasar.doma.internal.jdbc.mock.MockConfig; @@ -17,7 +16,7 @@ public class BuiltinTableIdGeneratorTest { @Test - public void test() throws Exception { + public void test() { MockConfig config = new MockConfig(); config.setDialect(new PostgresDialect()); MockConnection connection = new MockConnection(); @@ -31,7 +30,7 @@ public void test() throws Exception { new MockDataSource() { @Override - public Connection getConnection() throws SQLException { + public Connection getConnection() { return connections.pop(); } }; diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/ArrayCreateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/ArrayCreateQueryTest.java index 3b7c1c538..205701e6f 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/ArrayCreateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/ArrayCreateQueryTest.java @@ -8,7 +8,7 @@ public class ArrayCreateQueryTest { private final MockConfig config = new MockConfig(); @Test - public void testPrepare() throws Exception { + public void testPrepare() { ArrayCreateQuery query = new ArrayCreateQuery(); query.setConfig(config); query.setCallerClassName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java index 1fa3bdbbb..a331ba671 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQueryTest.java @@ -27,12 +27,12 @@ public class AutoBatchDeleteQueryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testPrepare() throws Exception { + public void testPrepare() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -54,7 +54,7 @@ public void testPrepare() throws Exception { } @Test - public void testOption_default() throws Exception { + public void testOption_default() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -89,7 +89,7 @@ public void testOption_default() throws Exception { } @Test - public void testOption_ignoreVersion() throws Exception { + public void testOption_ignoreVersion() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -123,7 +123,7 @@ public void testOption_ignoreVersion() throws Exception { } @Test - public void testTenantId() throws Exception { + public void testTenantId() { Salesman emp1 = new Salesman(); emp1.setId(10); emp1.setTenantId("bbb"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java index 37e544b96..8148a2ed4 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchInsertQueryTest.java @@ -26,12 +26,12 @@ public class AutoBatchInsertQueryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testPrepare() throws Exception { + public void testPrepare() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -54,7 +54,7 @@ public void testPrepare() throws Exception { } @Test - public void testOption_default() throws Exception { + public void testOption_default() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java index 39474cd8f..86bb1675f 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQueryTest.java @@ -29,12 +29,12 @@ public class AutoBatchUpdateQueryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testPrepare() throws Exception { + public void testPrepare() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -58,7 +58,7 @@ public void testPrepare() throws Exception { } @Test - public void testOption_default() throws Exception { + public void testOption_default() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -104,7 +104,7 @@ public void testOption_default() throws Exception { } @Test - public void testOption_ignoreVersion() throws Exception { + public void testOption_ignoreVersion() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -145,7 +145,7 @@ public void testOption_ignoreVersion() throws Exception { } @Test - public void testOption_include() throws Exception { + public void testOption_include() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -188,7 +188,7 @@ public void testOption_include() throws Exception { } @Test - public void testOption_exclude() throws Exception { + public void testOption_exclude() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -231,7 +231,7 @@ public void testOption_exclude() throws Exception { } @Test - public void testIsExecutable() throws Exception { + public void testIsExecutable() { AutoBatchUpdateQuery query = new AutoBatchUpdateQuery<>(_Emp.getSingletonInternal()); query.setMethod(method); query.setConfig(runtimeConfig); @@ -243,7 +243,7 @@ public void testIsExecutable() throws Exception { } @Test - public void testTenantId() throws Exception { + public void testTenantId() { Salesman s1 = new Salesman(); s1.setId(10); s1.setName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java index e9507466b..efeb2adbb 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoDeleteQueryTest.java @@ -25,12 +25,12 @@ public class AutoDeleteQueryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testPrepare() throws Exception { + public void testPrepare() { Emp emp = new Emp(); AutoDeleteQuery query = new AutoDeleteQuery<>(_Emp.getSingletonInternal()); @@ -46,7 +46,7 @@ public void testPrepare() throws Exception { } @Test - public void testOption_default() throws Exception { + public void testOption_default() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -70,7 +70,7 @@ public void testOption_default() throws Exception { } @Test - public void testOption_ignoreVersion() throws Exception { + public void testOption_ignoreVersion() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -94,7 +94,7 @@ public void testOption_ignoreVersion() throws Exception { } @Test - public void testTenantId() throws Exception { + public void testTenantId() { Salesman salesman = new Salesman(); salesman.setId(10); salesman.setName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java index 863b4a5bf..dcd00416f 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoFunctionQueryTest.java @@ -13,7 +13,7 @@ public class AutoFunctionQueryTest { private final MockConfig runtimeConfig = new MockConfig(); @Test - public void testPrepare() throws Exception { + public void testPrepare() { AutoFunctionQuery query = new AutoFunctionQuery<>(); query.setConfig(runtimeConfig); query.setFunctionName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java index 616320108..1ec8a28ce 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoInsertQueryTest.java @@ -25,12 +25,12 @@ public class AutoInsertQueryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testPrepare() throws Exception { + public void testPrepare() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -48,7 +48,7 @@ public void testPrepare() throws Exception { } @Test - public void testOption_default() throws Exception { + public void testOption_default() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -74,7 +74,7 @@ public void testOption_default() throws Exception { } @Test - public void testOption_excludeNull() throws Exception { + public void testOption_excludeNull() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -99,7 +99,7 @@ public void testOption_excludeNull() throws Exception { } @Test - public void testOption_include() throws Exception { + public void testOption_include() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -125,7 +125,7 @@ public void testOption_include() throws Exception { } @Test - public void testOption_exclude() throws Exception { + public void testOption_exclude() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java index 25f4772c3..a425b0800 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/AutoUpdateQueryTest.java @@ -28,12 +28,12 @@ public class AutoUpdateQueryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testPrepare() throws Exception { + public void testPrepare() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -52,7 +52,7 @@ public void testPrepare() throws Exception { } @Test - public void testOption_default() throws Exception { + public void testOption_default() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -81,7 +81,7 @@ public void testOption_default() throws Exception { } @Test - public void testOption_excludeNull() throws Exception { + public void testOption_excludeNull() { Emp emp = new Emp(); emp.setId(10); emp.setVersion(100); @@ -106,7 +106,7 @@ public void testOption_excludeNull() throws Exception { } @Test - public void testOption_ignoreVersion() throws Exception { + public void testOption_ignoreVersion() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -133,7 +133,7 @@ public void testOption_ignoreVersion() throws Exception { } @Test - public void testOption_include() throws Exception { + public void testOption_include() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -162,7 +162,7 @@ public void testOption_include() throws Exception { } @Test - public void testOption_exclude() throws Exception { + public void testOption_exclude() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -191,7 +191,7 @@ public void testOption_exclude() throws Exception { } @Test - public void testIsExecutable() throws Exception { + public void testIsExecutable() { Emp emp = new Emp(); emp.originalStates = new Emp(); @@ -208,7 +208,7 @@ public void testIsExecutable() throws Exception { } @Test - public void testTenantId() throws Exception { + public void testTenantId() { Salesman salesman = new Salesman(); salesman.setId(10); salesman.setName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java index 5620840d9..2d4ff9198 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchDeleteQueryTest.java @@ -23,12 +23,12 @@ public class SqlFileBatchDeleteQueryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testPrepare() throws Exception { + public void testPrepare() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -54,7 +54,7 @@ public void testPrepare() throws Exception { } @Test - public void testOption_default() throws Exception { + public void testOption_default() { Emp emp1 = new Emp(); emp1.setName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java index 124c7afca..110580ddf 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchInsertQueryTest.java @@ -25,12 +25,12 @@ public class SqlFileBatchInsertQueryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testPrepare() throws Exception { + public void testPrepare() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -56,7 +56,7 @@ public void testPrepare() throws Exception { } @Test - public void testOption_default() throws Exception { + public void testOption_default() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java index 6f4b88ccb..1cb8b78fe 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileBatchUpdateQueryTest.java @@ -29,12 +29,12 @@ public class SqlFileBatchUpdateQueryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testPrepare() throws Exception { + public void testPrepare() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -60,7 +60,7 @@ public void testPrepare() throws Exception { } @Test - public void testOption_default() throws Exception { + public void testOption_default() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -100,7 +100,7 @@ public void testOption_default() throws Exception { } @Test - public void testIsExecutable() throws Exception { + public void testIsExecutable() { SqlFileBatchUpdateQuery query = new SqlFileBatchUpdateQuery<>(Emp.class); query.setMethod(method); query.setConfig(runtimeConfig); @@ -114,7 +114,7 @@ public void testIsExecutable() throws Exception { } @Test - public void testPopulate() throws Exception { + public void testPopulate() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -144,7 +144,7 @@ public void testPopulate() throws Exception { } @Test - public void testPopulate_include() throws Exception { + public void testPopulate_include() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -174,7 +174,7 @@ public void testPopulate_include() throws Exception { } @Test - public void testPopulate_exclude() throws Exception { + public void testPopulate_exclude() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); @@ -204,7 +204,7 @@ public void testPopulate_exclude() throws Exception { } @Test - public void testPopulate_ignoreVersion() throws Exception { + public void testPopulate_ignoreVersion() { Emp emp1 = new Emp(); emp1.setId(10); emp1.setName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileScriptQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileScriptQueryTest.java index 926f102ff..61c665ae6 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileScriptQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileScriptQueryTest.java @@ -25,12 +25,12 @@ public class SqlFileScriptQueryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testPrepare() throws Exception { + public void testPrepare() { SqlFileScriptQuery query = new SqlFileScriptQuery(); query.setConfig(config); query.setMethod(method); @@ -52,7 +52,7 @@ public void testPrepare() throws Exception { } @Test - public void testPrepare_dbmsSpecific() throws Exception { + public void testPrepare_dbmsSpecific() { config.dialect = new Mssql2008Dialect(); SqlFileScriptQuery query = new SqlFileScriptQuery(); query.setConfig(config); @@ -75,7 +75,7 @@ public void testPrepare_dbmsSpecific() throws Exception { } @Test - public void testPrepare_ScriptFileNotFoundException() throws Exception { + public void testPrepare_ScriptFileNotFoundException() { SqlFileScriptQuery query = new SqlFileScriptQuery(); query.setConfig(config); query.setMethod(method); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java index 0529970ab..16527ac18 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileUpdateQueryTest.java @@ -42,12 +42,12 @@ public class SqlFileUpdateQueryTest { private Method method; @BeforeEach - protected void setUp(TestInfo testInfo) throws Exception { + protected void setUp(TestInfo testInfo) { method = testInfo.getTestMethod().get(); } @Test - public void testPopulate() throws Exception { + public void testPopulate() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -81,7 +81,7 @@ public void testPopulate() throws Exception { } @Test - public void testPopulate_states() throws Exception { + public void testPopulate_states() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -112,7 +112,7 @@ public void testPopulate_states() throws Exception { } @Test - public void testPopulate_excludeNull() throws Exception { + public void testPopulate_excludeNull() { Emp emp = new Emp(); emp.setId(10); emp.setName("hoge"); @@ -142,7 +142,7 @@ public void testPopulate_excludeNull() throws Exception { } @Test - public void testPopulate_excludeNull_updateNullableInPreUpdate() throws Exception { + public void testPopulate_excludeNull_updateNullableInPreUpdate() { Emp emp = new Emp(); emp.setId(10); emp.setVersion(100); @@ -171,7 +171,7 @@ public void testPopulate_excludeNull_updateNullableInPreUpdate() throws Exceptio } @Test - public void testPopulate_ignoreVersion() throws Exception { + public void testPopulate_ignoreVersion() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -202,7 +202,7 @@ public void testPopulate_ignoreVersion() throws Exception { } @Test - public void testPopulate_include() throws Exception { + public void testPopulate_include() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -233,7 +233,7 @@ public void testPopulate_include() throws Exception { } @Test - public void testPopulate_exclude() throws Exception { + public void testPopulate_exclude() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); @@ -265,7 +265,7 @@ public void testPopulate_exclude() throws Exception { } @Test - public void testPopulate_IsExecutable() throws Exception { + public void testPopulate_IsExecutable() { Emp emp = new Emp(); emp.originalStates = new Emp(); @@ -285,7 +285,7 @@ public void testPopulate_IsExecutable() throws Exception { } @Test - public void testNonEntity() throws Exception { + public void testNonEntity() { SqlFileUpdateQuery query = new SqlFileUpdateQuery(); query.setMethod(method); query.setSqlFilePath( @@ -312,7 +312,7 @@ public void testNonEntity() throws Exception { } @Test - public void testOriginalStates_unchanged() throws Exception { + public void testOriginalStates_unchanged() { Emp emp = new Emp(); emp.setId(10); emp.setName("aaa"); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java index 7b2e831b7..3007f2153 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java @@ -57,7 +57,7 @@ public void testBeginWithTransactionIsolationLevel() throws Exception { } @Test - public void testBegin_alreadyBegun() throws Exception { + public void testBegin_alreadyBegun() { transaction.begin(); try { transaction.begin(); @@ -116,7 +116,7 @@ public void setTransactionIsolation(int level) throws SQLException { } @Test - public void testSetSavepoint() throws Exception { + public void testSetSavepoint() { transaction.begin(); transaction.setSavepoint("hoge"); assertTrue(transaction.isActive()); @@ -125,7 +125,7 @@ public void testSetSavepoint() throws Exception { } @Test - public void testSetSavepoint_alreadyExists() throws Exception { + public void testSetSavepoint_alreadyExists() { transaction.begin(); transaction.setSavepoint("hoge"); try { @@ -137,7 +137,7 @@ public void testSetSavepoint_alreadyExists() throws Exception { } @Test - public void testSetSavepoint_notYetBegun() throws Exception { + public void testSetSavepoint_notYetBegun() { try { transaction.setSavepoint("hoge"); fail(); @@ -147,7 +147,7 @@ public void testSetSavepoint_notYetBegun() throws Exception { } @Test - public void testSetSavepoint_nullPointer() throws Exception { + public void testSetSavepoint_nullPointer() { transaction.begin(); try { transaction.setSavepoint(null); @@ -158,7 +158,7 @@ public void testSetSavepoint_nullPointer() throws Exception { } @Test - public void testHasSavepoint() throws Exception { + public void testHasSavepoint() { transaction.begin(); assertFalse(transaction.hasSavepoint("hoge")); transaction.setSavepoint("hoge"); @@ -168,7 +168,7 @@ public void testHasSavepoint() throws Exception { } @Test - public void testHasSavepoint_notYetBegun() throws Exception { + public void testHasSavepoint_notYetBegun() { try { transaction.hasSavepoint("hoge"); fail(); @@ -178,7 +178,7 @@ public void testHasSavepoint_notYetBegun() throws Exception { } @Test - public void testHasSavepoint_nullPointer() throws Exception { + public void testHasSavepoint_nullPointer() { transaction.begin(); try { transaction.hasSavepoint(null); @@ -189,7 +189,7 @@ public void testHasSavepoint_nullPointer() throws Exception { } @Test - public void testReleaseSavepoint() throws Exception { + public void testReleaseSavepoint() { transaction.begin(); transaction.setSavepoint("hoge"); transaction.setSavepoint("foo"); @@ -203,7 +203,7 @@ public void testReleaseSavepoint() throws Exception { } @Test - public void testReleaseSavepoint_notYetBegun() throws Exception { + public void testReleaseSavepoint_notYetBegun() { try { transaction.releaseSavepoint("hoge"); fail(); @@ -213,7 +213,7 @@ public void testReleaseSavepoint_notYetBegun() throws Exception { } @Test - public void testReleaseSavepoint_notFound() throws Exception { + public void testReleaseSavepoint_notFound() { transaction.begin(); transaction.setSavepoint("hoge"); try { @@ -225,7 +225,7 @@ public void testReleaseSavepoint_notFound() throws Exception { } @Test - public void testReleaseSavepoint_nullPointer() throws Exception { + public void testReleaseSavepoint_nullPointer() { transaction.begin(); try { transaction.releaseSavepoint(null); @@ -246,7 +246,7 @@ public void testCommit() throws Exception { } @Test - public void testCommit_ConnectionUnused() throws Exception { + public void testCommit_ConnectionUnused() { transaction.begin(); transaction.commit(); assertFalse(transaction.isActive()); @@ -255,7 +255,7 @@ public void testCommit_ConnectionUnused() throws Exception { } @Test - public void testCommit_notYetBegun() throws Exception { + public void testCommit_notYetBegun() { try { transaction.commit(); fail(); @@ -275,7 +275,7 @@ public void testRollback() throws Exception { } @Test - public void testRollback_ConnectionUnused() throws Exception { + public void testRollback_ConnectionUnused() { transaction.begin(); transaction.rollback(); assertFalse(transaction.isActive()); @@ -284,12 +284,12 @@ public void testRollback_ConnectionUnused() throws Exception { } @Test - public void testRollback_notYetBegun() throws Exception { + public void testRollback_notYetBegun() { transaction.rollback(); } @Test - public void testRollbackSavepoint() throws Exception { + public void testRollbackSavepoint() { transaction.begin(); transaction.setSavepoint("hoge"); transaction.rollback("hoge"); @@ -299,7 +299,7 @@ public void testRollbackSavepoint() throws Exception { } @Test - public void testRollbackSavepoint_notYetBegun() throws Exception { + public void testRollbackSavepoint_notYetBegun() { try { transaction.rollback("hoge"); } catch (TransactionNotYetBegunException expected) { @@ -308,7 +308,7 @@ public void testRollbackSavepoint_notYetBegun() throws Exception { } @Test - public void testRollbackSavepoint_notFound() throws Exception { + public void testRollbackSavepoint_notFound() { transaction.begin(); transaction.setSavepoint("hoge"); try { @@ -320,7 +320,7 @@ public void testRollbackSavepoint_notFound() throws Exception { } @Test - public void testInitAndDestory() throws Exception { + public void testInitAndDestory() { assertNull(transaction.localTxContextHolder.get()); transaction.init(); assertNotNull(transaction.localTxContextHolder.get()); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java index eaf9be4d8..edff46cc0 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java @@ -5,7 +5,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import java.sql.Connection; -import java.sql.SQLException; import java.sql.Savepoint; import org.junit.jupiter.api.Test; import org.seasar.doma.internal.jdbc.mock.MockConnection; @@ -44,12 +43,12 @@ public MySavepoint(String name) { } @Override - public int getSavepointId() throws SQLException { + public int getSavepointId() { return 0; } @Override - public String getSavepointName() throws SQLException { + public String getSavepointName() { return name; } } diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java index 895587f6d..7e7d2abe8 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java @@ -36,12 +36,12 @@ public void logTransactionEnded( private final LocalTransaction transaction = dataSource.getLocalTransaction(jdbcLogger); @BeforeEach - protected void setUp() throws Exception { + protected void setUp() { LocalTransactionManagerTest.counter = 0; } @Test - public void testRequired_blcok() throws Exception { + public void testRequired_blcok() { TransactionManager manager = new LocalTransactionManager(transaction); StringBuilder log = new StringBuilder(); log.append(LocalTransactionManagerTest.counter); @@ -59,14 +59,14 @@ public void testRequired_blcok() throws Exception { } @Test - public void testRequired_supplier() throws Exception { + public void testRequired_supplier() { LocalTransactionManager manager = new LocalTransactionManager(transaction); String result = manager.required(() -> "aaa"); assertEquals("aaa", result); } @Test - public void testRequiresNew_blcok() throws Exception { + public void testRequiresNew_blcok() { TransactionManager manager = new LocalTransactionManager(transaction); StringBuilder log = new StringBuilder(); log.append(LocalTransactionManagerTest.counter); @@ -84,14 +84,14 @@ public void testRequiresNew_blcok() throws Exception { } @Test - public void testRequiresNew_supplier() throws Exception { + public void testRequiresNew_supplier() { LocalTransactionManager manager = new LocalTransactionManager(transaction); String result = manager.requiresNew(() -> "aaa"); assertEquals("aaa", result); } @Test - public void testNotSupported_block() throws Exception { + public void testNotSupported_block() { TransactionManager manager = new LocalTransactionManager(transaction); StringBuilder log = new StringBuilder(); log.append(LocalTransactionManagerTest.counter); @@ -109,14 +109,14 @@ public void testNotSupported_block() throws Exception { } @Test - public void testNotSupported_supplier() throws Exception { + public void testNotSupported_supplier() { LocalTransactionManager manager = new LocalTransactionManager(transaction); String result = manager.notSupported(() -> "aaa"); assertEquals("aaa", result); } @Test - public void testNotSupported_in_tx() throws Exception { + public void testNotSupported_in_tx() { LocalTransactionManager manager = new LocalTransactionManager(transaction); StringBuilder log = new StringBuilder(); log.append(LocalTransactionManagerTest.counter); diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java index 414424c67..f52e7e95d 100644 --- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java +++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java @@ -54,7 +54,7 @@ public void testBeginWithTransactionIsolationLevel() throws Exception { } @Test - public void testBegin_alreadyBegun() throws Exception { + public void testBegin_alreadyBegun() { transaction.begin(); try { transaction.begin(); @@ -115,7 +115,7 @@ public void setTransactionIsolation(int level) throws SQLException { } @Test - public void testSetSavepoint() throws Exception { + public void testSetSavepoint() { transaction.begin(); transaction.setSavepoint("hoge"); assertTrue(transaction.isActive()); @@ -124,7 +124,7 @@ public void testSetSavepoint() throws Exception { } @Test - public void testSetSavepoint_alreadyExists() throws Exception { + public void testSetSavepoint_alreadyExists() { transaction.begin(); transaction.setSavepoint("hoge"); try { @@ -136,7 +136,7 @@ public void testSetSavepoint_alreadyExists() throws Exception { } @Test - public void testSetSavepoint_notYetBegun() throws Exception { + public void testSetSavepoint_notYetBegun() { try { transaction.setSavepoint("hoge"); fail(); @@ -146,7 +146,7 @@ public void testSetSavepoint_notYetBegun() throws Exception { } @Test - public void testSetSavepoint_nullPointer() throws Exception { + public void testSetSavepoint_nullPointer() { transaction.begin(); try { transaction.setSavepoint(null); @@ -157,7 +157,7 @@ public void testSetSavepoint_nullPointer() throws Exception { } @Test - public void testHasSavepoint() throws Exception { + public void testHasSavepoint() { transaction.begin(); assertFalse(transaction.hasSavepoint("hoge")); transaction.setSavepoint("hoge"); @@ -167,7 +167,7 @@ public void testHasSavepoint() throws Exception { } @Test - public void testHasSavepoint_notYetBegun() throws Exception { + public void testHasSavepoint_notYetBegun() { try { transaction.hasSavepoint("hoge"); fail(); @@ -177,7 +177,7 @@ public void testHasSavepoint_notYetBegun() throws Exception { } @Test - public void testHasSavepoint_nullPointer() throws Exception { + public void testHasSavepoint_nullPointer() { transaction.begin(); try { transaction.hasSavepoint(null); @@ -188,7 +188,7 @@ public void testHasSavepoint_nullPointer() throws Exception { } @Test - public void testReleaseSavepoint() throws Exception { + public void testReleaseSavepoint() { transaction.begin(); transaction.setSavepoint("hoge"); transaction.setSavepoint("foo"); @@ -202,7 +202,7 @@ public void testReleaseSavepoint() throws Exception { } @Test - public void testReleaseSavepoint_notYetBegun() throws Exception { + public void testReleaseSavepoint_notYetBegun() { try { transaction.releaseSavepoint("hoge"); fail(); @@ -212,7 +212,7 @@ public void testReleaseSavepoint_notYetBegun() throws Exception { } @Test - public void testReleaseSavepoint_notFound() throws Exception { + public void testReleaseSavepoint_notFound() { transaction.begin(); transaction.setSavepoint("hoge"); try { @@ -224,7 +224,7 @@ public void testReleaseSavepoint_notFound() throws Exception { } @Test - public void testReleaseSavepoint_nullPointer() throws Exception { + public void testReleaseSavepoint_nullPointer() { transaction.begin(); try { transaction.releaseSavepoint(null); @@ -254,7 +254,7 @@ public void testCommit_ConnectionUnused() { } @Test - public void testCommit_notYetBegun() throws Exception { + public void testCommit_notYetBegun() { try { transaction.commit(); fail(); @@ -274,7 +274,7 @@ public void testRollback() throws Exception { } @Test - public void testRollback_ConnectionUnused() throws Exception { + public void testRollback_ConnectionUnused() { transaction.begin(); transaction.rollback(); assertFalse(transaction.isActive()); @@ -283,12 +283,12 @@ public void testRollback_ConnectionUnused() throws Exception { } @Test - public void testRollback_notYetBegun() throws Exception { + public void testRollback_notYetBegun() { transaction.rollback(); } @Test - public void testRollbackSavepoint() throws Exception { + public void testRollbackSavepoint() { transaction.begin(); transaction.setSavepoint("hoge"); transaction.rollback("hoge"); @@ -298,7 +298,7 @@ public void testRollbackSavepoint() throws Exception { } @Test - public void testRollbackSavepoint_notYetBegun() throws Exception { + public void testRollbackSavepoint_notYetBegun() { try { transaction.rollback("hoge"); } catch (TransactionNotYetBegunException expected) { @@ -307,7 +307,7 @@ public void testRollbackSavepoint_notYetBegun() throws Exception { } @Test - public void testRollbackSavepoint_notFound() throws Exception { + public void testRollbackSavepoint_notFound() { transaction.begin(); transaction.setSavepoint("hoge"); try { diff --git a/doma-core/src/test/java/org/seasar/doma/message/MessageTest.java b/doma-core/src/test/java/org/seasar/doma/message/MessageTest.java index c25b8762e..76a2e351d 100644 --- a/doma-core/src/test/java/org/seasar/doma/message/MessageTest.java +++ b/doma-core/src/test/java/org/seasar/doma/message/MessageTest.java @@ -7,21 +7,21 @@ public class MessageTest { @Test - public void testDOMA0001() throws Exception { + public void testDOMA0001() { String message = Message.DOMA0001.getMessage("aaa", "bbb"); assertNotNull(message); System.out.println(message); } @Test - public void testDOMA4019() throws Exception { + public void testDOMA4019() { String message = Message.DOMA4019.getMessage("aaa", "bbb"); assertNotNull(message); System.out.println(message); } @Test - public void testDOMA4021() throws Exception { + public void testDOMA4021() { String message = Message.DOMA4021.getMessage("aaa", "bbb"); assertNotNull(message); System.out.println(message); From f08512d9f332659036b952acf63398493ef18bec Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 15:28:43 +0900 Subject: [PATCH 71/78] Remove unnecessary assertion --- .../test/java/org/seasar/doma/internal/RuntimeConfigTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/doma-core/src/test/java/org/seasar/doma/internal/RuntimeConfigTest.java b/doma-core/src/test/java/org/seasar/doma/internal/RuntimeConfigTest.java index d2a133818..1a4657839 100644 --- a/doma-core/src/test/java/org/seasar/doma/internal/RuntimeConfigTest.java +++ b/doma-core/src/test/java/org/seasar/doma/internal/RuntimeConfigTest.java @@ -56,7 +56,6 @@ public EntityListenerProvider getEntityListenerProvider() { .get(MockEntityListener.class, MockEntityListener::new); fail(); } catch (ConfigException e) { - assertEquals(originalConfig.getClass().getName(), e.getClassName()); assertEquals("getEntityListenerProvider", e.getMethodName()); } } From 9b5d8c393d392de04fafd4f3096780f3bfb6f5a6 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 19 Sep 2020 15:30:35 +0900 Subject: [PATCH 72/78] Fix typo --- .../org/seasar/doma/internal/Artifact.java | 6 ++-- .../internal/expr/ExpressionEvaluator.java | 30 +++++++++---------- .../node/AbstractArithmeticOperatorNode.java | 6 ++-- .../command/CallableSqlParameterFetcher.java | 4 +-- .../command/PreparedSqlParameterBinder.java | 6 ++-- .../doma/internal/jdbc/sql/SqlParser.java | 18 +++++------ .../declaration/ComparisonDeclaration.java | 12 ++++---- .../declaration/WhereDeclaration.java | 18 +++++------ .../doma/jdbc/domain/DomainConverter.java | 2 +- .../internal/expr/ExpressionParserTest.java | 12 ++++---- .../expr/ExpressionTokenizerTest.java | 2 +- .../doma/jdbc/builder/DeleteBuilderTest.java | 2 +- .../builder/MapBatchInsertBuilderTest.java | 2 +- .../doma/jdbc/builder/SelectBuilderTest.java | 2 +- .../jdbc/dialect/StandardDialectTest.java | 8 ++--- .../jdbc/entity/DefaultPropertyTypeTest.java | 8 ++--- .../tx/KeepAliveLocalTransactionTest.java | 4 +-- .../jdbc/tx/LocalTransactionManagerTest.java | 4 +-- .../doma/jdbc/tx/LocalTransactionTest.java | 2 +- ...pperTtest.java => IntegerWrapperTest.java} | 2 +- .../testExecute_resultList.sql | 2 +- .../testExecute_resultStream.sql | 2 +- 22 files changed, 77 insertions(+), 77 deletions(-) rename doma-core/src/test/java/org/seasar/doma/wrapper/{IntegerWrapperTtest.java => IntegerWrapperTest.java} (93%) diff --git a/doma-core/src/main/java/org/seasar/doma/internal/Artifact.java b/doma-core/src/main/java/org/seasar/doma/internal/Artifact.java index 356d289ed..41e57af61 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/Artifact.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/Artifact.java @@ -17,9 +17,9 @@ public static String getVersion() { return VERSION; } - public static void validateVersion(String generationtimeVersion) { - if (!VERSION.equals(generationtimeVersion)) { - throw new DomaException(Message.DOMA0003, VERSION, generationtimeVersion); + public static void validateVersion(String compileTimeVersion) { + if (!VERSION.equals(compileTimeVersion)) { + throw new DomaException(Message.DOMA0003, VERSION, compileTimeVersion); } } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java index 1fd9f153a..67348ba9b 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionEvaluator.java @@ -100,9 +100,9 @@ public Value removeValue(String variableName) { return variableValues.remove(variableName); } - public void add(String varialbeName, Value value) { - assertNotNull(varialbeName, value); - variableValues.put(varialbeName, value); + public void add(String variableName, Value value) { + assertNotNull(variableName, value); + variableValues.put(variableName, value); } public EvaluationResult evaluate(ExpressionNode node) { @@ -263,11 +263,11 @@ public EvaluationResult visitAddOperatorNode(AddOperatorNode node, Void p) { } protected Text createText( - OperatorNode operatoNode, ExpressionNode operandNode, EvaluationResult evaluationResult) { + OperatorNode operatorNode, ExpressionNode operandNode, EvaluationResult evaluationResult) { if (!Text.isAcceptable(evaluationResult.getValueClass())) { return null; } - return new Text(operatoNode, evaluationResult.getValue(), evaluationResult.getValueClass()); + return new Text(operatorNode, evaluationResult.getValue(), evaluationResult.getValueClass()); } protected void throwNotTextException( @@ -351,13 +351,13 @@ public EvaluationResult visitModOperatorNode(ModOperatorNode node, Void p) { } protected Number createNumber( - ArithmeticOperatorNode operatoNode, + ArithmeticOperatorNode operatorNode, ExpressionNode operandNode, EvaluationResult evaluationResult) { if (!Number.isAcceptable(evaluationResult.getValueClass())) { return null; } - return new Number(operatoNode, evaluationResult.getValue(), evaluationResult.getValueClass()); + return new Number(operatorNode, evaluationResult.getValue(), evaluationResult.getValueClass()); } protected ExpressionException newNotNumberException( @@ -569,19 +569,19 @@ protected Method findSuiteMethod( for (Method method : methods) { Class paramTypes[] = method.getParameterTypes(); if (paramTypes.length == argTypes.length) { - int degreeOfcoincidence = 0; + int degreeOfCoincidence = 0; for (int i = 0; i < paramTypes.length; i++) { int difference = calculateHierarchyDifference(paramTypes[i], argTypes[i], 0); if (difference == -1) { continue outer; } - degreeOfcoincidence += difference; + degreeOfCoincidence += difference; } - if (degreeOfcoincidence == 0) { + if (degreeOfCoincidence == 0) { return method; } - if (candidate == null || degreeOfcoincidence < candidate.degreeOfcoincidence) { - candidate = new CandidateMethod(degreeOfcoincidence, method); + if (candidate == null || degreeOfCoincidence < candidate.degreeOfCoincidence) { + candidate = new CandidateMethod(degreeOfCoincidence, method); } } } @@ -1188,11 +1188,11 @@ public Class[] getParamTypes() { } protected static class CandidateMethod { - final int degreeOfcoincidence; + final int degreeOfCoincidence; final Method method; - CandidateMethod(int degreeOfcoincidence, Method method) { - this.degreeOfcoincidence = degreeOfcoincidence; + CandidateMethod(int degreeOfCoincidence, Method method) { + this.degreeOfCoincidence = degreeOfCoincidence; this.method = method; } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/node/AbstractArithmeticOperatorNode.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/node/AbstractArithmeticOperatorNode.java index 017749dd8..6b009fd56 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/expr/node/AbstractArithmeticOperatorNode.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/node/AbstractArithmeticOperatorNode.java @@ -15,10 +15,10 @@ public abstract class AbstractArithmeticOperatorNode implements ArithmeticOperat protected ExpressionNode rightNode; protected AbstractArithmeticOperatorNode( - ExpressionLocation location, String expreexpression, int priority) { - assertNotNull(location, expreexpression); + ExpressionLocation location, String expression, int priority) { + assertNotNull(location, expression); this.location = location; - this.expression = expreexpression; + this.expression = expression; this.priority = priority; } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterFetcher.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterFetcher.java index 72658dffd..1d1e3f4e3 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterFetcher.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterFetcher.java @@ -37,9 +37,9 @@ public CallableSqlParameterFetcher(ModuleQuery query) throws SQLException { public void fetch(CallableStatement callableStatement, List parameters) throws SQLException { assertNotNull(callableStatement, parameters); - FetchingVisitor fetchngVisitor = new FetchingVisitor(query, callableStatement); + FetchingVisitor fetchingVisitor = new FetchingVisitor(query, callableStatement); for (SqlParameter parameter : parameters) { - parameter.accept(fetchngVisitor, null); + parameter.accept(fetchingVisitor, null); } } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/PreparedSqlParameterBinder.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/PreparedSqlParameterBinder.java index 8071e5bb8..b27c94e4c 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/PreparedSqlParameterBinder.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/PreparedSqlParameterBinder.java @@ -20,12 +20,12 @@ public PreparedSqlParameterBinder(Query query) { } @Override - public void bind(PreparedStatement preparedStatement, List> paramters) + public void bind(PreparedStatement preparedStatement, List> parameters) throws SQLException { - assertNotNull(preparedStatement, paramters); + assertNotNull(preparedStatement, parameters); int index = 1; JdbcMappingVisitor jdbcMappingVisitor = query.getConfig().getDialect().getJdbcMappingVisitor(); - for (InParameter parameter : paramters) { + for (InParameter parameter : parameters) { bindInParameter(preparedStatement, parameter, index, jdbcMappingVisitor); index++; } diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlParser.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlParser.java index f8899e432..ed6892f8e 100644 --- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlParser.java +++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlParser.java @@ -420,34 +420,34 @@ protected void parseClosedParens() { } protected void parseBindVariableBlockComment() { - String varialbeName = tokenType.extract(token); - if (varialbeName.isEmpty()) { + String variableName = tokenType.extract(token); + if (variableName.isEmpty()) { throw new JdbcException( Message.DOMA2120, sql, tokenizer.getLineNumber(), tokenizer.getPosition(), token); } - BindVariableNode node = new BindVariableNode(getLocation(), varialbeName, token); + BindVariableNode node = new BindVariableNode(getLocation(), variableName, token); appendNode(node); push(node); } protected void parseLiteralVariableBlockComment() { - String varialbeName = tokenType.extract(token); - if (varialbeName.isEmpty()) { + String variableName = tokenType.extract(token); + if (variableName.isEmpty()) { throw new JdbcException( Message.DOMA2228, sql, tokenizer.getLineNumber(), tokenizer.getPosition(), token); } - LiteralVariableNode node = new LiteralVariableNode(getLocation(), varialbeName, token); + LiteralVariableNode node = new LiteralVariableNode(getLocation(), variableName, token); appendNode(node); push(node); } protected void parseEmbeddedVariableBlockComment() { - String varialbeName = tokenType.extract(token); - if (varialbeName.isEmpty()) { + String variableName = tokenType.extract(token); + if (variableName.isEmpty()) { throw new JdbcException( Message.DOMA2121, sql, tokenizer.getLineNumber(), tokenizer.getPosition(), token); } - EmbeddedVariableNode node = new EmbeddedVariableNode(getLocation(), varialbeName, token); + EmbeddedVariableNode node = new EmbeddedVariableNode(getLocation(), variableName, token); appendNode(node); push(node); } diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/ComparisonDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/ComparisonDeclaration.java index ba4b0a17d..21f66b76d 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/ComparisonDeclaration.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/ComparisonDeclaration.java @@ -25,7 +25,7 @@ protected ComparisonDeclaration( * Adds a {@code =} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operand. * @param the property type * @throws NullPointerException if {@code left} is null @@ -55,7 +55,7 @@ public void eq(PropertyMetamodel left, PropertyMetamodel} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operand. * @param the property type * @throws NullPointerException if {@code left} is null @@ -85,7 +85,7 @@ public void ne(PropertyMetamodel left, PropertyMetamodel} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operand. * @param the property type * @throws NullPointerException if {@code left} is null @@ -115,7 +115,7 @@ public void gt(PropertyMetamodel left, PropertyMetamodel=} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operand. * @param the property type * @throws NullPointerException if {@code left} is null @@ -145,7 +145,7 @@ public void ge(PropertyMetamodel left, PropertyMetamodel the property type * @throws NullPointerException if {@code left} is null @@ -175,7 +175,7 @@ public void lt(PropertyMetamodel left, PropertyMetamodel the property type * @throws NullPointerException if {@code left} is null diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/WhereDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/WhereDeclaration.java index a0057ac45..858211369 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/WhereDeclaration.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/WhereDeclaration.java @@ -37,7 +37,7 @@ public WhereDeclaration(UpdateContext context) { * Adds a {@code LIKE} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operator. * @throws NullPointerException if {@code left} is null */ @@ -52,7 +52,7 @@ public void like(PropertyMetamodel left, CharSequence right) { * Adds a {@code LIKE} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operator. * @param option the option * @throws NullPointerException if {@code left} is null @@ -68,7 +68,7 @@ public void like(PropertyMetamodel left, CharSequence right, LikeOption optio * Adds a {@code NOT LIKE} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operator. * @throws NullPointerException if {@code left} is null */ @@ -83,7 +83,7 @@ public void notLike(PropertyMetamodel left, CharSequence right) { * Adds a {@code NOT LIKE} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operator. * @param option the option * @throws NullPointerException if {@code left} is null @@ -99,7 +99,7 @@ public void notLike(PropertyMetamodel left, CharSequence right, LikeOption op * Adds a {@code BETWEEN} operator. * *

If either of the {@code start} parameter or the {@code end} parameter is null, the query - * condition does'nt include the operator. + * condition doesn't include the operator. * * @param propertyMetamodel the left hand operand * @param start the first argument of the right hand operand @@ -123,7 +123,7 @@ public void between( * Adds a {@code IN} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operator. * @param the property type * @throws NullPointerException if {@code left} is null @@ -142,7 +142,7 @@ public void in(PropertyMetamodel left, List right * Adds a {@code NOT IN} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operator. * @param the property type * @throws NullPointerException if {@code left} is null @@ -191,7 +191,7 @@ public void notIn( * Adds a {@code IN} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operator. * @param the first property type * @param the second property type @@ -221,7 +221,7 @@ public void in( * Adds a {@code NOT IN} operator. * * @param left the left hand operand - * @param right the right hand operand. If this value is null, the query condition does'nt include + * @param right the right hand operand. If this value is null, the query condition doesn't include * the operator. * @param the first property type * @param the second property type diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/domain/DomainConverter.java b/doma-core/src/main/java/org/seasar/doma/jdbc/domain/DomainConverter.java index 0143435bd..ad051312c 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/domain/DomainConverter.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/domain/DomainConverter.java @@ -10,7 +10,7 @@ * {@link DomainConverters}. * * 

- * @ExtenalDomain
+ * @ExternalDomain
  * public class SalaryConverter implements DomainConverter<Salary, BigDecimal> {
  *
  *     public BigDecimal fromDomainToValue(Salary domain) {
diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java
index 1bbaa6674..845f7ebb2 100644
--- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionParserTest.java
@@ -217,7 +217,7 @@ public void testMethod_targetObjectIsNull() {
   }
 
   @Test
-  public void testStatictMethod() {
+  public void testStaticMethod() {
     ExpressionParser parser = new ExpressionParser("@java.lang.String@valueOf(1)");
     ExpressionNode expression = parser.parse();
     ExpressionEvaluator evaluator = new ExpressionEvaluator();
@@ -226,7 +226,7 @@ public void testStatictMethod() {
   }
 
   @Test
-  public void testStatictMethod_classNotFound() {
+  public void testStaticMethod_classNotFound() {
     ExpressionParser parser = new ExpressionParser("@java.lang.Xxx@valueOf(1)");
     ExpressionNode expression = parser.parse();
     ExpressionEvaluator evaluator = new ExpressionEvaluator();
@@ -239,7 +239,7 @@ public void testStatictMethod_classNotFound() {
   }
 
   @Test
-  public void testStatictMethod_methodNotFound() {
+  public void testStaticMethod_methodNotFound() {
     ExpressionParser parser = new ExpressionParser("@java.lang.String@xxx(1)");
     ExpressionNode expression = parser.parse();
     ExpressionEvaluator evaluator = new ExpressionEvaluator();
@@ -265,7 +265,7 @@ public void testField() {
   }
 
   @Test
-  public void testStatictField() {
+  public void testStaticField() {
     ExpressionParser parser = new ExpressionParser("@java.lang.String@CASE_INSENSITIVE_ORDER");
     ExpressionNode expression = parser.parse();
     ExpressionEvaluator evaluator = new ExpressionEvaluator();
@@ -274,7 +274,7 @@ public void testStatictField() {
   }
 
   @Test
-  public void testStatictField_classNotFound() {
+  public void testStaticField_classNotFound() {
     ExpressionParser parser = new ExpressionParser("@java.lang.Xxx@CASE_INSENSITIVE_ORDER");
     ExpressionNode expression = parser.parse();
     ExpressionEvaluator evaluator = new ExpressionEvaluator();
@@ -287,7 +287,7 @@ public void testStatictField_classNotFound() {
   }
 
   @Test
-  public void testStatictField_fieldNotFound() {
+  public void testStaticField_fieldNotFound() {
     ExpressionParser parser = new ExpressionParser("@java.lang.String@hoge");
     ExpressionNode expression = parser.parse();
     ExpressionEvaluator evaluator = new ExpressionEvaluator();
diff --git a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionTokenizerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionTokenizerTest.java
index ab6411879..a991823dc 100644
--- a/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionTokenizerTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/internal/expr/ExpressionTokenizerTest.java
@@ -207,7 +207,7 @@ public void testMethodOperator() {
   }
 
   @Test
-  public void testParans() {
+  public void testParens() {
     ExpressionTokenizer tokenizer = new ExpressionTokenizer("aaa.bbb(2, 3)");
     assertEquals(VARIABLE, tokenizer.next());
     assertEquals("aaa", tokenizer.getToken());
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/DeleteBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/DeleteBuilderTest.java
index 7dc20248f..724df24a8 100644
--- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/DeleteBuilderTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/DeleteBuilderTest.java
@@ -35,7 +35,7 @@ public void testGetSql() {
   }
 
   @Test
-  public void testLiterall() {
+  public void testLiteral() {
     DeleteBuilder builder = DeleteBuilder.newInstance(new MockConfig());
     builder.sql("delete from Emp");
     builder.sql("where");
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java
index 44382ed9c..712257fe3 100644
--- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java
@@ -273,7 +273,7 @@ public void testDifferentKey() {
                 new LinkedHashMap() {
                   {
                     put("name", "ALLEN");
-                    put("salaree", 2000);
+                    put("age", 20);
                   }
                 });
           }
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/SelectBuilderTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/SelectBuilderTest.java
index c4452b896..b8fa1b0d5 100644
--- a/doma-core/src/test/java/org/seasar/doma/jdbc/builder/SelectBuilderTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/jdbc/builder/SelectBuilderTest.java
@@ -53,7 +53,7 @@ public void testGetSql() {
   }
 
   @Test
-  public void testRmoveLast() {
+  public void testRemoveLast() {
     SelectBuilder builder = SelectBuilder.newInstance(new MockConfig());
     builder.sql("aaa").sql("bbb");
     builder.removeLast();
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/StandardDialectTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/StandardDialectTest.java
index e00bd072e..c147cee9e 100644
--- a/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/StandardDialectTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/jdbc/dialect/StandardDialectTest.java
@@ -118,7 +118,7 @@ public void testExpressionFunctions_infix_escapeWithBackslash() {
   }
 
   @Test
-  public void testExpressionFunctions_roundDonwTimePart_forUtilDate() {
+  public void testExpressionFunctions_roundDownTimePart_forUtilDate() {
     StandardDialect dialect = new StandardDialect();
     ExpressionFunctions functions = dialect.getExpressionFunctions();
     Calendar calendar = Calendar.getInstance();
@@ -128,7 +128,7 @@ public void testExpressionFunctions_roundDonwTimePart_forUtilDate() {
   }
 
   @Test
-  public void testExpressionFunctions_roundDonwTimePart_forDate() {
+  public void testExpressionFunctions_roundDownTimePart_forDate() {
     StandardDialect dialect = new StandardDialect();
     ExpressionFunctions functions = dialect.getExpressionFunctions();
     Calendar calendar = Calendar.getInstance();
@@ -138,7 +138,7 @@ public void testExpressionFunctions_roundDonwTimePart_forDate() {
   }
 
   @Test
-  public void testExpressionFunctions_roundDonwTimePart_forTimestamp() {
+  public void testExpressionFunctions_roundDownTimePart_forTimestamp() {
     StandardDialect dialect = new StandardDialect();
     ExpressionFunctions functions = dialect.getExpressionFunctions();
     Timestamp timestamp = Timestamp.valueOf("2009-01-23 12:34:56.123456789");
@@ -147,7 +147,7 @@ public void testExpressionFunctions_roundDonwTimePart_forTimestamp() {
   }
 
   @Test
-  public void testExpressionFunctions_roundDonwTimePart_forLocalDateTime() {
+  public void testExpressionFunctions_roundDownTimePart_forLocalDateTime() {
     StandardDialect dialect = new StandardDialect();
     ExpressionFunctions functions = dialect.getExpressionFunctions();
     LocalDateTime localDateTime = LocalDateTime.of(2009, 1, 23, 12, 34, 56, 123456789);
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java
index a528b7aea..27163e869 100644
--- a/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java
@@ -101,7 +101,7 @@ public void testGetColumnName_columnNotDefined() {
   }
 
   @Test
-  public void testGetColumnName_columnNotDefined_embeddableProeprty() {
+  public void testGetColumnName_columnNotDefined_embeddableProperty() {
     DefaultPropertyType propertyType =
         new DefaultPropertyType<>(
             DefaultPropertyTypeTest.class,
@@ -146,7 +146,7 @@ public void testGetColumnName_quote_quoteNotRequired() {
   }
 
   @Test
-  public void testGetColumnName_naiming_columnNotDefined() {
+  public void testGetColumnName_naming_columnNotDefined() {
     DefaultPropertyType propertyType =
         new DefaultPropertyType<>(
             DefaultPropertyTypeTest.class,
@@ -161,7 +161,7 @@ public void testGetColumnName_naiming_columnNotDefined() {
   }
 
   @Test
-  public void testGetColumnName_naiming_quote_quoteRequired() {
+  public void testGetColumnName_naming_quote_quoteRequired() {
     DefaultPropertyType propertyType =
         new DefaultPropertyType<>(
             DefaultPropertyTypeTest.class,
@@ -176,7 +176,7 @@ public void testGetColumnName_naiming_quote_quoteRequired() {
   }
 
   @Test
-  public void testGetColumnName_naiming_quote_quoteNotRequired() {
+  public void testGetColumnName_naming_quote_quoteNotRequired() {
     DefaultPropertyType propertyType =
         new DefaultPropertyType<>(
             DefaultPropertyTypeTest.class,
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java
index 3007f2153..269c83ac5 100644
--- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java
@@ -37,7 +37,7 @@ public void testBegin() throws Exception {
   }
 
   @Test
-  public void testBeginImlicitDefaultTransactionIsolationLevel() throws Exception {
+  public void testBeginImplicitDefaultTransactionIsolationLevel() throws Exception {
     LocalTransaction transaction =
         dataSource.getKeepAliveLocalTransaction(jdbcLogger, TransactionIsolationLevel.SERIALIZABLE);
     transaction.begin();
@@ -320,7 +320,7 @@ public void testRollbackSavepoint_notFound() {
   }
 
   @Test
-  public void testInitAndDestory() {
+  public void testInitAndDestroy() {
     assertNull(transaction.localTxContextHolder.get());
     transaction.init();
     assertNotNull(transaction.localTxContextHolder.get());
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java
index 7e7d2abe8..e65b4417e 100644
--- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java
@@ -41,7 +41,7 @@ protected void setUp() {
   }
 
   @Test
-  public void testRequired_blcok() {
+  public void testRequired_block() {
     TransactionManager manager = new LocalTransactionManager(transaction);
     StringBuilder log = new StringBuilder();
     log.append(LocalTransactionManagerTest.counter);
@@ -66,7 +66,7 @@ public void testRequired_supplier() {
   }
 
   @Test
-  public void testRequiresNew_blcok() {
+  public void testRequiresNew_block() {
     TransactionManager manager = new LocalTransactionManager(transaction);
     StringBuilder log = new StringBuilder();
     log.append(LocalTransactionManagerTest.counter);
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java
index f52e7e95d..94a496d01 100644
--- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java
@@ -34,7 +34,7 @@ public void testBegin() throws Exception {
   }
 
   @Test
-  public void testBeginImlicitDefaultTransactionIsolationLevel() throws Exception {
+  public void testBeginImplicitDefaultTransactionIsolationLevel() throws Exception {
     LocalTransaction transaction =
         dataSource.getLocalTransaction(jdbcLogger, TransactionIsolationLevel.SERIALIZABLE);
     transaction.begin();
diff --git a/doma-core/src/test/java/org/seasar/doma/wrapper/IntegerWrapperTtest.java b/doma-core/src/test/java/org/seasar/doma/wrapper/IntegerWrapperTest.java
similarity index 93%
rename from doma-core/src/test/java/org/seasar/doma/wrapper/IntegerWrapperTtest.java
rename to doma-core/src/test/java/org/seasar/doma/wrapper/IntegerWrapperTest.java
index e0681372c..95f03a3b5 100644
--- a/doma-core/src/test/java/org/seasar/doma/wrapper/IntegerWrapperTtest.java
+++ b/doma-core/src/test/java/org/seasar/doma/wrapper/IntegerWrapperTest.java
@@ -4,7 +4,7 @@
 
 import org.junit.jupiter.api.Test;
 
-public class IntegerWrapperTtest {
+public class IntegerWrapperTest {
 
   /** */
   @Test
diff --git a/doma-core/src/test/resources/META-INF/org/seasar/doma/jdbc/command/SelectCommandTest/testExecute_resultList.sql b/doma-core/src/test/resources/META-INF/org/seasar/doma/jdbc/command/SelectCommandTest/testExecute_resultList.sql
index bb8ebfabe..6da9aa5fc 100644
--- a/doma-core/src/test/resources/META-INF/org/seasar/doma/jdbc/command/SelectCommandTest/testExecute_resultList.sql
+++ b/doma-core/src/test/resources/META-INF/org/seasar/doma/jdbc/command/SelectCommandTest/testExecute_resultList.sql
@@ -1 +1 @@
-select * from aaa where sarary >= /*salary*/100
\ No newline at end of file
+select * from aaa where salary >= /*salary*/100
\ No newline at end of file
diff --git a/doma-core/src/test/resources/META-INF/org/seasar/doma/jdbc/command/SelectCommandTest/testExecute_resultStream.sql b/doma-core/src/test/resources/META-INF/org/seasar/doma/jdbc/command/SelectCommandTest/testExecute_resultStream.sql
index bb8ebfabe..6da9aa5fc 100644
--- a/doma-core/src/test/resources/META-INF/org/seasar/doma/jdbc/command/SelectCommandTest/testExecute_resultStream.sql
+++ b/doma-core/src/test/resources/META-INF/org/seasar/doma/jdbc/command/SelectCommandTest/testExecute_resultStream.sql
@@ -1 +1 @@
-select * from aaa where sarary >= /*salary*/100
\ No newline at end of file
+select * from aaa where salary >= /*salary*/100
\ No newline at end of file

From c8f6914f3f02b7aa0485fbc0344500f6c914c572 Mon Sep 17 00:00:00 2001
From: Toshihiro Nakamura 
Date: Sat, 19 Sep 2020 16:41:15 +0900
Subject: [PATCH 73/78] Avoid possible NullPointerException

---
 .../java/org/seasar/doma/internal/expr/ExpressionParser.java | 5 +++--
 .../java/org/seasar/doma/internal/util/AssertionUtil.java    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java
index bc58f82ba..fe95f98d6 100644
--- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java
+++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java
@@ -424,10 +424,11 @@ protected void parseNewOperand() {
   }
 
   protected void parseOperator(OperatorNode currentNode) {
-    if (operatorNodes.peek() == null) {
+    OperatorNode first = operatorNodes.peek();
+    if (first == null) {
       operatorNodes.push(currentNode);
     } else {
-      if (currentNode.getPriority() > operatorNodes.peek().getPriority()) {
+      if (currentNode.getPriority() > first.getPriority()) {
         operatorNodes.push(currentNode);
       } else {
         for (Iterator it = operatorNodes.iterator(); it.hasNext(); ) {
diff --git a/doma-core/src/main/java/org/seasar/doma/internal/util/AssertionUtil.java b/doma-core/src/main/java/org/seasar/doma/internal/util/AssertionUtil.java
index fe2210258..818e65f10 100644
--- a/doma-core/src/main/java/org/seasar/doma/internal/util/AssertionUtil.java
+++ b/doma-core/src/main/java/org/seasar/doma/internal/util/AssertionUtil.java
@@ -112,6 +112,7 @@ public static  void assertEquals(T expected, T actual) {
       if (actual != null) {
         throw new AssertionError("Not equals. expected is null, but actual is [" + actual + "]");
       }
+      return;
     }
     if (!expected.equals(actual)) {
       throw new AssertionError(

From bf825b74bee994c05ce5dadea52862ef7604db83 Mon Sep 17 00:00:00 2001
From: Toshihiro Nakamura 
Date: Sat, 19 Sep 2020 16:42:25 +0900
Subject: [PATCH 74/78] Suppress MagicConstant

---
 .../org/seasar/doma/internal/jdbc/dao/NeverClosedConnection.java | 1 +
 .../java/org/seasar/doma/jdbc/tx/LocalTransactionConnection.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnection.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnection.java
index e0e4bdf1b..1e2af734c 100644
--- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnection.java
+++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnection.java
@@ -126,6 +126,7 @@ public DatabaseMetaData getMetaData() throws SQLException {
 
   @Override
   public int getTransactionIsolation() throws SQLException {
+    //noinspection MagicConstant
     return connection.getTransactionIsolation();
   }
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionConnection.java b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionConnection.java
index 4b23bc5c7..7560c43cf 100644
--- a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionConnection.java
+++ b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionConnection.java
@@ -150,6 +150,7 @@ public DatabaseMetaData getMetaData() throws SQLException {
 
   @Override
   public int getTransactionIsolation() throws SQLException {
+    //noinspection MagicConstant
     return connection.getTransactionIsolation();
   }
 

From df2ed3e10ba8f3681fecd716cdbb1def91496360 Mon Sep 17 00:00:00 2001
From: Toshihiro Nakamura 
Date: Sat, 19 Sep 2020 16:45:51 +0900
Subject: [PATCH 75/78] Suppress RedundantThrows

---
 .../main/java/org/seasar/doma/jdbc/RequiresNewController.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/RequiresNewController.java b/doma-core/src/main/java/org/seasar/doma/jdbc/RequiresNewController.java
index 24bde1532..d05a01f12 100644
--- a/doma-core/src/main/java/org/seasar/doma/jdbc/RequiresNewController.java
+++ b/doma-core/src/main/java/org/seasar/doma/jdbc/RequiresNewController.java
@@ -21,6 +21,7 @@ public interface RequiresNewController {
    * @throws DomaNullPointerException if ｛@code callback} is {@code null}
    * @throws Throwable thrown, if any exception is thrown in the｛@code callback} execution
    */
+  @SuppressWarnings("RedundantThrows")
   default  R requiresNew(Callback callback) throws Throwable {
     if (callback == null) {
       throw new DomaNullPointerException("callback");

From 1405d8042e5d13edee965d0f83b26fd439b63b0d Mon Sep 17 00:00:00 2001
From: Toshihiro Nakamura 
Date: Sat, 19 Sep 2020 16:46:33 +0900
Subject: [PATCH 76/78] Remove unnecessary 'throws' declarations

---
 .../jdbc/command/CallableSqlParameterFetcher.java  |  4 ++--
 .../internal/jdbc/dao/NeverClosedConnection.java   |  2 +-
 .../jdbc/dao/NeverClosedConnectionProvider.java    | 14 +++++++-------
 .../org/seasar/doma/jdbc/SimpleDataSource.java     |  6 +++---
 .../doma/jdbc/tx/LocalTransactionConnection.java   |  2 +-
 .../doma/jdbc/tx/LocalTransactionDataSource.java   |  4 ++--
 .../jdbc/tx/KeepAliveLocalTransactionTest.java     | 14 +++++++-------
 .../jdbc/tx/LocalTransactionDataSourceTest.java    |  8 ++++----
 .../seasar/doma/jdbc/tx/LocalTransactionTest.java  | 14 +++++++-------
 9 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterFetcher.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterFetcher.java
index 1d1e3f4e3..ffb05f1b1 100644
--- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterFetcher.java
+++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/command/CallableSqlParameterFetcher.java
@@ -29,7 +29,7 @@ public class CallableSqlParameterFetcher {
 
   protected final ModuleQuery query;
 
-  public CallableSqlParameterFetcher(ModuleQuery query) throws SQLException {
+  public CallableSqlParameterFetcher(ModuleQuery query) {
     assertNotNull(query);
     this.query = query;
   }
@@ -63,7 +63,7 @@ public FetchingVisitor(ModuleQuery query, CallableStatement callableStatement) {
     }
 
     @Override
-    public  Void visitInParameter(InParameter parameter, Void p) throws SQLException {
+    public  Void visitInParameter(InParameter parameter, Void p) {
       index++;
       return null;
     }
diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnection.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnection.java
index 1e2af734c..4766fc1fa 100644
--- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnection.java
+++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnection.java
@@ -38,7 +38,7 @@ public void clearWarnings() throws SQLException {
   }
 
   @Override
-  public void close() throws SQLException {
+  public void close() {
     // do nothing.
   }
 
diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnectionProvider.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnectionProvider.java
index 02eaced54..f3e389e84 100644
--- a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnectionProvider.java
+++ b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/NeverClosedConnectionProvider.java
@@ -19,33 +19,33 @@ public NeverClosedConnectionProvider(NeverClosedConnection connection) {
   }
 
   @Override
-  public Connection getConnection() throws SQLException {
+  public Connection getConnection() {
     return connection;
   }
 
   @Override
-  public Connection getConnection(String username, String password) throws SQLException {
+  public Connection getConnection(String username, String password) {
     return connection;
   }
 
   @Override
-  public int getLoginTimeout() throws SQLException {
+  public int getLoginTimeout() {
     return 0;
   }
 
   @Override
-  public PrintWriter getLogWriter() throws SQLException {
+  public PrintWriter getLogWriter() {
     return null;
   }
 
   @Override
-  public void setLoginTimeout(int seconds) throws SQLException {}
+  public void setLoginTimeout(int seconds) {}
 
   @Override
-  public void setLogWriter(PrintWriter out) throws SQLException {}
+  public void setLogWriter(PrintWriter out) {}
 
   @Override
-  public boolean isWrapperFor(Class iface) throws SQLException {
+  public boolean isWrapperFor(Class iface) {
     return iface != null && iface.isAssignableFrom(getClass());
   }
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/SimpleDataSource.java b/doma-core/src/main/java/org/seasar/doma/jdbc/SimpleDataSource.java
index e82329de9..808156960 100644
--- a/doma-core/src/main/java/org/seasar/doma/jdbc/SimpleDataSource.java
+++ b/doma-core/src/main/java/org/seasar/doma/jdbc/SimpleDataSource.java
@@ -148,15 +148,15 @@ protected Connection getConnectionInternal(Properties info) throws SQLException
   }
 
   @Override
-  public PrintWriter getLogWriter() throws SQLException {
+  public PrintWriter getLogWriter() {
     return null;
   }
 
   @Override
-  public void setLogWriter(PrintWriter out) throws SQLException {}
+  public void setLogWriter(PrintWriter out) {}
 
   @Override
-  public boolean isWrapperFor(Class iface) throws SQLException {
+  public boolean isWrapperFor(Class iface) {
     return iface != null && iface.isAssignableFrom(getClass());
   }
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionConnection.java b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionConnection.java
index 7560c43cf..6c9a075b4 100644
--- a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionConnection.java
+++ b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionConnection.java
@@ -62,7 +62,7 @@ public void clearWarnings() throws SQLException {
   }
 
   @Override
-  public void close() throws SQLException {
+  public void close() {
     // do nothing.
   }
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSource.java b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSource.java
index 76c619cca..a69193550 100644
--- a/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSource.java
+++ b/doma-core/src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSource.java
@@ -69,7 +69,7 @@ public LocalTransactionDataSource(String url, String user, String password) {
    * @throws TransactionNotYetBegunException if the transaction is not yet begun
    */
   @Override
-  public Connection getConnection() throws SQLException {
+  public Connection getConnection() {
     return getConnectionInternal();
   }
 
@@ -82,7 +82,7 @@ public Connection getConnection() throws SQLException {
    * @throws TransactionNotYetBegunException if the transaction is not yet begun
    */
   @Override
-  public Connection getConnection(String username, String password) throws SQLException {
+  public Connection getConnection(String username, String password) {
     return getConnectionInternal();
   }
 
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java
index 269c83ac5..c71ed87ed 100644
--- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/KeepAliveLocalTransactionTest.java
@@ -28,7 +28,7 @@ public class KeepAliveLocalTransactionTest {
       dataSource.getKeepAliveLocalTransaction(jdbcLogger);
 
   @Test
-  public void testBegin() throws Exception {
+  public void testBegin() {
     transaction.begin();
     assertTrue(transaction.isActive());
     dataSource.getConnection();
@@ -37,7 +37,7 @@ public void testBegin() throws Exception {
   }
 
   @Test
-  public void testBeginImplicitDefaultTransactionIsolationLevel() throws Exception {
+  public void testBeginImplicitDefaultTransactionIsolationLevel() {
     LocalTransaction transaction =
         dataSource.getKeepAliveLocalTransaction(jdbcLogger, TransactionIsolationLevel.SERIALIZABLE);
     transaction.begin();
@@ -48,7 +48,7 @@ public void testBeginImplicitDefaultTransactionIsolationLevel() throws Exception
   }
 
   @Test
-  public void testBeginWithTransactionIsolationLevel() throws Exception {
+  public void testBeginWithTransactionIsolationLevel() {
     transaction.begin(TransactionIsolationLevel.SERIALIZABLE);
     assertTrue(transaction.isActive());
     dataSource.getConnection();
@@ -68,7 +68,7 @@ public void testBegin_alreadyBegun() {
   }
 
   @Test
-  public void testBegin_failedToBegin() throws Exception {
+  public void testBegin_failedToBegin() {
     final SQLException exception = new SQLException();
     MockConnection connection =
         new MockConnection() {
@@ -92,7 +92,7 @@ public void setAutoCommit(boolean autoCommit) throws SQLException {
   }
 
   @Test
-  public void testBegin_failedToSetTransactionIsolation() throws Exception {
+  public void testBegin_failedToSetTransactionIsolation() {
     final SQLException exception = new SQLException();
     MockConnection connection =
         new MockConnection() {
@@ -236,7 +236,7 @@ public void testReleaseSavepoint_nullPointer() {
   }
 
   @Test
-  public void testCommit() throws Exception {
+  public void testCommit() {
     transaction.begin();
     dataSource.getConnection();
     transaction.commit();
@@ -265,7 +265,7 @@ public void testCommit_notYetBegun() {
   }
 
   @Test
-  public void testRollback() throws Exception {
+  public void testRollback() {
     transaction.begin();
     dataSource.getConnection();
     transaction.rollback();
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSourceTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSourceTest.java
index 4d58f5cbc..f4f5a655e 100644
--- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSourceTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionDataSourceTest.java
@@ -14,7 +14,7 @@
 public class LocalTransactionDataSourceTest {
 
   @Test
-  public void testGetConnection() throws Exception {
+  public void testGetConnection() {
     UtilLoggingJdbcLogger jdbcLogger = new UtilLoggingJdbcLogger();
     LocalTransactionDataSource dataSource = new LocalTransactionDataSource(new MockDataSource());
     dataSource.getLocalTransaction(jdbcLogger).begin();
@@ -23,7 +23,7 @@ public void testGetConnection() throws Exception {
   }
 
   @Test
-  public void testGetConnection_notYetBegun() throws Exception {
+  public void testGetConnection_notYetBegun() {
     LocalTransactionDataSource dataSource = new LocalTransactionDataSource(new MockDataSource());
     try {
       dataSource.getConnection();
@@ -34,7 +34,7 @@ public void testGetConnection_notYetBegun() throws Exception {
   }
 
   @Test
-  public void testIsWrapperFor() throws Exception {
+  public void testIsWrapperFor() throws SQLException {
     DataSource dataSource = new LocalTransactionDataSource(new MockDataSource());
     assertTrue(dataSource.isWrapperFor(LocalTransactionDataSource.class));
     assertTrue(dataSource.isWrapperFor(MockDataSource.class));
@@ -42,7 +42,7 @@ public void testIsWrapperFor() throws Exception {
   }
 
   @Test
-  public void testUnwrap() throws Exception {
+  public void testUnwrap() throws SQLException {
     DataSource dataSource = new LocalTransactionDataSource(new MockDataSource());
     assertNotNull(dataSource.unwrap(LocalTransactionDataSource.class));
     assertNotNull(dataSource.unwrap(MockDataSource.class));
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java
index 94a496d01..72a6ae762 100644
--- a/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java
+++ b/doma-core/src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionTest.java
@@ -25,7 +25,7 @@ public class LocalTransactionTest {
   private final LocalTransaction transaction = dataSource.getLocalTransaction(jdbcLogger);
 
   @Test
-  public void testBegin() throws Exception {
+  public void testBegin() {
     transaction.begin();
     assertTrue(transaction.isActive());
     dataSource.getConnection();
@@ -34,7 +34,7 @@ public void testBegin() throws Exception {
   }
 
   @Test
-  public void testBeginImplicitDefaultTransactionIsolationLevel() throws Exception {
+  public void testBeginImplicitDefaultTransactionIsolationLevel() {
     LocalTransaction transaction =
         dataSource.getLocalTransaction(jdbcLogger, TransactionIsolationLevel.SERIALIZABLE);
     transaction.begin();
@@ -45,7 +45,7 @@ public void testBeginImplicitDefaultTransactionIsolationLevel() throws Exception
   }
 
   @Test
-  public void testBeginWithTransactionIsolationLevel() throws Exception {
+  public void testBeginWithTransactionIsolationLevel() {
     transaction.begin(TransactionIsolationLevel.SERIALIZABLE);
     assertTrue(transaction.isActive());
     dataSource.getConnection();
@@ -65,7 +65,7 @@ public void testBegin_alreadyBegun() {
   }
 
   @Test
-  public void testBeginAndGetConnection_failedToSetAutoCommit() throws Exception {
+  public void testBeginAndGetConnection_failedToSetAutoCommit() {
     final SQLException exception = new SQLException();
     MockConnection connection =
         new MockConnection() {
@@ -90,7 +90,7 @@ public void setAutoCommit(boolean autoCommit) throws SQLException {
   }
 
   @Test
-  public void testBegin_failedToSetTransactionIsolation() throws Exception {
+  public void testBegin_failedToSetTransactionIsolation() {
     final SQLException exception = new SQLException();
     MockConnection connection =
         new MockConnection() {
@@ -235,7 +235,7 @@ public void testReleaseSavepoint_nullPointer() {
   }
 
   @Test
-  public void testCommit() throws Exception {
+  public void testCommit() {
     transaction.begin();
     dataSource.getConnection();
     transaction.commit();
@@ -264,7 +264,7 @@ public void testCommit_notYetBegun() {
   }
 
   @Test
-  public void testRollback() throws Exception {
+  public void testRollback() {
     transaction.begin();
     dataSource.getConnection();
     transaction.rollback();

From 221d03c8cb60667ec30f437d84af8b8b3a408339 Mon Sep 17 00:00:00 2001
From: Toshihiro Nakamura 
Date: Sat, 19 Sep 2020 16:58:24 +0900
Subject: [PATCH 77/78] Remove redundant suppression

---
 .../src/main/java/org/seasar/doma/jdbc/SimpleDataSource.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/SimpleDataSource.java b/doma-core/src/main/java/org/seasar/doma/jdbc/SimpleDataSource.java
index 808156960..d501a5833 100644
--- a/doma-core/src/main/java/org/seasar/doma/jdbc/SimpleDataSource.java
+++ b/doma-core/src/main/java/org/seasar/doma/jdbc/SimpleDataSource.java
@@ -172,7 +172,6 @@ public  T unwrap(Class iface) throws SQLException {
     throw new SQLException("cannot unwrap to " + iface.getName());
   }
 
-  @SuppressWarnings("all")
   public Logger getParentLogger() throws SQLFeatureNotSupportedException {
     throw new SQLFeatureNotSupportedException();
   }

From 18537c62026eae52e629a94626542cf8c4ac7f47 Mon Sep 17 00:00:00 2001
From: Toshihiro Nakamura 
Date: Sat, 19 Sep 2020 17:11:35 +0900
Subject: [PATCH 78/78] Extract common part

---
 .../seasar/doma/internal/expr/ExpressionParser.java    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java
index fe95f98d6..04057add5 100644
--- a/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java
+++ b/doma-core/src/main/java/org/seasar/doma/internal/expr/ExpressionParser.java
@@ -425,12 +425,8 @@ protected void parseNewOperand() {
 
   protected void parseOperator(OperatorNode currentNode) {
     OperatorNode first = operatorNodes.peek();
-    if (first == null) {
-      operatorNodes.push(currentNode);
-    } else {
-      if (currentNode.getPriority() > first.getPriority()) {
-        operatorNodes.push(currentNode);
-      } else {
+    if (first != null) {
+      if (currentNode.getPriority() <= first.getPriority()) {
         for (Iterator it = operatorNodes.iterator(); it.hasNext(); ) {
           OperatorNode operatorNode = it.next();
           if (operatorNode.getPriority() > currentNode.getPriority()) {
@@ -438,9 +434,9 @@ protected void parseOperator(OperatorNode currentNode) {
             it.remove();
           }
         }
-        operatorNodes.push(currentNode);
       }
     }
+    operatorNodes.push(currentNode);
   }
 
   protected void reduceAll() {