Fix deprecation warnings

zanata · Sep 27, 2017 · f7e3691 · f7e3691
1 parent 5c1b553
commit f7e3691
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 18 deletions.
diff --git a/server/functional-test/pom.xml b/server/functional-test/pom.xml
@@ -298,9 +298,10 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
 
     <dependency>

diff --git a/server/functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java b/server/functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
@@ -1,7 +1,6 @@
 package org.zanata.feature.manual;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -15,6 +14,8 @@
 import org.zanata.util.SampleDataRule;
 import org.zanata.util.ZanataRestCaller;
 import java.util.List;
+
+import static org.zanata.util.RandomStringUtils.randomAlphabetic;
 import static org.zanata.util.ZanataRestCaller.*;
 
 /**
@@ -72,7 +73,7 @@ private static TextFlow[] generateTextFlows(int numOfTextFlows) {
         TextFlow[] textFlows = new TextFlow[numOfTextFlows];
         for (int i = 0; i < textFlows.length; i++) {
             textFlows[i] = buildTextFlow("res" + i,
-                    RandomStringUtils.randomAlphabetic(10));
+                    randomAlphabetic(10));
         }
         return textFlows;
     }

diff --git a/server/services/src/main/java/org/zanata/action/AdminCreateUserAction.java b/server/services/src/main/java/org/zanata/action/AdminCreateUserAction.java
@@ -27,7 +27,6 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.deltaspike.jpa.api.transaction.Transactional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +39,7 @@
 import org.zanata.service.UserAccountService;
 import org.zanata.ui.faces.FacesMessages;
 
+import static org.zanata.util.RandomStringUtils.randomAlphanumeric;
 
 @Named("adminCreateUserAction")
 @ViewScoped
@@ -92,7 +92,7 @@ public String saveNewUser() {
 
         String activationKey =
                 registerService.register(username,
-                        RandomStringUtils.randomAlphanumeric(8), username,
+                        randomAlphanumeric(8), username,
                         email);
         log.info("get register key:" + activationKey);
 

diff --git a/server/services/src/main/java/org/zanata/action/CacheAction.java b/server/services/src/main/java/org/zanata/action/CacheAction.java
@@ -22,7 +22,7 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.infinispan.Cache;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.stats.Stats;

diff --git a/server/services/src/main/java/org/zanata/action/UserSettingsAction.java b/server/services/src/main/java/org/zanata/action/UserSettingsAction.java
@@ -31,7 +31,7 @@
 import javax.validation.constraints.Size;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotEmpty;
 import javax.annotation.PostConstruct;

diff --git a/server/services/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java b/server/services/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
@@ -247,7 +247,7 @@ public void getDetailedIterationStatisticsForSpecificLocales() {
     @Test
     public void getSimpleDocumentStatisticsForAllLocales() {
         ContainerTranslationStatistics stats =
-                statisticsService.getStatistics("sample-project", "1.0",
+                statisticsService.getStatisticsWithDocId("sample-project", "1.0",
                         "my/path/document.txt", false, new String[] {});
 
         // Make sure the id matches
@@ -280,7 +280,7 @@ public void getDetailedDocumentStatisticsForSpecificLocales() {
         String[] locales = new String[] { "en-US", "es", "as" };
 
         ContainerTranslationStatistics stats =
-                statisticsService.getStatistics("sample-project", "1.0",
+                statisticsService.getStatisticsWithDocId("sample-project", "1.0",
                         "my/path/document.txt", true, locales);
 
         // Make sure the id matches

diff --git a/server/zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java b/server/zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
@@ -22,6 +22,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.EntityListeners;
 import javax.persistence.GeneratedValue;
@@ -36,7 +37,6 @@
 import javax.persistence.TemporalType;
 import javax.persistence.Version;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.FieldBridge;
@@ -136,14 +136,14 @@ public boolean equals(Object obj) {
         assert overridesEquals(this);
         assert overridesEquals(obj);
         ModelEntityBase other = (ModelEntityBase) obj;
-        if (!ObjectUtils.equals(getCreationDate(), other.getCreationDate()))
+        if (!Objects.equals(getCreationDate(), other.getCreationDate()))
             return false;
         if (getId() == null) {
             if (other.getId() != null)
                 return false;
         } else if (!getId().equals(other.getId()))
             return false;
-        if (!ObjectUtils.equals(getLastChanged(), other.getLastChanged()))
+        if (!Objects.equals(getLastChanged(), other.getLastChanged()))
             return false;
         return true;
     }

diff --git a/server/zanata-model/src/test/java/org/zanata/model/validator/EmailDomainValidatorTest.java b/server/zanata-model/src/test/java/org/zanata/model/validator/EmailDomainValidatorTest.java
@@ -4,7 +4,6 @@
 import javax.inject.Provider;
 import javax.validation.ConstraintValidatorContext;
 
-import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -14,6 +13,7 @@
 import static java.util.Collections.emptySet;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
+import static org.zanata.util.RandomStringUtils.randomAlphabetic;
 
 public class EmailDomainValidatorTest {
 
@@ -37,9 +37,9 @@ public void nullOrBlankStringIsValid() {
     }
 
     @Test
-    public void anyEmailIsvalidWhenNoRestrictionOnEmailDomain() {
+    public void anyEmailIsValidWhenNoRestrictionOnEmailDomain() {
         when(emailDomainsProvider.get()).thenReturn(emptySet());
-        assertThat(validator.isValid(RandomStringUtils.randomAlphabetic(5), context)).isTrue();
+        assertThat(validator.isValid(randomAlphabetic(5), context)).isTrue();
 
     }
 

diff --git a/server/zanata-war/src/test/java/org/zanata/rest/service/TMXImportITCase.java b/server/zanata-war/src/test/java/org/zanata/rest/service/TMXImportITCase.java
@@ -36,8 +36,8 @@
 import org.zanata.security.ZanataIdentity;
 import com.google.common.base.Charsets;
 
-import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
-import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
+import static org.zanata.util.RandomStringUtils.randomAlphabetic;
+import static org.zanata.util.RandomStringUtils.randomAlphanumeric;
 
 /**
  * @author Patrick Huang <a href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>