This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new a7df87a ARTEMIS-2778 AcceptorControl returns only transport parameters
new 7b07726 This closes #3147
a7df87a is described below
commit a7df87adf949e65a98b95939bce182fe46a12968
Author: brusdev <[email protected]>
AuthorDate: Wed May 27 07:35:59 2020 +0200
ARTEMIS-2778 AcceptorControl returns only transport parameters
Fix AcceptorControl to return all acceptor parameters.
---
.../core/management/impl/AcceptorControlImpl.java | 2 +-
.../management/impl/AcceptorControlImplTest.java | 52 ++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
index 301ef49..c56e916 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
@@ -84,7 +84,7 @@ public class AcceptorControlImpl extends AbstractControl
implements AcceptorCont
}
clearIO();
try {
- Map<String, Object> clone = new HashMap(configuration.getParams());
+ Map<String, Object> clone = new
HashMap(configuration.getCombinedParams());
for (Map.Entry<String, Object> entry : clone.entrySet()) {
if (entry.getKey().toLowerCase().contains("password")) {
entry.setValue("****");
diff --git
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImplTest.java
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImplTest.java
new file mode 100644
index 0000000..caa5952
--- /dev/null
+++
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImplTest.java
@@ -0,0 +1,52 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.management.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.spi.core.remoting.Acceptor;
+import org.apache.activemq.artemis.utils.RandomUtil;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class AcceptorControlImplTest extends Assert {
+
+ @Test
+ public void testParameters() throws Exception {
+ HashMap<String, Object> params = new HashMap<>();
+ params.put("param", RandomUtil.randomString());
+
+ HashMap<String, Object> extraProps = new HashMap<>();
+ extraProps.put("extraProp", RandomUtil.randomString());
+
+ Acceptor acceptor = Mockito.mock(Acceptor.class);
+ StorageManager storageManager = Mockito.mock(StorageManager.class);
+ TransportConfiguration transportConfiguration = new
TransportConfiguration(
+ InVMAcceptorFactory.class.getName(), params,
RandomUtil.randomString(), extraProps);
+ AcceptorControlImpl acceptorControl = new AcceptorControlImpl(acceptor,
storageManager, transportConfiguration);
+
+ Map<String, Object> acceptorPrameters = acceptorControl.getParameters();
+ Assert.assertEquals(params.get("param"), acceptorPrameters.get("param"));
+ Assert.assertEquals(extraProps.get("extraProp"),
acceptorPrameters.get("extraProp"));
+ }
+}
