Skip to content

Commit dc98c69

Browse files
anjacksonanjackson
committed
Merge pull request iipc#17 from gerhardgossen/master
Replace removed Guava classes and methods by updated versions
2 parents 3bcf756 + b3cb376 commit dc98c69

13 files changed

Lines changed: 48 additions & 46 deletions

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>com.google.guava</groupId>
7474
<artifactId>guava</artifactId>
75-
<version>14.0.1</version>
75+
<version>17.0</version>
7676
</dependency>
7777

7878
<dependency>

‎src/main/java/org/archive/extract/DumpingExtractorOutput.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import org.archive.util.StreamCopy;
1010
import org.json.JSONException;
1111

12+
import com.google.common.io.ByteStreams;
1213
import com.google.common.io.CountingOutputStream;
13-
import com.google.common.io.NullOutputStream;
1414

1515
public class DumpingExtractorOutput implements ExtractorOutput {
1616
private static final Logger LOG =
@@ -22,7 +22,7 @@ public DumpingExtractorOutput(OutputStream out) {
2222
}
2323

2424
public void output(Resource resource) throws IOException {
25-
NullOutputStream nullo = new NullOutputStream();
25+
OutputStream nullo = ByteStreams.nullOutputStream();
2626
CountingOutputStream co = new CountingOutputStream(nullo);
2727
StreamCopy.copy(resource.getInputStream(), co);
2828
long bytes = co.getCount();

‎src/main/java/org/archive/extract/RealCDXExtractorOutput.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.archive.extract;
22

33
import java.io.IOException;
4+
import java.io.OutputStream;
45
import java.io.PrintWriter;
56
import java.net.MalformedURLException;
67
import java.net.URISyntaxException;
@@ -23,8 +24,8 @@
2324
import org.json.JSONException;
2425
import org.json.JSONObject;
2526

27+
import com.google.common.io.ByteStreams;
2628
import com.google.common.io.CountingOutputStream;
27-
import com.google.common.io.NullOutputStream;
2829

2930
public class RealCDXExtractorOutput implements ExtractorOutput {
3031
private static final Logger LOG =
@@ -72,7 +73,7 @@ public RealCDXExtractorOutput(PrintWriter out) {
7273
// SimpleJSONPathSpec gzFooterLengthSpec = new SimpleJSONPathSpec("Container.Gzip-Metadata.Footer-Length");
7374
// SimpleJSONPathSpec gzHeaderLengthSpec = new SimpleJSONPathSpec("Container.Gzip-Metadata.Header-Length");
7475
public void output(Resource resource) throws IOException {
75-
NullOutputStream nullo = new NullOutputStream();
76+
OutputStream nullo = ByteStreams.nullOutputStream();
7677
CountingOutputStream co = new CountingOutputStream(nullo);
7778
try {
7879
StreamCopy.copy(resource.getInputStream(), co);

‎src/main/java/org/archive/extract/WARCMetadataRecordExtractorOutput.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.archive.extract;
22

33
import java.io.IOException;
4+
import java.io.OutputStream;
45
import java.io.PrintWriter;
56
import java.net.MalformedURLException;
67
import java.net.URISyntaxException;
@@ -21,8 +22,8 @@
2122
import org.json.JSONException;
2223
import org.json.JSONObject;
2324

25+
import com.google.common.io.ByteStreams;
2426
import com.google.common.io.CountingOutputStream;
25-
import com.google.common.io.NullOutputStream;
2627

2728
public class WARCMetadataRecordExtractorOutput implements ExtractorOutput {
2829
private static final Logger LOG =
@@ -47,7 +48,7 @@ public WARCMetadataRecordExtractorOutput(PrintWriter out) {
4748
}
4849

4950
public void output(Resource resource) throws IOException {
50-
NullOutputStream nullo = new NullOutputStream();
51+
OutputStream nullo = ByteStreams.nullOutputStream();
5152
CountingOutputStream co = new CountingOutputStream(nullo);
5253
try {
5354
StreamCopy.copy(resource.getInputStream(), co);

‎src/main/java/org/archive/resource/AbstractResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import org.archive.util.StreamCopy;
77

8-
import com.google.common.io.NullOutputStream;
8+
import com.google.common.io.ByteStreams;
99

1010
public abstract class AbstractResource implements Resource {
1111
protected ResourceContainer container;
@@ -44,7 +44,7 @@ public static void dumpShort(PrintStream out, Resource resource) throws IOExcept
4444
// out.println("Headers Before");
4545
// out.print(m.toString());
4646

47-
long bytes = StreamCopy.copy(resource.getInputStream(), new NullOutputStream());
47+
long bytes = StreamCopy.copy(resource.getInputStream(), ByteStreams.nullOutputStream());
4848
out.println("Resource Was:"+bytes+" Long");
4949

5050
out.println("[\n]Headers After");

‎src/main/java/org/archive/resource/arc/ARCResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import org.archive.util.io.EOFObserver;
1919
import org.archive.util.io.PushBackOneByteInputStream;
2020

21+
import com.google.common.io.ByteStreams;
2122
import com.google.common.io.CountingInputStream;
22-
import com.google.common.io.LimitInputStream;
2323

2424
public class ARCResource extends AbstractResource
2525

@@ -54,7 +54,7 @@ public ARCResource(MetaData metaData, ResourceContainer container,
5454
fields.putLong(DECLARED_LENGTH_KEY, arcMetaData.getLength());
5555

5656
countingIS = new CountingInputStream(
57-
new LimitInputStream(raw, arcMetaData.getLength()));
57+
ByteStreams.limit(raw, arcMetaData.getLength()));
5858

5959
try {
6060
digIS = new DigestInputStream(countingIS,

‎src/main/java/org/archive/resource/http/HTTPResponseResource.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.security.NoSuchAlgorithmException;
88
import java.util.logging.Logger;
99

10-
1110
import org.archive.format.http.HttpHeader;
1211
import org.archive.format.http.HttpResponse;
1312
import org.archive.format.http.HttpResponseMessage;
@@ -20,8 +19,8 @@
2019
import org.archive.util.io.EOFNotifyingInputStream;
2120
import org.archive.util.io.EOFObserver;
2221

22+
import com.google.common.io.ByteStreams;
2323
import com.google.common.io.CountingInputStream;
24-
import com.google.common.io.LimitInputStream;
2524

2625

2726

@@ -65,7 +64,7 @@ public HTTPResponseResource(MetaData metaData,
6564
headers.putString(h.getName(),h.getValue());
6665
}
6766
if(forceCheck && (length >= 0)) {
68-
LimitInputStream lis = new LimitInputStream(response, length);
67+
InputStream lis = ByteStreams.limit(response, length);
6968
countingIS = new CountingInputStream(lis);
7069
} else {
7170
countingIS = new CountingInputStream(response);

‎src/main/java/org/archive/resource/warc/WARCResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.archive.util.io.EOFObserver;
2020
import org.archive.util.io.PushBackOneByteInputStream;
2121

22+
import com.google.common.io.ByteStreams;
2223
import com.google.common.io.CountingInputStream;
23-
import com.google.common.io.LimitInputStream;
2424

2525
public class WARCResource extends AbstractResource implements EOFObserver, ResourceConstants {
2626
CountingInputStream countingIS;
@@ -51,7 +51,7 @@ public WARCResource(MetaData metaData, ResourceContainer container,
5151

5252
if(length >= 0) {
5353
countingIS = new CountingInputStream(
54-
new LimitInputStream(response, length));
54+
ByteStreams.limit(response, length));
5555
} else {
5656
throw new ResourceParseException(null);
5757
}

‎src/main/java/org/archive/url/URLRegexTransformer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ public static String hostToPublicSuffix(String host) {
101101
InternetDomainName idn;
102102

103103
try {
104-
idn = InternetDomainName.fromLenient(host);
104+
idn = InternetDomainName.from(host);
105105
} catch(IllegalArgumentException e) {
106106
return host;
107107
}
108108
InternetDomainName tmp = idn.publicSuffix();
109109
if(tmp == null) {
110110
return host;
111111
}
112-
String pubSuff = tmp.name();
112+
String pubSuff = tmp.toString();
113113
int idx = host.lastIndexOf(".", host.length() - (pubSuff.length()+2));
114114
if(idx == -1) {
115115
return host;

‎src/main/java/org/archive/util/TextUtils.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@
3636

3737
import org.apache.commons.lang.StringEscapeUtils;
3838

39-
import com.google.common.base.Function;
40-
import com.google.common.collect.MapMaker;
39+
import com.google.common.cache.CacheBuilder;
40+
import com.google.common.cache.CacheLoader;
41+
import com.google.common.cache.LoadingCache;
4142

4243
public class TextUtils {
4344
private static final String FIRSTWORD = "^([^\\s]*).*$";
@@ -51,11 +52,11 @@ protected Map<String,Matcher> initialValue() {
5152
};
5253

5354
/** global soft-cache of Patterns, by string key */
54-
private static final ConcurrentMap<String, Pattern> PATTERNS = new MapMaker()
55+
private static final LoadingCache<String, Pattern> PATTERNS = CacheBuilder.newBuilder()
5556
.concurrencyLevel(16)
5657
.softValues()
57-
.makeComputingMap(new Function<String, Pattern>() {
58-
public Pattern apply(String regex) {
58+
.build(new CacheLoader<String, Pattern>() {
59+
public Pattern load(String regex) {
5960
return Pattern.compile(regex);
6061
}
6162
});
@@ -84,7 +85,7 @@ public static Matcher getMatcher(String pattern, CharSequence input) {
8485
final Map<String,Matcher> matchers = TL_MATCHER_MAP.get();
8586
Matcher m = (Matcher)matchers.get(pattern);
8687
if(m == null) {
87-
m = PATTERNS.get(pattern).matcher(input);
88+
m = PATTERNS.getUnchecked(pattern).matcher(input);
8889
} else {
8990
matchers.put(pattern,null);
9091
m.reset(input);

0 commit comments

Comments
 (0)