From 7f0b99034ae875f4b720eda09da0d6c0493d6cdc Mon Sep 17 00:00:00 2001 From: Jakub Kubrynski Date: Mon, 13 Apr 2015 21:29:04 +0200 Subject: [PATCH] Fixed package name - renamed from coderate to codearte --- .../wiremock/ConversionAccurestException.groovy | 2 +- .../wiremock/DslToWiremockClientConverter.groovy | 2 +- .../wiremock/DslToWiremockConverter.groovy | 2 +- .../DslToWiremockClientConverterSpec.groovy | 4 ++-- .../wiremock/WiremockToDslConverterSpec.groovy | 12 ++++++------ .../resources/converter/source/dir1/dsl1.groovy | 2 +- .../resources/converter/source/dir1/dsl1b.groovy | 2 +- .../resources/converter/source/dir2/dsl2.groovy | 2 +- .../resources/converter/source/dslRoot.groovy | 2 +- .../accurest/AccurestException.groovy | 2 +- .../accurest/FileSaver.groovy | 8 ++++---- .../accurest/SingleTestGenerator.groovy | 16 ++++++++-------- .../accurest/TestGenerator.groovy | 6 +++--- .../accurest/builder/BlockBuilder.groovy | 2 +- .../accurest/builder/ClassBuilder.groovy | 8 ++++---- .../builder/JUnitMethodBodyBuilder.groovy | 2 +- .../accurest/builder/MethodBuilder.groovy | 8 ++++---- .../builder/SpockMethodBodyBuilder.groovy | 6 +++--- .../config/AccurestConfigProperties.groovy | 2 +- .../accurest/config/TestFramework.groovy | 2 +- .../accurest/config/TestMode.groovy | 2 +- .../accurest/dsl/BaseWiremockStubStrategy.groovy | 6 +++--- .../accurest/dsl/GroovyDsl.groovy | 6 +++--- .../dsl/WiremockRequestStubStrategy.groovy | 6 +++--- .../dsl/WiremockResponseStubStrategy.groovy | 6 +++--- .../accurest/dsl/WiremockStubStrategy.groovy | 2 +- .../accurest/dsl/internal/Body.groovy | 2 +- .../dsl/internal/ClientDslProperty.groovy | 2 +- .../accurest/dsl/internal/Common.groovy | 2 +- .../accurest/dsl/internal/DslProperty.groovy | 2 +- .../accurest/dsl/internal/Header.groovy | 2 +- .../accurest/dsl/internal/Headers.groovy | 2 +- .../accurest/dsl/internal/JSONCompareMode.groovy | 2 +- .../accurest/dsl/internal/Request.groovy | 2 +- .../accurest/dsl/internal/Response.groovy | 2 +- .../dsl/internal/ServerDslProperty.groovy | 2 +- .../accurest/dsl/internal/Url.groovy | 2 +- .../accurest/util/NamesUtil.groovy | 2 +- .../accurest/util/StubMappingConverter.groovy | 2 +- .../accurest/GeneratorScannerSpec.groovy | 5 +---- .../groovy/io/codearte/accurest/MainTest.groovy | 7 +++---- .../builder/SpockMethodBuilderSpec.groovy | 4 ++-- .../dsl/WiremockGroovyDslResponseSpec.groovy | 2 -- .../accurest/dsl/WiremockGroovyDslSpec.groovy | 3 --- .../test/resources/dsl/basic/sampleDsl.groovy | 2 +- .../accurest/plugin/AccurestGradlePlugin.groovy | 2 +- .../plugin/GenerateServerTestsTask.groovy | 6 +++--- .../pairId/colleratePlacesFromTweet.groovy | 2 +- 48 files changed, 85 insertions(+), 94 deletions(-) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/AccurestException.groovy (88%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/FileSaver.groovy (83%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/SingleTestGenerator.groovy (75%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/TestGenerator.groovy (94%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/builder/BlockBuilder.groovy (96%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/builder/ClassBuilder.groovy (92%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/builder/JUnitMethodBodyBuilder.groovy (90%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/builder/MethodBuilder.groovy (86%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/builder/SpockMethodBodyBuilder.groovy (96%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/config/AccurestConfigProperties.groovy (95%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/config/TestFramework.groovy (96%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/config/TestMode.groovy (66%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/BaseWiremockStubStrategy.groovy (93%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/GroovyDsl.groovy (84%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/WiremockRequestStubStrategy.groovy (89%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/WiremockResponseStubStrategy.groovy (86%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/WiremockStubStrategy.groovy (95%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/internal/Body.groovy (97%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/internal/ClientDslProperty.groovy (80%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/internal/Common.groovy (97%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/internal/DslProperty.groovy (92%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/internal/Header.groovy (93%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/internal/Headers.groovy (94%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/internal/JSONCompareMode.groovy (63%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/internal/Request.groovy (97%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/internal/Response.groovy (97%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/internal/ServerDslProperty.groovy (88%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/dsl/internal/Url.groovy (89%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/util/NamesUtil.groovy (96%) rename accurest-core/src/main/groovy/io/{coderate => codearte}/accurest/util/StubMappingConverter.groovy (97%) rename accurest-core/src/test/groovy/io/{coderate => codearte}/accurest/builder/SpockMethodBuilderSpec.groovy (97%) diff --git a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/ConversionAccurestException.groovy b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/ConversionAccurestException.groovy index 050853b02d..d4b35175a8 100644 --- a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/ConversionAccurestException.groovy +++ b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/ConversionAccurestException.groovy @@ -1,7 +1,7 @@ package io.codearte.accurest.wiremock import groovy.transform.CompileStatic -import io.coderate.accurest.AccurestException +import io.codearte.accurest.AccurestException @CompileStatic class ConversionAccurestException extends AccurestException { diff --git a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverter.groovy b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverter.groovy index 7b2b3054e7..8156f17cf6 100644 --- a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverter.groovy +++ b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverter.groovy @@ -1,7 +1,7 @@ package io.codearte.accurest.wiremock import groovy.transform.CompileStatic -import io.coderate.accurest.dsl.WiremockStubStrategy +import io.codearte.accurest.dsl.WiremockStubStrategy @CompileStatic class DslToWiremockClientConverter extends DslToWiremockConverter { diff --git a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockConverter.groovy b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockConverter.groovy index c44d8b40f1..5804010090 100644 --- a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockConverter.groovy +++ b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockConverter.groovy @@ -1,7 +1,7 @@ package io.codearte.accurest.wiremock import groovy.transform.CompileStatic -import io.coderate.accurest.dsl.GroovyDsl +import io.codearte.accurest.dsl.GroovyDsl @CompileStatic abstract class DslToWiremockConverter implements SingleFileConverter { diff --git a/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverterSpec.groovy b/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverterSpec.groovy index e4ccc28328..2f20546014 100755 --- a/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverterSpec.groovy +++ b/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockClientConverterSpec.groovy @@ -10,7 +10,7 @@ class DslToWiremockClientConverterSpec extends Specification { def converter = new DslToWiremockClientConverter() and: String dslBody = """ - io.coderate.accurest.dsl.GroovyDsl.make { + io.codearte.accurest.dsl.GroovyDsl.make { request { method('PUT') url \$(client(~/\\/[0-9]{2}/), server('/12')) @@ -33,7 +33,7 @@ class DslToWiremockClientConverterSpec extends Specification { def converter = new DslToWiremockClientConverter() and: String dslBody = """ - io.coderate.accurest.dsl.GroovyDsl.make { + io.codearte.accurest.dsl.GroovyDsl.make { request { method 'PUT' url '/api/12' diff --git a/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/WiremockToDslConverterSpec.groovy b/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/WiremockToDslConverterSpec.groovy index af1ba33e1b..7466b2e7f5 100755 --- a/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/WiremockToDslConverterSpec.groovy +++ b/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/WiremockToDslConverterSpec.groovy @@ -1,6 +1,6 @@ package io.codearte.accurest.wiremock -import io.coderate.accurest.dsl.GroovyDsl +import io.codearte.accurest.dsl.GroovyDsl import spock.lang.Specification class WiremockToDslConverterSpec extends Specification { @@ -65,7 +65,7 @@ class WiremockToDslConverterSpec extends Specification { String groovyDsl = WiremockToDslConverter.fromWiremockStub(wiremockStub) then: new GroovyShell(this.class.classLoader).evaluate( - """ io.coderate.accurest.dsl.GroovyDsl.make { + """ io.codearte.accurest.dsl.GroovyDsl.make { $groovyDsl }""") == expectedGroovyDsl } @@ -117,7 +117,7 @@ class WiremockToDslConverterSpec extends Specification { String groovyDsl = WiremockToDslConverter.fromWiremockStub(wiremockStub) then: new GroovyShell(this.class.classLoader).evaluate( - """ io.coderate.accurest.dsl.GroovyDsl.make { + """ io.codearte.accurest.dsl.GroovyDsl.make { $groovyDsl }""") == expectedGroovyDsl } @@ -166,7 +166,7 @@ class WiremockToDslConverterSpec extends Specification { String groovyDsl = WiremockToDslConverter.fromWiremockStub(wiremockStub) then: new GroovyShell(this.class.classLoader).evaluate( - """ io.coderate.accurest.dsl.GroovyDsl.make { + """ io.codearte.accurest.dsl.GroovyDsl.make { $groovyDsl }""") == expectedGroovyDsl } @@ -218,7 +218,7 @@ class WiremockToDslConverterSpec extends Specification { String groovyDsl = WiremockToDslConverter.fromWiremockStub(wiremockStub) then: new GroovyShell(this.class.classLoader).evaluate( - """ io.coderate.accurest.dsl.GroovyDsl.make { + """ io.codearte.accurest.dsl.GroovyDsl.make { $groovyDsl }""") == expectedGroovyDsl } @@ -282,7 +282,7 @@ class WiremockToDslConverterSpec extends Specification { String groovyDsl = WiremockToDslConverter.fromWiremockStub(wiremockStub) then: new GroovyShell(this.class.classLoader).evaluate( - """ io.coderate.accurest.dsl.GroovyDsl.make { + """ io.codearte.accurest.dsl.GroovyDsl.make { $groovyDsl }""") == expectedGroovyDsl } diff --git a/accurest-converters/src/test/resources/converter/source/dir1/dsl1.groovy b/accurest-converters/src/test/resources/converter/source/dir1/dsl1.groovy index be45f92092..d72463cde2 100644 --- a/accurest-converters/src/test/resources/converter/source/dir1/dsl1.groovy +++ b/accurest-converters/src/test/resources/converter/source/dir1/dsl1.groovy @@ -1,4 +1,4 @@ -io.coderate.accurest.dsl.GroovyDsl.make { +io.codearte.accurest.dsl.GroovyDsl.make { request { method('PUT') headers { diff --git a/accurest-converters/src/test/resources/converter/source/dir1/dsl1b.groovy b/accurest-converters/src/test/resources/converter/source/dir1/dsl1b.groovy index be45f92092..d72463cde2 100644 --- a/accurest-converters/src/test/resources/converter/source/dir1/dsl1b.groovy +++ b/accurest-converters/src/test/resources/converter/source/dir1/dsl1b.groovy @@ -1,4 +1,4 @@ -io.coderate.accurest.dsl.GroovyDsl.make { +io.codearte.accurest.dsl.GroovyDsl.make { request { method('PUT') headers { diff --git a/accurest-converters/src/test/resources/converter/source/dir2/dsl2.groovy b/accurest-converters/src/test/resources/converter/source/dir2/dsl2.groovy index be45f92092..d72463cde2 100644 --- a/accurest-converters/src/test/resources/converter/source/dir2/dsl2.groovy +++ b/accurest-converters/src/test/resources/converter/source/dir2/dsl2.groovy @@ -1,4 +1,4 @@ -io.coderate.accurest.dsl.GroovyDsl.make { +io.codearte.accurest.dsl.GroovyDsl.make { request { method('PUT') headers { diff --git a/accurest-converters/src/test/resources/converter/source/dslRoot.groovy b/accurest-converters/src/test/resources/converter/source/dslRoot.groovy index be45f92092..d72463cde2 100644 --- a/accurest-converters/src/test/resources/converter/source/dslRoot.groovy +++ b/accurest-converters/src/test/resources/converter/source/dslRoot.groovy @@ -1,4 +1,4 @@ -io.coderate.accurest.dsl.GroovyDsl.make { +io.codearte.accurest.dsl.GroovyDsl.make { request { method('PUT') headers { diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/AccurestException.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/AccurestException.groovy similarity index 88% rename from accurest-core/src/main/groovy/io/coderate/accurest/AccurestException.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/AccurestException.groovy index 740e13e620..b9fac01145 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/AccurestException.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/AccurestException.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest +package io.codearte.accurest /** * @author Jakub Kubrynski diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/FileSaver.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/FileSaver.groovy similarity index 83% rename from accurest-core/src/main/groovy/io/coderate/accurest/FileSaver.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/FileSaver.groovy index 2d20399d8a..a77aca416f 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/FileSaver.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/FileSaver.groovy @@ -1,16 +1,16 @@ -package io.coderate.accurest +package io.codearte.accurest import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import io.coderate.accurest.config.TestFramework -import io.coderate.accurest.util.NamesUtil +import io.codearte.accurest.config.TestFramework +import io.codearte.accurest.util.NamesUtil import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths import java.nio.file.StandardOpenOption -import static io.coderate.accurest.util.NamesUtil.capitalize +import static io.codearte.accurest.util.NamesUtil.capitalize @CompileStatic @Slf4j diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/SingleTestGenerator.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/SingleTestGenerator.groovy similarity index 75% rename from accurest-core/src/main/groovy/io/coderate/accurest/SingleTestGenerator.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/SingleTestGenerator.groovy index 80f7276a68..bc6f35adde 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/SingleTestGenerator.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/SingleTestGenerator.groovy @@ -1,14 +1,14 @@ -package io.coderate.accurest +package io.codearte.accurest import groovy.transform.PackageScope -import io.coderate.accurest.builder.ClassBuilder -import io.coderate.accurest.config.AccurestConfigProperties -import io.coderate.accurest.config.TestFramework -import io.coderate.accurest.config.TestMode +import io.codearte.accurest.builder.ClassBuilder +import io.codearte.accurest.config.AccurestConfigProperties +import io.codearte.accurest.config.TestFramework +import io.codearte.accurest.config.TestMode -import static io.coderate.accurest.builder.ClassBuilder.createClass -import static io.coderate.accurest.builder.MethodBuilder.createTestMethod -import static io.coderate.accurest.util.NamesUtil.capitalize +import static io.codearte.accurest.builder.ClassBuilder.createClass +import static io.codearte.accurest.builder.MethodBuilder.createTestMethod +import static io.codearte.accurest.util.NamesUtil.capitalize class SingleTestGenerator { private final AccurestConfigProperties configProperties diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/TestGenerator.groovy similarity index 94% rename from accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/TestGenerator.groovy index 45ba0ff497..fb612cebd1 100755 --- a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/TestGenerator.groovy @@ -1,12 +1,12 @@ -package io.coderate.accurest +package io.codearte.accurest import groovy.transform.PackageScope -import io.coderate.accurest.config.AccurestConfigProperties +import io.codearte.accurest.config.AccurestConfigProperties import org.apache.commons.io.FilenameUtils import org.codehaus.plexus.util.DirectoryScanner import java.util.concurrent.atomic.AtomicInteger -import static io.coderate.accurest.util.NamesUtil.afterLast +import static io.codearte.accurest.util.NamesUtil.afterLast /** * @author Jakub Kubrynski */ diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/builder/BlockBuilder.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/builder/BlockBuilder.groovy similarity index 96% rename from accurest-core/src/main/groovy/io/coderate/accurest/builder/BlockBuilder.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/builder/BlockBuilder.groovy index 31e8a05aac..62d97fdda7 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/builder/BlockBuilder.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/builder/BlockBuilder.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.builder +package io.codearte.accurest.builder import groovy.transform.PackageScope diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/builder/ClassBuilder.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/builder/ClassBuilder.groovy similarity index 92% rename from accurest-core/src/main/groovy/io/coderate/accurest/builder/ClassBuilder.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/builder/ClassBuilder.groovy index 912740b83f..29f4fc2c14 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/builder/ClassBuilder.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/builder/ClassBuilder.groovy @@ -1,8 +1,8 @@ -package io.coderate.accurest.builder +package io.codearte.accurest.builder -import io.coderate.accurest.config.AccurestConfigProperties -import io.coderate.accurest.config.TestFramework -import io.coderate.accurest.util.NamesUtil +import io.codearte.accurest.config.AccurestConfigProperties +import io.codearte.accurest.config.TestFramework +import io.codearte.accurest.util.NamesUtil /** * @author Jakub Kubrynski diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/builder/JUnitMethodBodyBuilder.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMethodBodyBuilder.groovy similarity index 90% rename from accurest-core/src/main/groovy/io/coderate/accurest/builder/JUnitMethodBodyBuilder.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMethodBodyBuilder.groovy index b81628533b..0f31ff8eb8 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/builder/JUnitMethodBodyBuilder.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMethodBodyBuilder.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.builder +package io.codearte.accurest.builder /** * @author Jakub Kubrynski diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/builder/MethodBuilder.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/builder/MethodBuilder.groovy similarity index 86% rename from accurest-core/src/main/groovy/io/coderate/accurest/builder/MethodBuilder.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/builder/MethodBuilder.groovy index 1695856b27..dd791fb666 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/builder/MethodBuilder.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/builder/MethodBuilder.groovy @@ -1,9 +1,9 @@ -package io.coderate.accurest.builder +package io.codearte.accurest.builder import groovy.util.logging.Slf4j -import io.coderate.accurest.config.TestFramework -import io.coderate.accurest.dsl.GroovyDsl -import io.coderate.accurest.util.NamesUtil +import io.codearte.accurest.config.TestFramework +import io.codearte.accurest.dsl.GroovyDsl +import io.codearte.accurest.util.NamesUtil /** * @author Jakub Kubrynski diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/builder/SpockMethodBodyBuilder.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/builder/SpockMethodBodyBuilder.groovy similarity index 96% rename from accurest-core/src/main/groovy/io/coderate/accurest/builder/SpockMethodBodyBuilder.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/builder/SpockMethodBodyBuilder.groovy index f8b9a62eff..25ebd02b99 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/builder/SpockMethodBodyBuilder.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/builder/SpockMethodBodyBuilder.groovy @@ -1,9 +1,9 @@ -package io.coderate.accurest.builder +package io.codearte.accurest.builder import groovy.json.JsonOutput import groovy.transform.PackageScope -import io.coderate.accurest.dsl.GroovyDsl -import io.coderate.accurest.dsl.internal.Header +import io.codearte.accurest.dsl.GroovyDsl +import io.codearte.accurest.dsl.internal.Header /** * @author Jakub Kubrynski diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/config/AccurestConfigProperties.groovy similarity index 95% rename from accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/config/AccurestConfigProperties.groovy index ec95b667b1..965f3bf84a 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/config/AccurestConfigProperties.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.config +package io.codearte.accurest.config /** * @author Jakub Kubrynski */ diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/config/TestFramework.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/config/TestFramework.groovy similarity index 96% rename from accurest-core/src/main/groovy/io/coderate/accurest/config/TestFramework.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/config/TestFramework.groovy index af5af4a47c..79758327f3 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/config/TestFramework.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/config/TestFramework.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.config +package io.codearte.accurest.config /** * @author Jakub Kubrynski diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/config/TestMode.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/config/TestMode.groovy similarity index 66% rename from accurest-core/src/main/groovy/io/coderate/accurest/config/TestMode.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/config/TestMode.groovy index f5a7b86389..e8a232e37c 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/config/TestMode.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/config/TestMode.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.config +package io.codearte.accurest.config /** * @author Jakub Kubrynski diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/BaseWiremockStubStrategy.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/BaseWiremockStubStrategy.groovy similarity index 93% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/BaseWiremockStubStrategy.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/BaseWiremockStubStrategy.groovy index c297a8757b..77866f1437 100755 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/BaseWiremockStubStrategy.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/BaseWiremockStubStrategy.groovy @@ -1,10 +1,10 @@ -package io.coderate.accurest.dsl +package io.codearte.accurest.dsl import groovy.json.JsonOutput import groovy.json.JsonSlurper import groovy.transform.TypeChecked import groovy.xml.XmlUtil -import io.coderate.accurest.dsl.internal.Header -import io.coderate.accurest.dsl.internal.Headers +import io.codearte.accurest.dsl.internal.Header +import io.codearte.accurest.dsl.internal.Headers import java.util.regex.Pattern diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/GroovyDsl.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/GroovyDsl.groovy similarity index 84% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/GroovyDsl.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/GroovyDsl.groovy index 6b2e9bbbc6..717047341d 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/GroovyDsl.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/GroovyDsl.groovy @@ -1,10 +1,10 @@ -package io.coderate.accurest.dsl +package io.codearte.accurest.dsl import groovy.transform.EqualsAndHashCode import groovy.transform.ToString import groovy.transform.TypeChecked -import io.coderate.accurest.dsl.internal.Request -import io.coderate.accurest.dsl.internal.Response +import io.codearte.accurest.dsl.internal.Request +import io.codearte.accurest.dsl.internal.Response @TypeChecked @EqualsAndHashCode(includeFields = true) diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/WiremockRequestStubStrategy.groovy similarity index 89% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/WiremockRequestStubStrategy.groovy index 02b78deb3e..02d7497a9c 100755 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/WiremockRequestStubStrategy.groovy @@ -1,9 +1,9 @@ -package io.coderate.accurest.dsl +package io.codearte.accurest.dsl import groovy.transform.PackageScope import groovy.transform.TypeChecked -import io.coderate.accurest.dsl.internal.ClientRequest -import io.coderate.accurest.dsl.internal.Request +import io.codearte.accurest.dsl.internal.ClientRequest +import io.codearte.accurest.dsl.internal.Request import java.util.regex.Pattern diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockResponseStubStrategy.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/WiremockResponseStubStrategy.groovy similarity index 86% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockResponseStubStrategy.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/WiremockResponseStubStrategy.groovy index 4c905bf4dc..e0b7556547 100755 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockResponseStubStrategy.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/WiremockResponseStubStrategy.groovy @@ -1,8 +1,8 @@ -package io.coderate.accurest.dsl +package io.codearte.accurest.dsl import groovy.transform.PackageScope import groovy.transform.TypeChecked -import io.coderate.accurest.dsl.internal.ClientResponse -import io.coderate.accurest.dsl.internal.Response +import io.codearte.accurest.dsl.internal.ClientResponse +import io.codearte.accurest.dsl.internal.Response @TypeChecked @PackageScope diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockStubStrategy.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/WiremockStubStrategy.groovy similarity index 95% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockStubStrategy.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/WiremockStubStrategy.groovy index b6f1bcdf4b..a4bf3ee9c4 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockStubStrategy.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/WiremockStubStrategy.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl +package io.codearte.accurest.dsl import groovy.json.JsonOutput import groovy.transform.CompileStatic diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Body.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Body.groovy similarity index 97% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Body.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Body.groovy index e5ec6a36f2..5e8d46ed98 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Body.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Body.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl.internal +package io.codearte.accurest.dsl.internal import groovy.json.JsonSlurper import groovy.transform.EqualsAndHashCode diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/ClientDslProperty.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/ClientDslProperty.groovy similarity index 80% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/ClientDslProperty.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/ClientDslProperty.groovy index 7b8525a078..007550b890 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/ClientDslProperty.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/ClientDslProperty.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl.internal +package io.codearte.accurest.dsl.internal import groovy.transform.CompileStatic diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Common.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Common.groovy similarity index 97% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Common.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Common.groovy index 934f98c2f5..f6eb65ab9e 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Common.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Common.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl.internal +package io.codearte.accurest.dsl.internal import groovy.transform.PackageScope import groovy.transform.TypeChecked diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/DslProperty.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/DslProperty.groovy similarity index 92% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/DslProperty.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/DslProperty.groovy index 6887ffc88c..f9da9227e5 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/DslProperty.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/DslProperty.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl.internal +package io.codearte.accurest.dsl.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Header.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Header.groovy similarity index 93% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Header.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Header.groovy index 90de0873f8..a7eefa180a 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Header.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Header.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl.internal +package io.codearte.accurest.dsl.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode import groovy.transform.ToString diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Headers.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Headers.groovy similarity index 94% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Headers.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Headers.groovy index be6f90c66f..d9c1bc85b7 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Headers.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Headers.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl.internal +package io.codearte.accurest.dsl.internal import groovy.transform.EqualsAndHashCode import groovy.transform.ToString diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/JSONCompareMode.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/JSONCompareMode.groovy similarity index 63% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/JSONCompareMode.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/JSONCompareMode.groovy index d4e7e3e15f..8929aa9bdc 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/JSONCompareMode.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/JSONCompareMode.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl.internal +package io.codearte.accurest.dsl.internal enum JSONCompareMode { STRICT, LENIENT, NON_EXTENSIBLE, STRICT_ORDER diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Request.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Request.groovy similarity index 97% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Request.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Request.groovy index fc1a4a58d9..77652a9396 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Request.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Request.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl.internal +package io.codearte.accurest.dsl.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode import groovy.transform.ToString diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Response.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Response.groovy similarity index 97% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Response.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Response.groovy index bb9a224de8..ce8a7b3b7d 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Response.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Response.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl.internal +package io.codearte.accurest.dsl.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/ServerDslProperty.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/ServerDslProperty.groovy similarity index 88% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/ServerDslProperty.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/ServerDslProperty.groovy index 3045736f1b..659fba901e 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/ServerDslProperty.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/ServerDslProperty.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl.internal +package io.codearte.accurest.dsl.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Url.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Url.groovy similarity index 89% rename from accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Url.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Url.groovy index a5c49944e3..da91b4a248 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Url.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Url.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.dsl.internal +package io.codearte.accurest.dsl.internal import groovy.transform.EqualsAndHashCode import groovy.transform.ToString diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/util/NamesUtil.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/util/NamesUtil.groovy similarity index 96% rename from accurest-core/src/main/groovy/io/coderate/accurest/util/NamesUtil.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/util/NamesUtil.groovy index f40034e002..4817cc4816 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/util/NamesUtil.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/util/NamesUtil.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.util +package io.codearte.accurest.util /** * @author Jakub Kubrynski diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/util/StubMappingConverter.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/util/StubMappingConverter.groovy similarity index 97% rename from accurest-core/src/main/groovy/io/coderate/accurest/util/StubMappingConverter.groovy rename to accurest-core/src/main/groovy/io/codearte/accurest/util/StubMappingConverter.groovy index 439224eccd..f1ce59959f 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/util/StubMappingConverter.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/util/StubMappingConverter.groovy @@ -1,4 +1,4 @@ -package io.coderate.accurest.util +package io.codearte.accurest.util import groovy.json.JsonException import groovy.json.JsonSlurper diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/GeneratorScannerSpec.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/GeneratorScannerSpec.groovy index 97aa6df799..6a478e3d92 100644 --- a/accurest-core/src/test/groovy/io/codearte/accurest/GeneratorScannerSpec.groovy +++ b/accurest-core/src/test/groovy/io/codearte/accurest/GeneratorScannerSpec.groovy @@ -1,9 +1,6 @@ package io.codearte.accurest -import io.coderate.accurest.FileSaver -import io.coderate.accurest.SingleTestGenerator -import io.coderate.accurest.TestGenerator -import io.coderate.accurest.config.AccurestConfigProperties +import io.codearte.accurest.config.AccurestConfigProperties import spock.lang.Specification class GeneratorScannerSpec extends Specification { diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/MainTest.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/MainTest.groovy index 4f16ddde86..4bdc8e9cc8 100644 --- a/accurest-core/src/test/groovy/io/codearte/accurest/MainTest.groovy +++ b/accurest-core/src/test/groovy/io/codearte/accurest/MainTest.groovy @@ -1,9 +1,8 @@ package io.codearte.accurest -import io.coderate.accurest.TestGenerator -import io.coderate.accurest.config.AccurestConfigProperties -import io.coderate.accurest.config.TestFramework -import io.coderate.accurest.config.TestMode +import io.codearte.accurest.config.AccurestConfigProperties +import io.codearte.accurest.config.TestFramework +import io.codearte.accurest.config.TestMode class MainTest { public static void main(String[] args) { diff --git a/accurest-core/src/test/groovy/io/coderate/accurest/builder/SpockMethodBuilderSpec.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/builder/SpockMethodBuilderSpec.groovy similarity index 97% rename from accurest-core/src/test/groovy/io/coderate/accurest/builder/SpockMethodBuilderSpec.groovy rename to accurest-core/src/test/groovy/io/codearte/accurest/builder/SpockMethodBuilderSpec.groovy index aa4d4547d0..c68a96a1e6 100644 --- a/accurest-core/src/test/groovy/io/coderate/accurest/builder/SpockMethodBuilderSpec.groovy +++ b/accurest-core/src/test/groovy/io/codearte/accurest/builder/SpockMethodBuilderSpec.groovy @@ -1,6 +1,6 @@ -package io.coderate.accurest.builder +package io.codearte.accurest.builder -import io.coderate.accurest.dsl.GroovyDsl +import io.codearte.accurest.dsl.GroovyDsl import spock.lang.Specification /** diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslResponseSpec.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslResponseSpec.groovy index ae33f3ccdc..13299ceebe 100644 --- a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslResponseSpec.groovy +++ b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslResponseSpec.groovy @@ -1,8 +1,6 @@ package io.codearte.accurest.dsl import groovy.json.JsonSlurper -import io.coderate.accurest.dsl.GroovyDsl -import io.coderate.accurest.dsl.WiremockResponseStubStrategy import spock.lang.Specification class WiremockGroovyDslResponseSpec extends Specification { diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy index a5db188554..2a2c500a3a 100755 --- a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy +++ b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy @@ -1,8 +1,5 @@ package io.codearte.accurest.dsl import groovy.json.JsonSlurper -import io.coderate.accurest.dsl.GroovyDsl -import io.coderate.accurest.dsl.WiremockRequestStubStrategy -import io.coderate.accurest.dsl.WiremockStubStrategy import spock.lang.Specification class WiremockGroovyDslSpec extends Specification { diff --git a/accurest-core/src/test/resources/dsl/basic/sampleDsl.groovy b/accurest-core/src/test/resources/dsl/basic/sampleDsl.groovy index 7200a71dae..95d19e6b87 100644 --- a/accurest-core/src/test/resources/dsl/basic/sampleDsl.groovy +++ b/accurest-core/src/test/resources/dsl/basic/sampleDsl.groovy @@ -1,4 +1,4 @@ -io.coderate.accurest.dsl.GroovyDsl.make { +io.codearte.accurest.dsl.GroovyDsl.make { request { method('PUT') headers { diff --git a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy index 1e90009be0..cee3f48357 100644 --- a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy +++ b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy @@ -1,6 +1,6 @@ package io.codearte.accurest.plugin -import io.coderate.accurest.config.AccurestConfigProperties +import io.codearte.accurest.config.AccurestConfigProperties import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.Task diff --git a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy index 9cf7c64a2e..d6fe06a9fd 100644 --- a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy +++ b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy @@ -1,8 +1,8 @@ package io.codearte.accurest.plugin -import io.coderate.accurest.AccurestException -import io.coderate.accurest.TestGenerator -import io.coderate.accurest.config.AccurestConfigProperties +import io.codearte.accurest.AccurestException +import io.codearte.accurest.TestGenerator +import io.codearte.accurest.config.AccurestConfigProperties import org.gradle.api.GradleException import org.gradle.api.internal.ConventionTask import org.gradle.api.tasks.InputDirectory diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/com/ofg/twitter-places-analyzer/pairId/colleratePlacesFromTweet.groovy b/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/com/ofg/twitter-places-analyzer/pairId/colleratePlacesFromTweet.groovy index 767b51797e..08b137a054 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/com/ofg/twitter-places-analyzer/pairId/colleratePlacesFromTweet.groovy +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/com/ofg/twitter-places-analyzer/pairId/colleratePlacesFromTweet.groovy @@ -1,4 +1,4 @@ -io.coderate.accurest.dsl.GroovyDsl.make { +io.codearte.accurest.dsl.GroovyDsl.make { request { method 'PUT' url '/api/12'