Merge branch 'dev'

Author: yuanxuegui

pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.springframework.data.build</groupId>
         <artifactId>spring-data-parent</artifactId>
-        <version>2.0.2.RELEASE</version>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <groupId>io.github.hexagonframework.data</groupId>
     <artifactId>spring-data-ebean</artifactId>
-    <version>1.2.6.RELEASE</version>
+    <version>1.2.7.SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Spring Data Ebean</name>
@@ -47,9 +47,9 @@
     <properties>
         <bundlor.enabled>false</bundlor.enabled>
         <bundlor.failOnWarnings>false</bundlor.failOnWarnings>
-        <springdata.commons>2.0.2.RELEASE</springdata.commons>
-        <ebean.version>11.6.1</ebean.version>
-        <ebean-spring-txn.version>10.1.1</ebean-spring-txn.version>
+        <springdata.commons>2.0.4.RELEASE</springdata.commons>
+        <ebean.version>11.10.6</ebean.version>
+        <ebean-spring-txn.version>11.10.3</ebean-spring-txn.version>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
     </properties>
 

src/main/java/org/springframework/data/ebean/annotation/Modifying.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,7 @@
 
 package org.springframework.data.ebean.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Indicates a method should be regarded as Update{@link io.ebean.UpdateQuery} or SqlUpdate {@link io.ebean.SqlUpdate}.

src/main/java/org/springframework/data/ebean/annotation/Procedure.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,10 @@
 
 package org.springframework.data.ebean.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import org.springframework.data.annotation.QueryAnnotation;
 
+import java.lang.annotation.*;
+
 /**
  * Annotation to declare stored procedure mappings directly on repository methods.
  *

src/main/java/org/springframework/data/ebean/annotation/Query.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,10 @@
 
 package org.springframework.data.ebean.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import org.springframework.data.annotation.QueryAnnotation;
 
+import java.lang.annotation.*;
+
 /**
  * Annotation to declare finder queries directly on repository methods.
  *

src/main/java/org/springframework/data/ebean/domain/AbstractAggregateRoot.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.ebean.domain;
+
+import org.springframework.data.domain.AfterDomainEventPublication;
+import org.springframework.data.domain.DomainEvents;
+import org.springframework.util.Assert;
+
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Abstract base class for aggregate root, aggregate extends {@link AbstractEntity} and add
+ * domain event functions.
+ *
+ * @author XueguiYuan
+ */
+@MappedSuperclass
+public abstract class AbstractAggregateRoot extends AbstractEntity {
+    @Transient
+    private transient final List<DomainEvent> domainEvents = new ArrayList<>();
+
+    /**
+     * Registers the given event object for publication on a call to a Spring Data repository's save methods.
+     *
+     * @param event must not be {@literal null}.
+     * @return the event that has been added.
+     */
+    protected <T extends DomainEvent> T registerEvent(T event) {
+        Assert.notNull(event, "Domain event must not be null!");
+
+        this.domainEvents.add(event);
+        return event;
+    }
+
+    /**
+     * Clears all domain events currently held. Usually invoked by the infrastructure in place in Spring Data
+     * repositories.
+     */
+    @AfterDomainEventPublication
+    protected void clearDomainEvents() {
+        this.domainEvents.clear();
+    }
+
+    /**
+     * All domain events currently captured by the aggregate.
+     */
+    @DomainEvents
+    protected Collection<DomainEvent> domainEvents() {
+        return Collections.unmodifiableList(domainEvents);
+    }
+
+}