diff --git a/ipp-v3-java-data/pom.xml b/ipp-v3-java-data/pom.xml index 1faec5e2..73e5077a 100755 --- a/ipp-v3-java-data/pom.xml +++ b/ipp-v3-java-data/pom.xml @@ -30,7 +30,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.9.10 + 2.18.3 org.glassfish.jaxb @@ -192,7 +192,7 @@ org.apache.commons commons-lang3 - 3.9 + 3.17.0 diff --git a/ipp-v3-java-devkit/pom.xml b/ipp-v3-java-devkit/pom.xml index 5774c569..337109b1 100644 --- a/ipp-v3-java-devkit/pom.xml +++ b/ipp-v3-java-devkit/pom.xml @@ -63,7 +63,7 @@ com.google.code.gson gson - 2.8.1 + 2.12.1 oauth.signpost @@ -76,10 +76,10 @@ 1.2 - - commons-configuration - commons-configuration - 1.6 + + org.apache.commons + commons-configuration2 + 2.12.0 commons-collections @@ -104,7 +104,7 @@ commons-beanutils commons-beanutils - 1.9.4 + 1.11.0 commons-io @@ -119,7 +119,7 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.9.10 + 2.18.3 org.jmockit @@ -314,12 +314,12 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.9.10 + 2.18.3 org.apache.commons - commons-lang3 - 3.9 + commons-lang3 + 3.17.0 org.jvnet.staxex diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/HTTPBatchClientConnectionInterceptor.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/HTTPBatchClientConnectionInterceptor.java index 2e5c91f5..de94e07e 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/HTTPBatchClientConnectionInterceptor.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/HTTPBatchClientConnectionInterceptor.java @@ -34,7 +34,7 @@ import javax.net.ssl.SSLContext; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpHost; import org.apache.http.HttpResponse; diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/IntuitInterceptorProvider.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/IntuitInterceptorProvider.java index 0c269710..d2a9a382 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/IntuitInterceptorProvider.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/IntuitInterceptorProvider.java @@ -27,7 +27,7 @@ import com.intuit.ipp.util.Config; import com.intuit.ipp.util.Logger; import com.intuit.ipp.util.StringUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; /** * Class to provide the provision to add interceptors in the order those have to be executed. diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/AttachableResponseDeserializer.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/AttachableResponseDeserializer.java index d3ef4d55..015029be 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/AttachableResponseDeserializer.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/AttachableResponseDeserializer.java @@ -18,17 +18,11 @@ import java.io.IOException; import java.util.Iterator; -import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.AnnotationIntrospector; -import com.fasterxml.jackson.databind.DeserializationConfig; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.intuit.ipp.data.Attachable; import com.intuit.ipp.data.AttachableResponse; @@ -57,7 +51,7 @@ public class AttachableResponseDeserializer extends JsonDeserializer @Override public CDCResponse deserialize(JsonParser jp, DeserializationContext desContext) throws IOException { ObjectMapper mapper = new ObjectMapper(); - + mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS,true); //Make the mapper JAXB annotations aware AnnotationIntrospector primary = new JaxbAnnotationIntrospector(); AnnotationIntrospector secondary = new JacksonAnnotationIntrospector(); diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/CustomFieldDefinitionDeserializer.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/CustomFieldDefinitionDeserializer.java index da86de1f..f432b0e0 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/CustomFieldDefinitionDeserializer.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/CustomFieldDefinitionDeserializer.java @@ -20,17 +20,11 @@ import java.util.Iterator; import java.util.List; -import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.AnnotationIntrospector; -import com.fasterxml.jackson.databind.DeserializationConfig; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.intuit.ipp.data.CustomField; import com.intuit.ipp.data.CustomFieldDefinition; @@ -61,7 +55,7 @@ public class CustomFieldDefinitionDeserializer extends JsonDeserializer cl) throws SerializationExcept Response intuitResponse = null; ObjectMapper mapper = new ObjectMapper(); - + mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS,true); SimpleModule simpleModule = new SimpleModule("IntuitResponseDeserializer", new Version(1, 0, 0, null)); simpleModule.addDeserializer(IntuitResponse.class, new IntuitResponseDeserializer()); mapper.registerModule(simpleModule); diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/QueryResponseDeserializer.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/QueryResponseDeserializer.java index 357e3d28..60f46556 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/QueryResponseDeserializer.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/QueryResponseDeserializer.java @@ -20,19 +20,13 @@ import javax.xml.bind.JAXBElement; -import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.Version; -import com.fasterxml.jackson.databind.AnnotationIntrospector; -import com.fasterxml.jackson.databind.DeserializationConfig; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.intuit.ipp.data.*; import com.intuit.ipp.util.Logger; @@ -87,7 +81,7 @@ public class QueryResponseDeserializer extends JsonDeserializer { @Override public QueryResponse deserialize(JsonParser jp, DeserializationContext desContext) throws IOException { ObjectMapper mapper = new ObjectMapper(); - + mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS,true); //Make the mapper JAXB annotations aware AnnotationIntrospector primary = new JaxbAnnotationIntrospector(); AnnotationIntrospector secondary = new JacksonAnnotationIntrospector(); diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/util/Config.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/util/Config.java index 215aaf63..ee54a0bc 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/util/Config.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/util/Config.java @@ -15,248 +15,253 @@ *******************************************************************************/ package com.intuit.ipp.util; -import org.apache.commons.configuration.CompositeConfiguration; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationUtils; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.EnvironmentConfiguration; -import org.apache.commons.configuration.XMLConfiguration; +import org.apache.commons.configuration2.CompositeConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationUtils; +import org.apache.commons.configuration2.EnvironmentConfiguration; +import org.apache.commons.configuration2.XMLConfiguration; +import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.ex.ConfigurationException; /** * Class to have all the configuration details. * This class uses ThreadLocal, so that each thread maintains its own scope. - * */ public final class Config { - /** - * logger instance - */ - private static final org.slf4j.Logger LOG = Logger.getLogger(); - - /** - * variable CompositeConfiguration - */ - private CompositeConfiguration cc = null; - - /** - * end point key name in the configuration for Intuit API - */ - - public static final String BASE_URL_QB_API = "baseURL.quickbooks-api"; - - /** - * variable BASE_URL_QBO - */ - public static final String BASE_URL_QBO = "baseURL.qbo"; - - /** - * variable BASE_URL_PLATFORMSERVICE - */ - public static final String BASE_URL_PLATFORMSERVICE = "baseURL.platformService"; - public static final String BASE_URL_ENTITLEMENTSERVICE = "baseURL.entitlementService"; - - /** - * variable PROXY_HOST - */ - public static final String PROXY_HOST = "proxy.host"; - - /** - * variable PROXY_PORT - */ - public static final String PROXY_PORT = "proxy.port"; - - /** - * variable PROXY_USERNAME - */ - public static final String PROXY_USERNAME = "proxy.username"; - - /** - * variable PROXY_PASSWORD - */ - public static final String PROXY_PASSWORD = "proxy.password"; - - public static final String PROXY_DOMAIN = "proxy.domain"; - - /** - * variable PROXY_KEYSTORE_PATH - */ - public static final String PROXY_KEYSTORE_PATH = "proxy.keystore.path"; - - /** - * variable PROXY_KEYSTORE_PASSWORD - */ - public static final String PROXY_KEYSTORE_PASSWORD = "proxy.keystore.password"; - - /** - * variable RETRY_MODE - */ - public static final String RETRY_MODE = "retry.mode"; - - /** - * variable RETRY_FIXED_COUNT - */ - public static final String RETRY_FIXED_COUNT = "retry.fixed.count"; - - /** - * variable RETRY_FIXED_INTERVAL - */ - public static final String RETRY_FIXED_INTERVAL = "retry.fixed.interval"; - - /** - * variable RETRY_INCREMENTAL_COUNT - */ - public static final String RETRY_INCREMENTAL_COUNT = "retry.incremental.count"; - - /** - * variable RETRY_INCREMENTAL_INTERVAL - */ - public static final String RETRY_INCREMENTAL_INTERVAL = "retry.incremental.interval"; - - /** - * variable RETRY_INCREMENTAL_INCREMENT - */ - public static final String RETRY_INCREMENTAL_INCREMENT = "retry.incremental.increment"; - - /** - * variable RETRY_EXPONENTIAL_COUNT - */ - public static final String RETRY_EXPONENTIAL_COUNT = "retry.exponential.count"; - - /** - * variable RETRY_EXPONENTIAL_MIN_BACKOFF - */ - public static final String RETRY_EXPONENTIAL_MIN_BACKOFF = "retry.exponential.minBackoff"; - - /** - * variable RETRY_EXPONENTIAL_MAX_BACKOFF - */ - public static final String RETRY_EXPONENTIAL_MAX_BACKOFF = "retry.exponential.maxBackoff"; - - /** - * variable RETRY_EXPONENTIAL_DELTA_BACKOFF - */ - public static final String RETRY_EXPONENTIAL_DELTA_BACKOFF = "retry.exponential.deltaBackoff"; - - /** - * variable COMPRESSION_REQUEST_FORMAT - */ - public static final String COMPRESSION_REQUEST_FORMAT = "message.request.compression"; - - /** - * variable COMPRESSION_RESPONSE_FORMAT - */ - public static final String COMPRESSION_RESPONSE_FORMAT = "message.response.compression"; - - /** - * variable SERIALIZATION_REQUEST_FORMAT - */ - public static final String SERIALIZATION_REQUEST_FORMAT = "message.request.serialization"; - - /** - * variable SERIALIZATION_RESPONSE_FORMAT - */ - public static final String SERIALIZATION_RESPONSE_FORMAT = "message.response.serialization"; - - /** - * variable SERIALIZATION_RESPONSE_FORMAT - */ - public static final String TIMEOUT_CONNECTION = "timeout.connectionTimeout"; - - /** - * variable SERIALIZATION_RESPONSE_FORMAT - */ - public static final String TIMEOUT_REQUEST = "timeout.requestTimeout"; - - /** - * variable ENVIRONMENT_VAR_QBO_BASE_URL - */ - public static final String ENVIRONMENT_VAR_QBO_BASE_URL = "IPP_QBO_BASE_URL"; - - /** - * Set to HTTP_URL_CONNECTION if required. Default is Apache HTTP Client if not set. In XML config you can set as HTTP_URL_CONNECTION - */ - public static final String HTTP_TRANSPORT = "httpTransport"; - - public static final String TLS_VERSION = "tls.version"; + /** + * logger instance + */ + private static final org.slf4j.Logger LOG = Logger.getLogger(); + + /** + * variable CompositeConfiguration + */ + private CompositeConfiguration cc = null; + + /** + * end point key name in the configuration for Intuit API + */ + + public static final String BASE_URL_QB_API = "baseURL.quickbooks-api"; + + /** + * variable BASE_URL_QBO + */ + public static final String BASE_URL_QBO = "baseURL.qbo"; + + /** + * variable BASE_URL_PLATFORMSERVICE + */ + public static final String BASE_URL_PLATFORMSERVICE = "baseURL.platformService"; + public static final String BASE_URL_ENTITLEMENTSERVICE = "baseURL.entitlementService"; + + /** + * variable PROXY_HOST + */ + public static final String PROXY_HOST = "proxy.host"; + + /** + * variable PROXY_PORT + */ + public static final String PROXY_PORT = "proxy.port"; + + /** + * variable PROXY_USERNAME + */ + public static final String PROXY_USERNAME = "proxy.username"; + + /** + * variable PROXY_PASSWORD + */ + public static final String PROXY_PASSWORD = "proxy.password"; + + public static final String PROXY_DOMAIN = "proxy.domain"; + + /** + * variable PROXY_KEYSTORE_PATH + */ + public static final String PROXY_KEYSTORE_PATH = "proxy.keystore.path"; + + /** + * variable PROXY_KEYSTORE_PASSWORD + */ + public static final String PROXY_KEYSTORE_PASSWORD = "proxy.keystore.password"; + + /** + * variable RETRY_MODE + */ + public static final String RETRY_MODE = "retry.mode"; + + /** + * variable RETRY_FIXED_COUNT + */ + public static final String RETRY_FIXED_COUNT = "retry.fixed.count"; + + /** + * variable RETRY_FIXED_INTERVAL + */ + public static final String RETRY_FIXED_INTERVAL = "retry.fixed.interval"; + + /** + * variable RETRY_INCREMENTAL_COUNT + */ + public static final String RETRY_INCREMENTAL_COUNT = "retry.incremental.count"; + + /** + * variable RETRY_INCREMENTAL_INTERVAL + */ + public static final String RETRY_INCREMENTAL_INTERVAL = "retry.incremental.interval"; + + /** + * variable RETRY_INCREMENTAL_INCREMENT + */ + public static final String RETRY_INCREMENTAL_INCREMENT = "retry.incremental.increment"; + + /** + * variable RETRY_EXPONENTIAL_COUNT + */ + public static final String RETRY_EXPONENTIAL_COUNT = "retry.exponential.count"; + + /** + * variable RETRY_EXPONENTIAL_MIN_BACKOFF + */ + public static final String RETRY_EXPONENTIAL_MIN_BACKOFF = "retry.exponential.minBackoff"; + + /** + * variable RETRY_EXPONENTIAL_MAX_BACKOFF + */ + public static final String RETRY_EXPONENTIAL_MAX_BACKOFF = "retry.exponential.maxBackoff"; + + /** + * variable RETRY_EXPONENTIAL_DELTA_BACKOFF + */ + public static final String RETRY_EXPONENTIAL_DELTA_BACKOFF = "retry.exponential.deltaBackoff"; + + /** + * variable COMPRESSION_REQUEST_FORMAT + */ + public static final String COMPRESSION_REQUEST_FORMAT = "message.request.compression"; + + /** + * variable COMPRESSION_RESPONSE_FORMAT + */ + public static final String COMPRESSION_RESPONSE_FORMAT = "message.response.compression"; + + /** + * variable SERIALIZATION_REQUEST_FORMAT + */ + public static final String SERIALIZATION_REQUEST_FORMAT = "message.request.serialization"; + + /** + * variable SERIALIZATION_RESPONSE_FORMAT + */ + public static final String SERIALIZATION_RESPONSE_FORMAT = "message.response.serialization"; + + /** + * variable SERIALIZATION_RESPONSE_FORMAT + */ + public static final String TIMEOUT_CONNECTION = "timeout.connectionTimeout"; + + /** + * variable SERIALIZATION_RESPONSE_FORMAT + */ + public static final String TIMEOUT_REQUEST = "timeout.requestTimeout"; + + /** + * variable ENVIRONMENT_VAR_QBO_BASE_URL + */ + public static final String ENVIRONMENT_VAR_QBO_BASE_URL = "IPP_QBO_BASE_URL"; + + /** + * Set to HTTP_URL_CONNECTION if required. Default is Apache HTTP Client if not set. In XML config you can set as HTTP_URL_CONNECTION + */ + public static final String HTTP_TRANSPORT = "httpTransport"; + + public static final String TLS_VERSION = "tls.version"; public static final String BIGDECIMAL_SCALE_SHIFT = "feature.bigDecimalScaleShift"; - + public static final String WEBHOOKS_VERIFIER_TOKEN = "webhooks.verifier.token"; public static final String LATEST_MINOR_VERSION = "minorVersion.latestMinorVersion"; - - /** - * variable ThreadLocal - */ - private static ThreadLocal local = new ThreadLocal() { - public Config initialValue() { - return new Config(); - } - - public Config get() { - return super.get(); - } - }; - - /** - * Constructor config - */ - private Config() { - try { - XMLConfiguration config = null; - XMLConfiguration devConfig = null; - - cc = new CompositeConfiguration(); - - try { - devConfig = new XMLConfiguration("intuit-config.xml"); - cc.addConfiguration(devConfig); - } catch (ConfigurationException e) { - LOG.warn("issue reading config.xml"); - LOG.debug("issue reading config.xml"); - } - - config = new XMLConfiguration("intuit-default-config.xml"); - cc.addConfiguration(config); - - try { - EnvironmentConfiguration envConfig = new EnvironmentConfiguration(); - String envQBOBaseUrl = envConfig.getString(ENVIRONMENT_VAR_QBO_BASE_URL); - if (StringUtils.hasText(envQBOBaseUrl)) { - cc.setProperty(BASE_URL_QBO, envQBOBaseUrl); - } - } catch (Exception e) { - LOG.warn("ConfigurationException while reading environment configuration.", e); - } - - } catch (ConfigurationException e) { - LOG.error("ConfigurationException while loading configuration xml file.", e); - } - } - - /** - * Gets the property value for the given property name - * @param key - * @return returns value - */ - public static String getProperty(String key) { - return local.get().cc.getString(key); - } - - /** - * Sets the property to the configuration - * @param key - * @param value - */ - public static void setProperty(String key, String value) { - local.get().cc.setProperty(key, value); - } + + /** + * variable ThreadLocal + */ + private static ThreadLocal local = new ThreadLocal() { + public Config initialValue() { + return new Config(); + } + + public Config get() { + return super.get(); + } + }; + + /** + * Constructor config + */ + private Config() { + try { + XMLConfiguration config = null; + XMLConfiguration devConfig = null; + + cc = new CompositeConfiguration(); + + try { +// devConfig = new XMLConfiguration("config.xml"); + devConfig = new FileBasedConfigurationBuilder<>(XMLConfiguration.class).configure(new Parameters().xml().setFileName("intuit-config.xml")).getConfiguration(); + cc.addConfiguration(devConfig); + } catch (ConfigurationException e) { + LOG.warn("issue reading config.xml"); + LOG.debug("issue reading config.xml"); + } +// config = new XMLConfiguration("intuit-default-config.xml"); + config = new FileBasedConfigurationBuilder<>(XMLConfiguration.class).configure(new Parameters().xml().setFileName("intuit-default-config.xml")).getConfiguration(); + cc.addConfiguration(config); + + try { + EnvironmentConfiguration envConfig = new EnvironmentConfiguration(); + String envQBOBaseUrl = envConfig.getString(ENVIRONMENT_VAR_QBO_BASE_URL); + if (StringUtils.hasText(envQBOBaseUrl)) { + cc.setProperty(BASE_URL_QBO, envQBOBaseUrl); + } + } catch (Exception e) { + LOG.warn("ConfigurationException while reading environment configuration.", e); + } + + } catch (ConfigurationException e) { + LOG.error("ConfigurationException while loading configuration xml file.", e); + } + } + + /** + * Gets the property value for the given property name + * + * @param key + * @return returns value + */ + public static String getProperty(String key) { + return local.get().cc.getString(key); + } + + /** + * Sets the property to the configuration + * + * @param key + * @param value + */ + public static void setProperty(String key, String value) { + local.get().cc.setProperty(key, value); + } /** * Returns boolean for specific setting + * * @param key * @return */ @@ -267,39 +272,41 @@ public static Boolean getBooleanProperty(String key) { /** * Returns boolean value for specified property and default value + * * @param key * @param defaultValue * @return */ public static Boolean getBooleanProperty(String key, Boolean defaultValue) { String value = getProperty(key); - if((null == value) || value.isEmpty() ) { + if ((null == value) || value.isEmpty()) { return (null == defaultValue) ? false : defaultValue; } - if("null".equals(value.toLowerCase()) && (null != defaultValue) ) { + if ("null".equals(value.toLowerCase()) && (null != defaultValue)) { return defaultValue; } return Boolean.parseBoolean(value); } - /** - * Returns a copy of manual configuration overrides. This implementation will create a deep - * clone, i.e. all manual configurations contained in this composite will also be - * cloned. - * - * @return the copy - */ - public static Configuration cloneConfigurationOverrides(){ - return ConfigurationUtils - .cloneConfiguration(local.get().cc.getInMemoryConfiguration()); - } - - /** - * Adds given manual configuration overrides to the {@link CompositeConfiguration} stored in ThreadLocal. - * @param configuration The configuration to add. - */ - public static void addConfigurationOverrides(Configuration configuration){ - ConfigurationUtils.copy(configuration, local.get().cc); - } + /** + * Returns a copy of manual configuration overrides. This implementation will create a deep + * clone, i.e. all manual configurations contained in this composite will also be + * cloned. + * + * @return the copy + */ + public static Configuration cloneConfigurationOverrides() { + return ConfigurationUtils + .cloneConfiguration(local.get().cc.getInMemoryConfiguration()); + } + + /** + * Adds given manual configuration overrides to the {@link CompositeConfiguration} stored in ThreadLocal. + * + * @param configuration The configuration to add. + */ + public static void addConfigurationOverrides(Configuration configuration) { + ConfigurationUtils.copy(configuration, local.get().cc); + } } diff --git a/oauth2-platform-api/pom.xml b/oauth2-platform-api/pom.xml index 80cb8504..7f0f7f77 100644 --- a/oauth2-platform-api/pom.xml +++ b/oauth2-platform-api/pom.xml @@ -27,9 +27,9 @@ Quickbooks API Helper Project for OAuth2 - commons-lang - commons-lang - 2.6 + org.apache.commons + commons-lang3 + 3.17.0 org.json @@ -49,7 +49,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.10.7 + 2.18.3 commons-codec diff --git a/oauth2-platform-api/src/main/java/com/intuit/oauth2/config/OAuth2Config.java b/oauth2-platform-api/src/main/java/com/intuit/oauth2/config/OAuth2Config.java index 23c0bc6f..c8230806 100644 --- a/oauth2-platform-api/src/main/java/com/intuit/oauth2/config/OAuth2Config.java +++ b/oauth2-platform-api/src/main/java/com/intuit/oauth2/config/OAuth2Config.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.UUID; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import com.intuit.oauth2.client.DiscoveryAPIClient; diff --git a/oauth2-platform-api/src/test/java/com/intuit/oauth2/data/AddressTest.java b/oauth2-platform-api/src/test/java/com/intuit/oauth2/data/AddressTest.java index 865da8b0..99fc8af2 100644 --- a/oauth2-platform-api/src/test/java/com/intuit/oauth2/data/AddressTest.java +++ b/oauth2-platform-api/src/test/java/com/intuit/oauth2/data/AddressTest.java @@ -1,6 +1,6 @@ package com.intuit.oauth2.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/pom.xml b/payments-api/pom.xml index 1f8bc696..9ee83ae0 100644 --- a/payments-api/pom.xml +++ b/payments-api/pom.xml @@ -26,14 +26,14 @@ Payments API SDK - commons-lang - commons-lang - 2.6 + org.apache.commons + commons-lang3 + 3.17.0 com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.9.10 + 2.18.3 org.jmockit diff --git a/payments-api/src/main/java/com/intuit/payment/data/Address.java b/payments-api/src/main/java/com/intuit/payment/data/Address.java index 9b2b5a3d..138e30b1 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/Address.java +++ b/payments-api/src/main/java/com/intuit/payment/data/Address.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/BankAccount.java b/payments-api/src/main/java/com/intuit/payment/data/BankAccount.java index 7349f169..220eca3d 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/BankAccount.java +++ b/payments-api/src/main/java/com/intuit/payment/data/BankAccount.java @@ -17,7 +17,7 @@ import java.util.Date; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/payments-api/src/main/java/com/intuit/payment/data/Capture.java b/payments-api/src/main/java/com/intuit/payment/data/Capture.java index 317efde8..80f85364 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/Capture.java +++ b/payments-api/src/main/java/com/intuit/payment/data/Capture.java @@ -18,7 +18,7 @@ import java.math.BigDecimal; import java.util.Date; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/Card.java b/payments-api/src/main/java/com/intuit/payment/data/Card.java index 75077ec1..7cddcfc2 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/Card.java +++ b/payments-api/src/main/java/com/intuit/payment/data/Card.java @@ -17,7 +17,7 @@ import java.util.Date; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/payments-api/src/main/java/com/intuit/payment/data/CardPresent.java b/payments-api/src/main/java/com/intuit/payment/data/CardPresent.java index b9701f14..a8e36f3f 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/CardPresent.java +++ b/payments-api/src/main/java/com/intuit/payment/data/CardPresent.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/Charge.java b/payments-api/src/main/java/com/intuit/payment/data/Charge.java index a20678be..73e10ce7 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/Charge.java +++ b/payments-api/src/main/java/com/intuit/payment/data/Charge.java @@ -18,7 +18,7 @@ import java.math.BigDecimal; import java.util.Date; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/CheckContext.java b/payments-api/src/main/java/com/intuit/payment/data/CheckContext.java index 9f81d5e7..06f564f4 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/CheckContext.java +++ b/payments-api/src/main/java/com/intuit/payment/data/CheckContext.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/CvcVerification.java b/payments-api/src/main/java/com/intuit/payment/data/CvcVerification.java index 05d39d8f..3185dae0 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/CvcVerification.java +++ b/payments-api/src/main/java/com/intuit/payment/data/CvcVerification.java @@ -17,7 +17,7 @@ import java.util.Date; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/DeviceInfo.java b/payments-api/src/main/java/com/intuit/payment/data/DeviceInfo.java index 840d1b88..6147bbec 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/DeviceInfo.java +++ b/payments-api/src/main/java/com/intuit/payment/data/DeviceInfo.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/ECheck.java b/payments-api/src/main/java/com/intuit/payment/data/ECheck.java index af11c91b..3472caab 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/ECheck.java +++ b/payments-api/src/main/java/com/intuit/payment/data/ECheck.java @@ -18,7 +18,7 @@ import java.math.BigDecimal; import java.util.Date; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/Error.java b/payments-api/src/main/java/com/intuit/payment/data/Error.java index c82e3dbb..7ec9947b 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/Error.java +++ b/payments-api/src/main/java/com/intuit/payment/data/Error.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/Errors.java b/payments-api/src/main/java/com/intuit/payment/data/Errors.java index 92e8c284..054b0444 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/Errors.java +++ b/payments-api/src/main/java/com/intuit/payment/data/Errors.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/payments-api/src/main/java/com/intuit/payment/data/Lodging.java b/payments-api/src/main/java/com/intuit/payment/data/Lodging.java index 69ded884..88fef8b8 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/Lodging.java +++ b/payments-api/src/main/java/com/intuit/payment/data/Lodging.java @@ -18,7 +18,7 @@ import java.math.BigDecimal; import java.util.Date; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/PaymentContext.java b/payments-api/src/main/java/com/intuit/payment/data/PaymentContext.java index 31494bb6..e128a93d 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/PaymentContext.java +++ b/payments-api/src/main/java/com/intuit/payment/data/PaymentContext.java @@ -17,7 +17,7 @@ import java.math.BigDecimal; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/QueryResponse.java b/payments-api/src/main/java/com/intuit/payment/data/QueryResponse.java index 0673528b..d67a057e 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/QueryResponse.java +++ b/payments-api/src/main/java/com/intuit/payment/data/QueryResponse.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; /** * @author dderose diff --git a/payments-api/src/main/java/com/intuit/payment/data/Refund.java b/payments-api/src/main/java/com/intuit/payment/data/Refund.java index 27b9cf39..3de2075f 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/Refund.java +++ b/payments-api/src/main/java/com/intuit/payment/data/Refund.java @@ -18,7 +18,7 @@ import java.math.BigDecimal; import java.util.Date; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/Restaurant.java b/payments-api/src/main/java/com/intuit/payment/data/Restaurant.java index 52ed3dec..728955c3 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/Restaurant.java +++ b/payments-api/src/main/java/com/intuit/payment/data/Restaurant.java @@ -17,7 +17,7 @@ import java.math.BigDecimal; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/data/Token.java b/payments-api/src/main/java/com/intuit/payment/data/Token.java index f90b4154..08c24d62 100644 --- a/payments-api/src/main/java/com/intuit/payment/data/Token.java +++ b/payments-api/src/main/java/com/intuit/payment/data/Token.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/payments-api/src/main/java/com/intuit/payment/services/BankAccountService.java b/payments-api/src/main/java/com/intuit/payment/services/BankAccountService.java index ca0f5a1d..f4c89d9d 100644 --- a/payments-api/src/main/java/com/intuit/payment/services/BankAccountService.java +++ b/payments-api/src/main/java/com/intuit/payment/services/BankAccountService.java @@ -17,7 +17,7 @@ import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/payments-api/src/main/java/com/intuit/payment/services/CardService.java b/payments-api/src/main/java/com/intuit/payment/services/CardService.java index 6909651c..ab6c821c 100644 --- a/payments-api/src/main/java/com/intuit/payment/services/CardService.java +++ b/payments-api/src/main/java/com/intuit/payment/services/CardService.java @@ -17,7 +17,7 @@ import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/payments-api/src/main/java/com/intuit/payment/services/ChargeService.java b/payments-api/src/main/java/com/intuit/payment/services/ChargeService.java index c3a0a615..4d76b7c1 100644 --- a/payments-api/src/main/java/com/intuit/payment/services/ChargeService.java +++ b/payments-api/src/main/java/com/intuit/payment/services/ChargeService.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.services; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/payments-api/src/main/java/com/intuit/payment/services/ECheckService.java b/payments-api/src/main/java/com/intuit/payment/services/ECheckService.java index a333f0c0..9c3e9afb 100644 --- a/payments-api/src/main/java/com/intuit/payment/services/ECheckService.java +++ b/payments-api/src/main/java/com/intuit/payment/services/ECheckService.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.services; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/payments-api/src/main/java/com/intuit/payment/services/base/ServiceBase.java b/payments-api/src/main/java/com/intuit/payment/services/base/ServiceBase.java index 8ec740ec..25bef504 100644 --- a/payments-api/src/main/java/com/intuit/payment/services/base/ServiceBase.java +++ b/payments-api/src/main/java/com/intuit/payment/services/base/ServiceBase.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpStatus; import org.slf4j.Logger; diff --git a/payments-api/src/test/java/com/intuit/payment/data/AddressTest.java b/payments-api/src/test/java/com/intuit/payment/data/AddressTest.java index 1f6cc48f..8551fdac 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/AddressTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/AddressTest.java @@ -1,6 +1,6 @@ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/BankAccountTest.java b/payments-api/src/test/java/com/intuit/payment/data/BankAccountTest.java index a1eb6d0d..54bd7f6f 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/BankAccountTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/BankAccountTest.java @@ -1,6 +1,6 @@ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/CaptureTest.java b/payments-api/src/test/java/com/intuit/payment/data/CaptureTest.java index a06ee66a..32329cad 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/CaptureTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/CaptureTest.java @@ -1,5 +1,5 @@ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/ChargeTest.java b/payments-api/src/test/java/com/intuit/payment/data/ChargeTest.java index 2591984d..456aa3b9 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/ChargeTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/ChargeTest.java @@ -16,7 +16,7 @@ package com.intuit.payment.data; import com.intuit.payment.data.Charge.ChargeStatus; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/CheckContextTest.java b/payments-api/src/test/java/com/intuit/payment/data/CheckContextTest.java index 417b29d3..cfc2ed01 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/CheckContextTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/CheckContextTest.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/CvcVerificationTest.java b/payments-api/src/test/java/com/intuit/payment/data/CvcVerificationTest.java index f0d42b31..c7c223a2 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/CvcVerificationTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/CvcVerificationTest.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/DeviceInfoTest.java b/payments-api/src/test/java/com/intuit/payment/data/DeviceInfoTest.java index 35f04f97..d9418673 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/DeviceInfoTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/DeviceInfoTest.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/ECheckTest.java b/payments-api/src/test/java/com/intuit/payment/data/ECheckTest.java index 27359b9c..f248ad64 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/ECheckTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/ECheckTest.java @@ -15,7 +15,7 @@ *******************************************************************************/ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/ErrorTest.java b/payments-api/src/test/java/com/intuit/payment/data/ErrorTest.java index 45d31d52..dca20966 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/ErrorTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/ErrorTest.java @@ -1,6 +1,6 @@ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/LodgingTest.java b/payments-api/src/test/java/com/intuit/payment/data/LodgingTest.java index fff74573..9a029314 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/LodgingTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/LodgingTest.java @@ -1,6 +1,6 @@ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/PaymentContextTest.java b/payments-api/src/test/java/com/intuit/payment/data/PaymentContextTest.java index 42060b0d..26423678 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/PaymentContextTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/PaymentContextTest.java @@ -1,6 +1,6 @@ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/QueryResponseTest.java b/payments-api/src/test/java/com/intuit/payment/data/QueryResponseTest.java index 4e2c2bbe..9c7e24dc 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/QueryResponseTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/QueryResponseTest.java @@ -1,5 +1,5 @@ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/RestaurantTest.java b/payments-api/src/test/java/com/intuit/payment/data/RestaurantTest.java index faef104e..1d53e999 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/RestaurantTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/RestaurantTest.java @@ -1,6 +1,6 @@ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; diff --git a/payments-api/src/test/java/com/intuit/payment/data/TokenTest.java b/payments-api/src/test/java/com/intuit/payment/data/TokenTest.java index 69899d28..4aa96738 100644 --- a/payments-api/src/test/java/com/intuit/payment/data/TokenTest.java +++ b/payments-api/src/test/java/com/intuit/payment/data/TokenTest.java @@ -1,5 +1,5 @@ package com.intuit.payment.data; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest;