Merge 2046362 into 0169b7a

CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file, which follo
 on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
+## [11.0.0-M31] - 2023-01-10
+### Changed
+- Provide constant for artemis healthcheck name
+- Provide capability to override destination names while performing artemis healthcheck
+- Update framework version to 11.0.0-M30
+
 ## [11.0.0-M30] - 2022-11-29
 ### Changed
 - Update framework version to 11.0.0-M29

healthchecks/src/main/java/uk/gov/justice/services/healthcheck/healthchecks/artemis/ArtemisHealthcheck.java

@@ -10,6 +10,8 @@
 
 public class ArtemisHealthcheck implements Healthcheck {
 
+    public static final String ARTEMIS_HEALTHCHECK_NAME = "artemis-healthcheck";
+
     @Inject
     private Logger logger;
 
@@ -21,7 +23,7 @@ public class ArtemisHealthcheck implements Healthcheck {
 
     @Override
     public String getHealthcheckName() {
-        return "artemis-healthcheck";
+        return ARTEMIS_HEALTHCHECK_NAME;
     }
 
     @Override

healthchecks/src/main/java/uk/gov/justice/services/healthcheck/healthchecks/artemis/DefaultDestinationNamesProvider.java

@@ -0,0 +1,23 @@
+package uk.gov.justice.services.healthcheck.healthchecks.artemis;
+
+import javax.inject.Inject;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class DefaultDestinationNamesProvider implements DestinationNamesProvider {
+
+    private static final List<String> DESTINATION_NAME_PATTERNS = List.of("%s.controller.command", "%s.handler.command", "%s.event");
+
+    @Inject
+    private JndiContextNameProvider jndiContextNameProvider;
+
+    public List<String> getDestinationNames() {
+        return DESTINATION_NAME_PATTERNS.stream()
+                .map(qp -> String.format(qp, getContextName()))
+                .collect(Collectors.toList());
+    }
+
+    protected final String getContextName() {
+        return jndiContextNameProvider.getContextName();
+    }
+}

healthchecks/src/main/java/uk/gov/justice/services/healthcheck/healthchecks/artemis/DestinationNamesProvider.java

@@ -1,20 +1,7 @@
 package uk.gov.justice.services.healthcheck.healthchecks.artemis;
 
-import javax.inject.Inject;
 import java.util.List;
-import java.util.stream.Collectors;
 
-public class DestinationNamesProvider {
-
-    private static final List<String> DESTINATION_NAME_PATTERNS = List.of("%s.controller.command", "%s.handler.command", "%s.event");
-
-    @Inject
-    private JndiContextNameProvider jndiContextNameProvider;
-
-    public List<String> getDestinationNames() {
-        var contextName = jndiContextNameProvider.getContextName();
-        return DESTINATION_NAME_PATTERNS.stream()
-                .map(qp -> String.format(qp, contextName))
-                .collect(Collectors.toList());
-    }
+public interface DestinationNamesProvider {
+    List<String> getDestinationNames();
 }

healthchecks/src/test/java/uk/gov/justice/services/healthcheck/healthchecks/artemis/DestinationNamesProviderTest.java → healthchecks/src/test/java/uk/gov/justice/services/healthcheck/healthchecks/artemis/DefaultDestinationNamesProviderTest.java

@@ -7,17 +7,18 @@
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.hamcrest.CoreMatchers.hasItems;
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 
 @RunWith(MockitoJUnitRunner.class)
-public class DestinationNamesProviderTest {
+public class DefaultDestinationNamesProviderTest {
 
     @Mock
     private JndiContextNameProvider jndiContextNameProvider;
 
     @InjectMocks
-    private DestinationNamesProvider destinationNamesProvider;
+    private DefaultDestinationNamesProvider destinationNamesProvider;
 
     @Test
     public void shouldReturnContextSpecificCQRSDestinationNames() {
@@ -26,6 +27,13 @@ public void shouldReturnContextSpecificCQRSDestinationNames() {
         assertThat(destinationNamesProvider.getDestinationNames(), hasItems("people.controller.command",
                 "people.handler.command",
                 "people.event"));
+    }
+
+    @Test
+    public void shouldReturnContextNae() {
+        given(jndiContextNameProvider.getContextName()).willReturn("people");
+
+        assertThat(destinationNamesProvider.getContextName(), is("people"));
 
     }
 }

pom.xml

@@ -39,7 +39,7 @@
 
     <properties>
         <cpp.repo.name>event-store</cpp.repo.name>
-        <framework.version>11.0.0-M29</framework.version>
+        <framework.version>11.0.0-M30</framework.version>
     </properties>
 
     <dependencyManagement>