Added ChangeSetValidator to detect duplicate ids

src/main/java/org/mongeez/Mongeez.java

@@ -4,7 +4,7 @@
  * 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.
@@ -17,8 +17,11 @@
 import org.mongeez.reader.ChangeSetFileProvider;
 import org.mongeez.reader.ChangeSetReaderFactory;
 import org.mongeez.reader.FilesetXMLChangeSetFileProvider;
+import org.mongeez.validation.ChangeSetsValidator;
+import org.mongeez.validation.DefaultChangeSetsValidator;
 
 import com.mongodb.Mongo;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
@@ -33,7 +36,8 @@ public class Mongeez {
     private Mongo mongo = null;
     private String dbName;
     private MongoAuth auth = null;
-    private ChangeSetFileProvider changeSetFileProvider;
+    private ChangeSetFileProvider changeSetFileProvider = null;
+    private ChangeSetsValidator changeSetsValidator = new DefaultChangeSetsValidator();
     private String context = null;
 
     public void process() {
@@ -50,6 +54,7 @@ private List<ChangeSet> getChangeSets() {
             changeSets.addAll(readerFactory.getChangeSetReader(file).getChangeSets(file));
         }
         logChangeSets(changeSets);
+        changeSetsValidator.validate(changeSets);
         return changeSets;
     }
 
@@ -82,6 +87,10 @@ public void setAuth(MongoAuth auth) {
         this.auth = auth;
     }
 
+    public void setChangeSetsValidator(ChangeSetsValidator changeSetsValidator) {
+        this.changeSetsValidator = changeSetsValidator;
+    }
+
     /**
      * Convenience method to set the ChangeSetFileProvider to an XML fileset based on the specified file
      */

src/main/java/org/mongeez/MongeezRunner.java

@@ -4,19 +4,21 @@
  * 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.mongeez;
 
 import com.mongodb.Mongo;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
-
 import org.mongeez.reader.ChangeSetFileProvider;
+import org.mongeez.validation.ChangeSetsValidator;
+import org.mongeez.validation.DefaultChangeSetsValidator;
 
 /**
  * @author oleksii
@@ -27,12 +29,14 @@ public class MongeezRunner implements InitializingBean {
     private Mongo mongo;
     private String dbName;
     private Resource file;
-    
+
     private String userName;
     private String passWord;
-    
+
     private ChangeSetFileProvider changeSetFileProvider;
 
+    private ChangeSetsValidator changeSetsValidator;
+
     @Override
     public void afterPropertiesSet() throws Exception {
         if (isExecuteEnabled()) {
@@ -44,11 +48,17 @@ public void execute() {
         Mongeez mongeez = new Mongeez();
         mongeez.setMongo(mongo);
         mongeez.setDbName(dbName);
+        if(changeSetsValidator != null) {
+            mongeez.setChangeSetsValidator(changeSetsValidator);
+        }
+        else {
+            mongeez.setChangeSetsValidator(new DefaultChangeSetsValidator());
+        }
         if (changeSetFileProvider != null) {
             mongeez.setChangeSetFileProvider(changeSetFileProvider);
         } else {
             mongeez.setFile(file);
-            
+
             if(!StringUtils.isEmpty(userName) && !StringUtils.isEmpty(passWord)){
             	MongoAuth auth = new MongoAuth(userName, passWord);
                 mongeez.setAuth(auth);
@@ -93,5 +103,5 @@ public void setUserName(String userName) {
 	public void setPassWord(String passWord) {
 		this.passWord = passWord;
 	}
-    
+
 }

src/main/java/org/mongeez/validation/ChangeSetsValidator.java

@@ -0,0 +1,10 @@
+package org.mongeez.validation;
+
+import java.util.List;
+
+
+import org.mongeez.commands.ChangeSet;
+
+public interface ChangeSetsValidator {
+    public void validate(List<ChangeSet> changeSets) throws ValidationException;
+}

src/main/java/org/mongeez/validation/DefaultChangeSetsValidator.java

@@ -0,0 +1,29 @@
+package org.mongeez.validation;
+
+import java.util.List;
+
+import org.mongeez.commands.ChangeSet;
+
+public class DefaultChangeSetsValidator implements ChangeSetsValidator {
+
+    @Override
+    public void validate(List<ChangeSet> changesets) throws ValidationException {
+        changeSetIdsNotUnique(changesets);
+    }
+
+    private void changeSetIdsNotUnique(List<ChangeSet> changeSets) {
+        for (int i = 0; i < changeSets.size() / 2; i++) {
+            ChangeSet changeSetI = changeSets.get(i);
+            String changeSetIId = changeSetI.getChangeId();
+
+            for (int j = i + 1; j < changeSets.size(); j++) {
+                ChangeSet changeSetJ = changeSets.get(j);
+                String changeSetJId = changeSetJ.getChangeId();
+
+                if (changeSetIId.equals(changeSetJId)) {
+                    throw new ValidationException("ChangeSetId " + changeSetIId + " is not unique.");
+                }
+            }
+        }
+    }
+}

src/main/java/org/mongeez/validation/ValidationException.java

@@ -0,0 +1,21 @@
+package org.mongeez.validation;
+
+public class ValidationException extends RuntimeException {
+
+    public ValidationException() {
+        super();
+    }
+
+    public ValidationException(String message, Throwable cause) {
+        super(message);
+    }
+
+    public ValidationException(String message) {
+        super(message);
+    }
+
+    public ValidationException(Throwable cause) {
+        super(cause);
+    }
+
+}

src/test/java/org/mongeez/MongeezTest.java

@@ -4,7 +4,7 @@
  * 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.
@@ -17,6 +17,8 @@
 import com.mongodb.DB;
 import com.mongodb.DBCursor;
 import com.mongodb.Mongo;
+
+import org.mongeez.validation.ValidationException;
 import org.springframework.core.io.ClassPathResource;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -144,4 +146,10 @@ public void testChangesWContextContextSetToOrganizations() throws Exception {
         assertEquals(db.getCollection("organization").count(), 2);
         assertEquals(db.getCollection("house").count(), 2);
     }
+
+    @Test(groups = "dao", expectedExceptions = ValidationException.class)
+    public void testFailDuplicateIds() throws Exception {
+        Mongeez mongeez = create("mongeez_fail_on_duplicate_changeset_ids.xml");
+        mongeez.process();
+    }
 }

src/test/resources/failing_changeset_on_duplicate_ids.xml

@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright 2011 SecondMarket Labs, LLC.
+  ~
+  ~ 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.
+  -->
+
+<mongoChangeLog>
+    <changeSet changeId="ChangeSet-1" author="d0x">
+        <script>
+            db.organization.findOne();
+        </script>
+    </changeSet>
+    <changeSet changeId="ChangeSet-1" author="d0x">
+        <script>
+            db.organization.findOne();
+        </script>
+    </changeSet>
+</mongoChangeLog>

src/test/resources/mongeez_fail_on_duplicate_changeset_ids.xml

@@ -0,0 +1,15 @@
+<!--
+  ~ Copyright 2011 SecondMarket Labs, LLC.
+  ~
+  ~ 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.
+  -->
+
+<changeFiles>
+    <file path="failing_changeset_on_duplicate_ids.xml"/>
+</changeFiles>