Replace some new HashSet<>() with immutable Set.copyOf

polypheny · Jan 7, 2025 · 6e617c0 · 6e617c0
1 parent 682af0f
commit 6e617c0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/core/src/main/java/org/polypheny/db/rex/RexSimplify.java b/core/src/main/java/org/polypheny/db/rex/RexSimplify.java
@@ -1255,7 +1255,7 @@ private <C extends Comparable<C>> RexNode simplifyAnd2ForUnknownAsFalse( List<Re
         // Example #1. x AND y AND z AND NOT (x AND y)  - not satisfiable
         // Example #2. x AND y AND NOT (x AND y)        - not satisfiable
         // Example #3. x AND y AND NOT (x AND y AND z)  - may be satisfiable
-        final Set<RexNode> termsSet = new HashSet<>( terms );
+        final Set<RexNode> termsSet = Set.copyOf( terms );
         for ( RexNode notDisjunction : notTerms ) {
             if ( !RexUtil.isDeterministic( notDisjunction ) ) {
                 continue;

diff --git a/core/src/main/java/org/polypheny/db/util/EquivalenceSet.java b/core/src/main/java/org/polypheny/db/util/EquivalenceSet.java
@@ -42,6 +42,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
 
@@ -169,7 +170,7 @@ public int size() {
      * Returns the number of equivalence classes in this equivalence set.
      */
     public int classCount() {
-        return new HashSet<>( parents.values() ).size();
+        return Set.copyOf( parents.values() ).size();
     }
 
 }
diff --git a/core/src/test/java/org/polypheny/db/util/ImmutableBitSetTest.java b/core/src/test/java/org/polypheny/db/util/ImmutableBitSetTest.java
@@ -232,7 +232,7 @@ public void testAsList() {
             assertEquals( list1, listView );
             assertThat( list1.hashCode(), equalTo( listView.hashCode() ) );
 
-            final Set<Integer> set = new HashSet<>( list1 );
+            final Set<Integer> set = Set.copyOf( list1 );
             assertThat( setView.hashCode(), is( set.hashCode() ) );
             assertThat( setView, equalTo( set ) );
 

diff --git a/core/src/test/java/org/polypheny/db/util/UtilTest.java b/core/src/test/java/org/polypheny/db/util/UtilTest.java
@@ -808,7 +808,7 @@ private List<Integer> checkIntegerIntervalSet( String s, int... ints ) {
         final Set<Integer> set = IntegerIntervalSet.of( s );
         assertEquals( set.size(), ints.length );
         List<Integer> list = new ArrayList<>( set );
-        assertEquals( new HashSet<>( Ints.asList( ints ) ), set );
+        assertEquals( Set.copyOf( Ints.asList( ints ) ), set );
         return list;
     }
 
@@ -980,7 +980,7 @@ public void testCompositeMap() {
     private void checkCompositeMap( String[] beatles, Map<String, Integer> map ) {
         assertThat( 4, equalTo( map.size() ) );
         assertThat( false, equalTo( map.isEmpty() ) );
-        assertThat( map.keySet(), equalTo( (Set<String>) new HashSet<>( Arrays.asList( beatles ) ) ) );
+        assertThat( map.keySet(), equalTo(  Set.copyOf( Arrays.asList( beatles ) ) ) );
         assertThat( ImmutableMultiset.copyOf( map.values() ), equalTo( ImmutableMultiset.copyOf( Arrays.asList( 4, 4, 6, 5 ) ) ) );
     }