Update to framework 7.2.0

CJSCommonPlatform · Nov 16, 2020 · 9ba1b21 · 9ba1b21
1 parent 317250b
commit 9ba1b21
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/...-control/src/main/java/uk/gov/moj/cpp/featurecontrol/example/HardCodedFeatureFetcher.java b/...-control/src/main/java/uk/gov/moj/cpp/featurecontrol/example/HardCodedFeatureFetcher.java
@@ -7,7 +7,6 @@
 import uk.gov.justice.services.core.featurecontrol.domain.Feature;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
@@ -21,7 +20,6 @@ public class HardCodedFeatureFetcher implements FeatureFetcher {
 
     private static final Feature HARD_CODED_DISABLED_FEATURE = new Feature(
             "recipes-have-allergens-specified",
-            "Version 2 of add recipe handler for testing feature toggling",
             false
     );
 

diff --git a/...ample-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/FeatureTogglingIT.java b/...ample-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/FeatureTogglingIT.java
@@ -64,7 +64,6 @@ public void shouldAcceptAddRecipeVersion2CommandIfTheFeatureIsEnabled() throws E
         final boolean enabled = true;
         final Feature feature = new Feature(
                 "recipes-have-allergens-specified",
-                "Version 2 of add recipe handler for testing feature toggling",
                 enabled
         );
 
@@ -88,7 +87,6 @@ public void shouldRejectAddRecipeVersion2CommandIfTheFeatureIsDisabled() throws
         final boolean enabled = false;
         final Feature feature = new Feature(
                 "recipes-have-allergens-specified",
-                "Version 2 of add recipe handler for testing feature toggling",
                 enabled
         );
 

diff --git a/...le-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/ListSystemCommandsIT.java b/...le-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/ListSystemCommandsIT.java
@@ -18,6 +18,7 @@
 import static uk.gov.justice.services.eventstore.management.commands.VerifyRebuildCommand.VERIFY_REBUILD;
 import static uk.gov.justice.services.jmx.system.command.client.connection.JmxParametersBuilder.jmxParameters;
 import static uk.gov.justice.services.management.ping.commands.PingCommand.PING;
+import static uk.gov.justice.services.management.suspension.commands.RefreshFeatureControlCacheCommand.REFRESH_FEATURE_CACHE;
 import static uk.gov.justice.services.management.suspension.commands.SuspendCommand.SUSPEND;
 import static uk.gov.justice.services.management.suspension.commands.UnsuspendCommand.UNSUSPEND;
 import static uk.gov.justice.services.test.utils.common.host.TestHostProvider.getHost;
@@ -26,6 +27,7 @@
 import uk.gov.justice.services.jmx.system.command.client.SystemCommanderClient;
 import uk.gov.justice.services.jmx.system.command.client.TestSystemCommanderClientFactory;
 import uk.gov.justice.services.jmx.system.command.client.connection.JmxParameters;
+import uk.gov.justice.services.management.suspension.commands.RefreshFeatureControlCacheCommand;
 
 import java.util.List;
 import java.util.Map;
@@ -54,7 +56,7 @@ public void shouldListAllSystemCommands() throws Exception {
                     .getRemote(CONTEXT_NAME)
                     .listCommands();
 
-            assertThat(systemCommandDetailsList.size(), is(13));
+            assertThat(systemCommandDetailsList.size(), is(14));
 
             final Map<String, SystemCommandDetails> systemCommandDetailsMap = systemCommandDetailsList
                     .stream()
@@ -67,6 +69,7 @@ public void shouldListAllSystemCommands() throws Exception {
             assertThat(systemCommandDetailsMap.get(INDEXER_CATCHUP), is(notNullValue()));
             assertThat(systemCommandDetailsMap.get(PING), is(notNullValue()));
             assertThat(systemCommandDetailsMap.get(REBUILD), is(notNullValue()));
+            assertThat(systemCommandDetailsMap.get(REFRESH_FEATURE_CACHE), is(notNullValue()));
             assertThat(systemCommandDetailsMap.get(REMOVE_TRIGGER), is(notNullValue()));
             assertThat(systemCommandDetailsMap.get(SUSPEND), is(notNullValue()));
             assertThat(systemCommandDetailsMap.get(UNSUSPEND), is(notNullValue()));

diff --git a/example-context/pom.xml b/example-context/pom.xml
@@ -18,6 +18,4 @@
         <module>example-persistence</module>
         <module>example-service</module>
     </modules>
-
-
 </project>
diff --git a/pom.xml b/pom.xml
@@ -31,9 +31,9 @@
     <properties>
         <cpp.repo.name>cake-shop</cpp.repo.name>
 
-        <framework-libraries.version>7.2.0-M3</framework-libraries.version>
-        <framework.version>7.2.0-M4</framework.version>
-        <event-store.version>7.2.0-M4</event-store.version>
+        <framework-libraries.version>7.2.0</framework-libraries.version>
+        <framework.version>7.2.0</framework.version>
+        <event-store.version>7.2.0</event-store.version>
     </properties>
 
     <dependencyManagement>