You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/10/25 11:52:47 UTC
[camel] branch main updated (f12421c5232 -> dbf79132760)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from f12421c5232 Polished
new 9f887d5d92e (chores) camel-core: added unit test for some ObjectHelper methods
new dbf79132760 (chores) camel-core: avoid checking for the first char during the loop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/support/ObjectHelper.java | 56 ++++++----
.../org/apache/camel/support/ObjectHelperTest.java | 123 +++++++++++++++++++++
2 files changed, 159 insertions(+), 20 deletions(-)
create mode 100644 core/camel-support/src/test/java/org/apache/camel/support/ObjectHelperTest.java
[camel] 02/02: (chores) camel-core: avoid checking for the first char during the loop
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dbf79132760ea291ed1112487876e320fec33a35
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Oct 25 09:04:00 2023 +0200
(chores) camel-core: avoid checking for the first char during the loop
---
.../org/apache/camel/support/ObjectHelper.java | 56 ++++++++++++++--------
.../org/apache/camel/support/ObjectHelperTest.java | 14 +++++-
2 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
index fbbd3512957..8d18cd513d8 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
@@ -343,45 +343,61 @@ public final class ObjectHelper {
* Checks whether the text is an integer number
*/
public static boolean isNumber(String text) {
- if (text == null || text.isEmpty()) {
- return false;
- }
- if (text.equals("-")) {
+ final int startPos = findStartPosition(text);
+ if (startPos < 0) {
return false;
}
- for (int i = 0; i < text.length(); i++) {
+
+ for (int i = startPos; i < text.length(); i++) {
char ch = text.charAt(i);
- if (i == 0 && ch == '-') {
- // skip leading negative
- } else if (!Character.isDigit(ch)) {
+ if (!Character.isDigit(ch)) {
return false;
}
}
return true;
}
+ private static int findStartPosition(String text) {
+ if (text == null || text.isEmpty()) {
+ // invalid
+ return -1;
+ }
+
+ int startPos = 0;
+ if (text.charAt(0) == '-') {
+ if (text.length() == 1) {
+ // invalid
+ return -1;
+ }
+
+ // skip leading negative
+ startPos = 1;
+ }
+
+ return startPos;
+ }
+
/**
* Checks whether the text is a float point number
*/
public static boolean isFloatingNumber(String text) {
- if (text == null || text.isEmpty()) {
- return false;
- }
- if (text.equals("-")) {
+ final int startPos = findStartPosition(text);
+ if (startPos < 0) {
return false;
}
+
boolean dots = false;
- for (int i = 0; i < text.length(); i++) {
+ for (int i = startPos; i < text.length(); i++) {
char ch = text.charAt(i);
- if (i == 0 && ch == '-') {
- // skip leading negative
- } else if (ch == '.') {
- if (dots) {
+ if (!Character.isDigit(ch)) {
+ if (ch == '.') {
+ if (dots) {
+ return false;
+ }
+ dots = true;
+ } else {
return false;
}
- dots = true;
- } else if (!Character.isDigit(ch)) {
- return false;
}
}
return true;
diff --git a/core/camel-support/src/test/java/org/apache/camel/support/ObjectHelperTest.java b/core/camel-support/src/test/java/org/apache/camel/support/ObjectHelperTest.java
index 44797ee904e..2f9ae2bf9a4 100644
--- a/core/camel-support/src/test/java/org/apache/camel/support/ObjectHelperTest.java
+++ b/core/camel-support/src/test/java/org/apache/camel/support/ObjectHelperTest.java
@@ -76,7 +76,7 @@ class ObjectHelperTest {
void isFloatingNumberNonNumeric() {
assertFalse(ObjectHelper.isFloatingNumber("ABC"));
assertFalse(ObjectHelper.isFloatingNumber("-ABC"));
- assertFalse(ObjectHelper.isFloatingNumber("ABC.0"));;
+ assertFalse(ObjectHelper.isFloatingNumber("ABC.0"));
assertFalse(ObjectHelper.isFloatingNumber("-ABC.0"));
assertFalse(ObjectHelper.isFloatingNumber("!@#$#$%@#$%"));
// TODO: fix ... currently it returns true for this
@@ -102,6 +102,16 @@ class ObjectHelperTest {
assertTrue(ObjectHelper.isFloatingNumber("0.0"));
}
+ @Test
+ @DisplayName("Tests that isFloatingNumber returns true for invalid floats")
+ void isFloatingNumberInvalidFloats() {
+ assertFalse(ObjectHelper.isFloatingNumber("12..34"));
+ assertFalse(ObjectHelper.isFloatingNumber("-12..34"));
+ assertFalse(ObjectHelper.isFloatingNumber("1..0"));
+ assertFalse(ObjectHelper.isFloatingNumber("0..0"));
+ assertFalse(ObjectHelper.isFloatingNumber(".."));
+ }
+
@Test
@DisplayName("Tests that isFloatingNumber returns false for valid floats using comma instead of dot")
void isFloatingNumberFloatsWithComma() {
@@ -110,4 +120,4 @@ class ObjectHelperTest {
assertFalse(ObjectHelper.isFloatingNumber("1,0"));
assertFalse(ObjectHelper.isFloatingNumber("0,0"));
}
-}
\ No newline at end of file
+}
[camel] 01/02: (chores) camel-core: added unit test for some ObjectHelper methods
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9f887d5d92e19456cd2221ea6d3a3e763cef172a
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Oct 25 08:36:51 2023 +0200
(chores) camel-core: added unit test for some ObjectHelper methods
---
.../org/apache/camel/support/ObjectHelperTest.java | 113 +++++++++++++++++++++
1 file changed, 113 insertions(+)
diff --git a/core/camel-support/src/test/java/org/apache/camel/support/ObjectHelperTest.java b/core/camel-support/src/test/java/org/apache/camel/support/ObjectHelperTest.java
new file mode 100644
index 00000000000..44797ee904e
--- /dev/null
+++ b/core/camel-support/src/test/java/org/apache/camel/support/ObjectHelperTest.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.support;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ObjectHelperTest {
+
+ @Test
+ @DisplayName("Tests that isNumber returns false for empty, space or null")
+ void isNumberEmpty() {
+ assertFalse(ObjectHelper.isNumber(""));
+ assertFalse(ObjectHelper.isNumber(" "));
+ assertFalse(ObjectHelper.isNumber(null));
+ }
+
+ @Test
+ @DisplayName("Tests that isNumber returns true for integers")
+ void isNumberIntegers() {
+ assertTrue(ObjectHelper.isNumber("1234"));
+ assertTrue(ObjectHelper.isNumber("-1234"));
+ assertTrue(ObjectHelper.isNumber("1"));
+ assertTrue(ObjectHelper.isNumber("0"));
+ }
+
+ @Test
+ @DisplayName("Tests that isNumber returns false for non-numeric chars")
+ void isNumberNonNumeric() {
+ assertFalse(ObjectHelper.isNumber("ABC"));
+ assertFalse(ObjectHelper.isNumber("-ABC"));
+ assertFalse(ObjectHelper.isNumber("ABC.0"));
+ assertFalse(ObjectHelper.isNumber("-ABC.0"));
+ assertFalse(ObjectHelper.isNumber("!@#$#$%@#$%"));
+ assertFalse(ObjectHelper.isNumber("."));
+ assertFalse(ObjectHelper.isNumber("-"));
+ }
+
+ @Test
+ @DisplayName("Tests that isNumber returns false for floats")
+ void isNumberFloats() {
+ assertFalse(ObjectHelper.isNumber("12.34"));
+ assertFalse(ObjectHelper.isNumber("-12.34"));
+ assertFalse(ObjectHelper.isNumber("1.0"));
+ assertFalse(ObjectHelper.isNumber("0.0"));
+ }
+
+ @Test
+ @DisplayName("Tests that isFloatingNumber returns true for empty, space or null")
+ void isFloatingNumberEmpty() {
+ assertFalse(ObjectHelper.isFloatingNumber(""));
+ assertFalse(ObjectHelper.isFloatingNumber(" "));
+ assertFalse(ObjectHelper.isFloatingNumber(null));
+ }
+
+ @Test
+ @DisplayName("Tests that isFloatingNumber returns false for non-numeric chars")
+ void isFloatingNumberNonNumeric() {
+ assertFalse(ObjectHelper.isFloatingNumber("ABC"));
+ assertFalse(ObjectHelper.isFloatingNumber("-ABC"));
+ assertFalse(ObjectHelper.isFloatingNumber("ABC.0"));;
+ assertFalse(ObjectHelper.isFloatingNumber("-ABC.0"));
+ assertFalse(ObjectHelper.isFloatingNumber("!@#$#$%@#$%"));
+ // TODO: fix ... currently it returns true for this
+ //assertFalse(ObjectHelper.isFloatingNumber("."));
+ assertFalse(ObjectHelper.isFloatingNumber("-"));
+ }
+
+ @Test
+ @DisplayName("Tests that isFloatingNumber returns true for integers")
+ void isFloatingNumberIntegers() {
+ assertTrue(ObjectHelper.isFloatingNumber("1234"));
+ assertTrue(ObjectHelper.isFloatingNumber("-1234"));
+ assertTrue(ObjectHelper.isFloatingNumber("1"));
+ assertTrue(ObjectHelper.isFloatingNumber("0"));
+ }
+
+ @Test
+ @DisplayName("Tests that isFloatingNumber returns true for floats")
+ void isFloatingNumberFloats() {
+ assertTrue(ObjectHelper.isFloatingNumber("12.34"));
+ assertTrue(ObjectHelper.isFloatingNumber("-12.34"));
+ assertTrue(ObjectHelper.isFloatingNumber("1.0"));
+ assertTrue(ObjectHelper.isFloatingNumber("0.0"));
+ }
+
+ @Test
+ @DisplayName("Tests that isFloatingNumber returns false for valid floats using comma instead of dot")
+ void isFloatingNumberFloatsWithComma() {
+ assertFalse(ObjectHelper.isFloatingNumber("12,34"));
+ assertFalse(ObjectHelper.isFloatingNumber("-12,34"));
+ assertFalse(ObjectHelper.isFloatingNumber("1,0"));
+ assertFalse(ObjectHelper.isFloatingNumber("0,0"));
+ }
+}
\ No newline at end of file