Introduce property shortenTransactionManagerIdIfNecessary with defaul…

…t false
snowdrop · Apr 22, 2024 · 49a7c20 · 49a7c20
1 parent d29b79d
commit 49a7c20
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/...oot-core/src/main/java/dev/snowdrop/boot/narayana/core/properties/NarayanaProperties.java b/...oot-core/src/main/java/dev/snowdrop/boot/narayana/core/properties/NarayanaProperties.java
@@ -45,6 +45,11 @@ public class NarayanaProperties {
  */
  private String transactionManagerId = "1";
 
+ /**
+ * Shorten transactionManagerId if necessary ( > 28 bytes).
+ */
+ private boolean shortenTransactionManagerIdIfNecessary = false;
+
  /**
  * Enable one phase commit optimization.
  */
@@ -146,6 +151,14 @@ public void setTransactionManagerId(String transactionManagerId) {
  this.transactionManagerId = transactionManagerId;
  }
 
+ public boolean isShortenTransactionManagerIdIfNecessary() {
+ return this.shortenTransactionManagerIdIfNecessary;
+ }
+
+ public void setShortenTransactionManagerIdIfNecessary(boolean shortenTransactionManagerIdIfNecessary) {
+ this.shortenTransactionManagerIdIfNecessary = shortenTransactionManagerIdIfNecessary;
+ }
+
  public boolean isOnePhaseCommit() {
  return this.onePhaseCommit;
  }

diff --git a/...c/main/java/dev/snowdrop/boot/narayana/core/properties/NarayanaPropertiesInitializer.java b/...c/main/java/dev/snowdrop/boot/narayana/core/properties/NarayanaPropertiesInitializer.java
@@ -47,7 +47,7 @@ public NarayanaPropertiesInitializer(NarayanaProperties narayanaProperties) {
 
  @Override
  public void afterPropertiesSet() {
- setNodeIdentifier(this.properties.getTransactionManagerId());
+ setNodeIdentifier(this.properties.getTransactionManagerId(), this.properties.isShortenTransactionManagerIdIfNecessary());
  setXARecoveryNodes(this.properties.getXaRecoveryNodes());
  setObjectStoreDir(this.properties.getLogDir());
  setCommitOnePhase(this.properties.isOnePhaseCommit());
@@ -63,10 +63,12 @@ public void afterPropertiesSet() {
  setExpiryScanners(this.properties.getExpiryScanners());
  }
 
- private void setNodeIdentifier(String nodeIdentifier) {
+ private void setNodeIdentifier(String nodeIdentifier, boolean shortenNodeNameIfNecessary) {
  String verifiedNodeIdentifier = nodeIdentifier;
  try {
- if (nodeIdentifier != null && nodeIdentifier.getBytes(StandardCharsets.UTF_8).length > 28) {
+ if (nodeIdentifier != null
+ && nodeIdentifier.getBytes(StandardCharsets.UTF_8).length > 28
+ && shortenNodeNameIfNecessary) {
  verifiedNodeIdentifier = shortenNodeIdentifier(nodeIdentifier);
  }
 

diff --git a/...t/java/dev/snowdrop/boot/narayana/core/properties/NarayanaPropertiesInitializerTests.java b/...t/java/dev/snowdrop/boot/narayana/core/properties/NarayanaPropertiesInitializerTests.java
@@ -116,6 +116,7 @@ void shouldSetDefaultProperties() {
  void shouldSetModifiedProperties() {
  NarayanaProperties narayanaProperties = new NarayanaProperties();
  narayanaProperties.setTransactionManagerId("test-id");
+ narayanaProperties.setShortenTransactionManagerIdIfNecessary(true);
  narayanaProperties.setLogDir("test-dir");
  narayanaProperties.setDefaultTimeout(1);
  narayanaProperties.setPeriodicRecoveryPeriod(2);