This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 6851e7d677 ARTEMIS-4204 connectors added via management are not durable
6851e7d677 is described below
commit 6851e7d677a914bc57891c7cb34120fa68b1bc6a
Author: Justin Bertram <[email protected]>
AuthorDate: Wed Mar 29 14:00:34 2023 -0500
ARTEMIS-4204 connectors added via management are not durable
---
.../management/impl/ActiveMQServerControlImpl.java | 3 +
.../artemis/core/persistence/StorageManager.java | 7 ++
.../persistence/config/PersistedConnector.java | 92 ++++++++++++++++++++++
.../journal/AbstractJournalStorageManager.java | 39 +++++++++
.../persistence/impl/journal/JournalRecordIds.java | 2 +
.../impl/nullpm/NullStorageManager.java | 14 ++++
.../core/server/impl/ActiveMQServerImpl.java | 12 +++
.../core/transaction/impl/TransactionImplTest.java | 14 ++++
.../tests/integration/client/SendAckFailTest.java | 14 ++++
.../integration/persistence/ConfigChangeTest.java | 17 +++-
.../persistence/ConnectorStorageTest.java | 65 +++++++++++++++
11 files changed, 275 insertions(+), 4 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index 78363c6e9f..eb147349b4 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -88,6 +88,7 @@ import
org.apache.activemq.artemis.core.messagecounter.MessageCounterManager;
import
org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterManagerImpl;
import org.apache.activemq.artemis.core.persistence.StorageManager;
import
org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting;
+import org.apache.activemq.artemis.core.persistence.config.PersistedConnector;
import
org.apache.activemq.artemis.core.persistence.config.PersistedSecuritySetting;
import org.apache.activemq.artemis.core.postoffice.Binding;
import org.apache.activemq.artemis.core.postoffice.Bindings;
@@ -3969,6 +3970,7 @@ public class ActiveMQServerControlImpl extends
AbstractControl implements Active
try {
server.getConfiguration().addConnectorConfiguration(name, url);
+ storageManager.storeConnector(new PersistedConnector(name, url));
} finally {
blockOnIO();
}
@@ -3985,6 +3987,7 @@ public class ActiveMQServerControlImpl extends
AbstractControl implements Active
try {
server.getConfiguration().getConnectorConfigurations().remove(name);
+ storageManager.deleteConnector(name);
} finally {
blockOnIO();
}
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
index fa7a5c4809..8e43f4ed72 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
@@ -40,6 +40,7 @@ import org.apache.activemq.artemis.core.paging.PagingStore;
import org.apache.activemq.artemis.core.paging.cursor.PagePosition;
import
org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting;
import
org.apache.activemq.artemis.core.persistence.config.PersistedBridgeConfiguration;
+import org.apache.activemq.artemis.core.persistence.config.PersistedConnector;
import
org.apache.activemq.artemis.core.persistence.config.PersistedDivertConfiguration;
import
org.apache.activemq.artemis.core.persistence.config.PersistedKeyValuePair;
import org.apache.activemq.artemis.core.persistence.config.PersistedRole;
@@ -369,6 +370,12 @@ public interface StorageManager extends IDGenerator,
ActiveMQComponent {
List<PersistedBridgeConfiguration> recoverBridgeConfigurations();
+ void storeConnector(PersistedConnector persistedConnector) throws Exception;
+
+ void deleteConnector(String connectorName) throws Exception;
+
+ List<PersistedConnector> recoverConnectors();
+
void storeUser(PersistedUser persistedUser) throws Exception;
void deleteUser(String username) throws Exception;
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedConnector.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedConnector.java
new file mode 100644
index 0000000000..7cc12dab33
--- /dev/null
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedConnector.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.core.persistence.config;
+
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.core.journal.EncodingSupport;
+import org.apache.activemq.artemis.utils.BufferHelper;
+
+public class PersistedConnector implements EncodingSupport {
+
+ private long storeId;
+
+ private String url;
+
+ private String name;
+
+ public PersistedConnector() {
+ }
+
+ public PersistedConnector(String name, String url) {
+ this.name = name;
+ this.url = url;
+ }
+
+ public void setStoreId(long id) {
+ this.storeId = id;
+ }
+
+ public long getStoreId() {
+ return storeId;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public int getEncodeSize() {
+ int size = 0;
+ size += BufferHelper.sizeOfString(name);
+ size += BufferHelper.sizeOfString(url);
+ return size;
+ }
+
+ @Override
+ public void encode(ActiveMQBuffer buffer) {
+ buffer.writeString(name);
+ buffer.writeString(url);
+ }
+
+ @Override
+ public void decode(ActiveMQBuffer buffer) {
+ name = buffer.readString();
+ url = buffer.readString();
+ }
+
+ @Override
+ public String toString() {
+ return "PersistedConnector [storeId=" + storeId +
+ ", name=" +
+ name +
+ ", url=" +
+ url +
+ "]";
+ }
+}
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index 7b86529a4b..b98e038d42 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -73,6 +73,7 @@ import
org.apache.activemq.artemis.core.persistence.AddressQueueStatus;
import org.apache.activemq.artemis.core.persistence.StorageManager;
import
org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting;
import
org.apache.activemq.artemis.core.persistence.config.PersistedBridgeConfiguration;
+import org.apache.activemq.artemis.core.persistence.config.PersistedConnector;
import
org.apache.activemq.artemis.core.persistence.config.PersistedDivertConfiguration;
import
org.apache.activemq.artemis.core.persistence.config.PersistedKeyValuePair;
import org.apache.activemq.artemis.core.persistence.config.PersistedRole;
@@ -225,6 +226,8 @@ public abstract class AbstractJournalStorageManager extends
CriticalComponentImp
protected final Map<String, PersistedBridgeConfiguration>
mapPersistedBridgeConfigurations = new ConcurrentHashMap<>();
+ protected final Map<String, PersistedConnector> mapPersistedConnectors =
new ConcurrentHashMap<>();
+
protected final Map<String, PersistedUser> mapPersistedUsers = new
ConcurrentHashMap<>();
protected final Map<String, PersistedRole> mapPersistedRoles = new
ConcurrentHashMap<>();
@@ -796,6 +799,32 @@ public abstract class AbstractJournalStorageManager
extends CriticalComponentImp
return new ArrayList<>(mapPersistedBridgeConfigurations.values());
}
+ @Override
+ public void storeConnector(PersistedConnector persistedConnector) throws
Exception {
+ deleteConnector(persistedConnector.getName());
+ try (ArtemisCloseable lock = closeableReadLock()) {
+ final long id = idGenerator.generateID();
+ persistedConnector.setStoreId(id);
+ bindingsJournal.appendAddRecord(id,
JournalRecordIds.CONNECTOR_RECORD, persistedConnector, true);
+ mapPersistedConnectors.put(persistedConnector.getName(),
persistedConnector);
+ }
+ }
+
+ @Override
+ public void deleteConnector(String connectorName) throws Exception {
+ PersistedConnector oldConnector =
mapPersistedConnectors.remove(connectorName);
+ if (oldConnector != null) {
+ try (ArtemisCloseable lock = closeableReadLock()) {
+ bindingsJournal.tryAppendDeleteRecord(oldConnector.getStoreId(),
this::recordNotFoundCallback, false);
+ }
+ }
+ }
+
+ @Override
+ public List<PersistedConnector> recoverConnectors() {
+ return new ArrayList<>(mapPersistedConnectors.values());
+ }
+
@Override
public void storeUser(PersistedUser persistedUser) throws Exception {
deleteUser(persistedUser.getUsername());
@@ -1628,6 +1657,9 @@ public abstract class AbstractJournalStorageManager
extends CriticalComponentImp
mapPersistedKeyValuePairs.put(keyValuePair.getMapId(),
persistedKeyValuePairs);
}
persistedKeyValuePairs.put(keyValuePair.getKey(), keyValuePair);
+ } else if (rec == JournalRecordIds.CONNECTOR_RECORD) {
+ PersistedConnector connector = newConnectorEncoding(id, buffer);
+ mapPersistedConnectors.put(connector.getName(), connector);
} else {
// unlikely to happen
ActiveMQServerLogger.LOGGER.invalidRecordType(rec, new
Exception("invalid record type " + rec));
@@ -2096,6 +2128,13 @@ public abstract class AbstractJournalStorageManager
extends CriticalComponentImp
return persistedBridgeConfiguration;
}
+ static PersistedConnector newConnectorEncoding(long id, ActiveMQBuffer
buffer) {
+ PersistedConnector persistedBridgeConfiguration = new
PersistedConnector();
+ persistedBridgeConfiguration.decode(buffer);
+ persistedBridgeConfiguration.setStoreId(id);
+ return persistedBridgeConfiguration;
+ }
+
static PersistedUser newUserEncoding(long id, ActiveMQBuffer buffer) {
PersistedUser persistedUser = new PersistedUser();
persistedUser.decode(buffer);
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java
index 1e4bea0477..28c560f2e9 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java
@@ -102,4 +102,6 @@ public final class JournalRecordIds {
public static final byte ADD_MESSAGE_BODY = 49;
public static final byte KEY_VALUE_PAIR_RECORD = 50;
+
+ public static final byte CONNECTOR_RECORD = 51;
}
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
index 735ceaa552..3f2771af5b 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
@@ -48,6 +48,7 @@ import
org.apache.activemq.artemis.core.persistence.AddressQueueStatus;
import org.apache.activemq.artemis.core.persistence.StorageManager;
import
org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting;
import
org.apache.activemq.artemis.core.persistence.config.PersistedBridgeConfiguration;
+import org.apache.activemq.artemis.core.persistence.config.PersistedConnector;
import
org.apache.activemq.artemis.core.persistence.config.PersistedDivertConfiguration;
import
org.apache.activemq.artemis.core.persistence.config.PersistedKeyValuePair;
import org.apache.activemq.artemis.core.persistence.config.PersistedRole;
@@ -481,6 +482,19 @@ public class NullStorageManager implements StorageManager {
return null;
}
+ @Override
+ public void storeConnector(PersistedConnector persistedConnector) throws
Exception {
+ }
+
+ @Override
+ public void deleteConnector(String connectorName) throws Exception {
+ }
+
+ @Override
+ public List<PersistedConnector> recoverConnectors() {
+ return null;
+ }
+
@Override
public void storeUser(PersistedUser persistedUser) throws Exception {
}
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 1ef0c161f4..cf06b78d4c 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -96,6 +96,7 @@ import
org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
import org.apache.activemq.artemis.core.persistence.StorageManager;
import
org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting;
import
org.apache.activemq.artemis.core.persistence.config.PersistedBridgeConfiguration;
+import org.apache.activemq.artemis.core.persistence.config.PersistedConnector;
import
org.apache.activemq.artemis.core.persistence.config.PersistedDivertConfiguration;
import
org.apache.activemq.artemis.core.persistence.config.PersistedSecuritySetting;
import org.apache.activemq.artemis.core.persistence.impl.PageCountPending;
@@ -3480,6 +3481,8 @@ public class ActiveMQServerImpl implements ActiveMQServer
{
postOffice.startAddressQueueScanner();
+ recoverStoredConnectors();
+
recoverStoredBridges();
}
@@ -4296,6 +4299,14 @@ public class ActiveMQServerImpl implements
ActiveMQServer {
}
}
+ private void recoverStoredConnectors() throws Exception {
+ if (storageManager.recoverConnectors() != null) {
+ for (PersistedConnector persistedConnector :
storageManager.recoverConnectors()) {
+
getConfiguration().addConnectorConfiguration(persistedConnector.getName(),
persistedConnector.getUrl());
+ }
+ }
+ }
+
private void deployGroupingHandlerConfiguration(final
GroupingHandlerConfiguration config) throws Exception {
if (config != null) {
GroupingHandler groupingHandler1;
@@ -4627,6 +4638,7 @@ public class ActiveMQServerImpl implements ActiveMQServer
{
destroyBridge(existingBridge.getConfiguration().getParentName());
}
}
+ recoverStoredConnectors();
recoverStoredBridges();
}
}
diff --git
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java
index 0e10557f31..b4e032ce72 100644
---
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java
+++
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java
@@ -46,6 +46,7 @@ import
org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
import org.apache.activemq.artemis.core.persistence.StorageManager;
import
org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting;
import
org.apache.activemq.artemis.core.persistence.config.PersistedBridgeConfiguration;
+import org.apache.activemq.artemis.core.persistence.config.PersistedConnector;
import
org.apache.activemq.artemis.core.persistence.config.PersistedDivertConfiguration;
import
org.apache.activemq.artemis.core.persistence.config.PersistedKeyValuePair;
import org.apache.activemq.artemis.core.persistence.config.PersistedRole;
@@ -637,6 +638,19 @@ public class TransactionImplTest extends ActiveMQTestBase {
return null;
}
+ @Override
+ public void storeConnector(PersistedConnector persistedConnector) throws
Exception {
+ }
+
+ @Override
+ public void deleteConnector(String connectorName) throws Exception {
+ }
+
+ @Override
+ public List<PersistedConnector> recoverConnectors() {
+ return null;
+ }
+
@Override
public void storeUser(PersistedUser persistedUser) throws Exception {
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SendAckFailTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SendAckFailTest.java
index 6619e6e0ab..e5f4a61363 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SendAckFailTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SendAckFailTest.java
@@ -62,6 +62,7 @@ import
org.apache.activemq.artemis.core.persistence.AddressQueueStatus;
import org.apache.activemq.artemis.core.persistence.StorageManager;
import
org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting;
import
org.apache.activemq.artemis.core.persistence.config.PersistedBridgeConfiguration;
+import org.apache.activemq.artemis.core.persistence.config.PersistedConnector;
import
org.apache.activemq.artemis.core.persistence.config.PersistedDivertConfiguration;
import
org.apache.activemq.artemis.core.persistence.config.PersistedKeyValuePair;
import org.apache.activemq.artemis.core.persistence.config.PersistedRole;
@@ -731,6 +732,19 @@ public class SendAckFailTest extends SpawnedTestBase {
return null;
}
+ @Override
+ public void storeConnector(PersistedConnector persistedConnector) throws
Exception {
+ }
+
+ @Override
+ public void deleteConnector(String connectorName) throws Exception {
+ }
+
+ @Override
+ public List<PersistedConnector> recoverConnectors() {
+ return null;
+ }
+
@Override
public void storeUser(PersistedUser persistedUser) throws Exception {
manager.storeUser(persistedUser);
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ConfigChangeTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ConfigChangeTest.java
index 1fc0675a34..3f9816b90a 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ConfigChangeTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ConfigChangeTest.java
@@ -150,8 +150,7 @@ public class ConfigChangeTest extends ActiveMQTestBase {
}
@Test
- public void bridgeConfigChagesPersist() throws Exception {
-
+ public void bridgeConfigChangesPersist() throws Exception {
server = createServer(true);
server.start();
@@ -163,8 +162,8 @@ public class ConfigChangeTest extends ActiveMQTestBase {
String queue = "Q1";
String forward = "Q2";
- session.createQueue(new
QueueConfiguration("Q1").setAddress("Q1").setRoutingType(RoutingType.ANYCAST).setAutoDelete(false));
- session.createQueue(new
QueueConfiguration("Q2").setAddress("Q2").setRoutingType(RoutingType.ANYCAST).setAutoDelete(false));
+ session.createQueue(new
QueueConfiguration(queue).setAddress(queue).setRoutingType(RoutingType.ANYCAST).setAutoDelete(false));
+ session.createQueue(new
QueueConfiguration(forward).setAddress(forward).setRoutingType(RoutingType.ANYCAST).setAutoDelete(false));
session.close();
BridgeConfiguration bridgeConfiguration = new
BridgeConfiguration().setName(bridgeName)
@@ -179,16 +178,26 @@ public class ConfigChangeTest extends ActiveMQTestBase {
server.getActiveMQServerControl().addConnector("connector2",
"tcp://localhost:61616");
server.getActiveMQServerControl().createBridge(bridgeConfiguration.toJSON());
+ Assert.assertEquals(2,
server.getConfiguration().getConnectorConfigurations().size());
Assert.assertEquals(2,
server.getActiveMQServerControl().getBridgeNames().length);
server.stop();
+
+ // clear the in-memory connector configurations to force a reload from
disk
+ server.getConfiguration().getConnectorConfigurations().clear();
+
server.start();
+ Assert.assertEquals(2,
server.getConfiguration().getConnectorConfigurations().size());
Assert.assertEquals(2,
server.getActiveMQServerControl().getBridgeNames().length);
server.getActiveMQServerControl().destroyBridge(bridgeName);
+ server.getActiveMQServerControl().removeConnector("connector1");
+ server.getActiveMQServerControl().removeConnector("connector2");
Assert.assertEquals(0,
server.getActiveMQServerControl().getBridgeNames().length);
+ Assert.assertEquals(0,
server.getConfiguration().getConnectorConfigurations().size());
server.stop();
server.start();
Assert.assertEquals(0,
server.getActiveMQServerControl().getBridgeNames().length);
+ Assert.assertEquals(0,
server.getConfiguration().getConnectorConfigurations().size());
server.stop();
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ConnectorStorageTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ConnectorStorageTest.java
new file mode 100644
index 0000000000..b8d0fd6d6b
--- /dev/null
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ConnectorStorageTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.integration.persistence;
+
+import java.util.List;
+
+import org.apache.activemq.artemis.core.config.StoreConfiguration;
+import org.apache.activemq.artemis.core.persistence.config.PersistedConnector;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ConnectorStorageTest extends StorageManagerTestBase {
+
+ public ConnectorStorageTest(StoreConfiguration.StoreType storeType) {
+ super(storeType);
+ }
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
+ @Test
+ public void testStoreConnector() throws Exception {
+ final String NAME = RandomUtil.randomString();
+ final String URL = RandomUtil.randomString();
+ createStorage();
+
+ PersistedConnector connector = new PersistedConnector(NAME, URL);
+
+ journal.storeConnector(connector);
+
+ journal.stop();
+ journal.start();
+
+ List<PersistedConnector> connectors = journal.recoverConnectors();
+
+ Assert.assertEquals(1, connectors.size());
+
+ PersistedConnector persistedConnector = connectors.get(0);
+ Assert.assertEquals(NAME, persistedConnector.getName());
+ Assert.assertEquals(URL, persistedConnector.getUrl());
+ journal.stop();
+
+ journal = null;
+
+ }
+}
