Release V1.4.5 (#16)

personium · Mar 13, 2017 · ecad02b · ecad02b
1 parent 93b1d28
commit ecad02b
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 292 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+##1.4.5
+BUG FIXES:
+* Fixed about Executing Cell Recursive Delete API does not delete OData in cell. ([#13](https://github.com/personium/personium-core/issues/13))
+
 ## 1.4.4
 
 MODIFICATIONS FOR RELIABILITY:

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>io.personium</groupId>
 	<artifactId>personium-core</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.4</version>
+	<version>1.4.5</version>
 	<name>personium-core Maven Webapp</name>
 	<url>http://maven.apache.org</url>
 	<licenses>
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>io.personium</groupId>
 			<artifactId>personium-lib-es-adapter</artifactId>
-			<version>1.4.2</version>
+			<version>1.4.3</version>
 		</dependency>
 		<dependency>
 			<groupId>io.personium</groupId>

diff --git a/src/main/java/io/personium/core/model/impl/es/BoxCmpEsImpl.java b/src/main/java/io/personium/core/model/impl/es/BoxCmpEsImpl.java
diff --git a/src/main/java/io/personium/core/model/impl/es/CellCmpEsImpl.java b/src/main/java/io/personium/core/model/impl/es/CellCmpEsImpl.java
diff --git a/src/main/java/io/personium/core/model/impl/es/DavNode.java b/src/main/java/io/personium/core/model/impl/es/DavNode.java
@@ -43,7 +43,7 @@ public class DavNode implements EsBulkRequest {
     long published;
     long updated;
     Map<String, Object> file;
-    private BULK_REQUEST_TYPE requestType = BULK_REQUEST_TYPE.INDEX;
+    private BulkRequestType requestType = BulkRequestType.INDEX;
 
     /** ES上のDavNode格納においてCellの内部IDを保存するJSONキー. */
     public static final String KEY_CELL_ID = "c";
@@ -335,7 +335,7 @@ public String getType() {
     }
 
     @Override
-    public BULK_REQUEST_TYPE getRequestType() {
+    public BulkRequestType getRequestType() {
         return requestType;
     }
 
@@ -344,7 +344,7 @@ public BULK_REQUEST_TYPE getRequestType() {
      * 既存の処理への影響を考慮して、デフォルト値は INDEX にしておく。
      * @param request リクエスト種別
      */
-    public void setRequestType(BULK_REQUEST_TYPE request) {
+    public void setRequestType(BulkRequestType request) {
         this.requestType = request;
     }
 }
diff --git a/src/main/java/io/personium/core/model/impl/es/accessor/DavMoveAccessor.java b/src/main/java/io/personium/core/model/impl/es/accessor/DavMoveAccessor.java
@@ -23,7 +23,7 @@
 
 import io.personium.common.ads.AdsWriteFailureLogInfo;
 import io.personium.common.es.EsBulkRequest;
-import io.personium.common.es.EsBulkRequest.BULK_REQUEST_TYPE;
+import io.personium.common.es.EsBulkRequest.BulkRequestType;
 import io.personium.common.es.EsIndex;
 import io.personium.common.es.response.PersoniumBulkItemResponse;
 import io.personium.common.es.response.PersoniumBulkResponse;
@@ -176,7 +176,7 @@ public void setMoveRequest(
         }
         // 移動先のDavNodeが存在する場合は、そのDavNodeを削除する（ファイル実体は含まない）。
         if (null != dstNode) {
-            dstNode.setRequestType(EsBulkRequest.BULK_REQUEST_TYPE.DELETE);
+            dstNode.setRequestType(EsBulkRequest.BulkRequestType.DELETE);
             adsBulkRequest.add(dstNode);
             esBulkRequest.add(dstNode);
             setDestinationNodeForRollback(dstNode);
@@ -219,7 +219,7 @@ private PersoniumBulkResponse adsMove(PersoniumBulkResponse response) {
             int i;
             for (i = 0; i < esBulkRequest.size(); i++) {
                 EsBulkRequest esReq = esBulkRequest.get(i);
-                if (BULK_REQUEST_TYPE.DELETE != esReq.getRequestType()) {
+                if (BulkRequestType.DELETE != esReq.getRequestType()) {
                     adsUpdateBulkRequest.add(adsBulkRequest.get(i));
                 } else {
                     // Davテーブル一括更新

diff --git a/src/main/java/io/personium/core/rs/odata/BulkRequest.java b/src/main/java/io/personium/core/rs/odata/BulkRequest.java
@@ -134,8 +134,8 @@ public void setError(Exception error) {
     }
 
     @Override
-    public BULK_REQUEST_TYPE getRequestType() {
-        return BULK_REQUEST_TYPE.INDEX;
+    public BulkRequestType getRequestType() {
+        return BulkRequestType.INDEX;
     }
 
 }
diff --git a/src/main/resources/personium-unit-config-default.properties b/src/main/resources/personium-unit-config-default.properties
@@ -23,7 +23,7 @@
 #################################################
 
 # core version
-io.personium.core.version=1.4.4
+io.personium.core.version=1.4.5
 
 # general configurations
 io.personium.core.unitUser.issuers=