[CAMEL-23481] replacing retired Apache Derby with HSQL and MariaDB in camel-sql#23597
[CAMEL-23481] replacing retired Apache Derby with HSQL and MariaDB in camel-sql#23597tmielke wants to merge 7 commits into
Conversation
stored procedures and stored function tests in sql-stored: component. While HSQL has support for stored procedures, it does not support SQL stored functions, neither does H2 support them. So using an embedded MariaDB4j instance to test SQL stored functions in class SqlFunctionDataSourceTest. Running an embedded MariaDB4j instance is slower to initialize, so using it only for the single test class SqlFunctionDataSourceTest. Made with help from AI tools.
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
|
It seems derby is using as testing for some other components Error: The project org.apache.camel:camel-spring-jdbc:4.21.0-SNAPSHOT (/home/runner/work/camel/camel/components/camel-spring-parent/camel-spring-jdbc/pom.xml) has 2 errors |
|
Yes, I initially replaced Derby in all components that use it but realised there are quite some changes and decided to go component by component. I need to reintroduce Derby until the last component does not use it. Let me fix that. |
…ntil no component uses Derby.
|
🧪 CI tested the following changed modules:
✅ POM dependency changes: targeted tests included Changed properties: mariadb-version, mariadb4j-version Modules affected by dependency changes (1)
All tested modules (10 modules)
|
davsclaus
left a comment
davsclaus
left a comment
There was a problem hiding this comment.
Thank you for tackling the Derby replacement — this is useful work and the HSQLDB migration for stored procedures looks solid.
I found a couple of issues that need to be addressed before merging:
-
MariaDB4j version 3.3.1 does not exist on Maven Central — the latest released version is 3.2.0. Please verify the correct version.
-
MariaDB4j lacks ppc64le/s390x native binaries — Camel CI tests on
amd64,ppc64le, ands390x. MariaDB4j only ships binaries for linux64 (x86_64), macos-arm64, and win-x64.SqlFunctionDataSourceTestwill fail on those architectures. Consider skipping it on unsupported archs viaskipITs.ppc64le/skipITs.s390xMaven properties or a JUnit condition. -
Tab characters in
components/camel-sql/pom.xmlandparent/pom.xml— the project uses 4-space indentation. -
Commented-out debug code — three test classes have identical commented-out
static {}blocks that are superseded by the surefire configuration. These should be removed. -
Missing trailing newlines in several SQL files.
This review is a project-rules and conventions check. It does not replace specialized review tools such as CodeRabbit or SonarCloud.
This review was generated by an AI agent and may contain inaccuracies. Please verify all suggestions before applying.
Claude Code on behalf of Claus Ibsen
| <debezium-mysql-connector-version>9.7.0</debezium-mysql-connector-version> | ||
| <derby-version>10.16.1.1</derby-version> | ||
| <debezium-mysql-connector-version>9.7.0</debezium-mysql-connector-version> | ||
| <derby-version>10.16.1.1</derby-version> |
There was a problem hiding this comment.
| <derby-version>10.16.1.1</derby-version> | |
| <derby-version>10.16.1.1</derby-version> |
| private TemplateParser templateParser; | ||
| private EmbeddedDatabase db; | ||
| private JdbcTemplate jdbcTemplate; | ||
| private CallableStatementWrapperFactory factory; |
There was a problem hiding this comment.
This commented-out static {} block is unnecessary since the hsqldb.method_class_names property is already set via the surefire plugin configuration in pom.xml. Please remove this dead code (also applies to ProducerInOutTest and ProducerTest).
| import org.springframework.jdbc.core.JdbcTemplate; | ||
| import org.springframework.jdbc.datasource.DriverManagerDataSource; | ||
| import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; | ||
|
|
There was a problem hiding this comment.
MariaDB4j ships native binaries only for linux64 (x86_64), macos-arm64, and win-x64. Camel CI also tests on ppc64le and s390x, where this test will fail because no MariaDB binary is available.
Consider:
- Adding
skipITs.ppc64leandskipITs.s390xMaven properties in the POM, or - Using a JUnit
@DisabledIfSystemProperty/ architecture check to skip on unsupported platforms.
gnodet
left a comment
gnodet
left a comment
There was a problem hiding this comment.
Good migration away from the retired Apache Derby to HSQLDB and MariaDB4j. The approach is sound: HSQLDB for most embedded tests, MariaDB4j for stored procedure tests that need more advanced SQL features.
Two minor observations:
-
Tab characters in pom.xml — there are a few tab characters mixed with spaces in the dependency indentation (e.g., the H2 dependency block). The project uses spaces consistently, and this may fail the
mvn formatter:formatCI check. -
Commented-out static blocks — the
hsqldb.method_class_namesstatic initializer blocks inCallableStatementWrapperTest.javaandProducerInOutTest.javaare commented out with a "useful for debugging" note. The surefire plugin systemProperty approach (in pom.xml) already handles this at build time, so these commented blocks are redundant. Consider removing them to keep the test code clean.
The ID value adjustments (1-based → 0-based) are correctly handled in the test assertions. Removing the shouldExecuteStoredFunction() test and the "it seems not to work with Derby" comment in SqlGeneratedKeysTest are clean improvements.
LGTM — the formatting issues are minor and easily fixable.
Fully automatic review from Claude Code
|
LGTM talked to Torsten |
- replace any tab characters with white spaces - upgrade MariaDB client to latest 3.5.8 release - restrict SqlFunctionDataSourceTest to be only run on Linux, MacOS and Windows Made with help from AI tools.
4 participants
[CAMEL-23481] replacing retired Apache Derby with HSQL and MariaDB for stored procedures and stored function tests in
sql-stored:component.While HSQL has support for stored procedures, it does not support SQL stored functions, neither does H2 support them.
So using an embedded MariaDB4j instance to test SQL stored functions in class
SqlFunctionDataSourceTest.Running an embedded MariaDB4j instance is slower to initialize, so using it only for the single test class SqlFunctionDataSourceTest.
Made with help from AI tools.