Skip to content

ARTEMIS-6128 restore backwards compatibility #6567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jbertram wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ARTEMIS-6128 restore backwards compatibility #6567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,8 +1302,14 @@ private synchronized void updateApplyStatus(String propsId, Map<String, String>

private synchronized void updateReadPropertiesStatus(String propsId, long adler32Hash, long fileAdler32) {
JsonObjectBuilder propertiesReadStatusBuilder = JsonLoader.createObjectBuilder();

// keep "alder32" & "fileAlder32" for backwards compatibility
propertiesReadStatusBuilder.add("alder32", String.valueOf(adler32Hash));
propertiesReadStatusBuilder.add("fileAlder32", String.valueOf(fileAdler32));

propertiesReadStatusBuilder.add("adler32", String.valueOf(adler32Hash));
propertiesReadStatusBuilder.add("fileAdler32", String.valueOf(fileAdler32));

JsonObjectBuilder jsonObjectBuilder = JsonUtil.objectBuilderWithValueAtPath("properties/" + propsId, propertiesReadStatusBuilder.build());
JsonObject jsonStatus = getJsonStatus();
this.jsonStatus = JsonUtil.mergeAndUpdate(jsonStatus, jsonObjectBuilder.build());
Expand Down
1 change: 1 addition & 0 deletions ...rc/main/java/org/apache/activemq/artemis/spi/core/security/jaas/ReloadableProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ protected String normaliseStringValue(String key) {

private void updateStatus() {
Map<String, String> statusAttributes = new HashMap<>();
statusAttributes.put("Alder32", String.valueOf(checksum));
statusAttributes.put("Adler32", String.valueOf(checksum));
statusAttributes.put("reloadTime", String.valueOf(reloadTime));
ServerStatus.getInstance().update(JAAS_COMPONENT + "/properties/" + key.file.getName(), statusAttributes);
Expand Down
5 changes: 5 additions & 0 deletions ...ver/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2455,6 +2455,7 @@ public void testTextPropertiesReaderFromFile() throws Exception {
configuration.parseProperties(tmpFile.getAbsolutePath());

testSimpleConfig(configuration);
assertTrue(configuration.getStatus().contains("\"fileAlder32\":\"2235122473\""));
assertTrue(configuration.getStatus().contains("\"fileAdler32\":\"2235122473\""));
}

Expand All @@ -2472,6 +2473,7 @@ public void testJsonPropertiesReaderFromFile() throws Exception {
configuration.parseProperties(tmpFile.getAbsolutePath());

testSimpleConfig(configuration);
assertTrue(configuration.getStatus().contains("\"fileAlder32\":\"1145294432\""));
assertTrue(configuration.getStatus().contains("\"fileAdler32\":\"1145294432\""));
}

Expand Down Expand Up @@ -2853,6 +2855,8 @@ private void testSimpleConfig(Configuration configuration) {
assertEquals("va", configuration.getDivertConfigurations().get(0).getTransformerConfiguration().getProperties().get("a"));
assertEquals("vbc", configuration.getDivertConfigurations().get(0).getTransformerConfiguration().getProperties().get("b.c"));

assertTrue(configuration.getStatus().contains("\"alder32"));
assertTrue(configuration.getStatus().contains("\"fileAlder32"));
assertTrue(configuration.getStatus().contains("\"adler32"));
assertTrue(configuration.getStatus().contains("\"fileAdler32"));
}
Expand Down Expand Up @@ -3055,6 +3059,7 @@ public void testStatusOnErrorApplyingProperties() throws Exception {

assertTrue(jsonStatus.contains(UPDATED_SHA));
assertFalse(jsonStatus.contains(SHA));
assertTrue(jsonStatus.contains("alder32"));
assertTrue(jsonStatus.contains("adler32"));
}

Expand Down
12 changes: 12 additions & 0 deletions docs/user-manual/versions.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ NOTE: Follow the general upgrade procedure outlined in the xref:upgrading.adoc#u

:sectnums!:

== Version 2.56.0

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920&version=xxx[Full release notes]

=== Highlights

*

=== Upgrading from 2.55.0

* Due to https://issues.apache.org/jira/browse/ARTEMIS-6128[ARTEMIS-6128] the `Alder32` and `fileAlder32` properties have been deprecated in favor of `Adler32` and `fileAdler32` respectively.

== Version 2.55.0

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920&version=12357054[Full release notes]
Expand Down
5 changes: 5 additions & 0 deletions ...src/test/java/org/apache/activemq/artemis/tests/integration/server/ConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,11 @@ public void testPropertiesOnlyConfigReload() throws Exception {
assertTrue(updatedStatus.contains(propsFile.getName()));
JsonObject jsonStarted = JsonLoader.readObject(new StringReader(startedStatus));
JsonObject jsonUpdated = JsonLoader.readObject(new StringReader(updatedStatus));

String alder32Used = jsonStarted.getJsonObject("configuration").getJsonObject("properties").getJsonObject(propsFile.getName()).getString("fileAlder32");
String alder32Updated = jsonUpdated.getJsonObject("configuration").getJsonObject("properties").getJsonObject(propsFile.getName()).getString("fileAlder32");
assertNotEquals(alder32Used, alder32Updated);

String adler32Used = jsonStarted.getJsonObject("configuration").getJsonObject("properties").getJsonObject(propsFile.getName()).getString("fileAdler32");
String adler32Updated = jsonUpdated.getJsonObject("configuration").getJsonObject("properties").getJsonObject(propsFile.getName()).getString("fileAdler32");
assertNotEquals(adler32Used, adler32Updated);
Expand Down
Loading