Rename xxxExecutionAbstract to xxxExecution

Author: yuanxuegui

src/main/java/org/springframework/data/ebean/repository/query/AbstractEbeanQuery.java

@@ -21,6 +21,8 @@
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.util.Assert;
 
+import static org.springframework.data.ebean.repository.query.AbstractEbeanQueryExecution.*;
+
 /**
  * Abstract base class to implement {@link RepositoryQuery}.
  *
@@ -77,17 +79,17 @@ private Object doExecute(AbstractEbeanQueryExecution execution, Object[] values)
 
   protected AbstractEbeanQueryExecution getExecution() {
     if (method.isStreamQuery()) {
-      return new AbstractEbeanQueryExecution.StreamExecutionAbstract();
+        return new StreamExecution();
     } else if (method.isCollectionQuery()) {
-      return new AbstractEbeanQueryExecution.CollectionExecutionAbstract();
+        return new AbstractEbeanQueryExecution.CollectionExecution();
     } else if (method.isSliceQuery()) {
-      return new AbstractEbeanQueryExecution.SlicedExecutionAbstract(method.getParameters());
+        return new SlicedExecution(method.getParameters());
     } else if (method.isPageQuery()) {
-      return new AbstractEbeanQueryExecution.PagedExecutionAbstract(method.getParameters());
+        return new PagedExecution(method.getParameters());
     } else if (method.isModifyingQuery()) {
-      return new AbstractEbeanQueryExecution.UpdateExecutionAbstract(method, ebeanServer);
+        return new UpdateExecution(method, ebeanServer);
     } else {
-      return new AbstractEbeanQueryExecution.SingleEntityExecutionAbstract();
+        return new SingleEntityExecution();
     }
   }
 

src/main/java/org/springframework/data/ebean/repository/query/AbstractEbeanQueryExecution.java

@@ -60,7 +60,7 @@ public Object execute(AbstractEbeanQuery query, Object[] values) {
   /**
    * Executes the query to return a simple collection of entities.
    */
-  static class CollectionExecutionAbstract extends AbstractEbeanQueryExecution {
+  static class CollectionExecution extends AbstractEbeanQueryExecution {
 
     @Override
     protected Object doExecute(AbstractEbeanQuery repositoryQuery, Object[] values) {
@@ -74,16 +74,16 @@ protected Object doExecute(AbstractEbeanQuery repositoryQuery, Object[] values)
    *
    * @author Xuegui Yuan
    */
-  static class SlicedExecutionAbstract extends AbstractEbeanQueryExecution {
+  static class SlicedExecution extends AbstractEbeanQueryExecution {
 
     private final Parameters<?, ?> parameters;
 
     /**
-     * Creates a new {@link SlicedExecutionAbstract} using the given {@link Parameters}.
+     * Creates a new {@link SlicedExecution} using the given {@link Parameters}.
      *
      * @param parameters must not be {@literal null}.
      */
-    public SlicedExecutionAbstract(Parameters<?, ?> parameters) {
+    public SlicedExecution(Parameters<?, ?> parameters) {
       this.parameters = parameters;
     }
 
@@ -104,11 +104,11 @@ protected Object doExecute(AbstractEbeanQuery query, Object[] values) {
    * Executes the {@link AbstractStringBasedEbeanQuery} to return a {@link org.springframework.data.domain.Page} of
    * entities.
    */
-  static class PagedExecutionAbstract extends AbstractEbeanQueryExecution {
+  static class PagedExecution extends AbstractEbeanQueryExecution {
 
     private final Parameters<?, ?> parameters;
 
-    public PagedExecutionAbstract(Parameters<?, ?> parameters) {
+      public PagedExecution(Parameters<?, ?> parameters) {
 
       this.parameters = parameters;
     }
@@ -126,7 +126,7 @@ protected Object doExecute(final AbstractEbeanQuery repositoryQuery, final Objec
   /**
    * Executes a {@link AbstractStringBasedEbeanQuery} to return a single entity.
    */
-  static class SingleEntityExecutionAbstract extends AbstractEbeanQueryExecution {
+  static class SingleEntityExecution extends AbstractEbeanQueryExecution {
 
     @Override
     protected Object doExecute(AbstractEbeanQuery query, Object[] values) {
@@ -138,7 +138,7 @@ protected Object doExecute(AbstractEbeanQuery query, Object[] values) {
   /**
    * Executes a update query such as an update, insert or delete.
    */
-  static class UpdateExecutionAbstract extends AbstractEbeanQueryExecution {
+  static class UpdateExecution extends AbstractEbeanQueryExecution {
 
     private final EbeanServer ebeanServer;
 
@@ -148,7 +148,7 @@ static class UpdateExecutionAbstract extends AbstractEbeanQueryExecution {
      *
      * @param ebeanServer
      */
-    public UpdateExecutionAbstract(EbeanQueryMethod method, EbeanServer ebeanServer) {
+    public UpdateExecution(EbeanQueryMethod method, EbeanServer ebeanServer) {
 
       Class<?> returnType = method.getReturnType();
 
@@ -172,11 +172,11 @@ protected Object doExecute(AbstractEbeanQuery query, Object[] values) {
    *
    * @author Xuegui Yuan
    */
-  static class DeleteExecutionAbstract extends AbstractEbeanQueryExecution {
+  static class DeleteExecution extends AbstractEbeanQueryExecution {
 
     private final EbeanServer ebeanServer;
 
-    public DeleteExecutionAbstract(EbeanServer ebeanServer) {
+      public DeleteExecution(EbeanServer ebeanServer) {
       this.ebeanServer = ebeanServer;
     }
 
@@ -196,7 +196,7 @@ protected Object doExecute(AbstractEbeanQuery ebeanQuery, Object[] values) {
    *
    * @author Xuegui Yuan
    */
-  static class ExistsExecutionAbstract extends AbstractEbeanQueryExecution {
+  static class ExistsExecution extends AbstractEbeanQueryExecution {
 
     @Override
     protected Object doExecute(AbstractEbeanQuery ebeanQuery, Object[] values) {
@@ -210,7 +210,7 @@ protected Object doExecute(AbstractEbeanQuery ebeanQuery, Object[] values) {
    *
    * @author Xuegui Yuan
    */
-  static class StreamExecutionAbstract extends AbstractEbeanQueryExecution {
+  static class StreamExecution extends AbstractEbeanQueryExecution {
 
     private static final String NO_SURROUNDING_TRANSACTION = "You're trying to execute a streaming query method without a surrounding transaction that keeps the connection open so that the Stream can actually be consumed. Make sure the code consuming the stream uses @Transactional or any other way of declaring a (read-only) transaction.";
 

src/main/java/org/springframework/data/ebean/repository/query/PartTreeEbeanQuery.java

@@ -60,9 +60,9 @@ public PartTreeEbeanQuery(EbeanQueryMethod method, EbeanServer ebeanServer) {
   @Override
   protected AbstractEbeanQueryExecution getExecution() {
     if (this.tree.isDelete()) {
-      return new AbstractEbeanQueryExecution.DeleteExecutionAbstract(getEbeanServer());
+      return new AbstractEbeanQueryExecution.DeleteExecution(getEbeanServer());
     } else if (this.tree.isExistsProjection()) {
-      return new AbstractEbeanQueryExecution.ExistsExecutionAbstract();
+      return new AbstractEbeanQueryExecution.ExistsExecution();
     }
 
     return super.getExecution();