From 0d4293139f064fb2593672f0c871e155c9e42367 Mon Sep 17 00:00:00 2001 From: Aaron McGrath Date: Mon, 29 Jul 2024 14:38:27 +0100 Subject: [PATCH] Modified the autoStart property from boolean to string. --- interlok-core/build.gradle | 2 +- .../main/java/com/adaptris/core/runtime/ChannelManager.java | 6 +++--- .../java/com/adaptris/core/runtime/ChannelManagerMBean.java | 6 +++--- .../java/com/adaptris/core/runtime/AdapterManagerTest.java | 4 ++-- .../java/com/adaptris/core/runtime/ChannelManagerTest.java | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/interlok-core/build.gradle b/interlok-core/build.gradle index 4b52f9552..f72924817 100644 --- a/interlok-core/build.gradle +++ b/interlok-core/build.gradle @@ -177,7 +177,7 @@ jar { "Implementation-Version": project.version, "Implementation-Vendor-Id": project.group, "Implementation-Vendor": organizationName, - "Add-Opens": "java.base/java.lang java.base/java.util", + "Add-Opens": "java.base/java.lang java.base/java.util java.management/javax.management", "Main-Class": "com.adaptris.interlok.boot.InterlokLauncher") } from ("$project.buildDir/spring-boot-loader") { diff --git a/interlok-core/src/main/java/com/adaptris/core/runtime/ChannelManager.java b/interlok-core/src/main/java/com/adaptris/core/runtime/ChannelManager.java index 7eccac618..d10bc2bf7 100644 --- a/interlok-core/src/main/java/com/adaptris/core/runtime/ChannelManager.java +++ b/interlok-core/src/main/java/com/adaptris/core/runtime/ChannelManager.java @@ -49,7 +49,7 @@ public class ChannelManager extends ComponentManagerImpl implements Cha private transient Set workflowManagers; private transient ObjectName myObjectName = null; private transient Set childRuntimeInfoComponents; - private transient boolean autoStart; + private transient String autoStart; private ChannelManager() { super(); @@ -65,7 +65,7 @@ public ChannelManager(Channel c, AdapterManager owner) throws MalformedObjectNam this(); channel = c; parent = owner; - autoStart = BooleanUtils.toBooleanDefaultIfNull(c.getAutoStart(), true); + autoStart = Boolean.toString(BooleanUtils.toBooleanDefaultIfNull(c.getAutoStart(), true)); initMembers(); if (!skipBackRef) { parent.addChild(this); @@ -246,7 +246,7 @@ public String getParentId() { } @Override - public boolean getAutoStart() { + public String getAutoStart() { return autoStart; } diff --git a/interlok-core/src/main/java/com/adaptris/core/runtime/ChannelManagerMBean.java b/interlok-core/src/main/java/com/adaptris/core/runtime/ChannelManagerMBean.java index 96d78b9cc..f67efb6b1 100644 --- a/interlok-core/src/main/java/com/adaptris/core/runtime/ChannelManagerMBean.java +++ b/interlok-core/src/main/java/com/adaptris/core/runtime/ChannelManagerMBean.java @@ -56,11 +56,11 @@ public interface ChannelManagerMBean extends AdapterComponentMBean, ParentRuntim boolean removeWorkflow(String id) throws CoreException, IllegalStateException, MalformedObjectNameException; /** - * Will return the configured auto-start boolean. + * Will return the configured auto-start boolean in string form. * Auto-start determines if this channel should be started when the Adapter starts. * - * @return true if the channel is set to start with the Adapter + * @return "true" if the channel is set to start with the Adapter */ - boolean getAutoStart(); + String getAutoStart(); } diff --git a/interlok-core/src/test/java/com/adaptris/core/runtime/AdapterManagerTest.java b/interlok-core/src/test/java/com/adaptris/core/runtime/AdapterManagerTest.java index ba3170cfb..febd4f90a 100644 --- a/interlok-core/src/test/java/com/adaptris/core/runtime/AdapterManagerTest.java +++ b/interlok-core/src/test/java/com/adaptris/core/runtime/AdapterManagerTest.java @@ -2267,8 +2267,8 @@ public String getWrappedComponentClassname() { } @Override - public boolean getAutoStart() { - return true; + public String getAutoStart() { + return "true"; } } diff --git a/interlok-core/src/test/java/com/adaptris/core/runtime/ChannelManagerTest.java b/interlok-core/src/test/java/com/adaptris/core/runtime/ChannelManagerTest.java index ab4d34aeb..44ce6e026 100644 --- a/interlok-core/src/test/java/com/adaptris/core/runtime/ChannelManagerTest.java +++ b/interlok-core/src/test/java/com/adaptris/core/runtime/ChannelManagerTest.java @@ -169,7 +169,7 @@ public void testGetAutoStart() throws Exception { try { AdapterManager adapterManager = new AdapterManager(adapter); ChannelManager channelManager = new ChannelManager(channel, adapterManager); - assertFalse(channelManager.getAutoStart()); + assertFalse(Boolean.parseBoolean(channelManager.getAutoStart())); } finally { adapter.requestClose(); @@ -184,7 +184,7 @@ public void testGetDefaultAutoStart() throws Exception { try { AdapterManager adapterManager = new AdapterManager(adapter); ChannelManager channelManager = new ChannelManager(channel, adapterManager); - assertTrue(channelManager.getAutoStart()); + assertTrue(Boolean.parseBoolean(channelManager.getAutoStart())); } finally { adapter.requestClose();