Tuned syntax.

qaware · Aug 16, 2018 · 97682d0 · 97682d0
1 parent 9e8d32f
commit 97682d0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/README.adoc b/README.adoc
@@ -52,7 +52,7 @@ Uniformly rename classes, to establish or change some naming conventions:
 val refactobot = Refactobot.configure {
 
     refactor {
-        renameFile("""(.*)DaoBean\.java""", "(.*)DaoImpl.java")
+        renameFile("""(.*)DaoBean\.java""" to "(.*)DaoImpl.java")
     }
 }
 

diff --git a/src/main/kotlin/de/qaware/refactobot/configuration/RefactoringContext.kt b/src/main/kotlin/de/qaware/refactobot/configuration/RefactoringContext.kt
@@ -24,8 +24,8 @@ class RefactoringContext(originalLocation: FileLocation) {
     /**
      * DSL element for simple file rename
      */
-    fun renameFile(regex: String, newName: String) {
-        fileName = fileName.replace(regex.toRegex(), newName)
+    fun renameFile(replacement: Pair<String, String>) {
+        fileName = fileName.replace(replacement.first.toRegex(), replacement.second)
     }
 
     /**

diff --git a/src/test/kotlin/de/qaware/refactobot/expander/ExpanderTest.kt b/src/test/kotlin/de/qaware/refactobot/expander/ExpanderTest.kt
@@ -41,7 +41,7 @@ class ExpanderTest {
         val bot = Refactobot.configure {
 
             refactor {
-                renameFile("(.*)A.java", "$1B.java")
+                renameFile("(.*)A.java" to "$1B.java")
             }
 
         }

diff --git a/src/test/kotlin/de/qaware/refactobot/integration/FullIntegrationTest.kt b/src/test/kotlin/de/qaware/refactobot/integration/FullIntegrationTest.kt
@@ -26,8 +26,8 @@ class FullIntegrationTest {
         val bot = Refactobot.configure {
 
             refactor {
-                renameFile("InterfaceA.java", "FancyInterface.java")
-                renameFile("TestClassB.java", "TestClassBar.java")
+                renameFile("InterfaceA.java" to "FancyInterface.java")
+                renameFile("TestClassB.java" to "TestClassBar.java")
             }
 
         }