diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java index ae71ecaa8d..c2ac0b6ad0 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java @@ -640,7 +640,7 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf deserializationWhiteList = BufferHelper.readNullableSimpleStringAsString(buffer); - enable1xPrefixes = buffer.readableBytes() > 0 ? buffer.readBoolean() : null; + enable1xPrefixes = buffer.readableBytes() > 0 ? buffer.readBoolean() : ActiveMQClient.DEFAULT_ENABLE_1X_PREFIXES; enableSharedClientID = buffer.readableBytes() > 0 ? buffer.readBoolean() : ActiveMQClient.DEFAULT_ENABLED_SHARED_CLIENT_ID; diff --git a/tests/compatibility-tests/src/main/resources/serial/cfserial.groovy b/tests/compatibility-tests/src/main/resources/serial/cfserial.groovy new file mode 100644 index 0000000000..26085cd8d5 --- /dev/null +++ b/tests/compatibility-tests/src/main/resources/serial/cfserial.groovy @@ -0,0 +1,72 @@ +package clients + +import io.netty.buffer.Unpooled +import org.apache.activemq.artemis.api.core.ActiveMQBuffer +import org.apache.activemq.artemis.api.core.ActiveMQBuffers +import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper +import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl + +/* + * 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. + */ + +// Create a client connection factory + +import org.apache.activemq.artemis.tests.compatibility.GroovyRun; +import javax.jms.*; +import org.apache.activemq.artemis.jms.client.* + +import java.nio.ByteBuffer + +file = arg[0] +method = arg[1] +version = arg[2] + +if (method.equals("write")) { + List transportConfigurations = new ArrayList<>(); + transportConfigurations.add("tst"); cfConfiguration = new ConnectionFactoryConfigurationImpl(); + cfConfiguration.setName("np").setConnectorNames(transportConfigurations); + ActiveMQBuffer buffer = ActiveMQBuffers.dynamicBuffer(1024); + cfConfiguration.encode(buffer); + byte[] bytes = new byte[buffer.readableBytes()]; + buffer.readBytes(bytes); + + + + ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(file)); + objectOutputStream.write(bytes); + objectOutputStream.close(); +} else { + ObjectInputStream inputStream = new ObjectInputStream(new FileInputStream(file)) + ActiveMQBuffer buffer = ActiveMQBuffers.dynamicBuffer(1024); + while (true) { + int byteRead = inputStream.read() + if (byteRead < 0) { + break; + } + + buffer.writeByte((byte)byteRead); + } + cfConfiguration = new ConnectionFactoryConfigurationImpl(); + cfConfiguration.decode(buffer); + + inputStream.close(); +} + +GroovyRun.assertEquals("np", cfConfiguration.getName()) + + + diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java new file mode 100644 index 0000000000..d40a8da87c --- /dev/null +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java @@ -0,0 +1,100 @@ +/* + * 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.compatibility; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import org.apache.activemq.artemis.utils.FileUtil; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR; + +/** + * To run this test on the IDE and debug it, run the compatibility-tests through a command line once: + * + * cd /compatibility-tests + * mvn install -Ptests | tee output.log + * + * on the output.log you will see the output generated by {@link #getClasspathProperty(String)} + * + * On your IDE, edit the Run Configuration to your test and add those -D as parameters to your test. + * On Idea you would do the following: + * + * Run->Edit Configuration->Add ArtemisMeshTest and add your properties. + */ +@RunWith(Parameterized.class) +public class ConnectionFactoryConfigurationSerializationTest extends VersionedBaseTest { + + // this will ensure that all tests in this class are run twice, + // once with "true" passed to the class' constructor and once with "false" + @Parameterized.Parameters(name = "server={0}, producer={1}, consumer={2}") + public static Collection getParameters() { + // we don't need every single version ever released.. + // if we keep testing current one against 2.4 and 1.4.. we are sure the wire and API won't change over time + List combinations = new ArrayList<>(); + + /* + // during development sometimes is useful to comment out the combinations + // and add the ones you are interested.. example: + */ + // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE}); + // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE}); + + combinations.addAll(combinatory(new Object[]{null}, new Object[]{ONE_FIVE, SNAPSHOT, TWO_FOUR}, new Object[]{ONE_FIVE, SNAPSHOT, TWO_FOUR})); + return combinations; + } + + public ConnectionFactoryConfigurationSerializationTest(String server, String sender, String receiver) throws Exception { + super(server, sender, receiver); + } + + @Before + public void beforeTest() throws Throwable { + FileUtil.deleteDirectory(serverFolder.getRoot()); + serverFolder.getRoot().mkdirs(); + setVariable(senderClassloader, "persistent", false); + startServer(serverFolder.getRoot(), senderClassloader, "1"); + } + + @After + public void afterTest() { + try { + stopServer(senderClassloader); + } catch (Throwable ignored) { + ignored.printStackTrace(); + } + } + + @Test + public void testSerializeFactory() throws Throwable { + File file = serverFolder.newFile("objects.ser"); + evaluate(senderClassloader, "serial/cfserial.groovy", file.getAbsolutePath(), "write", sender); + evaluate(receiverClassloader, "serial/cfserial.groovy", file.getAbsolutePath(), "read", receiver); + } + +} +