diff --git a/pom.xml b/pom.xml index 4f0518ec..7443cd32 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.versionone VersionOne.SDK.Java.APIClient - 21.2.0 + 21.2.1 jar VersionOne.SDK.Java.APIClient @@ -73,6 +73,11 @@ UTF-8 github ${project.version} + 4.5.14 + 4.4.16 + 2.21.0 + 3.20.0 + 20250517 @@ -293,54 +298,50 @@ junit junit - 4.13 + 4.13.2 test - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - org.apache.httpcomponents httpclient - 4.4 + ${httpclient4.version} org.apache.httpcomponents httpclient-win - 4.4 + ${httpclient4.version} org.apache.httpcomponents httpmime - 4.4 + ${httpclient4.version} - - org.apache.commons - commons-io - 1.3.2 + org.apache.httpcomponents + httpcore + ${httpcore4.version} + - commons-validator - commons-validator - 1.4.1 + commons-io + commons-io + ${commons.io.version} - commons-lang - commons-lang - 2.4 + org.apache.commons + commons-lang3 + ${commons.lang3.version} org.json json - 20141113 + ${org.json.version} com.github.tomakehurst wiremock 1.58 + test standalone diff --git a/src/main/java/com/versionone/apiclient/AttributeDefinition.java b/src/main/java/com/versionone/apiclient/AttributeDefinition.java index f3772687..d0bce14f 100644 --- a/src/main/java/com/versionone/apiclient/AttributeDefinition.java +++ b/src/main/java/com/versionone/apiclient/AttributeDefinition.java @@ -6,8 +6,7 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; -import org.apache.commons.lang.NullArgumentException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; import com.versionone.DB; @@ -119,7 +118,7 @@ public Object coerce(Object value) throws V1Exception { return value; case Guid: if (value == null || StringUtils.isEmpty(value.toString())) - throw new NullArgumentException("value"); + throw new IllegalArgumentException("value"); return UUID.fromString(new DB.Str(value).getValue()); default: throw new MetaException("Unsupported AttributeType ", getAttributeType().toString()); diff --git a/src/main/java/com/versionone/apiclient/Services.java b/src/main/java/com/versionone/apiclient/Services.java index 6d74d12f..ac1e6642 100644 --- a/src/main/java/com/versionone/apiclient/Services.java +++ b/src/main/java/com/versionone/apiclient/Services.java @@ -23,8 +23,7 @@ import javax.xml.xpath.XPathFactory; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.NullArgumentException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -87,27 +86,27 @@ public Services(IMetaModel metaModel, IAPIConnector connector) { _connector = connector; } - public Services(V1Connector v1Connector) throws NullArgumentException { + public Services(V1Connector v1Connector) { if (v1Connector == null) - throw new NullArgumentException("v1Connector"); + throw new IllegalArgumentException("v1Connector"); _v1Connector = v1Connector; _meta = new MetaModel(_v1Connector); } - public Services(V1Connector connector, IMetaModel metaModel) throws NullArgumentException { + public Services(V1Connector connector, IMetaModel metaModel) { if (connector == null) - throw new NullArgumentException("connector"); + throw new IllegalArgumentException("connector"); if (metaModel == null) - throw new NullArgumentException("metaModel"); + throw new IllegalArgumentException("metaModel"); _v1Connector = connector; _meta = metaModel; } - public Services(V1Connector connector, boolean preLoadMeta) throws NullArgumentException { + public Services(V1Connector connector, boolean preLoadMeta) { if (connector == null) - throw new NullArgumentException("connector"); + throw new IllegalArgumentException("connector"); _v1Connector = connector; _meta = new MetaModel(connector, preLoadMeta); @@ -576,7 +575,7 @@ public String getLocalization(IAttributeDefinition attribute) throws V1Exception if (null != attribute) { return getStringData("?" + attribute.getDisplayName()); } else { - throw new NullArgumentException("IAttributeDefinition"); + throw new IllegalArgumentException("IAttributeDefinition"); } } @@ -651,7 +650,7 @@ public Map getLocalization(ArrayList attri @Override public Oid saveAttachment(String filePath, Asset asset, String attachmentName) throws V1Exception, IOException { if (StringUtils.isEmpty(filePath)) - throw new NullArgumentException("filePath"); + throw new IllegalArgumentException("filePath"); File file = new File(filePath); if (!file.exists()) @@ -712,7 +711,7 @@ public InputStream getAttachment(Oid attachmentOid) throws V1Exception{ @Override public Oid saveEmbeddedImage(String filePath, Asset asset) throws V1Exception, IOException { if (StringUtils.isEmpty(filePath)) - throw new NullArgumentException("Null value " + filePath); + throw new IllegalArgumentException("Null value " + filePath); File file = new File(filePath); if (!file.exists()) diff --git a/src/main/java/com/versionone/apiclient/V1Configuration.java b/src/main/java/com/versionone/apiclient/V1Configuration.java index ce7491eb..172fe7df 100644 --- a/src/main/java/com/versionone/apiclient/V1Configuration.java +++ b/src/main/java/com/versionone/apiclient/V1Configuration.java @@ -8,7 +8,6 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.apache.commons.lang.NullArgumentException; import org.w3c.dom.Document; import com.versionone.apiclient.exceptions.APIException; @@ -38,13 +37,13 @@ public class V1Configuration implements IV1Configuration { */ public V1Configuration(IAPIConnector connector) { if (connector == null) - throw new NullArgumentException("connector"); + throw new IllegalArgumentException("connector"); this._connector = connector; } public V1Configuration(V1Connector connector) { if (connector == null) - throw new NullArgumentException("_v1connector"); + throw new IllegalArgumentException("_v1connector"); this._v1connector = connector; } diff --git a/src/main/java/com/versionone/apiclient/V1Connector.java b/src/main/java/com/versionone/apiclient/V1Connector.java index db2f48bf..82dbf858 100644 --- a/src/main/java/com/versionone/apiclient/V1Connector.java +++ b/src/main/java/com/versionone/apiclient/V1Connector.java @@ -17,8 +17,8 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.ByteArrayOutputStream; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpHeaders; diff --git a/src/test/java/com/versionone/sdk/integration/tests/CreateAssets.java b/src/test/java/com/versionone/sdk/integration/tests/CreateAssets.java index 25759723..ff71900a 100644 --- a/src/test/java/com/versionone/sdk/integration/tests/CreateAssets.java +++ b/src/test/java/com/versionone/sdk/integration/tests/CreateAssets.java @@ -3,7 +3,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.junit.BeforeClass; import org.junit.Test; diff --git a/src/test/java/com/versionone/sdk/integration/tests/Localization.java b/src/test/java/com/versionone/sdk/integration/tests/Localization.java index a4bfad2a..170053ff 100644 --- a/src/test/java/com/versionone/sdk/integration/tests/Localization.java +++ b/src/test/java/com/versionone/sdk/integration/tests/Localization.java @@ -7,7 +7,7 @@ import java.util.Arrays; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.BeforeClass; import org.junit.Test; diff --git a/src/test/java/com/versionone/sdk/integration/tests/QueryAssets.java b/src/test/java/com/versionone/sdk/integration/tests/QueryAssets.java index 56ca6bd7..67a021fe 100644 --- a/src/test/java/com/versionone/sdk/integration/tests/QueryAssets.java +++ b/src/test/java/com/versionone/sdk/integration/tests/QueryAssets.java @@ -10,7 +10,7 @@ import java.util.Calendar; import java.util.Date; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.junit.BeforeClass; import org.junit.Test; diff --git a/src/test/java/com/versionone/sdk/unit/tests/ServicesTests.java b/src/test/java/com/versionone/sdk/unit/tests/ServicesTests.java index c207e8bf..43c0b962 100644 --- a/src/test/java/com/versionone/sdk/unit/tests/ServicesTests.java +++ b/src/test/java/com/versionone/sdk/unit/tests/ServicesTests.java @@ -10,7 +10,6 @@ import com.versionone.apiclient.exceptions.V1Exception; import com.versionone.apiclient.filters.FilterTerm; -import org.apache.commons.lang.NullArgumentException; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; @@ -198,14 +197,14 @@ public void Asset_with_null_Guid_Attribute() throws OidException, ConnectionExce try { subject.retrieve(query); - } catch (NullArgumentException ex) { + } catch (IllegalArgumentException ex) { Assert.assertEquals( - "value must not be null.", + "value", ex.getMessage()); return; } - Assert.fail("Expected to raise NullArgumentException, but did not."); + Assert.fail("Expected to raise IllegalArgumentException, but did not."); } }