Changed the consolidate comic guard name [#889]

comixed · Sep 19, 2021 · 90c975d · 90c975d
1 parent 1a7b7a8
commit 90c975d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...ate/src/main/java/org/comixedproject/state/comicbooks/ComicStateMachineConfiguration.java b/...ate/src/main/java/org/comixedproject/state/comicbooks/ComicStateMachineConfiguration.java
@@ -24,7 +24,7 @@
 import org.comixedproject.state.comicbooks.actions.*;
 import org.comixedproject.state.comicbooks.guards.ComicContentsProcessedGuard;
 import org.comixedproject.state.comicbooks.guards.ComicFileAlreadyRecreatingGuard;
-import org.comixedproject.state.comicbooks.guards.ComicFilenameWillChangeGuard;
+import org.comixedproject.state.comicbooks.guards.ConsolidateComicGuard;
 import org.comixedproject.state.comicbooks.guards.FileDetailsCreatedGuard;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +51,7 @@ public class ComicStateMachineConfiguration
   @Autowired private UpdateMetadataAction updateMetadataAction;
   @Autowired private MetadataUpdatedAction metadataUpdatedAction;
   @Autowired private ConsolidateComicAction consolidateComicAction;
-  @Autowired private ComicFilenameWillChangeGuard comicFilenameWillChangeGuard;
+  @Autowired private ConsolidateComicGuard consolidateComicGuard;
   @Autowired private ComicConsolidatedAction comicConsolidatedAction;
   @Autowired private ComicFileAlreadyRecreatingGuard comicFileAlreadyRecreatingGuard;
   @Autowired private RecreateComicFileAction recreateComicFileAction;
@@ -137,14 +137,14 @@ public void configure(final StateMachineTransitionConfigurer<ComicState, ComicEv
         .source(ComicState.STABLE)
         .target(ComicState.STABLE)
         .event(ComicEvent.consolidateComic)
-        .guard(comicFilenameWillChangeGuard)
+        .guard(consolidateComicGuard)
         .action(consolidateComicAction)
         .and()
         .withExternal()
         .source(ComicState.CHANGED)
         .target(ComicState.CHANGED)
         .event(ComicEvent.consolidateComic)
-        .guard(comicFilenameWillChangeGuard)
+        .guard(consolidateComicGuard)
         .action(consolidateComicAction)
         .and()
         .withExternal()

diff --git a/.../guards/ComicFilenameWillChangeGuard.java → ...icbooks/guards/ConsolidateComicGuard.java b/.../guards/ComicFilenameWillChangeGuard.java → ...icbooks/guards/ConsolidateComicGuard.java
@@ -33,13 +33,13 @@
 import org.springframework.stereotype.Component;
 
 /**
- * <code>ComicFilenameWillChangeGuard</code> checks if the comic already has the target filename.
+ * <code>ConsolidateComicGuard</code> checks if the comic already has the target filename.
  *
  * @author Darryl L. Pierce
  */
 @Component
 @Log4j2
-public class ComicFilenameWillChangeGuard extends AbstractComicGuard {
+public class ConsolidateComicGuard extends AbstractComicGuard {
   @Autowired private ComicFileAdaptor comicFileAdaptor;
 
   @Override
@@ -53,7 +53,7 @@ public boolean evaluate(final StateContext<ComicState, ComicEvent> context) {
     final String renamingRule = context.getMessageHeaders().get(HEADER_RENAMING_RULE, String.class);
     log.trace("Generating target name");
     final String targetName = this.comicFileAdaptor.createFilenameFromRule(comic, renamingRule);
-    log.trace("Ensuring the comic filename would be difference");
+    log.trace("Ensuring the comic filename would be different");
     final String absoluteSource = comic.getFile().getAbsolutePath();
     final String absoluteTarget =
         new File(String.format("%s/%s", targetDirectory, targetName)).getAbsolutePath();

diff --git a/...rds/ComicFilenameWillChangeGuardTest.java → ...oks/guards/ConsolidateComicGuardTest.java b/...rds/ComicFilenameWillChangeGuardTest.java → ...oks/guards/ConsolidateComicGuardTest.java
@@ -38,13 +38,13 @@
 import org.springframework.statemachine.StateContext;
 
 @RunWith(MockitoJUnitRunner.class)
-public class ComicFilenameWillChangeGuardTest {
+public class ConsolidateComicGuardTest {
   private static final String TEST_TARGET_DIRECTORY = "/Users/comixed/Documents/old";
   private static final String TEST_RENAMING_RULE = "The renaming rule";
   private static final String TEST_OLD_FILENAME = "The old filename";
   private static final String TEST_NEW_FILENAME = "The new filename";
 
-  @InjectMocks private ComicFilenameWillChangeGuard guard;
+  @InjectMocks private ConsolidateComicGuard guard;
   @Mock private StateContext<ComicState, ComicEvent> context;
   @Mock private MessageHeaders messageHeaders;
   @Mock private Comic comic;