Skip to content

Commit

Permalink
Change commons.lang package to commons.lang3 (frankframework#1621)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nielsm5
nielsm5 authored Mar 26, 2021
1 parent 26c00c0 commit 398dee5
Show file tree
Hide file tree
Showing 268 changed files with 315 additions and 307 deletions.
6 changes: 3 additions & 3 deletions aspose/src/main/java/nl/nn/adapterframework/extensions/aspose/services/util/StringsUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ private StringsUtil() {
}

/**
* Replaces org.apache.commons.lang.StringUtils.isBlank(String) with the guava library.
* Replaces org.apache.commons.lang3.StringUtils.isBlank(String) with the guava library.
*/
public static boolean isBlank(String str) {
return Strings.isNullOrEmpty(trimToNull(str));
}

/**
* Replaces org.apache.commons.lang.StringUtils.isNotBlank(String) with the guava library.
* Replaces org.apache.commons.lang3.StringUtils.isNotBlank(String) with the guava library.
*/
public static boolean isNotBlank(String str) {
return !isBlank(str);
}

/**
* Replaces org.apache.commons.lang.StringUtils.trimToNull(String) with the guava library.
* Replaces org.apache.commons.lang3.StringUtils.trimToNull(String) with the guava library.
*/
public static String trimToNull(String str) {
String result = null;
Expand Down
4 changes: 2 additions & 2 deletions cmis/src/main/java/nl/nn/adapterframework/extensions/cmis/CmisSender.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2016 - 2019 Nationale-Nederlanden
Copyright 2016-2019 Nationale-Nederlanden, 2020-2021 WeAreFrank
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -55,7 +55,7 @@
import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.w3c.dom.Element;
import org.w3c.dom.Node;

Expand Down
2 changes: 1 addition & 1 deletion cmis/src/main/java/nl/nn/adapterframework/extensions/cmis/CmisSessionBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.apache.chemistry.opencmis.commons.data.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.BindingType;
import org.apache.chemistry.opencmis.commons.enums.DateTimeFormat;
import org.apache.commons.lang.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;

Expand Down
2 changes: 1 addition & 1 deletion cmis/src/main/java/nl/nn/adapterframework/extensions/cmis/server/CmisSecurityHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.security.Principal;

import org.apache.chemistry.opencmis.commons.server.CallContext;
import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.lang3.NotImplementedException;

import nl.nn.adapterframework.core.IPipeLineSession;
import nl.nn.adapterframework.core.ISecurityHandler;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/nl/nn/adapterframework/align/Json2Xml.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
import javax.json.JsonValue;
import javax.xml.validation.ValidatorHandler;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.xerces.xs.XSElementDeclaration;
import org.apache.xerces.xs.XSModel;
import org.xml.sax.SAXException;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/nl/nn/adapterframework/align/ToXml.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
import javax.xml.transform.sax.SAXSource;
import javax.xml.validation.ValidatorHandler;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.xerces.xs.XSAttributeDeclaration;
import org.apache.xerces.xs.XSAttributeUse;
import org.apache.xerces.xs.XSComplexTypeDefinition;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/align/Tree2Xml.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import javax.xml.validation.ValidatorHandler;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.xerces.xs.XSElementDeclaration;
import org.apache.xerces.xs.XSModel;
import org.xml.sax.SAXException;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/align/XmlAligner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.ValidatorHandler;

import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.logging.log4j.Logger;
import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.impl.xs.XMLSchemaLoader;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/align/XmlTo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import javax.xml.validation.ValidatorHandler;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;
import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.xs.XSAttributeDeclaration;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/align/content/JsonDocumentContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import javax.json.stream.JsonGenerator;

import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.logging.log4j.Logger;
import org.apache.xerces.xs.XSTypeDefinition;

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/batch/AbstractRecordHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.List;
import java.util.StringTokenizer;

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

import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/batch/AbstractResultHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package nl.nn.adapterframework.batch;

import nl.nn.adapterframework.doc.IbisDoc;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;

import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/batch/DelphiStringRecordReader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import nl.nn.adapterframework.util.LogUtil;
import nl.nn.adapterframework.util.Misc;

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

/**
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/batch/RecordHandlingFlow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import java.util.Map;

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

import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/batch/RecordTransformer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import nl.nn.adapterframework.doc.IbisDoc;
import nl.nn.adapterframework.util.FileUtils;

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

/**
* Translate a record using an outputFields description.
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/batch/RecordXmlTransformer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.util.List;
import java.util.StringTokenizer;

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

import lombok.Getter;
import nl.nn.adapterframework.configuration.ConfigurationException;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/batch/Result2Filewriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.HashMap;
import java.util.Map;

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

import lombok.Getter;
import nl.nn.adapterframework.core.IPipeLineSession;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/batch/ResultBlock2Sender.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.util.HashMap;
import java.util.Map;

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

import nl.nn.adapterframework.configuration.Configuration;
import nl.nn.adapterframework.configuration.ConfigurationException;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/batch/ResultWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.HashMap;
import java.util.Map;

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

import nl.nn.adapterframework.core.IPipeLineSession;
import nl.nn.adapterframework.doc.IbisDoc;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/batch/StreamTransformerPipe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.util.List;
import java.util.Map;

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

import nl.nn.adapterframework.configuration.ConfigurationException;
import nl.nn.adapterframework.configuration.ConfigurationWarnings;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/cache/CacheAdapterBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package nl.nn.adapterframework.cache;

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

import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/cache/IbisCacheManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import nl.nn.adapterframework.util.AppConstants;
import nl.nn.adapterframework.util.LogUtil;

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

/**
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/cache/RemoveCacheKeyPipe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.io.IOException;
import java.io.Serializable;

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

import net.sf.ehcache.Cache;
import nl.nn.adapterframework.configuration.ConfigurationException;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/compression/ZipIteratorPipe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;

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

import nl.nn.adapterframework.configuration.ConfigurationException;
import nl.nn.adapterframework.configuration.ConfigurationWarning;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/compression/ZipWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;

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

import nl.nn.adapterframework.core.IPipeLineSession;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/compression/ZipWriterPipe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import javax.servlet.http.HttpServletResponse;

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

import nl.nn.adapterframework.configuration.ConfigurationException;
import nl.nn.adapterframework.configuration.ConfigurationWarning;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/configuration/BaseConfigurationWarnings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package nl.nn.adapterframework.configuration;

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

import java.util.LinkedList;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/configuration/ConfigurationDigester.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

import org.apache.commons.digester3.Digester;
import org.apache.commons.digester3.binder.DigesterLoader;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.context.ApplicationContext;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/configuration/ConfigurationUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import javax.xml.transform.TransformerException;

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 org.xml.sax.SAXException;

Expand Down
2 changes: 1 addition & 1 deletion ...main/java/nl/nn/adapterframework/configuration/HostnamePropertyPlaceholderConfigurer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import nl.nn.adapterframework.util.AppConstants;
import nl.nn.adapterframework.util.Misc;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;

/**
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/configuration/IbisContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.Properties;
import java.util.Set;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.BeanInstantiationException;
import org.springframework.beans.factory.BeanCreationException;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/core/Adapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.Map;
import java.util.StringTokenizer;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/core/AllowAllSecurityHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import java.security.Principal;

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

/**
* Security handler that declares that each role is valid.
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/core/ISecurityHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import java.security.Principal;

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

/**
* Defines behaviour that can be used to assert identity of callers of a pipeline.
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/core/PipeForward.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package nl.nn.adapterframework.core;

import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;

/**
* Bean that knows a functional name of a Forward, to be referred by
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/core/PipeLine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.List;
import java.util.Map;

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

import lombok.Getter;
import nl.nn.adapterframework.cache.ICacheAdapter;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/core/PipeLineSessionBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.util.Optional;
import java.util.function.BiFunction;

import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.logging.log4j.Logger;

import nl.nn.adapterframework.stream.Message;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/core/PipeRunResult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package nl.nn.adapterframework.core;

import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;

import nl.nn.adapterframework.stream.Message;

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/nl/nn/adapterframework/errormessageformatters/ErrorMessageFormatter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.io.IOException;
import java.util.Date;

import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.logging.log4j.Logger;

import lombok.Getter;
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/nl/nn/adapterframework/errormessageformatters/FixedErrorMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@

import javax.xml.transform.Transformer;

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

/**
* ErrorMessageFormatter that returns a fixed message with replacements.
Expand All @@ -52,7 +51,7 @@ public Message format(String errorMessage, Throwable t, INamedObject location, M
}
if (StringUtils.isNotEmpty(getFileName())) {
try {
messageToReturn = new Message(messageToReturn.asString() + Misc.resourceToString(ClassUtils.getResourceURL(this, getFileName()), SystemUtils.LINE_SEPARATOR));
messageToReturn = new Message(messageToReturn.asString() + Misc.resourceToString(ClassUtils.getResourceURL(this, getFileName()), Misc.LINE_SEPARATOR));
} catch (Throwable e) {
log.error("got exception loading error message file [" + getFileName() + "]", e);
}
Expand Down
Loading

0 comments on commit 398dee5

Please sign in to comment.