[Core] Change return value to reduce duplication.

cucumber · Jul 25, 2017 · e52fc4f · e52fc4f
1 parent 44fbd93
commit e52fc4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/core/src/main/java/cucumber/runtime/RuntimeOptions.java b/core/src/main/java/cucumber/runtime/RuntimeOptions.java
@@ -444,8 +444,7 @@ public Map<String, List<Long>> getLineFilters(ResourceLoader resourceLoader) {
     private void processRerunFiles(ResourceLoader resourceLoader) {
         for (String featurePath : featurePaths) {
             if (featurePath.startsWith("@")) {
-                for (String path : CucumberFeature.loadRerunFile(resourceLoader, featurePath.substring(1))) {
-                    PathWithLines pathWithLines = new PathWithLines(path);
+                for (PathWithLines pathWithLines : CucumberFeature.loadRerunFile(resourceLoader, featurePath.substring(1))) {
                     addLineFilters(lineFilters, pathWithLines.path, pathWithLines.lines);
                 }
             }

diff --git a/core/src/main/java/cucumber/runtime/model/CucumberFeature.java b/core/src/main/java/cucumber/runtime/model/CucumberFeature.java
@@ -55,20 +55,20 @@ public static List<CucumberFeature> load(ResourceLoader resourceLoader, List<Str
     }
 
     private static void loadFromRerunFile(FeatureBuilder builder, ResourceLoader resourceLoader, String rerunPath) {
-        for(String path : loadRerunFile(resourceLoader, rerunPath)){
-            loadFromFileSystemOrClasspath(builder, resourceLoader, new PathWithLines(path).path);
+        for(PathWithLines pathWithLines : loadRerunFile(resourceLoader, rerunPath)){
+            loadFromFileSystemOrClasspath(builder, resourceLoader, pathWithLines.path);
         }
     }
 
-    public static List<String> loadRerunFile(ResourceLoader resourceLoader, String rerunPath) {
-        List<String> featurePaths = new ArrayList<String>();
+    public static List<PathWithLines> loadRerunFile(ResourceLoader resourceLoader, String rerunPath) {
+        List<PathWithLines> featurePaths = new ArrayList<PathWithLines>();
         Iterable<Resource> resources = resourceLoader.resources(rerunPath, null);
         for (Resource resource : resources) {
             String source = read(resource);
             if (!source.isEmpty()) {
                 Matcher matcher = RERUN_PATH_SPECIFICATION.matcher(source);
                 while(matcher.find()){
-                    featurePaths.add(matcher.group(1));
+                    featurePaths.add(new PathWithLines(matcher.group(1)));
                 }
             }
         }