diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..0ab96ff --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,14 @@ +name: Build mockserver +on: [push] +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'temurin' + - name: Build with Maven + run: ./mvnw package \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index f3283b0..7d02699 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.6.3/apache-maven-3.6.3-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-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/.woodpecker.yaml b/.woodpecker.yaml deleted file mode 100644 index 5921e36..0000000 --- a/.woodpecker.yaml +++ /dev/null @@ -1,59 +0,0 @@ -variables: - &maven_image maven:3.9.6-eclipse-temurin-11-alpine - -when: - evaluate: 'not (CI_COMMIT_MESSAGE contains "Release")' - -steps: - - name: build - image: *maven_image - commands: - - mvn -B clean install -DskipTests -Dmaven.test.skip - - name: test - image: *maven_image - commands: - - mvn -B -pl :mockserver-tests verify - - name: deploy to public - image: *maven_image - commands: - - mvn -B jar:jar deploy:deploy - secrets: [reposilite_user, reposilite_token] - when: - branch: [dev, master] - - name: deploy to releases - image: woodpeckerci/plugin-gitea-release - settings: - base-url: https://git.ztsh.eu - files: - - "mockserver-client/target/mockserver-client*.jar" - - "mockserver/target/mockserver-full.jar" - api_key: - from_secret: git_pat - when: - - event: tag - - name: tag docker image - image: woodpeckerci/plugin-docker-buildx - settings: - platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x - repo: ztsheu/http-mock-server - registry: docker.io - tags: ${CI_COMMIT_TAG} - username: ztsheu - password: - from_secret: docker_pat - when: - - event: tag - - name: build docker image - image: woodpeckerci/plugin-docker-buildx - settings: - platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x - repo: ztsheu/http-mock-server - registry: docker.io - tags: latest - username: ztsheu - password: - from_secret: docker_pat - when: - - event: tag - - event: push - branch: dev diff --git a/Dockerfile b/Dockerfile index 3250eed..87dd9dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:11.0.22_7-jre-jammy +FROM java:8 ADD mockserver/target/mockserver-full.jar /mockserver.jar @@ -8,4 +8,4 @@ RUN mkdir /externalSchema VOLUME /externalSchema -CMD java -cp /mockserver.jar:/externalSchema eu.ztsh.mockserver.server.Main +CMD java -cp /mockserver.jar:/externalSchema pl.touk.mockserver.server.Main diff --git a/README.md b/README.md index cb67c96..a8336d3 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ docker-compose up -d ### Docker repoository -Currently unavailable +Built image is available at https://hub.docker.com/r/alien11689/mockserver/ Create mock on server --------------------- @@ -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.ztsh.eu`. +Mockserver is available at `philanthropist.touk.pl`. Just add repository to maven pom: @@ -436,7 +436,7 @@ Just add repository to maven pom: ... touk - https://philanthropist.ztsh.eu/nexus/content/repositories/releases + https://philanthropist.touk.pl/nexus/content/repositories/releases ... diff --git a/mockserver-api/pom.xml b/mockserver-api/pom.xml index de5029a..47ee838 100644 --- a/mockserver-api/pom.xml +++ b/mockserver-api/pom.xml @@ -1,21 +1,15 @@ - - 4.0.0 - + - eu.ztsh.mockserver http-mock-server - 3.0.0-SNAPSHOT + pl.touk.mockserver + 2.8.4 + 4.0.0 mockserver-api - - jakarta.xml.bind - jakarta.xml.bind-api - org.projectlombok lombok @@ -24,9 +18,19 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.8 + 1.8 + + org.codehaus.mojo jaxb2-maven-plugin + 2.2 xjc diff --git a/mockserver-api/src/main/xjb/binding.xjb b/mockserver-api/src/main/xjb/binding.xjb index fdf2585..a735d24 100644 --- a/mockserver-api/src/main/xjb/binding.xjb +++ b/mockserver-api/src/main/xjb/binding.xjb @@ -1,9 +1,10 @@ - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/common.xsd b/mockserver-api/src/main/xsd/pl/touk/mockserver/api/common.xsd similarity index 95% rename from mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/common.xsd rename to mockserver-api/src/main/xsd/pl/touk/mockserver/api/common.xsd index 6dac2a9..4b084dd 100644 --- a/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/common.xsd +++ b/mockserver-api/src/main/xsd/pl/touk/mockserver/api/common.xsd @@ -1,5 +1,5 @@ - + diff --git a/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/request.xsd b/mockserver-api/src/main/xsd/pl/touk/mockserver/api/request.xsd similarity index 90% rename from mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/request.xsd rename to mockserver-api/src/main/xsd/pl/touk/mockserver/api/request.xsd index 891aebf..25287c8 100644 --- a/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/request.xsd +++ b/mockserver-api/src/main/xsd/pl/touk/mockserver/api/request.xsd @@ -1,7 +1,7 @@ - + - + diff --git a/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/response.xsd b/mockserver-api/src/main/xsd/pl/touk/mockserver/api/response.xsd similarity index 95% rename from mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/response.xsd rename to mockserver-api/src/main/xsd/pl/touk/mockserver/api/response.xsd index 66d4566..1f96dc8 100644 --- a/mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/response.xsd +++ b/mockserver-api/src/main/xsd/pl/touk/mockserver/api/response.xsd @@ -1,7 +1,7 @@ - + - + diff --git a/mockserver-client/pom.xml b/mockserver-client/pom.xml index cb7acfb..0cef548 100644 --- a/mockserver-client/pom.xml +++ b/mockserver-client/pom.xml @@ -1,44 +1,30 @@ - - 4.0.0 - + - eu.ztsh.mockserver http-mock-server - 3.0.0-SNAPSHOT + pl.touk.mockserver + 2.8.4 + 4.0.0 mockserver-client + + clean install + - eu.ztsh.mockserver - mockserver-api - - - - org.apache.groovy + org.codehaus.groovy groovy - org.apache.groovy + org.codehaus.groovy groovy-json - org.apache.groovy + org.codehaus.groovy groovy-xml - - - org.glassfish.jaxb - jaxb-core - - - org.glassfish.jaxb - jaxb-runtime - - org.apache.httpcomponents httpclient @@ -47,15 +33,9 @@ org.apache.commons commons-lang3 + + pl.touk.mockserver + mockserver-api + - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - - diff --git a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockDefinition.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockDefinition.groovy similarity index 86% rename from mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockDefinition.groovy rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockDefinition.groovy index a39ef77..f95b584 100644 --- a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockDefinition.groovy +++ b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockDefinition.groovy @@ -1,4 +1,4 @@ -package eu.ztsh.mockserver.client +package pl.touk.mockserver.client import groovy.transform.CompileStatic import groovy.transform.TypeChecked diff --git a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockRequestSchema.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockRequestSchema.groovy similarity index 82% rename from mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockRequestSchema.groovy rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockRequestSchema.groovy index b1de96f..ff3d401 100644 --- a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockRequestSchema.groovy +++ b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockRequestSchema.groovy @@ -1,4 +1,4 @@ -package eu.ztsh.mockserver.client +package pl.touk.mockserver.client import groovy.transform.CompileStatic import groovy.transform.TypeChecked diff --git a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockAlreadyExists.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy similarity index 82% rename from mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockAlreadyExists.groovy rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy index 40d5dce..f0c00a9 100644 --- a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockAlreadyExists.groovy +++ b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy @@ -1,4 +1,4 @@ -package eu.ztsh.mockserver.client +package pl.touk.mockserver.client import groovy.transform.CompileStatic import groovy.transform.TypeChecked diff --git a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockDoesNotExist.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy similarity index 82% rename from mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockDoesNotExist.groovy rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy index fe93dc0..02d0bee 100644 --- a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockDoesNotExist.groovy +++ b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy @@ -1,4 +1,4 @@ -package eu.ztsh.mockserver.client +package pl.touk.mockserver.client import groovy.transform.CompileStatic import groovy.transform.TypeChecked diff --git a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/RemoteMockServer.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/RemoteMockServer.groovy similarity index 85% rename from mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/RemoteMockServer.groovy rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/RemoteMockServer.groovy index f594614..91ebc33 100644 --- a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/RemoteMockServer.groovy +++ b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/RemoteMockServer.groovy @@ -1,4 +1,4 @@ -package eu.ztsh.mockserver.client +package pl.touk.mockserver.client import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpGet @@ -7,17 +7,17 @@ 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 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 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 jakarta.xml.bind.JAXBContext +import javax.xml.bind.JAXBContext class RemoteMockServer { private final String address diff --git a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/Util.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy similarity index 88% rename from mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/Util.groovy rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy index e79e0c3..3a427d6 100644 --- a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/Util.groovy +++ b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy @@ -1,18 +1,17 @@ -package eu.ztsh.mockserver.client +package pl.touk.mockserver.client import groovy.json.JsonSlurper import groovy.transform.CompileStatic import groovy.transform.TypeChecked -import groovy.xml.XmlSlurper -import groovy.xml.slurpersupport.GPathResult +import groovy.util.slurpersupport.GPathResult import org.apache.http.HttpEntity import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.util.EntityUtils -import eu.ztsh.mockserver.api.response.ExceptionOccured -import eu.ztsh.mockserver.api.response.MockAdded -import eu.ztsh.mockserver.api.response.MockServerResponse +import pl.touk.mockserver.api.response.ExceptionOccured +import pl.touk.mockserver.api.response.MockAdded +import pl.touk.mockserver.api.response.MockServerResponse -import jakarta.xml.bind.JAXBContext +import javax.xml.bind.JAXBContext @CompileStatic @TypeChecked diff --git a/mockserver-tests/pom.xml b/mockserver-tests/pom.xml index 2506a7a..87a06b0 100644 --- a/mockserver-tests/pom.xml +++ b/mockserver-tests/pom.xml @@ -1,36 +1,27 @@ - - 4.0.0 - + http-mock-server - eu.ztsh.mockserver - 3.0.0-SNAPSHOT + pl.touk.mockserver + 2.8.4 + 4.0.0 mockserver-tests + + clean install + + - eu.ztsh.mockserver - mockserver - - - eu.ztsh.mockserver - mockserver-client - - - - org.apache.groovy + org.codehaus.groovy groovy - - org.apache.httpcomponents - httpclient + org.spockframework + spock-core - org.slf4j slf4j-api @@ -39,30 +30,24 @@ ch.qos.logback logback-core - - org.spockframework - spock-core + org.apache.httpcomponents + httpclient + + + pl.touk.mockserver + mockserver + ${project.version} + + + pl.touk.mockserver + mockserver-client + ${project.version} + + + info.solidsoft.spock + spock-global-unroll - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - 3.2.5 - - - **/*Test.java - - - - - - diff --git a/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerHttpsTest.groovy b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy similarity index 93% rename from mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerHttpsTest.groovy rename to mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy index e1ecd95..58c922e 100644 --- a/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerHttpsTest.groovy +++ b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy @@ -1,11 +1,6 @@ -package eu.ztsh.mockserver.tests +package pl.touk.mockserver.tests -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 groovy.xml.slurpersupport.GPathResult +import groovy.util.slurpersupport.GPathResult import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpPost import org.apache.http.conn.ssl.SSLConnectionSocketFactory @@ -14,6 +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 spock.lang.AutoCleanup import spock.lang.Ignore import spock.lang.Shared @@ -23,7 +23,7 @@ import javax.net.ssl.SSLContext import javax.net.ssl.SSLHandshakeException import java.security.KeyStore -@Ignore +@Ignore('Upgrade of Java needed') class MockServerHttpsTest extends Specification { RemoteMockServer remoteMockServer = new RemoteMockServer('localhost', 19000) @@ -48,7 +48,6 @@ class MockServerHttpsTest extends Specification { .loadTrustMaterial(trustStore()) .build() - @Ignore("TODO: SSL peer shut down incorrectly") def 'should handle HTTPS server' () { given: remoteMockServer.addMock(new AddMock( @@ -73,7 +72,6 @@ class MockServerHttpsTest extends Specification { restPostResponse.name() == 'goodResponse-request' } - @Ignore("TODO: SSL peer shut down incorrectly") def 'should handle HTTPS server with client auth' () { given: remoteMockServer.addMock(new AddMock( diff --git a/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerIntegrationTest.groovy b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy similarity index 98% rename from mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerIntegrationTest.groovy rename to mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy index 038a143..1ab1dad 100644 --- a/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerIntegrationTest.groovy +++ b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy @@ -1,6 +1,6 @@ -package eu.ztsh.mockserver.tests +package pl.touk.mockserver.tests -import groovy.xml.slurpersupport.GPathResult +import groovy.util.slurpersupport.GPathResult import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpDelete import org.apache.http.client.methods.HttpGet @@ -15,20 +15,19 @@ 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 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 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 spock.lang.AutoCleanup -import spock.lang.Ignore import spock.lang.Specification class MockServerIntegrationTest extends Specification { @@ -66,7 +65,6 @@ class MockServerIntegrationTest extends Specification { remoteMockServer.removeMock('testRest')?.size() == 1 } - @Ignore("TODO: restPostResponse.name()") def "should add working rest mock on endpoint with utf"() { expect: remoteMockServer.addMock(new AddMock( diff --git a/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerMaxUsesTest.groovy b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerMaxUsesTest.groovy similarity index 98% rename from mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerMaxUsesTest.groovy rename to mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerMaxUsesTest.groovy index eda365c..fd21436 100644 --- a/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerMaxUsesTest.groovy +++ b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerMaxUsesTest.groovy @@ -1,4 +1,4 @@ -package eu.ztsh.mockserver.tests +package pl.touk.mockserver.tests import org.apache.http.client.methods.CloseableHttpResponse @@ -7,10 +7,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 eu.ztsh.mockserver.api.request.AddMock -import eu.ztsh.mockserver.client.RemoteMockServer -import eu.ztsh.mockserver.server.HttpMockServer +import pl.touk.mockserver.api.request.AddMock +import pl.touk.mockserver.client.RemoteMockServer +import pl.touk.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 d097048..28d4ca1 100644 --- a/mockserver/pom.xml +++ b/mockserver/pom.xml @@ -1,49 +1,27 @@ - - 4.0.0 - + - eu.ztsh.mockserver http-mock-server - 3.0.0-SNAPSHOT + pl.touk.mockserver + 2.8.4 + 4.0.0 mockserver - eu.ztsh.mockserver - mockserver-api - - - - org.apache.groovy + org.codehaus.groovy groovy - org.apache.groovy + org.codehaus.groovy groovy-json - org.apache.groovy + org.codehaus.groovy groovy-xml - - - org.glassfish.jaxb - jaxb-core - - - org.glassfish.jaxb - jaxb-runtime - - - - org.apache.commons - commons-lang3 - - org.slf4j slf4j-api @@ -56,21 +34,25 @@ ch.qos.logback logback-classic + + org.apache.commons + commons-lang3 + + + pl.touk.mockserver + mockserver-api + clean package assembly:single install - - org.codehaus.gmavenplus - gmavenplus-plugin - maven-assembly-plugin - eu.ztsh.mockserver.server.Main + pl.touk.mockserver.server.Main @@ -79,17 +61,16 @@ mockserver-full false - + - create-archive - package - - single - - - + create-archive + package + + single + + + - diff --git a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/ContextExecutor.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy similarity index 97% rename from mockserver/src/main/groovy/eu/ztsh/mockserver/server/ContextExecutor.groovy rename to mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy index 6023a1c..57aa952 100644 --- a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/ContextExecutor.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy @@ -1,9 +1,9 @@ -package eu.ztsh.mockserver.server +package pl.touk.mockserver.server import com.sun.net.httpserver.HttpExchange import groovy.transform.PackageScope import groovy.util.logging.Slf4j -import eu.ztsh.mockserver.api.common.Method +import pl.touk.mockserver.api.common.Method import java.util.concurrent.CopyOnWriteArrayList diff --git a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpMockServer.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy similarity index 69% rename from mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpMockServer.groovy rename to mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy index eaae94d..f0352ae 100644 --- a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpMockServer.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy @@ -1,32 +1,32 @@ -package eu.ztsh.mockserver.server +package pl.touk.mockserver.server import com.sun.net.httpserver.HttpExchange import groovy.util.logging.Slf4j -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 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 jakarta.xml.bind.JAXBContext +import javax.xml.bind.JAXBContext import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.CopyOnWriteArraySet import java.util.concurrent.Executor import java.util.concurrent.Executors -import static eu.ztsh.mockserver.server.Util.createResponse +import static pl.touk.mockserver.server.Util.createResponse @Slf4j class HttpMockServer { @@ -79,22 +79,22 @@ class HttpMockServer { void listMocks(HttpExchange ex) { Mocks mockListing = new Mocks( - mocks: listMocks().collect { - new MockReport( - name: it.name, - path: it.path, - port: it.port, - predicate: it.predicateClosureText, - response: it.responseClosureText, - responseHeaders: it.responseHeadersClosureText, - soap: it.soap, - method: it.method, - statusCode: it.statusCode as int, - schema: it.schema, - imports: it.imports.collect { new ImportAlias(alias: it.key, fullClassName: it.value) }, - preserveHistory: it.preserveHistory - ) - } + mocks: listMocks().collect { + new MockReport( + name: it.name, + path: it.path, + port: it.port, + predicate: it.predicateClosureText, + response: it.responseClosureText, + responseHeaders: it.responseHeadersClosureText, + soap: it.soap, + method: it.method, + statusCode: it.statusCode as int, + schema: it.schema, + imports: it.imports.collect { new ImportAlias(alias: it.key, fullClassName: it.value) }, + preserveHistory: it.preserveHistory + ) + } ) createResponse(ex, mockListing, 200) } @@ -182,12 +182,12 @@ class HttpMockServer { mock.preserveHistory = co.preserveHistory != false if (co.https) { mock.https = new Https( - keystorePath: co.https.keystorePath ?: null, - keystorePassword: co.https.keystorePassword, - keyPassword: co.https.keyPassword, - truststorePath: co.https.truststorePath, - truststorePassword: co.https.truststorePassword, - requireClientAuth: co.https?.requireClientAuth?.asBoolean() ?: false + keystorePath: co.https.keystorePath ?: null, + keystorePassword: co.https.keystorePassword, + keyPassword: co.https.keyPassword, + truststorePath: co.https.truststorePath, + truststorePassword: co.https.truststorePassword, + requireClientAuth: co.https?.requireClientAuth?.asBoolean() ?: false ) } mock.maxUses = co.maxUses ?: null @@ -217,7 +217,7 @@ class HttpMockServer { mockNames.remove(name) configuration.remove(name) MockRemoved mockRemoved = new MockRemoved( - mockEvents: createMockEventReports(mockEvents) + mockEvents: createMockEventReports(mockEvents) ) createResponse(ex, mockRemoved, 200) } @@ -225,23 +225,23 @@ class HttpMockServer { private static List createMockEventReports(List mockEvents) { return mockEvents.collect { new MockEventReport( - request: new MockRequestReport( - text: it.request.text, - headers: new MockRequestReport.Headers(headers: it.request.headers.collect { - new Parameter(name: it.key, value: it.value) - }), - queryParams: new MockRequestReport.QueryParams(queryParams: it.request.query.collect { - new Parameter(name: it.key, value: it.value) - }), - path: new MockRequestReport.Path(pathParts: it.request.path) - ), - response: new MockResponseReport( - statusCode: it.response.statusCode, - text: it.response.text, - headers: new MockResponseReport.Headers(headers: it.response.headers.collect { - new Parameter(name: it.key, value: it.value) - }) - ) + request: new MockRequestReport( + text: it.request.text, + headers: new MockRequestReport.Headers(headers: it.request.headers.collect { + new Parameter(name: it.key, value: it.value) + }), + queryParams: new MockRequestReport.QueryParams(queryParams: it.request.query.collect { + new Parameter(name: it.key, value: it.value) + }), + path: new MockRequestReport.Path(pathParts: it.request.path) + ), + response: new MockResponseReport( + statusCode: it.response.statusCode, + text: it.response.text, + headers: new MockResponseReport.Headers(headers: it.response.headers.collect { + new Parameter(name: it.key, value: it.value) + }) + ) ) } } @@ -254,7 +254,7 @@ class HttpMockServer { log.trace("Peeking mock $name") List mockEvents = childServers.values().collect { it.peekMock(name) }.flatten() as List MockPeeked mockPeeked = new MockPeeked( - mockEvents: createMockEventReports(mockEvents) + mockEvents: createMockEventReports(mockEvents) ) createResponse(ex, mockPeeked, 200) } diff --git a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpServerWrapper.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy similarity index 97% rename from mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpServerWrapper.groovy rename to mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy index 5d33156..c9e63e9 100644 --- a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpServerWrapper.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy @@ -1,11 +1,11 @@ -package eu.ztsh.mockserver.server +package pl.touk.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 eu.ztsh.mockserver.api.common.Https +import pl.touk.mockserver.api.common.Https import javax.net.ssl.KeyManager import javax.net.ssl.KeyManagerFactory diff --git a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpsConfig.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpsConfig.groovy similarity index 91% rename from mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpsConfig.groovy rename to mockserver/src/main/groovy/pl/touk/mockserver/server/HttpsConfig.groovy index 9d00714..68b5550 100644 --- a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpsConfig.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpsConfig.groovy @@ -1,9 +1,9 @@ -package eu.ztsh.mockserver.server +package pl.touk.mockserver.server import com.sun.net.httpserver.HttpsConfigurator import com.sun.net.httpserver.HttpsParameters import groovy.transform.CompileStatic -import eu.ztsh.mockserver.api.common.Https +import pl.touk.mockserver.api.common.Https import javax.net.ssl.SSLContext import javax.net.ssl.SSLParameters diff --git a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Main.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/Main.groovy similarity index 96% rename from mockserver/src/main/groovy/eu/ztsh/mockserver/server/Main.groovy rename to mockserver/src/main/groovy/pl/touk/mockserver/server/Main.groovy index 916569e..0b8d42a 100644 --- a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Main.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/Main.groovy @@ -1,4 +1,4 @@ -package eu.ztsh.mockserver.server +package pl.touk.mockserver.server import groovy.util.logging.Slf4j diff --git a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Mock.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/Mock.groovy similarity index 98% rename from mockserver/src/main/groovy/eu/ztsh/mockserver/server/Mock.groovy rename to mockserver/src/main/groovy/pl/touk/mockserver/server/Mock.groovy index 821471c..3f0f4fe 100644 --- a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Mock.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/Mock.groovy @@ -1,12 +1,12 @@ -package eu.ztsh.mockserver.server +package pl.touk.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 eu.ztsh.mockserver.api.common.Https -import eu.ztsh.mockserver.api.common.Method +import pl.touk.mockserver.api.common.Https +import pl.touk.mockserver.api.common.Method import javax.xml.XMLConstants import javax.xml.transform.stream.StreamSource diff --git a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockEvent.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockEvent.groovy similarity index 88% rename from mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockEvent.groovy rename to mockserver/src/main/groovy/pl/touk/mockserver/server/MockEvent.groovy index 9c429f1..97a46a2 100644 --- a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockEvent.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockEvent.groovy @@ -1,4 +1,4 @@ -package eu.ztsh.mockserver.server +package pl.touk.mockserver.server import groovy.transform.PackageScope diff --git a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockRequest.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy similarity index 95% rename from mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockRequest.groovy rename to mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy index a714afe..3657131 100644 --- a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockRequest.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy @@ -1,10 +1,9 @@ -package eu.ztsh.mockserver.server +package pl.touk.mockserver.server import com.sun.net.httpserver.Headers import groovy.json.JsonSlurper import groovy.transform.PackageScope -import groovy.xml.XmlSlurper -import groovy.xml.slurpersupport.GPathResult +import groovy.util.slurpersupport.GPathResult import groovy.xml.XmlUtil @PackageScope diff --git a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockResponse.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy similarity index 90% rename from mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockResponse.groovy rename to mockserver/src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy index 260acce..913f9f3 100644 --- a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockResponse.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy @@ -1,4 +1,4 @@ -package eu.ztsh.mockserver.server +package pl.touk.mockserver.server import groovy.transform.PackageScope diff --git a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Util.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/Util.groovy similarity index 89% rename from mockserver/src/main/groovy/eu/ztsh/mockserver/server/Util.groovy rename to mockserver/src/main/groovy/pl/touk/mockserver/server/Util.groovy index c51d1f0..3864afa 100644 --- a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/Util.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/Util.groovy @@ -1,9 +1,9 @@ -package eu.ztsh.mockserver.server +package pl.touk.mockserver.server import com.sun.net.httpserver.HttpExchange -import eu.ztsh.mockserver.api.response.MockAdded +import pl.touk.mockserver.api.response.MockAdded -import jakarta.xml.bind.JAXBContext +import javax.xml.bind.JAXBContext class Util { diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml index e73db5c..c9730a5 100644 --- a/performance-tests/pom.xml +++ b/performance-tests/pom.xml @@ -1,25 +1,25 @@ - 4.0.0 - - eu.ztsh.mockserver http-mock-server - 3.0.0-SNAPSHOT + pl.touk.mockserver + 2.8.4 + 4.0.0 mockserver-performance-tests - eu.ztsh.mockserver + pl.touk.mockserver mockserver + ${project.version} - eu.ztsh.mockserver + pl.touk.mockserver mockserver-client + ${project.version} - org.openjdk.jmh jmh-core diff --git a/performance-tests/src/test/java/eu/ztsh/mockserver/client/MockserverTest.java b/performance-tests/src/test/java/pl/touk/mockserver/client/MockserverTest.java similarity index 95% rename from performance-tests/src/test/java/eu/ztsh/mockserver/client/MockserverTest.java rename to performance-tests/src/test/java/pl/touk/mockserver/client/MockserverTest.java index 2a3b943..233a5f7 100644 --- a/performance-tests/src/test/java/eu/ztsh/mockserver/client/MockserverTest.java +++ b/performance-tests/src/test/java/pl/touk/mockserver/client/MockserverTest.java @@ -1,4 +1,4 @@ -package eu.ztsh.mockserver.client; +package pl.touk.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 eu.ztsh.mockserver.api.request.AddMock; -import eu.ztsh.mockserver.server.HttpMockServer; +import pl.touk.mockserver.api.request.AddMock; +import pl.touk.mockserver.server.HttpMockServer; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/pom.xml b/pom.xml index a981985..360fdec 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,17 @@ - + 4.0.0 - eu.ztsh.mockserver + + pl.touk + top + 1.0.7 + + + pl.touk.mockserver http-mock-server pom - 3.0.0-SNAPSHOT - + 2.8.4 mockserver-client mockserver @@ -17,74 +21,58 @@ - 11 - ${java.version} - ${java.version} UTF-8 - UTF-8 - 4.0.12 + 3.1 + 2.5.7 4.5.13 - 2.2-groovy-4.0 + 1.3-groovy-2.5 3.3.2 1.7.30 - 1.3.12 - 1.18.26 - 4.0.4 + 1.2.9 + 1.16.6 true - 1.37 - 3.0.2 - 3.1.0 + 1.11.2 + 2.5.2 + 1.4 + 0.5.1 + + scm:git:git@github.com:TouK/http-mock-server.git + scm:git:git@github.com:TouK/http-mock-server.git + http-mock-server-2.8.4 + + - eu.ztsh.mockserver - mockserver-api - ${project.version} - - - eu.ztsh.mockserver - mockserver - ${project.version} - - - eu.ztsh.mockserver - mockserver-client - ${project.version} - - - - org.glassfish.jaxb - jaxb-bom - ${jaxb.version} - pom - import - - - - org.apache.groovy + org.codehaus.groovy groovy ${groovy.version} - org.apache.groovy + org.codehaus.groovy groovy-json ${groovy.version} - org.apache.groovy + org.codehaus.groovy groovy-xml ${groovy.version} - org.apache.httpcomponents httpclient ${httpclient.version} + + org.spockframework + spock-core + ${spock-core.version} + test + org.apache.commons commons-lang3 @@ -110,12 +98,10 @@ lombok ${lombok.version} - - org.spockframework - spock-core - ${spock-core.version} - test + pl.touk.mockserver + mockserver-api + ${project.version} org.openjdk.jmh @@ -129,32 +115,63 @@ ${jmh.version} test + + info.solidsoft.spock + spock-global-unroll + ${spock-global-unroll.version} + test + - - - - org.codehaus.mojo - jaxb2-maven-plugin - ${jaxb2-maven-plugin.version} - - - org.codehaus.gmavenplus - gmavenplus-plugin - ${gmavenplus-plugin.version} - - - - compile - compileTests - - - - - - + clean install + + + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + org.codehaus.gmavenplus + gmavenplus-plugin + ${gmavenplus-plugin.version} + + + + compile + testCompile + + + + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + + true + + + + + + Dominik Przybysz + alien11689@gmail.com + + + + + + touk + TouK Open source repository + https://philanthropist.touk.pl/nexus/content/repositories/releases + + +