This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new e9a6167bab StringUtils improvements
e9a6167bab is described below
commit e9a6167baba5640eea4ea2eba2214fbb05ed64ce
Author: James Bognar <[email protected]>
AuthorDate: Sun Nov 30 10:58:53 2025 -0500
StringUtils improvements
---
.../src/main/java/org/apache/juneau/bean/openapi3/Items.java | 6 +++---
.../src/main/java/org/apache/juneau/bean/openapi3/Parameter.java | 6 +++---
.../java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java | 6 +++---
.../src/main/java/org/apache/juneau/common/utils/StringUtils.java | 4 ++--
.../java/org/apache/juneau/common/utils/StringUtils_Test.java | 8 ++++----
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
index 9f3f272b13..f857952275 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.StringUtils.*;
-import static org.apache.juneau.common.utils.StringUtils.contains;
+import static org.apache.juneau.common.utils.StringUtils.containsAny;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
@@ -434,7 +434,7 @@ public class Items extends OpenApiElement {
* @return This object
*/
public Items setCollectionFormat(String value) {
- if (isStrict() && ! contains(value, VALID_COLLECTION_FORMATS))
+ if (isStrict() && ! containsAny(value,
VALID_COLLECTION_FORMATS))
throw rex("Invalid value passed in to
setCollectionFormat(String). Value=''{0}'', valid values=[{1}]", value,
toCdl(VALID_COLLECTION_FORMATS));
collectionFormat = value;
return this;
@@ -706,7 +706,7 @@ public class Items extends OpenApiElement {
* @return This object
*/
public Items setType(String value) {
- if (isStrict() && ! contains(value, VALID_TYPES))
+ if (isStrict() && ! containsAny(value, VALID_TYPES))
throw illegalArg("Invalid value passed in to
setType(String). Value=''{0}'', valid values={1}", value,
Json5Serializer.DEFAULT.toString(VALID_TYPES));
type = value;
return this;
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Parameter.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Parameter.java
index c3c7bc4184..b29125c287 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Parameter.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Parameter.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.CollectionUtils.*;
-import static org.apache.juneau.common.utils.StringUtils.contains;
+import static org.apache.juneau.common.utils.StringUtils.containsAny;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
@@ -357,7 +357,7 @@ public class Parameter extends OpenApiElement {
* @return This object.
*/
public Parameter setIn(String value) {
- if (isStrict() && ! contains(value, VALID_IN))
+ if (isStrict() && ! containsAny(value, VALID_IN))
throw rex("Invalid value passed in to setIn(String).
Value=''{0}'', valid values={1}", value, Json5.of(VALID_IN));
this.in = value;
return this;
@@ -403,7 +403,7 @@ public class Parameter extends OpenApiElement {
* @return This object.
*/
public Parameter setStyle(String value) {
- if (isStrict() && ! contains(value, VALID_STYLES))
+ if (isStrict() && ! containsAny(value, VALID_STYLES))
throw rex("Invalid value passed in to setStyle(String).
Value=''{0}'', valid values={1}", value, Json5.of(VALID_STYLES));
this.style = value;
return this;
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
index 78e153178b..1a1ec0fe3b 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.StringUtils.*;
-import static org.apache.juneau.common.utils.StringUtils.contains;
+import static org.apache.juneau.common.utils.StringUtils.containsAny;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
@@ -341,7 +341,7 @@ public class SecuritySchemeInfo extends OpenApiElement {
* @return This object
*/
public SecuritySchemeInfo setIn(String value) {
- if (isStrict() && ! contains(value, VALID_IN))
+ if (isStrict() && ! containsAny(value, VALID_IN))
throw rex("Invalid value passed in to setIn(String).
Value=''{0}'', valid values=[{1}]", value, toCdl(VALID_IN));
in = value;
return this;
@@ -431,7 +431,7 @@ public class SecuritySchemeInfo extends OpenApiElement {
* @return This object
*/
public SecuritySchemeInfo setType(String value) {
- if (isStrict() && ! contains(value, VALID_TYPES))
+ if (isStrict() && ! containsAny(value, VALID_TYPES))
throw rex("Invalid value passed in to setType(String).
Value=''{0}'', valid values=[{1}]", value, toCdl(VALID_TYPES));
type = value;
return this;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
index 1116d03605..c648a5559a 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
@@ -394,7 +394,7 @@ public class StringUtils {
* @param values The substrings to check for.
* @return <jk>true</jk> if the string contains any of the specified
substrings.
*/
- public static boolean contains(String s, String...values) {
+ public static boolean containsAny(String s, String...values) {
if (s == null || values == null || values.length == 0)
return false;
for (var v : values) {
@@ -6869,7 +6869,7 @@ public class StringUtils {
* @return <jk>true</jk> if the string does not contain any of the
values.
*/
public static boolean notContains(String s, String...values) {
- return ! contains(s, values);
+ return ! containsAny(s, values);
}
/**
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/utils/StringUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/utils/StringUtils_Test.java
index e0c62dd1b6..d5c4f5ae96 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/common/utils/StringUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/utils/StringUtils_Test.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.TestUtils.*;
import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.StringUtils.*;
import static org.apache.juneau.common.utils.StringUtils.compare;
-import static org.apache.juneau.common.utils.StringUtils.contains;
+import static org.apache.juneau.common.utils.StringUtils.containsAny;
import static org.apache.juneau.common.utils.StringUtils.eqic;
import static org.apache.juneau.common.utils.StringUtils.reverse;
import static org.apache.juneau.common.utils.Utils.eqic;
@@ -3235,11 +3235,11 @@ class StringUtils_Test extends TestBase {
assertTrue(contains("test", "te"));
assertTrue(contains("test", "st"));
assertTrue(contains("test", "test"));
- assertTrue(contains("test", "te", "xx"));
+ assertTrue(containsAny("test", "te", "xx"));
assertFalse(contains("test", "xx"));
- assertFalse(contains("test", "xx", "yy"));
+ assertFalse(containsAny("test", "xx", "yy"));
assertFalse(contains(null, "test"));
- assertFalse(contains("test", (String[])null));
+ assertFalse(containsAny("test", (String[])null));
}
@Test
