Skip to content

Commit 461113d

Browse files
glibasglibas
committed
Prepare v4.5.4; Cleanup
1 parent ee98a8b commit 461113d

File tree

4 files changed

+40
-34
lines changed

4 files changed

+40
-34
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<minimum.maven.version>3.3</minimum.maven.version>
3131
<outputDirectory>${project.build.directory}</outputDirectory>
3232
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
33-
<cucumber.version>4.5.3</cucumber.version>
33+
<cucumber.version>4.5.4</cucumber.version>
3434
<gherkin.version>5.1.0</gherkin.version>
3535
<groovy.version>2.4.12</groovy.version>
3636
<junit.version>4.12</junit.version>

‎scala/sources/src/main/scala/cucumber/api/scala/README.scala

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎scala/sources/src/main/scala/cucumber/api/scala/package.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<body>
22
<p>
3-
See <a href="http://cukes.info/api/cucumber/jvm/scaladoc">the Scala API</a> for cucumber-scala.
3+
See <a href="https://cucumber.io/docs/installation/scala">the Scala API</a> for cucumber-jvm-scala.
44
</p>
55
</body>

‎scala/sources/src/main/scala/cucumber/runtime/scala/ScalaBackend.scala

Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
11
package cucumber.runtime.scala
22

3-
import java.util.{List => JList}
4-
5-
import gherkin.pickles.PickleStep
63
import java.lang.reflect.Modifier
74
import java.net.URI
5+
import java.util.{List => JList}
86

9-
import cucumber.runtime.snippets.SnippetGenerator
10-
import cucumber.runtime.snippets.FunctionNameGenerator
117
import cucumber.api.scala.ScalaDsl
12-
import cucumber.runtime.ClassFinder
13-
import cucumber.runtime.io.ResourceLoaderClassFinder
14-
import cucumber.runtime.io.ResourceLoader
15-
import cucumber.runtime.io.MultiLoader
16-
import cucumber.runtime.Backend
17-
import cucumber.runtime.Glue
8+
import cucumber.runtime.{Backend, Glue}
9+
import cucumber.runtime.io.{ResourceLoader, ResourceLoaderClassFinder}
10+
import cucumber.runtime.snippets.{FunctionNameGenerator, SnippetGenerator}
11+
import gherkin.pickles.PickleStep
1812
import io.cucumber.stepexpression.TypeRegistry
1913

2014
import scala.collection.JavaConverters._
2115

22-
class ScalaBackend(resourceLoader:ResourceLoader, typeRegistry: TypeRegistry) extends Backend {
16+
class ScalaBackend(resourceLoader: ResourceLoader, typeRegistry: TypeRegistry) extends Backend {
2317
private val snippetGenerator = new SnippetGenerator(new ScalaSnippetGenerator(), typeRegistry.parameterTypeRegistry())
24-
private var instances:Seq[ScalaDsl] = Nil
18+
private var instances: Seq[ScalaDsl] = Nil
19+
2520

26-
2721
def getStepDefinitions = instances.flatMap(_.getStepDefs(typeRegistry))
2822

2923
def getBeforeHooks = instances.flatMap(_.beforeHooks)
@@ -34,49 +28,65 @@ class ScalaBackend(resourceLoader:ResourceLoader, typeRegistry: TypeRegistry) ex
3428

3529
def getBeforeStepHooks = instances.flatMap(_.beforeStepHooks)
3630

37-
def disposeWorld() : Unit = { instances = Nil }
31+
def disposeWorld(): Unit = {
32+
instances = Nil
33+
}
3834

3935
def getSnippet(step: PickleStep, keyword: String, functionNameGenerator: FunctionNameGenerator) = snippetGenerator.getSnippet(step, keyword, functionNameGenerator)
4036

41-
def buildWorld() : Unit = {
37+
def buildWorld(): Unit = {
4238
//I don't believe scala has to do anything to clean out its world
4339
}
4440

45-
def loadGlue(glue: Glue, gluePaths: JList[URI]) : Unit = {
41+
def loadGlue(glue: Glue, gluePaths: JList[URI]): Unit = {
4642

4743
val cl = Thread.currentThread().getContextClassLoader
4844
val classFinder = new ResourceLoaderClassFinder(resourceLoader, cl)
4945
val packages = gluePaths.asScala
50-
val dslClasses = packages flatMap { classFinder.getDescendants(classOf[ScalaDsl], _).asScala } filter { cls =>
46+
val dslClasses = packages flatMap {
47+
classFinder.getDescendants(classOf[ScalaDsl], _).asScala
48+
} filter { cls =>
5149
try {
5250
cls.getDeclaredConstructor()
5351
true
5452
} catch {
55-
case e : Throwable => false
53+
case e: Throwable => false
5654
}
5755
}
5856

5957
val (clsClasses, objClasses) = dslClasses partition { cls =>
6058
try {
61-
Modifier.isPublic (cls.getConstructor().getModifiers)
59+
Modifier.isPublic(cls.getConstructor().getModifiers)
6260
} catch {
63-
case e : Throwable => false
61+
case e: Throwable => false
6462
}
6563
}
66-
val objInstances = objClasses map {cls =>
64+
val objInstances = objClasses map { cls =>
6765
val instField = cls.getDeclaredField("MODULE$")
6866
instField.setAccessible(true)
6967
instField.get(null).asInstanceOf[ScalaDsl]
7068
}
71-
val clsInstances = clsClasses.map {_.newInstance()}
69+
val clsInstances = clsClasses.map {
70+
_.newInstance()
71+
}
7272

7373
instances = objInstances.toSeq ++ clsInstances
7474

75-
getStepDefinitions map {glue.addStepDefinition(_)}
76-
getBeforeHooks map {glue.addBeforeHook(_)}
77-
getAfterHooks map {glue.addAfterHook(_)}
78-
getAfterStepHooks map {glue.addAfterStepHook(_)}
79-
getBeforeStepHooks map {glue.addBeforeStepHook(_)}
75+
getStepDefinitions map {
76+
glue.addStepDefinition(_)
77+
}
78+
getBeforeHooks map {
79+
glue.addBeforeHook(_)
80+
}
81+
getAfterHooks map {
82+
glue.addAfterHook(_)
83+
}
84+
getAfterStepHooks map {
85+
glue.addAfterStepHook(_)
86+
}
87+
getBeforeStepHooks map {
88+
glue.addBeforeStepHook(_)
89+
}
8090
()
8191
}
8292

0 commit comments

Comments
 (0)