Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Apache Commons Lang lib version #909

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Update Apache Commons Lang lib version #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdcc784
Update Apache Commons Lang lib version
iroqueta Oct 28, 2024
b58f029
Merge branch 'master' into RemoveCommonsLang
iroqueta Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions android/src/main/java/com/genexus/util/GxJsonReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;

import org.apache.commons.lang.CharEncoding;
import java.nio.charset.StandardCharsets;

import com.genexus.internet.StringCollection;
import com.google.gson.stream.JsonReader;
Expand All @@ -14,11 +14,7 @@ public class GxJsonReader {
private JsonReader reader;

public GxJsonReader(InputStream stream) {
try {
reader = new JsonReader(new InputStreamReader(stream, CharEncoding.UTF_8));
} catch (UnsupportedEncodingException e) {
//TODO
}
reader = new JsonReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
}

public boolean readBeginArray() {
Expand Down
10 changes: 5 additions & 5 deletions common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
<artifactId>commons-codec</artifactId>
<version>1.15</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>3.17.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/com/genexus/BaseProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import com.genexus.diagnostics.core.ILogger;
import com.genexus.diagnostics.core.LogManager;
import com.genexus.xml.XMLReader;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import com.genexus.GXSmartCacheProvider.DataUpdateStatus;
import com.genexus.common.classes.AbstractGXFile;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/com/genexus/CommonUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import java.text.*;
import java.util.*;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import java.lang.reflect.*;
import java.security.*;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/com/genexus/util/ExpressionEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import java.util.*;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import com.genexus.ModelContext;
import com.genexus.common.interfaces.SpecificImplementation;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/com/genexus/xml/XMLWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.genexus.CommonUtil;
import java.util.*;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import java.math.BigDecimal;

Expand Down
2 changes: 1 addition & 1 deletion gxawsserverless/src/main/java/com/genexus/cloud/serverless/GXProcedureExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.genexus.cloud.serverless.model.EventMessageResponse;
import com.genexus.cloud.serverless.model.EventMessages;
import com.genexus.db.DynamicExecute;
import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.lang3.NotImplementedException;

import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
Expand Down
2 changes: 1 addition & 1 deletion gxcache-redis/src/main/java/com/genexus/cache/redis/RedisClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import java.util.List;

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.DeserializationFeature;
Expand Down
2 changes: 1 addition & 1 deletion gxcosmosdb/src/main/java/com/genexus/db/cosmosdb/CosmosDBConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.azure.cosmos.CosmosAsyncDatabase;
import com.azure.cosmos.CosmosClientBuilder;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import java.sql.ResultSet;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion gxdynamodb/src/main/java/com/genexus/db/dynamodb/DynamoDBConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.genexus.db.dynamodb;

import com.genexus.db.service.ServiceConnection;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.regions.Region;
Expand Down
2 changes: 1 addition & 1 deletion gxmail/src/main/java/com/genexus/internet/SMTPSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.genexus.diagnostics.core.ILogger;
import com.genexus.diagnostics.core.LogManager;
import org.apache.commons.codec.binary.Base64OutputStream;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import com.genexus.CommonUtil;
import com.genexus.common.interfaces.SpecificImplementation;
Expand Down
2 changes: 1 addition & 1 deletion gxqueue-azure/src/main/java/com/genexus/messaging/queue/azure/AzureQueueFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.genexus.diagnostics.core.LogManager;
import com.genexus.messaging.queue.SimpleMessageQueue;
import com.genexus.services.ServiceConfigurationException;
import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.lang3.NotImplementedException;


public class AzureQueueFactory {
Expand Down
2 changes: 1 addition & 1 deletion gxweb/src/main/java/com/genexus/security/web/SecureToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package com.genexus.security.web;
import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.lang3.NotImplementedException;

import com.genexus.internet.IGxJSONAble;

Expand Down
2 changes: 1 addition & 1 deletion gxweb/src/main/java/com/genexus/security/web/SecureTokenHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.Map;

import com.fasterxml.jackson.core.JsonProcessingException;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.genexus.diagnostics.core.ILogger;
Expand Down
9 changes: 5 additions & 4 deletions gxweb/src/main/java/com/genexus/security/web/WebSecureToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import java.util.Date;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;

import json.org.json.IJsonFormattable;
import json.org.json.JSONException;
Expand All @@ -22,12 +23,12 @@ public class WebSecureToken extends SecureToken {

private JSONObject _jObj = new JSONObject();

public WebSecureToken(){
_expiration = org.apache.commons.lang.time.DateUtils.addDays(new Date(), TOKEN_DAYS_EXPIRATION);
public WebSecureToken(){
_expiration = DateUtils.addDays(new Date(), TOKEN_DAYS_EXPIRATION);
}

public WebSecureToken(String pgmName, String issuer, String value) {
_expiration = org.apache.commons.lang.time.DateUtils.addDays(new Date(), TOKEN_DAYS_EXPIRATION);
_expiration = DateUtils.addDays(new Date(), TOKEN_DAYS_EXPIRATION);
_pgmName = pgmName;
_value = value;
_issuer = issuer;
Expand Down
2 changes: 1 addition & 1 deletion gxweb/src/main/java/com/genexus/security/web/WebSecurityHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.Date;

import com.genexus.GXutil;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;

import com.genexus.security.web.SecureTokenHelper.SecurityMode;
Expand Down
4 changes: 2 additions & 2 deletions gxweb/src/main/java/com/genexus/security/web/jose/jwt/JWTSigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
import java.util.Map;
import java.util.UUID;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;

import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.Validate;
import org.apache.commons.lang3.Validate;
import org.bouncycastle.jce.provider.BouncyCastleProvider;

import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
2 changes: 1 addition & 1 deletion gxweb/src/main/java/com/genexus/webpanels/GXWebObjectBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.genexus.webpanels;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import com.genexus.*;
import com.genexus.configuration.ConfigurationManager;
Expand Down
2 changes: 1 addition & 1 deletion gxweb/src/main/java/com/genexus/webpanels/GXWebPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import json.org.json.JSONArray;
import json.org.json.JSONException;
import json.org.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

class DataIntegrityException extends Exception
{
Expand Down
2 changes: 1 addition & 1 deletion java/src/main/java/com/genexus/GXutil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import com.genexus.util.*;

import json.org.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

public final class GXutil
{
Expand Down
2 changes: 1 addition & 1 deletion java/src/main/java/com/genexus/PrivateUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public static String checkFileNameLength(String baseDir, String fileName, String
int pathLength;
int fileNameLength = fileName.length();
int extensionLength = extension.length();
if (org.apache.commons.lang.SystemUtils.IS_OS_WINDOWS)
if (isWindowsPlatform())
{
pathLength = baseDir.length() + fileNameLength + extensionLength;
if (pathLength > 260)
Expand Down
2 changes: 1 addition & 1 deletion java/src/main/java/com/genexus/webpanels/HttpContextWeb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.genexus.fileupload.IFileItemIterator;
import com.genexus.fileupload.servlet.ServletFileUpload;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;

import com.genexus.internet.GXNavigationHelper;
Expand Down
Loading