Skip to content

Commit e41dc29

Browse files
chrisknollecruz165
andauthored
Removed dependency on commons lang (#2415)
* Code base has both commons-lang and commons-lang3 libraries loaded. I replaced existing references with newer library variant. * WordUtils was moved to commons-text --------- Co-authored-by: edwincruz <ecruz165@yahoo.com>
1 parent fce763f commit e41dc29

11 files changed

Lines changed: 16 additions & 16 deletions

File tree

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,11 @@
780780
<artifactId>commons-lang3</artifactId>
781781
<version>3.12.0</version>
782782
</dependency>
783+
<dependency>
784+
<groupId>org.apache.commons</groupId>
785+
<artifactId>commons-text</artifactId>
786+
<version>1.10.0</version>
787+
</dependency>
783788
<dependency>
784789
<groupId>org.flywaydb</groupId>
785790
<artifactId>flyway-core</artifactId>

src/main/java/org/ohdsi/webapi/check/checker/ir/helper/IRAnalysisExpressionHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.ohdsi.webapi.check.checker.ir.helper;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44
import org.ohdsi.webapi.check.builder.IterableForEachValidatorBuilder;
55
import org.ohdsi.webapi.check.builder.NotNullNotEmptyValidatorBuilder;
66
import org.ohdsi.webapi.check.builder.PredicateValidatorBuilder;

src/main/java/org/ohdsi/webapi/estimation/converter/EstimationToEstimationShortDTOConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.ohdsi.webapi.estimation.converter;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44
import org.ohdsi.webapi.estimation.Estimation;
55
import org.ohdsi.webapi.estimation.dto.EstimationShortDTO;
66
import org.ohdsi.webapi.service.converters.BaseCommonEntityToDTOConverter;

src/main/java/org/ohdsi/webapi/exampleapplication/ExampleApplicationWithJobService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.ohdsi.webapi.exampleapplication;
22

3-
import org.apache.commons.lang.RandomStringUtils;
3+
import org.apache.commons.lang3.RandomStringUtils;
44
import org.ohdsi.circe.vocabulary.Concept;
55
import org.ohdsi.webapi.exampleapplication.model.Widget;
66
import org.ohdsi.webapi.exampleapplication.repository.WidgetRepository;

src/main/java/org/ohdsi/webapi/generationcache/CleanupScheduler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.ohdsi.webapi.generationcache;
22

33
import com.cosium.spring.data.jpa.entity.graph.domain.EntityGraphUtils;
4-
import org.apache.commons.lang.time.DateUtils;
4+
import org.apache.commons.lang3.time.DateUtils;
55
import org.springframework.beans.factory.annotation.Value;
66
import org.springframework.scheduling.annotation.Scheduled;
77
import org.springframework.stereotype.Component;

src/main/java/org/ohdsi/webapi/report/mapper/GenericRowMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.fasterxml.jackson.databind.JsonNode;
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import com.fasterxml.jackson.databind.node.ObjectNode;
6-
import org.apache.commons.lang.WordUtils;
6+
import org.apache.commons.text.WordUtils;
77
import org.springframework.jdbc.core.RowMapper;
88
import org.springframework.jdbc.support.JdbcUtils;
99

src/main/java/org/ohdsi/webapi/shiro/filters/UpdateAccessTokenFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import javax.servlet.http.HttpServletResponse;
1919
import javax.servlet.http.HttpSession;
2020
import javax.ws.rs.core.UriBuilder;
21-
import org.apache.commons.lang.StringUtils;
21+
import org.apache.commons.lang3.StringUtils;
2222
import org.apache.shiro.SecurityUtils;
2323
import org.apache.shiro.session.Session;
2424
import org.apache.shiro.subject.PrincipalCollection;

src/main/java/org/ohdsi/webapi/shiro/management/AtlasRegularSecurity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import io.buji.pac4j.filter.CallbackFilter;
55
import io.buji.pac4j.filter.SecurityFilter;
66
import io.buji.pac4j.realm.Pac4jRealm;
7-
import org.apache.commons.lang.StringUtils;
7+
import org.apache.commons.lang3.StringUtils;
88
import org.apache.shiro.realm.Realm;
99
import org.apache.shiro.realm.activedirectory.ActiveDirectoryRealm;
1010
import org.apache.shiro.realm.ldap.DefaultLdapRealm;

src/main/java/org/ohdsi/webapi/shiro/realms/ADRealm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.ohdsi.webapi.shiro.realms;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44
import org.apache.shiro.authc.AuthenticationInfo;
55
import org.apache.shiro.authc.AuthenticationToken;
66
import org.apache.shiro.authc.SimpleAuthenticationInfo;

src/main/java/org/ohdsi/webapi/user/importer/providers/ActiveDirectoryProvider.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.ohdsi.webapi.user.importer.providers;
22

33
import com.google.common.collect.ImmutableSet;
4-
import org.apache.commons.lang.StringUtils;
4+
import org.apache.commons.lang3.StringUtils;
55
import org.ohdsi.webapi.user.importer.model.LdapGroup;
66
import org.ohdsi.webapi.user.importer.model.LdapUser;
77
import org.springframework.beans.factory.annotation.Value;
@@ -13,11 +13,9 @@
1313
import org.springframework.ldap.support.LdapUtils;
1414
import org.springframework.stereotype.Component;
1515

16-
import javax.annotation.PostConstruct;
1716
import javax.naming.NamingException;
1817
import javax.naming.directory.Attributes;
1918
import javax.naming.directory.SearchControls;
20-
import java.util.Arrays;
2119
import java.util.List;
2220
import java.util.Set;
2321
import java.util.stream.Collectors;

0 commit comments

Comments
 (0)