Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
37eedad7
Commit
37eedad7
authored
Jul 09, 2018
by
Matija Obreza
Browse files
Upgrade to commons-lang3
parent
13cfe1f7
Changes
71
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
37eedad7
...
...
@@ -63,7 +63,7 @@
<commons.collections.version>
3.2.1
</commons.collections.version>
<commons.fileupload.version>
1.3.1
</commons.fileupload.version>
<commons.io.version>
2.4
</commons.io.version>
<commons.lang.version>
2.6
</commons.lang.version>
<commons.lang.version>
3.7
</commons.lang.version>
<commons.logging.version>
1.2
</commons.logging.version>
<commons.validator.version>
1.4.0
</commons.validator.version>
...
...
@@ -152,10 +152,16 @@
<artifactId>
commons-io
</artifactId>
<version>
${commons.io.version}
</version>
</dependency>
<dependency>
<groupId>
commons-lang
</groupId>
<artifactId>
commons-lang
</artifactId>
<version>
2.6
</version>
</dependency>
<dependency>
<groupId>
org.apache.commons
</groupId>
<artifactId>
commons-lang3
</artifactId>
<version>
${commons.lang.version}
</version>
</dependency>
...
...
src/main/java/org/genesys2/server/listener/sample/CreateAdminListener.java
View file @
37eedad7
...
...
@@ -46,7 +46,7 @@ public class CreateAdminListener extends RunAsAdminListener {
public
void
init
()
throws
Exception
{
LOG
.
info
(
"Checking for at least one account"
);
if
(
userService
.
listUsers
(
new
PageRequest
(
0
,
1
)).
getTotalElements
()
==
0
)
{
if
(
userService
.
listUsers
(
new
PageRequest
(
0
,
2
)).
getTotalElements
()
<
2
)
{
createDefaultAccounts
();
}
}
...
...
src/main/java/org/genesys2/server/listener/sample/FirstRunListener.java
View file @
37eedad7
...
...
@@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import
com.fasterxml.jackson.databind.node.ArrayNode
;
import
com.fasterxml.jackson.databind.node.ObjectNode
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.apache.commons.lang3.RandomStringUtils
;
import
org.genesys.blocks.oauth.model.OAuthClient
;
import
org.genesys.blocks.oauth.model.OAuthRole
;
...
...
src/main/java/org/genesys2/server/model/elastic/AccessionDetails.java
View file @
37eedad7
...
...
@@ -8,7 +8,7 @@ import java.util.List;
import
java.util.Set
;
import
java.util.UUID
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys2.server.model.genesys.AccessionAlias
;
import
org.genesys2.server.model.genesys.AccessionAlias.AliasType
;
import
org.genesys2.server.model.genesys.AccessionBreeding
;
...
...
src/main/java/org/genesys2/server/model/elastic/Alias.java
View file @
37eedad7
package
org.genesys2.server.model.elastic
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys2.server.model.genesys.AccessionAlias
;
import
org.genesys2.server.model.genesys.AccessionAlias.AliasType
;
import
org.springframework.data.elasticsearch.annotations.Field
;
...
...
src/main/java/org/genesys2/server/model/elastic/Collect.java
View file @
37eedad7
...
...
@@ -4,7 +4,7 @@ import java.util.Date;
import
java.util.HashSet
;
import
java.util.Set
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys2.server.model.genesys.AccessionCollect
;
import
org.genesys2.util.MCPDUtil
;
import
org.springframework.data.elasticsearch.annotations.Field
;
...
...
src/main/java/org/genesys2/server/model/elastic/Geo.java
View file @
37eedad7
package
org.genesys2.server.model.elastic
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys2.server.model.genesys.AccessionGeo
;
import
org.springframework.data.elasticsearch.annotations.Field
;
import
org.springframework.data.elasticsearch.annotations.FieldIndex
;
...
...
src/main/java/org/genesys2/server/model/elastic/Remark.java
View file @
37eedad7
package
org.genesys2.server.model.elastic
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys2.server.model.genesys.AccessionRemark
;
import
org.springframework.data.elasticsearch.annotations.Field
;
import
org.springframework.data.elasticsearch.annotations.FieldIndex
;
...
...
src/main/java/org/genesys2/server/model/elastic/Taxonomy.java
View file @
37eedad7
package
org.genesys2.server.model.elastic
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys2.server.model.genesys.Taxonomy2
;
import
org.springframework.data.elasticsearch.annotations.Field
;
import
org.springframework.data.elasticsearch.annotations.FieldIndex
;
...
...
src/main/java/org/genesys2/server/model/genesys/AccessionCollect.java
View file @
37eedad7
...
...
@@ -25,7 +25,7 @@ import javax.persistence.OneToOne;
import
javax.persistence.Table
;
import
javax.persistence.Version
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys.blocks.auditlog.annotations.Audited
;
import
org.genesys.blocks.model.BasicModel
;
import
org.hibernate.annotations.Type
;
...
...
src/main/java/org/genesys2/server/model/genesys/AccessionGeo.java
View file @
37eedad7
...
...
@@ -26,7 +26,7 @@ import javax.persistence.PreUpdate;
import
javax.persistence.Table
;
import
javax.persistence.Version
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys.blocks.auditlog.annotations.Audited
;
import
org.genesys.blocks.model.BasicModel
;
import
org.genesys.worldclim.WorldClimUtil
;
...
...
src/main/java/org/genesys2/server/model/genesys/Taxonomy2.java
View file @
37eedad7
...
...
@@ -33,7 +33,7 @@ import javax.persistence.UniqueConstraint;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys2.server.model.GlobalVersionedAuditedModel
;
import
org.genesys2.server.model.impl.CropTaxonomy
;
import
org.hibernate.annotations.Type
;
...
...
src/main/java/org/genesys2/server/model/genesys/TraitCode.java
View file @
37eedad7
...
...
@@ -25,7 +25,7 @@ import java.util.TreeMap;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
/**
* Class representing one coded trait descriptor value.
...
...
src/main/java/org/genesys2/server/model/impl/Crop.java
View file @
37eedad7
...
...
@@ -43,7 +43,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys.blocks.security.model.AclAwareModel
;
import
org.genesys2.server.model.GlobalVersionedAuditedModel
;
import
org.hibernate.annotations.Type
;
...
...
src/main/java/org/genesys2/server/model/impl/FaoInstitute.java
View file @
37eedad7
...
...
@@ -38,7 +38,7 @@ import javax.persistence.UniqueConstraint;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys.blocks.model.BasicModel
;
import
org.genesys.blocks.model.EntityId
;
import
org.genesys.blocks.security.model.AclAwareModel
;
...
...
src/main/java/org/genesys2/server/model/json/GenesysJsonFactory.java
View file @
37eedad7
...
...
@@ -19,7 +19,7 @@ package org.genesys2.server.model.json;
import
java.util.List
;
import
org.apache.commons.lang.ArrayUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys2.server.model.genesys.AccessionBreeding
;
import
org.genesys2.server.model.genesys.AccessionCollect
;
import
org.genesys2.server.model.genesys.AccessionData
;
...
...
src/main/java/org/genesys2/server/service/impl/BatchRESTServiceImpl.java
View file @
37eedad7
...
...
@@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.Predicate
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys.glis.v1.TermConstants
;
import
org.genesys.glis.v1.api.GenesysApi
;
import
org.genesys.glis.v1.model.UpdateTargets
;
...
...
src/main/java/org/genesys2/server/service/impl/ContentServiceImpl.java
View file @
37eedad7
...
...
@@ -23,7 +23,7 @@ import java.util.List;
import
java.util.Locale
;
import
java.util.Map
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.apache.velocity.VelocityContext
;
import
org.apache.velocity.app.VelocityEngine
;
import
org.genesys.blocks.auditlog.service.ClassPKService
;
...
...
src/main/java/org/genesys2/server/service/impl/CropServiceImpl.java
View file @
37eedad7
...
...
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.Predicate
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys2.server.model.genesys.Taxonomy2
;
import
org.genesys2.server.model.impl.Crop
;
import
org.genesys2.server.model.impl.CropRule
;
...
...
src/main/java/org/genesys2/server/service/impl/DirectMysqlQuery.java
View file @
37eedad7
...
...
@@ -25,7 +25,7 @@ import java.util.Set;
import
java.util.UUID
;
import
org.apache.commons.lang.ArrayUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang
3
.StringUtils
;
import
org.genesys2.server.model.genesys.Method
;
import
org.genesys2.server.service.FilterConstants
;
import
org.genesys2.server.service.MappingService.CoordUtil
;
...
...
Prev
1
2
3
4
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment