From 36bc5dd14b831392c83aa17b670f06d51601d418 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 22 Feb 2024 22:42:33 +0100 Subject: [PATCH] Rebranding --- .mvn/wrapper/maven-wrapper.properties | 2 +- Dockerfile | 2 +- README.md | 24 ++++++------ mockserver-api/pom.xml | 4 +- .../ztsh}/mockserver/api/common.xsd | 2 +- .../ztsh}/mockserver/api/request.xsd | 4 +- .../ztsh}/mockserver/api/response.xsd | 4 +- mockserver-client/pom.xml | 6 +-- .../client/InvalidMockDefinition.groovy | 2 +- .../client/InvalidMockRequestSchema.groovy | 2 +- .../client/MockAlreadyExists.groovy | 2 +- .../mockserver/client/MockDoesNotExist.groovy | 2 +- .../mockserver/client/RemoteMockServer.groovy | 20 +++++----- .../ztsh}/mockserver/client/Util.groovy | 8 ++-- mockserver-tests/pom.xml | 8 ++-- .../tests/MockServerHttpsTest.groovy | 12 +++--- .../tests/MockServerIntegrationTest.groovy | 26 ++++++------- .../tests/MockServerMaxUsesTest.groovy | 9 ++--- mockserver/pom.xml | 8 ++-- .../mockserver/server/ContextExecutor.groovy | 4 +- .../mockserver/server/HttpMockServer.groovy | 38 +++++++++---------- .../server/HttpServerWrapper.groovy | 4 +- .../mockserver/server/HttpsConfig.groovy | 4 +- .../ztsh}/mockserver/server/Main.groovy | 2 +- .../ztsh}/mockserver/server/Mock.groovy | 6 +-- .../ztsh}/mockserver/server/MockEvent.groovy | 2 +- .../mockserver/server/MockRequest.groovy | 2 +- .../mockserver/server/MockResponse.groovy | 2 +- .../ztsh}/mockserver/server/Util.groovy | 4 +- performance-tests/pom.xml | 8 ++-- .../mockserver/client/MockserverTest.java | 6 +-- pom.xml | 37 +++--------------- 32 files changed, 120 insertions(+), 146 deletions(-) rename mockserver-api/src/main/xsd/{pl/touk => eu/ztsh}/mockserver/api/common.xsd (95%) rename mockserver-api/src/main/xsd/{pl/touk => eu/ztsh}/mockserver/api/request.xsd (90%) rename mockserver-api/src/main/xsd/{pl/touk => eu/ztsh}/mockserver/api/response.xsd (95%) rename mockserver-client/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/client/InvalidMockDefinition.groovy (86%) rename mockserver-client/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/client/InvalidMockRequestSchema.groovy (82%) rename mockserver-client/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/client/MockAlreadyExists.groovy (82%) rename mockserver-client/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/client/MockDoesNotExist.groovy (82%) rename mockserver-client/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/client/RemoteMockServer.groovy (86%) rename mockserver-client/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/client/Util.groovy (92%) rename mockserver-tests/src/test/groovy/{pl/touk => eu/ztsh}/mockserver/tests/MockServerHttpsTest.groovy (95%) rename mockserver-tests/src/test/groovy/{pl/touk => eu/ztsh}/mockserver/tests/MockServerIntegrationTest.groovy (98%) rename mockserver-tests/src/test/groovy/{pl/touk => eu/ztsh}/mockserver/tests/MockServerMaxUsesTest.groovy (98%) rename mockserver/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/server/ContextExecutor.groovy (97%) rename mockserver/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/server/HttpMockServer.groovy (91%) rename mockserver/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/server/HttpServerWrapper.groovy (97%) rename mockserver/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/server/HttpsConfig.groovy (91%) rename mockserver/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/server/Main.groovy (96%) rename mockserver/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/server/Mock.groovy (98%) rename mockserver/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/server/MockEvent.groovy (88%) rename mockserver/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/server/MockRequest.groovy (98%) rename mockserver/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/server/MockResponse.groovy (90%) rename mockserver/src/main/groovy/{pl/touk => eu/ztsh}/mockserver/server/Util.groovy (92%) rename performance-tests/src/test/java/{pl/touk => eu/ztsh}/mockserver/client/MockserverTest.java (95%) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 7d02699..f3283b0 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/Dockerfile b/Dockerfile index 87dd9dd..6ea2981 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,4 @@ RUN mkdir /externalSchema VOLUME /externalSchema -CMD java -cp /mockserver.jar:/externalSchema pl.touk.mockserver.server.Main +CMD java -cp /mockserver.jar:/externalSchema eu.ztsh.mockserver.server.Main diff --git a/README.md b/README.md index a8336d3..6869c93 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ remoteMockServer.addMock(new AddMock( Send POST request to localhost:/serverControl ```xml - + ... ... ... @@ -200,13 +200,13 @@ In closures input parameter (called req) contains properties: Response if success: ```xml - + ``` Response with error message if failure: ```xml -... +... ``` Peek mock @@ -225,7 +225,7 @@ List mockEvents = remoteMockServer.peekMock('...') Send POST request to localhost:/serverControl ```xml - + ... ``` @@ -233,7 +233,7 @@ Send POST request to localhost:/serverControl Response if success: ```xml - + ... @@ -265,7 +265,7 @@ Response if success: Response with error message if failure: ```xml -... +... ``` Remove mock @@ -284,7 +284,7 @@ List mockEvents = remoteMockServer.removeMock('...', ...) Send POST request to localhost:/serverControl ```xml - + ... ... @@ -293,7 +293,7 @@ Send POST request to localhost:/serverControl Response if success (and skipReport not given or equal false): ```xml - + ... @@ -325,13 +325,13 @@ Response if success (and skipReport not given or equal false): If skipReport is set to true then response will be: ```xml - + ``` Response with error message if failure: ```xml -... +... ``` List mocks definitions @@ -425,7 +425,7 @@ This response could be saved to file and passed as it is during mock server crea Remote repository ----------------- -Mockserver is available at `philanthropist.touk.pl`. +Mockserver is available at `philanthropist.ztsh.eu`. Just add repository to maven pom: @@ -436,7 +436,7 @@ Just add repository to maven pom: ... touk - https://philanthropist.touk.pl/nexus/content/repositories/releases + https://philanthropist.ztsh.eu/nexus/content/repositories/releases ... diff --git a/mockserver-api/pom.xml b/mockserver-api/pom.xml index c48fbca..3b26bf1 100644 --- a/mockserver-api/pom.xml +++ b/mockserver-api/pom.xml @@ -2,8 +2,8 @@ http-mock-server - pl.touk.mockserver - 2.8.5-SNAPSHOT + eu.ztsh.mockserver + 3.0.0-SNAPSHOT 4.0.0 diff --git a/mockserver-api/src/main/xsd/pl/touk/mockserver/api/common.xsd b/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/common.xsd similarity index 95% rename from mockserver-api/src/main/xsd/pl/touk/mockserver/api/common.xsd rename to mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/common.xsd index 4b084dd..6dac2a9 100644 --- a/mockserver-api/src/main/xsd/pl/touk/mockserver/api/common.xsd +++ b/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/common.xsd @@ -1,5 +1,5 @@ - + diff --git a/mockserver-api/src/main/xsd/pl/touk/mockserver/api/request.xsd b/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/request.xsd similarity index 90% rename from mockserver-api/src/main/xsd/pl/touk/mockserver/api/request.xsd rename to mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/request.xsd index 25287c8..891aebf 100644 --- a/mockserver-api/src/main/xsd/pl/touk/mockserver/api/request.xsd +++ b/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/request.xsd @@ -1,7 +1,7 @@ - + - + diff --git a/mockserver-api/src/main/xsd/pl/touk/mockserver/api/response.xsd b/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/response.xsd similarity index 95% rename from mockserver-api/src/main/xsd/pl/touk/mockserver/api/response.xsd rename to mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/response.xsd index 1f96dc8..66d4566 100644 --- a/mockserver-api/src/main/xsd/pl/touk/mockserver/api/response.xsd +++ b/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/response.xsd @@ -1,7 +1,7 @@ - + - + diff --git a/mockserver-client/pom.xml b/mockserver-client/pom.xml index fb10031..ac9bac3 100644 --- a/mockserver-client/pom.xml +++ b/mockserver-client/pom.xml @@ -2,8 +2,8 @@ http-mock-server - pl.touk.mockserver - 2.8.5-SNAPSHOT + eu.ztsh.mockserver + 3.0.0-SNAPSHOT 4.0.0 @@ -34,7 +34,7 @@ commons-lang3 - pl.touk.mockserver + eu.ztsh.mockserver mockserver-api diff --git a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockDefinition.groovy b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockDefinition.groovy similarity index 86% rename from mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockDefinition.groovy rename to mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockDefinition.groovy index f95b584..a39ef77 100644 --- a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockDefinition.groovy +++ b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockDefinition.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.client +package eu.ztsh.mockserver.client import groovy.transform.CompileStatic import groovy.transform.TypeChecked diff --git a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockRequestSchema.groovy b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockRequestSchema.groovy similarity index 82% rename from mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockRequestSchema.groovy rename to mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockRequestSchema.groovy index ff3d401..b1de96f 100644 --- a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockRequestSchema.groovy +++ b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockRequestSchema.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.client +package eu.ztsh.mockserver.client import groovy.transform.CompileStatic import groovy.transform.TypeChecked diff --git a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockAlreadyExists.groovy similarity index 82% rename from mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy rename to mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockAlreadyExists.groovy index f0c00a9..40d5dce 100644 --- a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy +++ b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockAlreadyExists.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.client +package eu.ztsh.mockserver.client import groovy.transform.CompileStatic import groovy.transform.TypeChecked diff --git a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockDoesNotExist.groovy similarity index 82% rename from mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy rename to mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockDoesNotExist.groovy index 02d0bee..fe93dc0 100644 --- a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy +++ b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockDoesNotExist.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.client +package eu.ztsh.mockserver.client import groovy.transform.CompileStatic import groovy.transform.TypeChecked diff --git a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/RemoteMockServer.groovy b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/RemoteMockServer.groovy similarity index 86% rename from mockserver-client/src/main/groovy/pl/touk/mockserver/client/RemoteMockServer.groovy rename to mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/RemoteMockServer.groovy index 91ebc33..8439124 100644 --- a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/RemoteMockServer.groovy +++ b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/RemoteMockServer.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.client +package eu.ztsh.mockserver.client import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpGet @@ -7,15 +7,15 @@ import org.apache.http.entity.ContentType import org.apache.http.entity.StringEntity import org.apache.http.impl.client.CloseableHttpClient import org.apache.http.impl.client.HttpClients -import pl.touk.mockserver.api.request.AddMock -import pl.touk.mockserver.api.request.MockServerRequest -import pl.touk.mockserver.api.request.PeekMock -import pl.touk.mockserver.api.request.RemoveMock -import pl.touk.mockserver.api.response.MockEventReport -import pl.touk.mockserver.api.response.MockPeeked -import pl.touk.mockserver.api.response.MockRemoved -import pl.touk.mockserver.api.response.MockReport -import pl.touk.mockserver.api.response.Mocks +import eu.ztsh.mockserver.api.request.AddMock +import eu.ztsh.mockserver.api.request.MockServerRequest +import eu.ztsh.mockserver.api.request.PeekMock +import eu.ztsh.mockserver.api.request.RemoveMock +import eu.ztsh.mockserver.api.response.MockEventReport +import eu.ztsh.mockserver.api.response.MockPeeked +import eu.ztsh.mockserver.api.response.MockRemoved +import eu.ztsh.mockserver.api.response.MockReport +import eu.ztsh.mockserver.api.response.Mocks import javax.xml.bind.JAXBContext diff --git a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/Util.groovy similarity index 92% rename from mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy rename to mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/Util.groovy index 3a427d6..167cb3b 100644 --- a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy +++ b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/Util.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.client +package eu.ztsh.mockserver.client import groovy.json.JsonSlurper import groovy.transform.CompileStatic @@ -7,9 +7,9 @@ import groovy.util.slurpersupport.GPathResult import org.apache.http.HttpEntity import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.util.EntityUtils -import pl.touk.mockserver.api.response.ExceptionOccured -import pl.touk.mockserver.api.response.MockAdded -import pl.touk.mockserver.api.response.MockServerResponse +import eu.ztsh.mockserver.api.response.ExceptionOccured +import eu.ztsh.mockserver.api.response.MockAdded +import eu.ztsh.mockserver.api.response.MockServerResponse import javax.xml.bind.JAXBContext diff --git a/mockserver-tests/pom.xml b/mockserver-tests/pom.xml index afcfe3c..6adec6e 100644 --- a/mockserver-tests/pom.xml +++ b/mockserver-tests/pom.xml @@ -2,8 +2,8 @@ http-mock-server - pl.touk.mockserver - 2.8.5-SNAPSHOT + eu.ztsh.mockserver + 3.0.0-SNAPSHOT 4.0.0 @@ -35,12 +35,12 @@ httpclient - pl.touk.mockserver + eu.ztsh.mockserver mockserver ${project.version} - pl.touk.mockserver + eu.ztsh.mockserver mockserver-client ${project.version} diff --git a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy b/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerHttpsTest.groovy similarity index 95% rename from mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy rename to mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerHttpsTest.groovy index 58c922e..c83ed6c 100644 --- a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy +++ b/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerHttpsTest.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.tests +package eu.ztsh.mockserver.tests import groovy.util.slurpersupport.GPathResult import org.apache.http.client.methods.CloseableHttpResponse @@ -9,11 +9,11 @@ import org.apache.http.entity.ContentType import org.apache.http.entity.StringEntity import org.apache.http.impl.client.CloseableHttpClient import org.apache.http.impl.client.HttpClients -import pl.touk.mockserver.api.common.Https -import pl.touk.mockserver.api.request.AddMock -import pl.touk.mockserver.client.RemoteMockServer -import pl.touk.mockserver.client.Util -import pl.touk.mockserver.server.HttpMockServer +import eu.ztsh.mockserver.api.common.Https +import eu.ztsh.mockserver.api.request.AddMock +import eu.ztsh.mockserver.client.RemoteMockServer +import eu.ztsh.mockserver.client.Util +import eu.ztsh.mockserver.server.HttpMockServer import spock.lang.AutoCleanup import spock.lang.Ignore import spock.lang.Shared diff --git a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy b/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerIntegrationTest.groovy similarity index 98% rename from mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy rename to mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerIntegrationTest.groovy index 1ab1dad..fc88b53 100644 --- a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy +++ b/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerIntegrationTest.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.tests +package eu.ztsh.mockserver.tests import groovy.util.slurpersupport.GPathResult import org.apache.http.client.methods.CloseableHttpResponse @@ -15,18 +15,18 @@ import org.apache.http.entity.StringEntity import org.apache.http.impl.client.CloseableHttpClient import org.apache.http.impl.client.HttpClients import org.apache.http.util.EntityUtils -import pl.touk.mockserver.api.common.ImportAlias -import pl.touk.mockserver.api.common.Method -import pl.touk.mockserver.api.request.AddMock -import pl.touk.mockserver.api.response.MockEventReport -import pl.touk.mockserver.api.response.MockReport -import pl.touk.mockserver.client.InvalidMockDefinition -import pl.touk.mockserver.client.InvalidMockRequestSchema -import pl.touk.mockserver.client.MockAlreadyExists -import pl.touk.mockserver.client.MockDoesNotExist -import pl.touk.mockserver.client.RemoteMockServer -import pl.touk.mockserver.client.Util -import pl.touk.mockserver.server.HttpMockServer +import eu.ztsh.mockserver.api.common.ImportAlias +import eu.ztsh.mockserver.api.common.Method +import eu.ztsh.mockserver.api.request.AddMock +import eu.ztsh.mockserver.api.response.MockEventReport +import eu.ztsh.mockserver.api.response.MockReport +import eu.ztsh.mockserver.client.InvalidMockDefinition +import eu.ztsh.mockserver.client.InvalidMockRequestSchema +import eu.ztsh.mockserver.client.MockAlreadyExists +import eu.ztsh.mockserver.client.MockDoesNotExist +import eu.ztsh.mockserver.client.RemoteMockServer +import eu.ztsh.mockserver.client.Util +import eu.ztsh.mockserver.server.HttpMockServer import spock.lang.AutoCleanup import spock.lang.Specification diff --git a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerMaxUsesTest.groovy b/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerMaxUsesTest.groovy similarity index 98% rename from mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerMaxUsesTest.groovy rename to mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerMaxUsesTest.groovy index fd21436..eda365c 100644 --- a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerMaxUsesTest.groovy +++ b/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerMaxUsesTest.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.tests +package eu.ztsh.mockserver.tests import org.apache.http.client.methods.CloseableHttpResponse @@ -7,11 +7,10 @@ import org.apache.http.entity.ContentType import org.apache.http.entity.StringEntity import org.apache.http.impl.client.CloseableHttpClient import org.apache.http.impl.client.HttpClients -import pl.touk.mockserver.api.request.AddMock -import pl.touk.mockserver.client.RemoteMockServer -import pl.touk.mockserver.server.HttpMockServer +import eu.ztsh.mockserver.api.request.AddMock +import eu.ztsh.mockserver.client.RemoteMockServer +import eu.ztsh.mockserver.server.HttpMockServer import spock.lang.AutoCleanup -import spock.lang.Shared import spock.lang.Specification class MockServerMaxUsesTest extends Specification { diff --git a/mockserver/pom.xml b/mockserver/pom.xml index 25e8617..750d7d6 100644 --- a/mockserver/pom.xml +++ b/mockserver/pom.xml @@ -2,8 +2,8 @@ http-mock-server - pl.touk.mockserver - 2.8.5-SNAPSHOT + eu.ztsh.mockserver + 3.0.0-SNAPSHOT 4.0.0 @@ -39,7 +39,7 @@ commons-lang3 - pl.touk.mockserver + eu.ztsh.mockserver mockserver-api @@ -52,7 +52,7 @@ - pl.touk.mockserver.server.Main + eu.ztsh.mockserver.server.Main diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/ContextExecutor.groovy similarity index 97% rename from mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy rename to mockserver/src/main/groovy/eu/ztsh/mockserver/server/ContextExecutor.groovy index 57aa952..6023a1c 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy +++ b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/ContextExecutor.groovy @@ -1,9 +1,9 @@ -package pl.touk.mockserver.server +package eu.ztsh.mockserver.server import com.sun.net.httpserver.HttpExchange import groovy.transform.PackageScope import groovy.util.logging.Slf4j -import pl.touk.mockserver.api.common.Method +import eu.ztsh.mockserver.api.common.Method import java.util.concurrent.CopyOnWriteArrayList diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpMockServer.groovy similarity index 91% rename from mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy rename to mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpMockServer.groovy index f0352ae..88c15ce 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy +++ b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpMockServer.groovy @@ -1,24 +1,24 @@ -package pl.touk.mockserver.server +package eu.ztsh.mockserver.server import com.sun.net.httpserver.HttpExchange import groovy.util.logging.Slf4j -import pl.touk.mockserver.api.common.Https -import pl.touk.mockserver.api.common.ImportAlias -import pl.touk.mockserver.api.common.Method -import pl.touk.mockserver.api.request.AddMock -import pl.touk.mockserver.api.request.MockServerRequest -import pl.touk.mockserver.api.request.PeekMock -import pl.touk.mockserver.api.request.RemoveMock -import pl.touk.mockserver.api.response.ExceptionOccured -import pl.touk.mockserver.api.response.MockAdded -import pl.touk.mockserver.api.response.MockEventReport -import pl.touk.mockserver.api.response.MockPeeked -import pl.touk.mockserver.api.response.MockRemoved -import pl.touk.mockserver.api.response.MockReport -import pl.touk.mockserver.api.response.MockRequestReport -import pl.touk.mockserver.api.response.MockResponseReport -import pl.touk.mockserver.api.response.Mocks -import pl.touk.mockserver.api.response.Parameter +import eu.ztsh.mockserver.api.common.Https +import eu.ztsh.mockserver.api.common.ImportAlias +import eu.ztsh.mockserver.api.common.Method +import eu.ztsh.mockserver.api.request.AddMock +import eu.ztsh.mockserver.api.request.MockServerRequest +import eu.ztsh.mockserver.api.request.PeekMock +import eu.ztsh.mockserver.api.request.RemoveMock +import eu.ztsh.mockserver.api.response.ExceptionOccured +import eu.ztsh.mockserver.api.response.MockAdded +import eu.ztsh.mockserver.api.response.MockEventReport +import eu.ztsh.mockserver.api.response.MockPeeked +import eu.ztsh.mockserver.api.response.MockRemoved +import eu.ztsh.mockserver.api.response.MockReport +import eu.ztsh.mockserver.api.response.MockRequestReport +import eu.ztsh.mockserver.api.response.MockResponseReport +import eu.ztsh.mockserver.api.response.Mocks +import eu.ztsh.mockserver.api.response.Parameter import javax.xml.bind.JAXBContext import java.util.concurrent.ConcurrentHashMap @@ -26,7 +26,7 @@ import java.util.concurrent.CopyOnWriteArraySet import java.util.concurrent.Executor import java.util.concurrent.Executors -import static pl.touk.mockserver.server.Util.createResponse +import static eu.ztsh.mockserver.server.Util.createResponse @Slf4j class HttpMockServer { diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpServerWrapper.groovy similarity index 97% rename from mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy rename to mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpServerWrapper.groovy index c9e63e9..5d33156 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy +++ b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpServerWrapper.groovy @@ -1,11 +1,11 @@ -package pl.touk.mockserver.server +package eu.ztsh.mockserver.server import com.sun.net.httpserver.HttpHandler import com.sun.net.httpserver.HttpServer import com.sun.net.httpserver.HttpsServer import groovy.transform.PackageScope import groovy.util.logging.Slf4j -import pl.touk.mockserver.api.common.Https +import eu.ztsh.mockserver.api.common.Https import javax.net.ssl.KeyManager import javax.net.ssl.KeyManagerFactory diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpsConfig.groovy b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpsConfig.groovy similarity index 91% rename from mockserver/src/main/groovy/pl/touk/mockserver/server/HttpsConfig.groovy rename to mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpsConfig.groovy index 68b5550..9d00714 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpsConfig.groovy +++ b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpsConfig.groovy @@ -1,9 +1,9 @@ -package pl.touk.mockserver.server +package eu.ztsh.mockserver.server import com.sun.net.httpserver.HttpsConfigurator import com.sun.net.httpserver.HttpsParameters import groovy.transform.CompileStatic -import pl.touk.mockserver.api.common.Https +import eu.ztsh.mockserver.api.common.Https import javax.net.ssl.SSLContext import javax.net.ssl.SSLParameters diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/Main.groovy b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Main.groovy similarity index 96% rename from mockserver/src/main/groovy/pl/touk/mockserver/server/Main.groovy rename to mockserver/src/main/groovy/eu/ztsh/mockserver/server/Main.groovy index 0b8d42a..916569e 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/Main.groovy +++ b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Main.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.server +package eu.ztsh.mockserver.server import groovy.util.logging.Slf4j diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/Mock.groovy b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Mock.groovy similarity index 98% rename from mockserver/src/main/groovy/pl/touk/mockserver/server/Mock.groovy rename to mockserver/src/main/groovy/eu/ztsh/mockserver/server/Mock.groovy index 3f0f4fe..821471c 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/Mock.groovy +++ b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Mock.groovy @@ -1,12 +1,12 @@ -package pl.touk.mockserver.server +package eu.ztsh.mockserver.server import groovy.transform.EqualsAndHashCode import groovy.transform.PackageScope import groovy.util.logging.Slf4j import org.codehaus.groovy.control.CompilerConfiguration import org.codehaus.groovy.control.customizers.ImportCustomizer -import pl.touk.mockserver.api.common.Https -import pl.touk.mockserver.api.common.Method +import eu.ztsh.mockserver.api.common.Https +import eu.ztsh.mockserver.api.common.Method import javax.xml.XMLConstants import javax.xml.transform.stream.StreamSource diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/MockEvent.groovy b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockEvent.groovy similarity index 88% rename from mockserver/src/main/groovy/pl/touk/mockserver/server/MockEvent.groovy rename to mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockEvent.groovy index 97a46a2..9c429f1 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/MockEvent.groovy +++ b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockEvent.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.server +package eu.ztsh.mockserver.server import groovy.transform.PackageScope diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockRequest.groovy similarity index 98% rename from mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy rename to mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockRequest.groovy index 3657131..4d9fca0 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy +++ b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockRequest.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.server +package eu.ztsh.mockserver.server import com.sun.net.httpserver.Headers import groovy.json.JsonSlurper diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockResponse.groovy similarity index 90% rename from mockserver/src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy rename to mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockResponse.groovy index 913f9f3..260acce 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy +++ b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockResponse.groovy @@ -1,4 +1,4 @@ -package pl.touk.mockserver.server +package eu.ztsh.mockserver.server import groovy.transform.PackageScope diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/Util.groovy b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Util.groovy similarity index 92% rename from mockserver/src/main/groovy/pl/touk/mockserver/server/Util.groovy rename to mockserver/src/main/groovy/eu/ztsh/mockserver/server/Util.groovy index 3864afa..6e72916 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/Util.groovy +++ b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Util.groovy @@ -1,7 +1,7 @@ -package pl.touk.mockserver.server +package eu.ztsh.mockserver.server import com.sun.net.httpserver.HttpExchange -import pl.touk.mockserver.api.response.MockAdded +import eu.ztsh.mockserver.api.response.MockAdded import javax.xml.bind.JAXBContext diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml index 4655442..a16e4e6 100644 --- a/performance-tests/pom.xml +++ b/performance-tests/pom.xml @@ -2,8 +2,8 @@ http-mock-server - pl.touk.mockserver - 2.8.5-SNAPSHOT + eu.ztsh.mockserver + 3.0.0-SNAPSHOT 4.0.0 @@ -11,12 +11,12 @@ - pl.touk.mockserver + eu.ztsh.mockserver mockserver ${project.version} - pl.touk.mockserver + eu.ztsh.mockserver mockserver-client ${project.version} diff --git a/performance-tests/src/test/java/pl/touk/mockserver/client/MockserverTest.java b/performance-tests/src/test/java/eu/ztsh/mockserver/client/MockserverTest.java similarity index 95% rename from performance-tests/src/test/java/pl/touk/mockserver/client/MockserverTest.java rename to performance-tests/src/test/java/eu/ztsh/mockserver/client/MockserverTest.java index 233a5f7..2a3b943 100644 --- a/performance-tests/src/test/java/pl/touk/mockserver/client/MockserverTest.java +++ b/performance-tests/src/test/java/eu/ztsh/mockserver/client/MockserverTest.java @@ -1,4 +1,4 @@ -package pl.touk.mockserver.client; +package eu.ztsh.mockserver.client; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.CloseableHttpResponse; @@ -18,8 +18,8 @@ import org.openjdk.jmh.annotations.TearDown; import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; import org.openjdk.jmh.infra.ThreadParams; -import pl.touk.mockserver.api.request.AddMock; -import pl.touk.mockserver.server.HttpMockServer; +import eu.ztsh.mockserver.api.request.AddMock; +import eu.ztsh.mockserver.server.HttpMockServer; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/pom.xml b/pom.xml index c35c484..0847141 100644 --- a/pom.xml +++ b/pom.xml @@ -1,17 +1,13 @@ - + 4.0.0 - - pl.touk - top - 1.0.7 - - - pl.touk.mockserver + eu.ztsh.mockserver http-mock-server pom - 2.8.5-SNAPSHOT + 3.0.0-SNAPSHOT + mockserver-client mockserver @@ -39,12 +35,6 @@ 0.5.1 - - scm:git:git@github.com:TouK/http-mock-server.git - scm:git:git@github.com:TouK/http-mock-server.git - HEAD - - @@ -99,7 +89,7 @@ ${lombok.version} - pl.touk.mockserver + eu.ztsh.mockserver mockserver-api ${project.version} @@ -159,19 +149,4 @@ - - - Dominik Przybysz - alien11689@gmail.com - - - - - - touk - TouK Open source repository - https://philanthropist.touk.pl/nexus/content/repositories/releases - - -