svn commit: r1725553 - in /sling/trunk/contrib/nosql/mongodb-resourceprovider/src: main/java/org/apache/sling/nosql/mongodb/resourceprovider/impl/ test/java/org/apache/sling/nosql/mongodb/resourceprovider/integration/

[sseifert]

Author: sseifert
Date: Tue Jan 19 15:57:39 2016
New Revision: 1725553

URL: http://svn.apache.org/viewvc?rev=1725553&view=rev
Log:
SLING-5078 fix invalid index attribute names

Modified:
    
sling/trunk/contrib/nosql/mongodb-resourceprovider/src/main/java/org/apache/sling/nosql/mongodb/resourceprovider/impl/MongoDBNoSqlAdapter.java
    
sling/trunk/contrib/nosql/mongodb-resourceprovider/src/test/java/org/apache/sling/nosql/mongodb/resourceprovider/integration/IndexCreationIT.java

Modified: 
sling/trunk/contrib/nosql/mongodb-resourceprovider/src/main/java/org/apache/sling/nosql/mongodb/resourceprovider/impl/MongoDBNoSqlAdapter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/mongodb-resourceprovider/src/main/java/org/apache/sling/nosql/mongodb/resourceprovider/impl/MongoDBNoSqlAdapter.java?rev=1725553&r1=1725552&r2=1725553&view=diff
==============================================================================
--- 
sling/trunk/contrib/nosql/mongodb-resourceprovider/src/main/java/org/apache/sling/nosql/mongodb/resourceprovider/impl/MongoDBNoSqlAdapter.java
 (original)
+++ 
sling/trunk/contrib/nosql/mongodb-resourceprovider/src/main/java/org/apache/sling/nosql/mongodb/resourceprovider/impl/MongoDBNoSqlAdapter.java
 Tue Jan 19 15:57:39 2016
@@ -67,19 +67,19 @@ public final class MongoDBNoSqlAdapter e
         
         // create index on parent path field (if it does not exist yet)
         try {
-            Document parenPathtIndex = new Document("_parentPath", 1);
+            Document parenPathtIndex = new Document(PN_PARENT_PATH, 1);
             this.collection.createIndex(parenPathtIndex);
         }
         catch (DuplicateKeyException ex) {
             // index already exists, ignore
         }
         catch (Throwable ex) {
-            log.error("Unable to create index on _parentPath: " + 
ex.getMessage(), ex);
+            log.error("Unable to create index on " + PN_PARENT_PATH + ": " + 
ex.getMessage(), ex);
         }
         
         // create unique index on path field (if it does not exist yet)
         try {
-            Document pathIndex = new Document("_path", 1);
+            Document pathIndex = new Document(PN_PATH, 1);
             IndexOptions idxOptions = new IndexOptions();
             idxOptions.unique(true);
             this.collection.createIndex(pathIndex, idxOptions);
@@ -88,7 +88,7 @@ public final class MongoDBNoSqlAdapter e
             // index already exists, ignore
         }
         catch (Throwable ex) {
-            log.error("Unable to create unique index on _path: " + 
ex.getMessage(), ex);
+            log.error("Unable to create unique index on " + PN_PATH + ": " + 
ex.getMessage(), ex);
         }
     }
 

Modified: 
sling/trunk/contrib/nosql/mongodb-resourceprovider/src/test/java/org/apache/sling/nosql/mongodb/resourceprovider/integration/IndexCreationIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/mongodb-resourceprovider/src/test/java/org/apache/sling/nosql/mongodb/resourceprovider/integration/IndexCreationIT.java?rev=1725553&r1=1725552&r2=1725553&view=diff
==============================================================================
--- 
sling/trunk/contrib/nosql/mongodb-resourceprovider/src/test/java/org/apache/sling/nosql/mongodb/resourceprovider/integration/IndexCreationIT.java
 (original)
+++ 
sling/trunk/contrib/nosql/mongodb-resourceprovider/src/test/java/org/apache/sling/nosql/mongodb/resourceprovider/integration/IndexCreationIT.java
 Tue Jan 19 15:57:39 2016
@@ -18,6 +18,7 @@
  */
 package org.apache.sling.nosql.mongodb.resourceprovider.integration;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.util.Arrays;
@@ -60,17 +61,17 @@ public class IndexCreationIT {
        public void testIndexesPresent() {
                assertNotNull(underTest);
                
-               //expecting at least 3 indexes (_id, _path, _parentPath)
-               int expected = 3;
+               //expecting 2 indexes (_id, parentPath)
+               int expected = 2;
                int actual = 0;
                
-               final String[] expectedIndexesNames=  {"_id_", "_path_1", 
"_parentPath_1"};
+               final String[] expectedIndexesNames=  {"_id_", "parentPath_1"};
                
-               for( Document d : 
mongoClient.getDatabase(database).getCollection(collection).listIndexes()){
+               for (Document d : 
mongoClient.getDatabase(database).getCollection(collection).listIndexes()){
                        assert Arrays.asList(expectedIndexesNames).contains( 
d.get("name") );
                        actual++;
                }
-               assert expected == actual;
+               assertEquals(expected, actual);
        }
 
 }