Merge pull request #411 from domaframework/remove-duplicated-code

Remove duplicated code about the peek method

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/AbstractStatement.java

@@ -12,7 +12,7 @@
 import org.seasar.doma.message.Message;
 
 public abstract class AbstractStatement<RESULT, STMT extends AbstractStatement<RESULT, STMT>>
-    implements Statement<RESULT>, Peekable<STMT> {
+    implements Statement<RESULT> {
 
   protected static final String EXECUTE_METHOD_NAME = "execute";
   protected static final Method EXECUTE_METHOD;
@@ -46,8 +46,7 @@ public Sql<?> asSql() {
   @Override
   @SuppressWarnings("unchecked")
   public STMT peek(Consumer<Sql<?>> consumer) {
-    consumer.accept(asSql());
-    return (STMT) this;
+    return (STMT) Statement.super.peek(consumer);
   }
 
   protected Function<String, String> createCommenter(String comment) {

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/Buildable.java

@@ -1,8 +1,17 @@
 package org.seasar.doma.jdbc.criteria.statement;
 
+import java.util.Objects;
+import java.util.function.Consumer;
 import org.seasar.doma.jdbc.Sql;
 
-public interface Buildable {
+public interface Buildable<BUILDABLE extends Buildable<BUILDABLE>> {
 
   Sql<?> asSql();
+
+  @SuppressWarnings("unchecked")
+  default BUILDABLE peek(Consumer<Sql<?>> consumer) {
+    Objects.requireNonNull(consumer);
+    consumer.accept(asSql());
+    return (BUILDABLE) this;
+  }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/Collectable.java

@@ -1,20 +1,17 @@
 package org.seasar.doma.jdbc.criteria.statement;
 
-import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collector;
 import java.util.stream.Stream;
 import org.seasar.doma.jdbc.Sql;
 
-public interface Collectable<ELEMENT> extends Statement<List<ELEMENT>>, Listable<ELEMENT> {
+public interface Collectable<ELEMENT> extends Listable<ELEMENT> {
 
   <RESULT> RESULT mapStream(Function<Stream<ELEMENT>, RESULT> streamMapper);
 
   <RESULT> RESULT collect(Collector<ELEMENT, ?, RESULT> collector);
 
-  default Collectable<ELEMENT> peek(Consumer<Sql<?>> consumer) {
-    consumer.accept(asSql());
-    return this;
-  }
+  @Override
+  Collectable<ELEMENT> peek(Consumer<Sql<?>> consumer);
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/Listable.java

@@ -24,8 +24,6 @@ default ELEMENT fetchOne() {
     return fetchOptional().orElse(null);
   }
 
-  default Listable<ELEMENT> peek(Consumer<Sql<?>> consumer) {
-    consumer.accept(asSql());
-    return this;
-  }
+  @Override
+  Listable<ELEMENT> peek(Consumer<Sql<?>> consumer);
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/Mappable.java

@@ -1,15 +1,8 @@
 package org.seasar.doma.jdbc.criteria.statement;
 
-import java.util.function.Consumer;
 import java.util.function.Function;
-import org.seasar.doma.jdbc.Sql;
 
-public interface Mappable<ELEMENT> extends SetOperand<ELEMENT>, Buildable {
+public interface Mappable<ELEMENT> extends SetOperand<ELEMENT>, Buildable<Mappable<ELEMENT>> {
 
   Collectable<ELEMENT> map(Function<Row, ELEMENT> mapper);
-
-  default Mappable<ELEMENT> peek(Consumer<Sql<?>> consumer) {
-    consumer.accept(asSql());
-    return this;
-  }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/Peekable.java

@@ -3,12 +3,12 @@
 import java.util.function.Consumer;
 import org.seasar.doma.jdbc.Sql;
 
-public interface Statement<RESULT> extends Buildable {
+public interface Statement<RESULT> extends Buildable<Statement<RESULT>> {
 
   RESULT execute();
 
+  @Override
   default Statement<RESULT> peek(Consumer<Sql<?>> consumer) {
-    consumer.accept(asSql());
-    return this;
+    return Buildable.super.peek(consumer);
   }
 }