Merge branch 'develop'

Author: tchlyah

pom.xml

@@ -9,12 +9,12 @@
     <url>https://github.com/differentway/couchmove</url>
     <properties>
         <java.version>1.8</java.version>
-        <couchbase.client.version>2.4.5</couchbase.client.version>
+        <couchbase.client.version>2.5.7</couchbase.client.version>
     </properties>
 
     <groupId>com.github.differentway</groupId>
     <artifactId>couchmove</artifactId>
-    <version>1.0.1</version>
+    <version>develop-SNAPSHOT</version>
 
     <licenses>
         <license>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.16</version>
+            <version>1.16.20</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>com.github.differentway</groupId>
             <artifactId>couchbase-testcontainer</artifactId>
-            <version>1.0</version>
+            <version>1.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/test/java/com/github/couchmove/CouchmoveIntegrationTest.java

@@ -125,7 +125,7 @@ public void should_migration_fail_on_exception() {
         assertThrows(couchmove::migrate, CouchmoveException.class);
 
         // Then new ChangeLog is executed
-        assertLike(changeLogRepository.findOne(PREFIX_ID + "1"), "1", 1, "insert users", N1QL, "V1__insert_users.n1ql", "efcc80f763e48e2a1d5b6689351ad1b4d678c70bebc0c0975a2d19f94e938f18", EXECUTED);
+        assertLike(changeLogRepository.findOne(PREFIX_ID + "1"), "1", 1, "insert users", N1QL, "V1__insert_users.n1ql", "a4b082eb19477034060ba02f60a7d40f39588e8d6fa6618b26b94cc6916d6cc3", EXECUTED);
 
         assertEquals(new User("admin", "Administrator", "01/09/1998"), userRepository.findOne("user::Administrator"));
 
@@ -148,10 +148,10 @@ public void should_fixed_failed_migration_pass() {
         couchmove.migrate();
 
         // Then it should be success
-        assertLike(changeLogRepository.findOne(PREFIX_ID + "1"), "1", 1, "insert users", N1QL, "V1__insert_users.n1ql", "efcc80f763e48e2a1d5b6689351ad1b4d678c70bebc0c0975a2d19f94e938f18", EXECUTED);
+        assertLike(changeLogRepository.findOne(PREFIX_ID + "1"), "1", 1, "insert users", N1QL, "V1__insert_users.n1ql", "a4b082eb19477034060ba02f60a7d40f39588e8d6fa6618b26b94cc6916d6cc3", EXECUTED);
 
         assertLike(changeLogRepository.findOne(PREFIX_ID + "2"), "2", 2, "invalid request", N1QL, "V2__invalid_request.n1ql",
-                "778c69b64c030eec8b33eb6ebf955954a3dfa20cab489021a2b71d445d5c3e54", EXECUTED);
+                "8fd2066ea5ad4e4151cc5b1262542455f41e7bcefe447cbcfbc004c6fe3bac12", EXECUTED);
 
         assertEquals(new User("user", "toto", "06/03/1997"), userRepository.findOne("user::toto"));
     }

src/test/java/com/github/couchmove/pojo/User.java

@@ -1,14 +1,20 @@
 package com.github.couchmove.pojo;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import static lombok.AccessLevel.PRIVATE;
 
 /**
  * @author ctayeb
  * Created on 07/06/2017
  */
 @EqualsAndHashCode(callSuper = false)
 @Data
+@AllArgsConstructor
+@NoArgsConstructor(force = true, access = PRIVATE)
 public class User extends CouchbaseEntity {
     private final String type;
     private final String username;

src/test/resources/db/migration/fail/V1__insert_users.n1ql

@@ -1,4 +1,4 @@
-INSERT INTO default (KEY, VALUE)
+INSERT INTO `${bucket}` (KEY, VALUE)
   VALUES
     ("user::Administrator",
       {

src/test/resources/db/migration/fixed-fail/V1__insert_users.n1ql

@@ -1,4 +1,4 @@
-INSERT INTO default (KEY, VALUE)
+INSERT INTO `${bucket}` (KEY, VALUE)
   VALUES
     ("user::Administrator",
       {

src/test/resources/db/migration/fixed-fail/V2__invalid_request.n1ql

@@ -1,4 +1,4 @@
-INSERT INTO default (KEY, VALUE)
+INSERT INTO `${bucket}` (KEY, VALUE)
   VALUES
     ("user::toto",
       {