From 0888f11257d76a6065f6bbbce2df88ee12704c0d Mon Sep 17 00:00:00 2001 From: Athou Date: Tue, 19 Aug 2014 00:56:21 +0200 Subject: [PATCH] less boilerplate --- .../com/commafeed/backend/HttpGetter.java | 49 ++++--------------- .../commafeed/backend/feed/FeedFetcher.java | 2 +- 2 files changed, 10 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/commafeed/backend/HttpGetter.java b/src/main/java/com/commafeed/backend/HttpGetter.java index 34b3f35f..85b85d6d 100644 --- a/src/main/java/com/commafeed/backend/HttpGetter.java +++ b/src/main/java/com/commafeed/backend/HttpGetter.java @@ -15,6 +15,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; +import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -195,47 +196,15 @@ public class HttpGetter { return result; } + @Getter + @RequiredArgsConstructor public static class HttpResult { - - private byte[] content; - private String contentType; - private String lastModifiedSince; - private String eTag; - private long duration; - private String urlAfterRedirect; - - private HttpResult(byte[] content, String contentType, String lastModifiedSince, String eTag, long duration, String urlAfterRedirect) { - this.content = content; - this.contentType = contentType; - this.lastModifiedSince = lastModifiedSince; - this.eTag = eTag; - this.duration = duration; - this.urlAfterRedirect = urlAfterRedirect; - } - - public byte[] getContent() { - return content; - } - - public String getContentType() { - return contentType; - } - - public String getLastModifiedSince() { - return lastModifiedSince; - } - - public String geteTag() { - return eTag; - } - - public long getDuration() { - return duration; - } - - public String getUrlAfterRedirect() { - return urlAfterRedirect; - } + private final byte[] content; + private final String contentType; + private final String lastModifiedSince; + private final String eTag; + private final long duration; + private final String urlAfterRedirect; } public static CloseableHttpClient newClient(int timeout) { diff --git a/src/main/java/com/commafeed/backend/feed/FeedFetcher.java b/src/main/java/com/commafeed/backend/feed/FeedFetcher.java index 5c4239ba..c492f7f3 100644 --- a/src/main/java/com/commafeed/backend/feed/FeedFetcher.java +++ b/src/main/java/com/commafeed/backend/feed/FeedFetcher.java @@ -77,7 +77,7 @@ public class FeedFetcher { Feed feed = fetchedFeed.getFeed(); feed.setLastModifiedHeader(result.getLastModifiedSince()); - feed.setEtagHeader(FeedUtils.truncate(result.geteTag(), 255)); + feed.setEtagHeader(FeedUtils.truncate(result.getETag(), 255)); feed.setLastContentHash(hash); fetchedFeed.setFetchDuration(result.getDuration()); fetchedFeed.setUrlAfterRedirect(result.getUrlAfterRedirect());