Skip to content

Commit

Permalink
Stop using Constants utility in JmsAccessor
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrannen committed Jul 19, 2023
1 parent 15253f3 commit b2ca36f
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.springframework.jms.support;

import java.util.Map;

import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSException;
Expand All @@ -24,7 +26,6 @@
import org.apache.commons.logging.LogFactory;

import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.Constants;
import org.springframework.jms.JmsException;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
Expand All @@ -40,14 +41,23 @@
* See {@link org.springframework.jms.core.JmsTemplate}.
*
* @author Juergen Hoeller
* @author Sam Brannen
* @since 1.2
* @see org.springframework.jms.support.destination.JmsDestinationAccessor
* @see org.springframework.jms.core.JmsTemplate
*/
public abstract class JmsAccessor implements InitializingBean {

/** Constants instance for {@code jakarta.jms.Session}. */
private static final Constants sessionConstants = new Constants(Session.class);
/**
* Map of constant names to constant values for the constants defined in
* {@link jakarta.jms.Session}.
*/
private static final Map<String, Integer> sessionConstants = Map.of(
"AUTO_ACKNOWLEDGE", Session.AUTO_ACKNOWLEDGE,
"CLIENT_ACKNOWLEDGE", Session.CLIENT_ACKNOWLEDGE,
"DUPS_OK_ACKNOWLEDGE", Session.DUPS_OK_ACKNOWLEDGE,
"SESSION_TRANSACTED", Session.SESSION_TRANSACTED
);


/** Logger available to subclasses. */
Expand Down Expand Up @@ -133,7 +143,10 @@ public boolean isSessionTransacted() {
* @see jakarta.jms.Connection#createSession(int)
*/
public void setSessionAcknowledgeModeName(String constantName) {
setSessionAcknowledgeMode(sessionConstants.asNumber(constantName).intValue());
Assert.hasText(constantName, "'constantName' must not be null or blank");
Integer acknowledgeMode = sessionConstants.get(constantName);
Assert.notNull(acknowledgeMode, "Only acknowledge mode constants allowed");
setSessionAcknowledgeMode(acknowledgeMode);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,18 @@

package org.springframework.jms.support;

import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.stream.Stream;

import jakarta.jms.Session;
import org.junit.jupiter.api.Test;

import org.springframework.util.ReflectionUtils;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;

Expand Down Expand Up @@ -70,6 +77,24 @@ void setSessionAcknowledgeModeNameToUnsupportedValues() {
assertThatIllegalArgumentException().isThrownBy(() -> accessor.setSessionAcknowledgeModeName("bogus"));
}

/**
* This test effectively verifies that the internal 'constants' map is properly
* configured for all acknowledge mode constants constants defined in
* {@link jakarta.jms.Session}.
*/
@Test
void setSessionAcknowledgeModeNameToAllSupportedValues() {
streamAcknowledgeModeConstants()
.map(Field::getName)
.forEach(name -> assertThatNoException().isThrownBy(() -> accessor.setSessionAcknowledgeModeName(name)));
}


private static Stream<Field> streamAcknowledgeModeConstants() {
return Arrays.stream(Session.class.getFields())
.filter(ReflectionUtils::isPublicStaticFinal);
}

@Test
void customAcknowledgeModeIsConsideredClientAcknowledge() throws Exception {
Session session = mock();
Expand Down

0 comments on commit b2ca36f

Please sign in to comment.