JBEHAVE-1489 Add ability to build converters chain by their source an…

…d target types
valfirst · May 27, 2021 · 482b1ff · 482b1ff
1 parent c2ab2d7
commit 482b1ff
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 105 deletions.
diff --git a/examples/core/src/main/java/org/jbehave/examples/core/converters/CalendarConverter.java b/examples/core/src/main/java/org/jbehave/examples/core/converters/CalendarConverter.java
@@ -6,9 +6,9 @@
 import java.util.Calendar;
 
 import org.apache.commons.lang3.StringUtils;
-import org.jbehave.core.steps.ParameterConverters.AbstractParameterConverter;
+import org.jbehave.core.steps.ParameterConverters.FromStringParameterConverter;
 
-public class CalendarConverter extends AbstractParameterConverter<Calendar> {
+public class CalendarConverter extends FromStringParameterConverter<Calendar> {
 
     private final SimpleDateFormat dateFormat;
 

diff --git a/examples/core/src/main/java/org/jbehave/examples/core/converters/TraderConverter.java b/examples/core/src/main/java/org/jbehave/examples/core/converters/TraderConverter.java
@@ -2,12 +2,12 @@
 
 import java.lang.reflect.Type;
 
-import org.jbehave.core.steps.ParameterConverters.AbstractParameterConverter;
+import org.jbehave.core.steps.ParameterConverters.FromStringParameterConverter;
 import org.jbehave.core.steps.ParameterConverters.ParameterConversionFailed;
 import org.jbehave.examples.core.model.Trader;
 import org.jbehave.examples.core.persistence.TraderPersister;
 
-public class TraderConverter extends AbstractParameterConverter<Trader> {
+public class TraderConverter extends FromStringParameterConverter<Trader> {
     private TraderPersister persister;
 
     public TraderConverter(TraderPersister persister) {

diff --git a/jbehave-core/src/main/java/org/jbehave/core/steps/AbstractStepsFactory.java b/jbehave-core/src/main/java/org/jbehave/core/steps/AbstractStepsFactory.java
@@ -9,8 +9,8 @@
 
 import org.jbehave.core.annotations.AsParameterConverter;
 import org.jbehave.core.configuration.Configuration;
-import org.jbehave.core.steps.ParameterConverters.MethodReturningConverter;
 import org.jbehave.core.steps.ParameterConverters.ParameterConverter;
+import org.jbehave.core.steps.ParameterConverters.MethodReturningConverter;
 
 /**
  * <p>

diff --git a/jbehave-core/src/main/java/org/jbehave/core/steps/ParameterConverters.java b/jbehave-core/src/main/java/org/jbehave/core/steps/ParameterConverters.java
diff --git a/jbehave-core/src/main/java/org/jbehave/core/steps/StepCreator.java b/jbehave-core/src/main/java/org/jbehave/core/steps/StepCreator.java
@@ -45,7 +45,7 @@
 import org.jbehave.core.model.Verbatim;
 import org.jbehave.core.parsers.StepMatcher;
 import org.jbehave.core.reporters.StoryReporter;
-import org.jbehave.core.steps.ParameterConverters.ParameterConverter;
+import org.jbehave.core.steps.ParameterConverters.FromStringParameterConverter;
 import org.jbehave.core.steps.context.StepsContext;
 
 public class StepCreator {
@@ -763,7 +763,7 @@ public StepResult doNotPerform(StoryReporter storyReporter, UUIDExceptionWrapper
             return perform(storyReporter, storyFailureIfItHappened);
         }
 
-        private class UUIDExceptionWrapperInjector implements ParameterConverter<UUIDExceptionWrapper> {
+        private class UUIDExceptionWrapperInjector extends FromStringParameterConverter<UUIDExceptionWrapper> {
             private final UUIDExceptionWrapper storyFailureIfItHappened;
 
             public UUIDExceptionWrapperInjector(UUIDExceptionWrapper storyFailureIfItHappened) {

diff --git a/jbehave-core/src/test/java/org/jbehave/core/configuration/AnnotationBuilderBehaviour.java b/jbehave-core/src/test/java/org/jbehave/core/configuration/AnnotationBuilderBehaviour.java
@@ -26,7 +26,7 @@
 import org.jbehave.core.embedder.EmbedderControls;
 import org.jbehave.core.i18n.LocalizedKeywords;
 import org.jbehave.core.steps.CandidateSteps;
-import org.jbehave.core.steps.ParameterConverters.ParameterConverter;
+import org.jbehave.core.steps.ParameterConverters.FromStringParameterConverter;
 import org.jbehave.core.steps.Steps;
 import org.jbehave.core.steps.scan.GivenOnly;
 import org.jbehave.core.steps.scan.GivenWhen;
@@ -188,7 +188,7 @@ static class Annotated {
 
     }
 
-    static class MyParameterConverter implements ParameterConverter<String> {
+    static class MyParameterConverter extends FromStringParameterConverter<String> {
 
         @Override
         public boolean canConvertTo(Type type) {

diff --git a/jbehave-core/src/test/java/org/jbehave/core/steps/ParameterConvertersBehaviour.java b/jbehave-core/src/test/java/org/jbehave/core/steps/ParameterConvertersBehaviour.java