Changeset 31211 for other-projects/hathitrust/wcsa

Timestamp:

2016-12-12T16:01:59+13:00 (7 years ago)

Author:

davidb

Message:

Changing back to regular Guava classes. Looking to use maven shading to remap Guava 20.0 into different namespace

File:

• other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/WhitelistBloomFilter.java (modified) (5 diffs)

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/WhitelistBloomFilter.java

@@ -24 +24 @@
 
 import com.google.common.base.Preconditions;
-//import com.google.common.hash.BloomFilter;
-import com.google.common.hash.BloomFilterAdvanced;
+import com.google.common.hash.BloomFilter;
+//import com.google.common.hash.BloomFilterAdvanced;
 //import com.google.common.hash.BloomFilterStrategies.BitArray;
 import com.google.common.hash.Funnel;
@@ -34 +34 @@
 
 public class WhitelistBloomFilter {
-    
-    
-
-    protected BloomFilterAdvanced<CharSequence> _bloomFilter;
+
+    protected BloomFilter<CharSequence> _bloomFilter;
     protected static final String SERIALIZED_SUFFIX = "-serialized";
     protected static final double FALSE_POSITIVE_PERCENTAGE = 0.01;
@@ -87 +85 @@
                 //Funnel<CharSequence> string_funnel = Funnels.stringFunnel(StandardCharsets.UTF_8);
                 Funnel<CharSequence> string_funnel = stringFunnel(StandardCharsets.UTF_8);
-                _bloomFilter = BloomFilterAdvanced.create(string_funnel, num_lines,FALSE_POSITIVE_PERCENTAGE);
+                _bloomFilter = BloomFilter.create(string_funnel, num_lines,FALSE_POSITIVE_PERCENTAGE);
             } 
             catch (IOException e) {
@@ -148 +146 @@
     }
 
-    protected static BloomFilterAdvanced<CharSequence> serializeIn(File ser_file)
-    {
-        BloomFilterAdvanced<CharSequence> bloomFilter = null;
+    protected static BloomFilter<CharSequence> serializeIn(File ser_file)
+    {
+        BloomFilter<CharSequence> bloomFilter = null;
     
         try {
@@ -158 +156 @@
             //Funnel<CharSequence> string_funnel = Funnels.stringFunnel(StandardCharsets.UTF_8);
             Funnel<CharSequence> string_funnel = stringFunnel(StandardCharsets.UTF_8);
-            bloomFilter = BloomFilterAdvanced.readFrom(bfis,string_funnel);
+            bloomFilter = BloomFilter.readFrom(bfis,string_funnel);
 
             bfis.close();