commons-lang upgrade to v3

pom.xml

@@ -243,6 +243,10 @@
 					<groupId>javax.ws.rs</groupId>
 					<artifactId>jsr311-api</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>commons-lang</artifactId>
+					<groupId>commons-lang</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -259,11 +263,6 @@
 			<version>${querydsl.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
-		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>

src/main/java/com/commafeed/CommaFeedConfiguration.java

@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
 
 import lombok.Getter;
 
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.hibernate.validator.constraints.NotBlank;
 
 import com.commafeed.backend.cache.RedisPoolFactory;

src/main/java/com/commafeed/CommaFeedModule.java

@@ -11,8 +11,8 @@ import com.commafeed.CommaFeedConfiguration.CacheType;
 import com.commafeed.backend.cache.CacheService;
 import com.commafeed.backend.cache.NoopCacheService;
 import com.commafeed.backend.cache.RedisCacheService;
-import com.commafeed.backend.favicon.DefaultFaviconFetcher;
 import com.commafeed.backend.favicon.AbstractFaviconFetcher;
+import com.commafeed.backend.favicon.DefaultFaviconFetcher;
 import com.commafeed.backend.favicon.YoutubeFaviconFetcher;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;

src/main/java/com/commafeed/backend/HttpGetter.java

@@ -17,7 +17,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.Consts;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;

src/main/java/com/commafeed/backend/cache/RedisPoolFactory.java

@@ -2,7 +2,7 @@ package com.commafeed.backend.cache;
 
 import lombok.Getter;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;

src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java

@@ -1,11 +1,11 @@
 package com.commafeed.backend.dao;
 
 import java.util.List;
+import java.util.Objects;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.apache.commons.lang.ObjectUtils;
 import org.hibernate.SessionFactory;
 
 import com.commafeed.backend.model.FeedCategory;
@@ -70,7 +70,7 @@ public class FeedCategoryDAO extends GenericDAO<FeedCategory> {
 		}
 		boolean isChild = false;
 		while (child != null) {
-			if (ObjectUtils.equals(child.getId(), parent.getId())) {
+			if (Objects.equals(child.getId(), parent.getId())) {
 				isChild = true;
 				break;
 			}

src/main/java/com/commafeed/backend/dao/FeedDAO.java

@@ -7,7 +7,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.SessionFactory;
 
 import com.commafeed.backend.model.Feed;

src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java

@@ -7,8 +7,8 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang.builder.CompareToBuilder;
+import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.hibernate.SessionFactory;
 
 import com.commafeed.CommaFeedConfiguration;

src/main/java/com/commafeed/backend/favicon/AbstractFaviconFetcher.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.backend.model.Feed;
 

src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java

@@ -6,7 +6,7 @@ import javax.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;

src/main/java/com/commafeed/backend/feed/FeedFetcher.java

@@ -45,7 +45,7 @@ public class FeedFetcher {
 		} catch (FeedException e) {
 			if (extractFeedUrlFromHtml) {
 				String extractedUrl = extractFeedUrl(StringUtils.newStringUtf8(result.getContent()), feedUrl);
-				if (org.apache.commons.lang.StringUtils.isNotBlank(extractedUrl)) {
+				if (org.apache.commons.lang3.StringUtils.isNotBlank(extractedUrl)) {
 					feedUrl = extractedUrl;
 
 					result = getter.getBinary(extractedUrl, lastModified, eTag, timeout);

src/main/java/com/commafeed/backend/feed/FeedParser.java

@@ -11,8 +11,7 @@ import javax.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang.SystemUtils;
 import org.jdom2.Element;
 import org.jdom2.Namespace;
 import org.xml.sax.InputSource;
@@ -173,7 +172,7 @@ public class FeedParser {
 		if (item.getContents().isEmpty()) {
 			content = item.getDescription() == null ? null : item.getDescription().getValue();
 		} else {
-			content = StringUtils.join(Collections2.transform(item.getContents(), CONTENT_TO_STRING), SystemUtils.LINE_SEPARATOR);
+			content = StringUtils.join(Collections2.transform(item.getContents(), CONTENT_TO_STRING), System.lineSeparator());
 		}
 		return StringUtils.trimToNull(content);
 	}

src/main/java/com/commafeed/backend/feed/FeedQueues.java

@@ -9,7 +9,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.Meter;

src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java

@@ -16,8 +16,8 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.hibernate.SessionFactory;
 
 import com.codahale.metrics.Meter;

src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java

@@ -11,8 +11,8 @@ import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 
 import com.codahale.metrics.MetricRegistry;
 import com.commafeed.CommaFeedConfiguration;

src/main/java/com/commafeed/backend/feed/FeedUtils.java

@@ -13,9 +13,9 @@ import java.util.regex.Pattern;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -517,4 +517,5 @@ public class FeedUtils {
 			}
 		}
 	}
+
 }

src/main/java/com/commafeed/backend/model/User.java

@@ -15,7 +15,7 @@ import javax.persistence.TemporalType;
 import lombok.Getter;
 import lombok.Setter;
 
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.hibernate.annotations.Cascade;
 
 import com.commafeed.backend.model.UserRole.Role;

src/main/java/com/commafeed/backend/opml/OPMLImporter.java

@@ -10,7 +10,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.backend.cache.CacheService;
 import com.commafeed.backend.dao.FeedCategoryDAO;

src/main/java/com/commafeed/backend/service/FeedEntryContentService.java

@@ -6,7 +6,7 @@ import javax.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.backend.dao.FeedEntryContentDAO;
 import com.commafeed.backend.feed.FeedUtils;

src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java

@@ -9,7 +9,7 @@ import javax.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.cache.CacheService;

src/main/java/com/commafeed/backend/service/PasswordEncryptionService.java

@@ -15,7 +15,7 @@ import javax.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 // taken from http://www.javacodegeeks.com/2012/05/secure-password-storage-donts-dos-and.html
 @SuppressWarnings("serial")

src/main/java/com/commafeed/backend/service/PubSubService.java

@@ -10,7 +10,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHeaders;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;

src/main/java/com/commafeed/backend/service/UserService.java

@@ -10,7 +10,7 @@ import javax.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.dao.FeedCategoryDAO;

src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java

@@ -7,7 +7,7 @@ import javax.inject.Singleton;
 
 import lombok.RequiredArgsConstructor;
 
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.dao.UserDAO;

src/main/java/com/commafeed/frontend/resource/AdminREST.java

@@ -19,7 +19,7 @@ import javax.ws.rs.core.Response.Status;
 
 import lombok.RequiredArgsConstructor;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.codahale.metrics.MetricRegistry;
 import com.commafeed.CommaFeedApplication;

src/main/java/com/commafeed/frontend/resource/CategoryREST.java

@@ -9,6 +9,7 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -27,8 +28,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.cache.CacheService;
@@ -359,7 +360,7 @@ public class CategoryREST {
 
 			int existingIndex = -1;
 			for (int i = 0; i < categories.size(); i++) {
-				if (ObjectUtils.equals(categories.get(i).getId(), category.getId())) {
+				if (Objects.equals(categories.get(i).getId(), category.getId())) {
 					existingIndex = i;
 				}
 			}
@@ -436,7 +437,7 @@ public class CategoryREST {
 		category.setExpanded(true);
 
 		for (FeedCategory c : categories) {
-			if ((id == null && c.getParent() == null) || (c.getParent() != null && ObjectUtils.equals(c.getParent().getId(), id))) {
+			if ((id == null && c.getParent() == null) || (c.getParent() != null && Objects.equals(c.getParent().getId(), id))) {
 				Category child = buildCategory(c.getId(), categories, subscriptions, unreadCount);
 				child.setId(String.valueOf(c.getId()));
 				child.setName(c.getName());
@@ -457,7 +458,7 @@ public class CategoryREST {
 
 		for (FeedSubscription subscription : subscriptions) {
 			if ((id == null && subscription.getCategory() == null)
-					|| (subscription.getCategory() != null && ObjectUtils.equals(subscription.getCategory().getId(), id))) {
+					|| (subscription.getCategory() != null && Objects.equals(subscription.getCategory().getId(), id))) {
 				UnreadCount uc = unreadCount.get(subscription.getId());
 				Subscription sub = Subscription.build(subscription, config.getApplicationSettings().getPublicUrl(), uc);
 				category.getFeeds().add(sub);

src/main/java/com/commafeed/frontend/resource/FeedREST.java

@@ -11,6 +11,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -33,8 +34,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 
 import com.commafeed.CommaFeedApplication;
@@ -439,7 +440,7 @@ public class FeedREST {
 
 			int existingIndex = -1;
 			for (int i = 0; i < subs.size(); i++) {
-				if (ObjectUtils.equals(subs.get(i).getId(), subscription.getId())) {
+				if (Objects.equals(subs.get(i).getId(), subscription.getId())) {
 					existingIndex = i;
 				}
 			}

src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java

@@ -23,8 +23,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.codahale.metrics.MetricRegistry;
 import com.commafeed.CommaFeedConfiguration;

src/main/java/com/commafeed/frontend/resource/ServerREST.java

@@ -15,7 +15,7 @@ import javax.ws.rs.core.Response.Status;
 
 import lombok.RequiredArgsConstructor;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.HttpGetter;

src/main/java/com/commafeed/frontend/resource/UserREST.java

@@ -27,9 +27,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.http.client.utils.URIBuilder;
 
 import com.commafeed.CommaFeedApplication;

src/main/java/com/commafeed/frontend/servlet/AnalyticsServlet.java

@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.CommaFeedConfiguration;
 

src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java

@@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import lombok.RequiredArgsConstructor;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.SessionFactory;
 
 import com.commafeed.CommaFeedConfiguration;

src/main/java/edu/uci/ics/crawler4j/url/URLCanonicalizer.java

@@ -28,11 +28,11 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
- * See http://en.wikipedia.org/wiki/URL_normalization for a reference Note: some
+ * See http://en.wikipedia.org/wiki/URL_normalization for a reference Note: some parts of the code are adapted from:
- * parts of the code are adapted from: http://stackoverflow.com/a/4057470/405418
+ * http://stackoverflow.com/a/4057470/405418
  * 
  * @author Yasser Ganjisaffar <lastname at gmail dot com>
  */
@@ -122,8 +122,7 @@ public class URLCanonicalizer {
 	}
 
 	/**
-	 * Takes a query string, separates the constituent name-value pairs, and
+	 * Takes a query string, separates the constituent name-value pairs, and stores them in a SortedMap ordered by lexicographical order.
-	 * stores them in a SortedMap ordered by lexicographical order.
 	 * 
 	 * @return Null if there is no query string.
 	 */
@@ -188,8 +187,7 @@ public class URLCanonicalizer {
 	}
 
 	/**
-	 * Percent-encode values according the RFC 3986. The built-in Java
+	 * Percent-encode values according the RFC 3986. The built-in Java URLEncoder does not encode according to the RFC, so we make the extra
-	 * URLEncoder does not encode according to the RFC, so we make the extra
 	 * replacements.
 	 * 
 	 * @param string

src/test/java/com/commafeed/backend/FixedSizeSortedSetTest.java

@@ -2,7 +2,7 @@ package com.commafeed.backend;
 
 import java.util.Comparator;
 
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;