This is an automated email from the ASF dual-hosted git repository.
ashishvijaywargiya pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6a97756e1b Rename MailDkimConfig.domain to signingDomain to avoid
reserved SQL word (#1661)
6a97756e1b is described below
commit 6a97756e1b2229ec70a2bb929db1068ea9004e84
Author: Ashish Vijaywargiya <[email protected]>
AuthorDate: Sun Aug 16 15:56:55 2026 +0530
Rename MailDkimConfig.domain to signingDomain to avoid reserved SQL word
(#1661)
DOMAIN is a reserved word in some databases (H2 included), which was
logged as a [FieldNameRW] warning at every delegator startup. Renamed
the field and updated the two places that referenced it by name.
This entity was added very recently and hasn't shipped in a release, so
the rename carries no migration concern.
Verified by running the DKIM unit tests (all pass) and a full
testIntegration run: build stays successful, no suite regressions, and
the reserved-word warning is gone from the log.
---
framework/common/entitydef/entitymodel.xml | 2 +-
.../main/java/org/apache/ofbiz/common/email/EmailServices.java | 4 ++--
.../org/apache/ofbiz/common/email/EmailServicesDkimTests.java | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/framework/common/entitydef/entitymodel.xml
b/framework/common/entitydef/entitymodel.xml
index aef8a0d4ad..93a306df99 100644
--- a/framework/common/entitydef/entitymodel.xml
+++ b/framework/common/entitydef/entitymodel.xml
@@ -947,7 +947,7 @@ under the License.
<description>Optional link to a MailSmtpConfig row; unset today,
ready for per-relay DKIM
once multi-SMTP-config support exists</description>
</field>
- <field name="domain" type="value"><description>Signing domain, e.g.
example.com</description></field>
+ <field name="signingDomain" type="value"><description>Signing domain,
e.g. example.com</description></field>
<field name="selector" type="value"><description>DKIM selector, e.g.
ofbiz</description></field>
<field name="privateKey" type="very-long" encrypt="true">
<description>PKCS#8 PEM RSA private key</description>
diff --git
a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
index 1de5b4237c..c2cacb918b 100644
---
a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
+++
b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
@@ -794,7 +794,7 @@ public class EmailServices {
if (config == null || !"Y".equals(config.getString("enabled"))) {
return mail;
}
- String domain = config.getString("domain");
+ String domain = config.getString("signingDomain");
String selector = config.getString("selector");
String privateKeyPem = config.getString("privateKey");
if (UtilValidate.isEmpty(domain) || UtilValidate.isEmpty(selector) ||
UtilValidate.isEmpty(privateKeyPem)) {
@@ -840,7 +840,7 @@ public class EmailServices {
if (config == null) {
return ServiceUtil.returnError("No MailDkimConfig found for ID ["
+ mailDkimConfigId + "]");
}
- String domain = config.getString("domain");
+ String domain = config.getString("signingDomain");
String selector = config.getString("selector");
String privateKeyPem = config.getString("privateKey");
if (UtilValidate.isEmpty(domain) || UtilValidate.isEmpty(selector) ||
UtilValidate.isEmpty(privateKeyPem)) {
diff --git
a/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesDkimTests.java
b/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesDkimTests.java
index 23eb1c9c93..ad23d36428 100644
---
a/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesDkimTests.java
+++
b/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesDkimTests.java
@@ -131,7 +131,7 @@ public final class EmailServicesDkimTests {
public void dkimSignReturnsOriginalWhenIncompleteConfig() throws Exception
{
GenericValue config = mock(GenericValue.class);
when(config.getString("enabled")).thenReturn("Y");
- when(config.getString("domain")).thenReturn("example.com");
+ when(config.getString("signingDomain")).thenReturn("example.com");
when(config.getString("selector")).thenReturn("");
when(config.getString("privateKey")).thenReturn("");
when(config.getString("mailDkimConfigId")).thenReturn("TEST_DKIM_1");
@@ -144,7 +144,7 @@ public final class EmailServicesDkimTests {
public void dkimSignReturnsOriginalWhenPrivateKeyIsGarbage() throws
Exception {
GenericValue config = mock(GenericValue.class);
when(config.getString("enabled")).thenReturn("Y");
- when(config.getString("domain")).thenReturn("example.com");
+ when(config.getString("signingDomain")).thenReturn("example.com");
when(config.getString("selector")).thenReturn("ofbiz");
when(config.getString("privateKey")).thenReturn("not a real key");
when(config.getString("mailDkimConfigId")).thenReturn("TEST_DKIM_1");
@@ -157,7 +157,7 @@ public final class EmailServicesDkimTests {
public void dkimSignWrapsAndSignsWhenFullyConfigured() throws Exception {
GenericValue config = mock(GenericValue.class);
when(config.getString("enabled")).thenReturn("Y");
- when(config.getString("domain")).thenReturn("example.com");
+ when(config.getString("signingDomain")).thenReturn("example.com");
when(config.getString("selector")).thenReturn("ofbiz");
when(config.getString("privateKey")).thenReturn(testPrivateKeyPem);
when(config.getString("mailDkimConfigId")).thenReturn("TEST_DKIM_1");
@@ -184,7 +184,7 @@ public final class EmailServicesDkimTests {
public void dkimSignatureVerifiesAgainstDerivedPublicKey() throws
Exception {
GenericValue config = mock(GenericValue.class);
when(config.getString("enabled")).thenReturn("Y");
- when(config.getString("domain")).thenReturn("example.com");
+ when(config.getString("signingDomain")).thenReturn("example.com");
when(config.getString("selector")).thenReturn("ofbiz");
when(config.getString("privateKey")).thenReturn(testPrivateKeyPem);
when(config.getString("mailDkimConfigId")).thenReturn("TEST_DKIM_1");
