update test.yml, build.xml, and WorkspaceMongoIndex.java

kbase · Feb 22, 2024 · 11521dc · 11521dc
1 parent 640953d
commit 11521dc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -46,7 +46,7 @@ jobs:
       matrix:
         include:
           - java: '11'
-            mongo: 'mongodb-linux-x86_64-3.6.23'
+            mongo: 'mongodb-linux-x86_64-ubuntu2204-7.0.4'
             minio: '2019-05-23T00-29-34Z'
             wired_tiger: 'true'
             ant_test: 'test_quick_coverage'
@@ -56,12 +56,6 @@ jobs:
             minio: '2019-05-23T00-29-34Z'
             wired_tiger: 'false'
             ant_test: 'test_quick_coverage'
-          # Mongo7 setup
-          - java: '11'
-            mongo: 'mongodb-linux-x86_64-ubuntu2204-7.0.4'
-            minio: '2019-05-23T00-29-34Z'
-            wired_tiger: 'false'
-            ant_test: 'test_quick_coverage'
     steps:
       - uses: actions/checkout@v3
 

diff --git a/build.xml b/build.xml
@@ -104,14 +104,15 @@
     <include name="apache_commons/commons-collections-3.2.1.jar"/>
     <include name="jsemver/java-semver-0.9.0.jar"/>
     <include name="equalsverifier/equalsverifier-3.1.10.jar"/>
-    <include name="kbase/auth2/kbase-auth2-test-fat-0.6.1.jar"/>
     <include name="arangodb/arangodb-java-driver-6.7.2.jar"/>
     <include name="arangodb/velocypack-2.4.0.jar"/>
     <!-- mockito and dependencies -->
     <include name="mockito/mockito-core-3.0.0.jar"/>
     <include name="bytebuddy/byte-buddy-1.9.10.jar"/>
     <include name="bytebuddy/byte-buddy-agent-1.9.10.jar"/>
     <include name="objenesis/objenesis-2.6.jar"/>
+<!--    put auth2 fat jar in the last entry so that it would not shadow other jars-->
+    <include name="kbase/auth2/kbase-auth2-test-fat-0.6.1.jar"/>
   </fileset>
 
   <union id="applicationjars">

diff --git a/src/us/kbase/workspace/test/WorkspaceMongoIndex.java b/src/us/kbase/workspace/test/WorkspaceMongoIndex.java
@@ -10,8 +10,8 @@ public class WorkspaceMongoIndex {
 
     public static Set<Document> getAndNormalizeIndexes(final MongoDatabase db, final String collectionName) {
         final Set<Document> indexes = new HashSet<>();
-        for (Document index: db.getCollection(collectionName).listIndexes()) {
-            // In MongoDB 4.4, the listIndexes and the mongo shell helper method db.collection.getAndNormalizeIndexes()
+        for (final Document index: db.getCollection(collectionName).listIndexes()) {
+            // In MongoDB 4.4, the listIndexes and the mongo shell helper method db.collection.getIndexes()
             // no longer returns the namespace ns field in the index specification documents.
             index.remove("ns");
             // some versions of Mongo return ints, some longs. Convert all to longs.