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
The following commit(s) were added to refs/heads/main by this push:
new 1c464c2f9a1 CAMEL-19754: remove code checking for older Java versions
(#11122)
1c464c2f9a1 is described below
commit 1c464c2f9a11461a5223a46c8beb65d803e9afc2
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Wed Aug 16 17:02:47 2023 +0200
CAMEL-19754: remove code checking for older Java versions (#11122)
---
.../language/csimple/joor/OriginalSimpleTest.java | 26 ++++------------------
.../apache/camel/language/joor/JoorLanguage.java | 14 ------------
.../org/apache/camel/test/junit5/TestSupport.java | 6 +----
.../test/java/org/apache/camel/TestSupport.java | 16 ++++---------
.../apache/camel/language/simple/SimpleTest.java | 25 ++++-----------------
.../camel/support/jsse/KeyStoreParametersTest.java | 15 -------------
.../dsl/yaml/common/ConstructorResolverTest.groovy | 12 +++-------
7 files changed, 16 insertions(+), 98 deletions(-)
diff --git
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
index abbca568940..19dd1cd1ac8 100644
---
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
+++
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
@@ -47,7 +47,6 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
-import static org.apache.camel.test.junit5.TestSupport.getJavaMajorVersion;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -480,12 +479,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause =
assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- if (getJavaMajorVersion() <= 8) {
- assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- } else {
- assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- }
-
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
}
assertExpression("${exchangeProperty.unknown[cool]}", null);
}
@@ -505,11 +499,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause =
assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- if (getJavaMajorVersion() <= 8) {
- assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- } else {
- assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- }
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
}
assertExpression("${exchangeProperty.unknown[cool]}", null);
assertExpression("${exchangePropertyAsIndex(unknown, OrderLine,
'cool')}", null);
@@ -974,11 +964,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause =
assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- if (getJavaMajorVersion() <= 8) {
- assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- } else {
- assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- }
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
}
assertExpression("${header.unknown[cool]}", null);
}
@@ -997,11 +983,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause =
assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- if (getJavaMajorVersion() <= 8) {
- assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- } else {
- assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- }
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
}
assertExpression("${header.unknown[cool]}", null);
}
diff --git
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorLanguage.java
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorLanguage.java
index 329e56d7c9f..fe271ca4159 100644
---
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorLanguage.java
+++
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorLanguage.java
@@ -143,13 +143,6 @@ public class JoorLanguage extends TypedLanguageSupport
implements ScriptingLangu
@Override
public void init() {
- if (java8 == null) {
- java8 = getJavaMajorVersion() == 8;
- if (java8) {
- throw new UnsupportedOperationException("Java 8 is not
supported. Use Java 11 or higher");
- }
- }
-
// attempt to load optional configuration from classpath
loadConfiguration();
}
@@ -223,11 +216,4 @@ public class JoorLanguage extends TypedLanguageSupport
implements ScriptingLangu
scriptingCompiler.getImports().addAll(imports);
}
}
-
- private static int getJavaMajorVersion() {
- String javaSpecVersion =
System.getProperty("java.specification.version");
- return javaSpecVersion.contains(".")
- ? Integer.parseInt(javaSpecVersion.split("\\.")[1]) :
Integer.parseInt(javaSpecVersion);
- }
-
}
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
index f717a3cefdb..5d7375f9b94 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
@@ -557,11 +557,7 @@ public final class TestSupport {
*/
public static int getJavaMajorVersion() {
String javaSpecVersion =
System.getProperty("java.specification.version");
- if (javaSpecVersion.contains(".")) { // before jdk 9
- return Integer.parseInt(javaSpecVersion.split("\\.")[1]);
- } else {
- return Integer.parseInt(javaSpecVersion);
- }
+ return Integer.parseInt(javaSpecVersion);
}
/**
diff --git a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
index a1dd3941305..69096982481 100644
--- a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -593,19 +593,15 @@ public abstract class TestSupport {
* <p/>
* Uses <tt>java.version</tt> from the system properties to determine the
version.
*
- * @param version such as 1.6 or 6
+ * @param version such as 17
* @return <tt>true</tt> if its that vendor.
*/
public static boolean isJavaVersion(String version) {
- if (version.contains(".")) { // before jdk 9
- return Integer.parseInt(version.split("\\.")[1]) ==
getJavaMajorVersion();
- } else {
- return Integer.parseInt(version) == getJavaMajorVersion();
- }
+ return Integer.parseInt(version) == getJavaMajorVersion();
}
/**
- * Returns the current major Java version e.g 8.
+ * Returns the current major Java version e.g 17.
* <p/>
* Uses <tt>java.specification.version</tt> from the system properties to
determine the major version.
*
@@ -613,11 +609,7 @@ public abstract class TestSupport {
*/
public static int getJavaMajorVersion() {
String javaSpecVersion =
System.getProperty("java.specification.version");
- if (javaSpecVersion.contains(".")) { // before jdk 9
- return Integer.parseInt(javaSpecVersion.split("\\.")[1]);
- } else {
- return Integer.parseInt(javaSpecVersion);
- }
+ return Integer.parseInt(javaSpecVersion);
}
/**
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index eff32549d7e..7a550ecfc6a 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -447,12 +447,7 @@ public class SimpleTest extends LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause =
assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- if (getJavaMajorVersion() <= 8) {
- assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- } else {
- assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- }
-
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
}
assertExpression("${exchangeProperty.unknown[cool]}", null);
}
@@ -471,11 +466,7 @@ public class SimpleTest extends LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause =
assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- if (getJavaMajorVersion() <= 8) {
- assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- } else {
- assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- }
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
}
assertExpression("${exchangeProperty.unknown[cool]}", null);
}
@@ -969,11 +960,7 @@ public class SimpleTest extends LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause =
assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- if (getJavaMajorVersion() <= 8) {
- assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- } else {
- assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- }
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
}
assertExpression("${header.unknown[cool]}", null);
}
@@ -992,11 +979,7 @@ public class SimpleTest extends LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause =
assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- if (getJavaMajorVersion() <= 8) {
- assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- } else {
- assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG,
cause.getMessage());
- }
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
}
assertExpression("${header.unknown[cool]}", null);
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
index 33f79aaabca..ccd22ebf9a1 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
@@ -124,21 +124,6 @@ public class KeyStoreParametersTest extends
AbstractJsseParametersTest {
} catch (KeyStoreException e) {
// expected
}
-
- if (getJavaMajorVersion() >= 9) {
- // checkout http://openjdk.java.net/jeps/229
- return;
- }
-
- ksp = this.createMinimalKeyStoreParameters();
- ksp.setType("JCEKS");
-
- try {
- ksp.createKeyStore();
- fail();
- } catch (IOException e) {
- // expected
- }
}
@Test
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.groovy
index abdce04629d..abbda8e5a88 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.groovy
@@ -30,11 +30,9 @@ class ConstructorResolverTest extends Specification {
static int getJavaMajorVersion() {
String javaSpecVersion =
System.getProperty("java.specification.version");
- if (javaSpecVersion.contains(".")) { // before jdk 9
- return Integer.parseInt(javaSpecVersion.split("\\.")[1]);
- } else {
- return Integer.parseInt(javaSpecVersion);
- }
+
+ return Integer.parseInt(javaSpecVersion);
+
}
def "test"() {
@@ -54,10 +52,6 @@ class ConstructorResolverTest extends Specification {
message: nested
'''.stripLeading())
then:
- if (getJavaMajorVersion() == 8) {
- return;
- }
-
with(result, List) {
size() == 1
