diff --git a/src/main/java/com/commafeed/backend/dao/FeedDAO.java b/src/main/java/com/commafeed/backend/dao/FeedDAO.java index 949bd39b..78b6884b 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedDAO.java @@ -72,15 +72,10 @@ public class FeedDAO extends GenericDAO { } public Feed findByUrl(String url) { - List feeds = findByField(Feed_.urlHash, DigestUtils.sha1Hex(url)); - Feed feed = Iterables.getFirst(feeds, null); - if (feed != null && StringUtils.equals(url, feed.getUrl())) { - return feed; - } String normalized = FeedUtils.normalizeURL(url); - feeds = findByField(Feed_.normalizedUrlHash, DigestUtils.sha1Hex(normalized)); - feed = Iterables.getFirst(feeds, null); + List feeds = findByField(Feed_.normalizedUrlHash, DigestUtils.sha1Hex(normalized)); + Feed feed = Iterables.getFirst(feeds, null); if (feed != null && StringUtils.equals(normalized, feed.getNormalizedUrl())) { return feed; } diff --git a/src/main/java/com/commafeed/backend/model/Feed.java b/src/main/java/com/commafeed/backend/model/Feed.java index 9e6f5af4..e5771b71 100644 --- a/src/main/java/com/commafeed/backend/model/Feed.java +++ b/src/main/java/com/commafeed/backend/model/Feed.java @@ -29,9 +29,6 @@ public class Feed extends AbstractModel { @Column(length = 2048, nullable = false) private String url; - @Column(length = 40, nullable = false) - private String urlHash; - @Column(length = 2048, nullable = false) private String normalizedUrl; @@ -199,14 +196,6 @@ public class Feed extends AbstractModel { this.disabledUntil = disabledUntil; } - public String getUrlHash() { - return urlHash; - } - - public void setUrlHash(String urlHash) { - this.urlHash = urlHash; - } - public String getLastModifiedHeader() { return lastModifiedHeader; } diff --git a/src/main/java/com/commafeed/backend/services/FeedService.java b/src/main/java/com/commafeed/backend/services/FeedService.java index 9ae903e4..334d179a 100644 --- a/src/main/java/com/commafeed/backend/services/FeedService.java +++ b/src/main/java/com/commafeed/backend/services/FeedService.java @@ -30,7 +30,6 @@ public class FeedService { String normalized = FeedUtils.normalizeURL(url); feed = new Feed(); feed.setUrl(url); - feed.setUrlHash(DigestUtils.sha1Hex(url)); feed.setNormalizedUrl(normalized); feed.setNormalizedUrlHash(DigestUtils.sha1Hex(normalized)); feed.setDisabledUntil(new Date(0)); diff --git a/src/main/resources/changelogs/db.changelog-1.2.xml b/src/main/resources/changelogs/db.changelog-1.2.xml index def2bbee..eb009324 100644 --- a/src/main/resources/changelogs/db.changelog-1.2.xml +++ b/src/main/resources/changelogs/db.changelog-1.2.xml @@ -103,7 +103,13 @@ + + + + + +