stawros/http-mock-server
1
0
Fork 0
Code Releases Packages Activity

Compare commits

base: stawros:dev
Branches Tags
stawros:dev
stawros:master
stawros:mockserver
stawros:logback
stawros:max.uses.history
stawros:https
stawros:http-mock-server-2.8.4
stawros:http-mock-server-2.8.3
stawros:http-mock-server-2.8.2
stawros:http-mock-server-2.8.1
stawros:http-mock-server-2.8.0
stawros:http-mock-server-2.7.0
stawros:http-mock-server-2.6.1
stawros:http-mock-server-2.6.0
stawros:http-mock-server-2.5.1
stawros:http-mock-server-2.5.0
stawros:http-mock-server-2.4.0
stawros:http-mock-server-2.3.0
stawros:http-mock-server-2.2.0
stawros:http-mock-server-2.1.1
stawros:http-mock-server-2.1.0
stawros:http-mock-server-2.0.0
stawros:http-mock-server-1.1.0
stawros:http-mock-server-1.0.5
stawros:http-mock-server-1.0.4
stawros:http-mock-server-1.0.3
stawros:http-mock-server-1.0.2
stawros:http-mock-server-1.0.1.1.beta
stawros:http-mock-server-1.0.1.beta
stawros:http-mock-server-1.0.0-beta
stawros:http-mock-server-1.0.0
..
compare: stawros:http-mock-server-2.8.4
Branches Tags
stawros:dev
stawros:master
stawros:mockserver
stawros:logback
stawros:max.uses.history
stawros:https
stawros:http-mock-server-2.8.4
stawros:http-mock-server-2.8.3
stawros:http-mock-server-2.8.2
stawros:http-mock-server-2.8.1
stawros:http-mock-server-2.8.0
stawros:http-mock-server-2.7.0
stawros:http-mock-server-2.6.1
stawros:http-mock-server-2.6.0
stawros:http-mock-server-2.5.1
stawros:http-mock-server-2.5.0
stawros:http-mock-server-2.4.0
stawros:http-mock-server-2.3.0
stawros:http-mock-server-2.2.0
stawros:http-mock-server-2.1.1
stawros:http-mock-server-2.1.0
stawros:http-mock-server-2.0.0
stawros:http-mock-server-1.1.0
stawros:http-mock-server-1.0.5
stawros:http-mock-server-1.0.4
stawros:http-mock-server-1.0.3
stawros:http-mock-server-1.0.2
stawros:http-mock-server-1.0.1.1.beta
stawros:http-mock-server-1.0.1.beta
stawros:http-mock-server-1.0.0-beta
stawros:http-mock-server-1.0.0

No commits in common. "dev" and "http-mock-server-2.8.4" have entirely different histories.
dev ... http-mock-

35 changed files with 349 additions and 431 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/build.yml vendored Normal file
View file

@ -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

2
.mvn/wrapper/maven-wrapper.properties vendored
View file

@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the # KIND, either express or implied. See the License for the
# specific language governing permissions and limitations # specific language governing permissions and limitations
# under the License. # 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 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

59
.woodpecker.yaml
View file

@ -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

4
Dockerfile
View file

@ -1,4 +1,4 @@
FROM eclipse-temurin:11.0.22_7-jre-jammy FROM java:8
ADD mockserver/target/mockserver-full.jar /mockserver.jar ADD mockserver/target/mockserver-full.jar /mockserver.jar
@ -8,4 +8,4 @@ RUN mkdir /externalSchema
VOLUME /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

26
README.md
View file

@ -94,7 +94,7 @@ docker-compose up -d
### Docker repoository ### Docker repoository
Currently unavailable Built image is available at https://hub.docker.com/r/alien11689/mockserver/
Create mock on server Create mock on server
--------------------- ---------------------
@ -132,7 +132,7 @@ remoteMockServer.addMock(new AddMock(
Send POST request to localhost:<PORT>/serverControl Send POST request to localhost:<PORT>/serverControl
```xml ```xml
<addMock xmlns="http://ztsh.eu/mockserver/api/request"> <addMock xmlns="http://touk.pl/mockserver/api/request">
<name>...</name> <name>...</name>
<path>...</path> <path>...</path>
<port>...</port> <port>...</port>
@ -200,13 +200,13 @@ In closures input parameter (called req) contains properties:
Response if success: Response if success:
```xml ```xml
<mockAdded xmlns="http://ztsh.eu/mockserver/api/response"/> <mockAdded xmlns="http://touk.pl/mockserver/api/response"/>
``` ```
Response with error message if failure: Response with error message if failure:
```xml ```xml
<exceptionOccured xmlns="http://ztsh.eu/mockserver/api/response">...</exceptionOccured> <exceptionOccured xmlns="http://touk.pl/mockserver/api/response">...</exceptionOccured>
``` ```
Peek mock Peek mock
@ -225,7 +225,7 @@ List<MockEvent> mockEvents = remoteMockServer.peekMock('...')
Send POST request to localhost:<PORT>/serverControl Send POST request to localhost:<PORT>/serverControl
```xml ```xml
<peekMock xmlns="http://ztsh.eu/mockserver/api/request"> <peekMock xmlns="http://touk.pl/mockserver/api/request">
<name>...</name> <name>...</name>
</peekMock> </peekMock>
``` ```
@ -233,7 +233,7 @@ Send POST request to localhost:<PORT>/serverControl
Response if success: Response if success:
```xml ```xml
<mockPeeked xmlns="http://ztsh.eu/mockserver/api/response"> <mockPeeked xmlns="http://touk.pl/mockserver/api/response">
<mockEvent> <mockEvent>
<request> <request>
<text>...</text> <text>...</text>
@ -265,7 +265,7 @@ Response if success:
Response with error message if failure: Response with error message if failure:
```xml ```xml
<exceptionOccured xmlns="http://ztsh.eu/mockserver/api/response">...</exceptionOccured> <exceptionOccured xmlns="http://touk.pl/mockserver/api/response">...</exceptionOccured>
``` ```
Remove mock Remove mock
@ -284,7 +284,7 @@ List<MockEvent> mockEvents = remoteMockServer.removeMock('...', ...)
Send POST request to localhost:<PORT>/serverControl Send POST request to localhost:<PORT>/serverControl
```xml ```xml
<removeMock xmlns="http://ztsh.eu/mockserver/api/request"> <removeMock xmlns="http://touk.pl/mockserver/api/request">
<name>...</name> <name>...</name>
<skipReport>...</skipReport> <skipReport>...</skipReport>
</removeMock> </removeMock>
@ -293,7 +293,7 @@ Send POST request to localhost:<PORT>/serverControl
Response if success (and skipReport not given or equal false): Response if success (and skipReport not given or equal false):
```xml ```xml
<mockRemoved xmlns="http://ztsh.eu/mockserver/api/response"> <mockRemoved xmlns="http://touk.pl/mockserver/api/response">
<mockEvent> <mockEvent>
<request> <request>
<text>...</text> <text>...</text>
@ -325,13 +325,13 @@ Response if success (and skipReport not given or equal false):
If skipReport is set to true then response will be: If skipReport is set to true then response will be:
```xml ```xml
<mockRemoved xmlns="http://ztsh.eu/mockserver/api/response"/> <mockRemoved xmlns="http://touk.pl/mockserver/api/response"/>
``` ```
Response with error message if failure: Response with error message if failure:
```xml ```xml
<exceptionOccured xmlns="http://ztsh.eu/mockserver/api/response">...</exceptionOccured> <exceptionOccured xmlns="http://touk.pl/mockserver/api/response">...</exceptionOccured>
``` ```
List mocks definitions 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 Remote repository
----------------- -----------------
Mockserver is available at `philanthropist.ztsh.eu`. Mockserver is available at `philanthropist.touk.pl`.
Just add repository to maven pom: Just add repository to maven pom:
@ -436,7 +436,7 @@ Just add repository to maven pom:
... ...
<repository> <repository>
<id>touk</id> <id>touk</id>
<url>https://philanthropist.ztsh.eu/nexus/content/repositories/releases</url> <url>https://philanthropist.touk.pl/nexus/content/repositories/releases</url>
</repository> </repository>
... ...
</repositories> </repositories>

24
mockserver-api/pom.xml
View file

@ -1,21 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>eu.ztsh.mockserver</groupId>
<artifactId>http-mock-server</artifactId> <artifactId>http-mock-server</artifactId>
<version>3.0.0-SNAPSHOT</version> <groupId>pl.touk.mockserver</groupId>
<version>2.8.4</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mockserver-api</artifactId> <artifactId>mockserver-api</artifactId>
<dependencies> <dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
@ -24,9 +18,19 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId> <artifactId>jaxb2-maven-plugin</artifactId>
<version>2.2</version>
<executions> <executions>
<execution> <execution>
<id>xjc</id> <id>xjc</id>

19
mockserver-api/src/main/xjb/binding.xjb
View file

@ -1,9 +1,10 @@
<bindings version="3.0" <?xml version="1.0"?>
xmlns="https://jakarta.ee/xml/ns/jaxb" <jxb:bindings version="1.0" xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"> xmlns:xjc= "http://java.sun.com/xml/ns/jaxb/xjc"
jxb:extensionBindingPrefixes="xjc" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<globalBindings> <jxb:bindings>
<xjc:simple/> <jxb:globalBindings>
</globalBindings> <xjc:simple/>
</jxb:globalBindings>
</bindings> </jxb:bindings>
</jxb:bindings>

2
mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/common.xsd → mockserver-api/src/main/xsd/pl/touk/mockserver/api/common.xsd
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<xs:schema version="1.0" targetNamespace="http://ztsh.eu/mockserver/api/common" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:schema version="1.0" targetNamespace="http://touk.pl/mockserver/api/common" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:simpleType name="method"> <xs:simpleType name="method">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">

4
mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/request.xsd → mockserver-api/src/main/xsd/pl/touk/mockserver/api/request.xsd
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://ztsh.eu/mockserver/api/request" xmlns:tns="http://ztsh.eu/mockserver/api/request" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:common="http://ztsh.eu/mockserver/api/common"> <xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://touk.pl/mockserver/api/request" xmlns:tns="http://touk.pl/mockserver/api/request" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:common="http://touk.pl/mockserver/api/common">
<xs:import namespace="http://ztsh.eu/mockserver/api/common" schemaLocation="common.xsd"/> <xs:import namespace="http://touk.pl/mockserver/api/common" schemaLocation="common.xsd"/>
<xs:element name="addMock" type="tns:AddMock"/> <xs:element name="addMock" type="tns:AddMock"/>

4
mockserver-api/src/main/xsd/eu/ztsh/mockserver/api/response.xsd → mockserver-api/src/main/xsd/pl/touk/mockserver/api/response.xsd
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://ztsh.eu/mockserver/api/response" xmlns:tns="http://ztsh.eu/mockserver/api/response" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:common="http://ztsh.eu/mockserver/api/common"> <xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://touk.pl/mockserver/api/response" xmlns:tns="http://touk.pl/mockserver/api/response" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:common="http://touk.pl/mockserver/api/common">
<xs:import namespace="http://ztsh.eu/mockserver/api/common" schemaLocation="common.xsd"/> <xs:import namespace="http://touk.pl/mockserver/api/common" schemaLocation="common.xsd"/>
<xs:element name="exceptionOccured" type="tns:exceptionOccured"/> <xs:element name="exceptionOccured" type="tns:exceptionOccured"/>

48
mockserver-client/pom.xml
View file

@ -1,44 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>eu.ztsh.mockserver</groupId>
<artifactId>http-mock-server</artifactId> <artifactId>http-mock-server</artifactId>
<version>3.0.0-SNAPSHOT</version> <groupId>pl.touk.mockserver</groupId>
<version>2.8.4</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mockserver-client</artifactId> <artifactId>mockserver-client</artifactId>
<build>
<defaultGoal>clean install</defaultGoal>
</build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>eu.ztsh.mockserver</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>mockserver-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId> <artifactId>groovy</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-json</artifactId> <artifactId>groovy-json</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-xml</artifactId> <artifactId>groovy-xml</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
@ -47,15 +33,9 @@
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency>
<groupId>pl.touk.mockserver</groupId>
<artifactId>mockserver-api</artifactId>
</dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

2
mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockDefinition.groovy → mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockDefinition.groovy
View file

@ -1,4 +1,4 @@
package eu.ztsh.mockserver.client package pl.touk.mockserver.client
import groovy.transform.CompileStatic import groovy.transform.CompileStatic
import groovy.transform.TypeChecked import groovy.transform.TypeChecked

2
mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/InvalidMockRequestSchema.groovy → mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockRequestSchema.groovy
View file

@ -1,4 +1,4 @@
package eu.ztsh.mockserver.client package pl.touk.mockserver.client
import groovy.transform.CompileStatic import groovy.transform.CompileStatic
import groovy.transform.TypeChecked import groovy.transform.TypeChecked

2
mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockAlreadyExists.groovy → mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy
View file

@ -1,4 +1,4 @@
package eu.ztsh.mockserver.client package pl.touk.mockserver.client
import groovy.transform.CompileStatic import groovy.transform.CompileStatic
import groovy.transform.TypeChecked import groovy.transform.TypeChecked

2
mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/MockDoesNotExist.groovy → mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy
View file

@ -1,4 +1,4 @@
package eu.ztsh.mockserver.client package pl.touk.mockserver.client
import groovy.transform.CompileStatic import groovy.transform.CompileStatic
import groovy.transform.TypeChecked import groovy.transform.TypeChecked

22
mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/RemoteMockServer.groovy → mockserver-client/src/main/groovy/pl/touk/mockserver/client/RemoteMockServer.groovy
View file

@ -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.CloseableHttpResponse
import org.apache.http.client.methods.HttpGet 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.entity.StringEntity
import org.apache.http.impl.client.CloseableHttpClient import org.apache.http.impl.client.CloseableHttpClient
import org.apache.http.impl.client.HttpClients import org.apache.http.impl.client.HttpClients
import eu.ztsh.mockserver.api.request.AddMock import pl.touk.mockserver.api.request.AddMock
import eu.ztsh.mockserver.api.request.MockServerRequest import pl.touk.mockserver.api.request.MockServerRequest
import eu.ztsh.mockserver.api.request.PeekMock import pl.touk.mockserver.api.request.PeekMock
import eu.ztsh.mockserver.api.request.RemoveMock import pl.touk.mockserver.api.request.RemoveMock
import eu.ztsh.mockserver.api.response.MockEventReport import pl.touk.mockserver.api.response.MockEventReport
import eu.ztsh.mockserver.api.response.MockPeeked import pl.touk.mockserver.api.response.MockPeeked
import eu.ztsh.mockserver.api.response.MockRemoved import pl.touk.mockserver.api.response.MockRemoved
import eu.ztsh.mockserver.api.response.MockReport import pl.touk.mockserver.api.response.MockReport
import eu.ztsh.mockserver.api.response.Mocks import pl.touk.mockserver.api.response.Mocks
import jakarta.xml.bind.JAXBContext import javax.xml.bind.JAXBContext
class RemoteMockServer { class RemoteMockServer {
private final String address private final String address

13
mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/Util.groovy → mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy
View file

@ -1,18 +1,17 @@
package eu.ztsh.mockserver.client package pl.touk.mockserver.client
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import groovy.transform.CompileStatic import groovy.transform.CompileStatic
import groovy.transform.TypeChecked import groovy.transform.TypeChecked
import groovy.xml.XmlSlurper import groovy.util.slurpersupport.GPathResult
import groovy.xml.slurpersupport.GPathResult
import org.apache.http.HttpEntity import org.apache.http.HttpEntity
import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.CloseableHttpResponse
import org.apache.http.util.EntityUtils import org.apache.http.util.EntityUtils
import eu.ztsh.mockserver.api.response.ExceptionOccured import pl.touk.mockserver.api.response.ExceptionOccured
import eu.ztsh.mockserver.api.response.MockAdded import pl.touk.mockserver.api.response.MockAdded
import eu.ztsh.mockserver.api.response.MockServerResponse import pl.touk.mockserver.api.response.MockServerResponse
import jakarta.xml.bind.JAXBContext import javax.xml.bind.JAXBContext
@CompileStatic @CompileStatic
@TypeChecked @TypeChecked

69
mockserver-tests/pom.xml
View file

@ -1,36 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>http-mock-server</artifactId> <artifactId>http-mock-server</artifactId>
<groupId>eu.ztsh.mockserver</groupId> <groupId>pl.touk.mockserver</groupId>
<version>3.0.0-SNAPSHOT</version> <version>2.8.4</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mockserver-tests</artifactId> <artifactId>mockserver-tests</artifactId>
<build>
<defaultGoal>clean install</defaultGoal>
</build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>eu.ztsh.mockserver</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>mockserver</artifactId>
</dependency>
<dependency>
<groupId>eu.ztsh.mockserver</groupId>
<artifactId>mockserver-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId> <artifactId>groovy</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.spockframework</groupId>
<artifactId>httpclient</artifactId> <artifactId>spock-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
@ -39,30 +30,24 @@
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId> <artifactId>logback-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.spockframework</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>spock-core</artifactId> <artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>pl.touk.mockserver</groupId>
<artifactId>mockserver</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>pl.touk.mockserver</groupId>
<artifactId>mockserver-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>info.solidsoft.spock</groupId>
<artifactId>spock-global-unroll</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<configuration>
<includes>
<include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

18
mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerHttpsTest.groovy → mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy
View file

@ -1,11 +1,6 @@
package eu.ztsh.mockserver.tests package pl.touk.mockserver.tests
import eu.ztsh.mockserver.api.common.Https import groovy.util.slurpersupport.GPathResult
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 org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.CloseableHttpResponse
import org.apache.http.client.methods.HttpPost import org.apache.http.client.methods.HttpPost
import org.apache.http.conn.ssl.SSLConnectionSocketFactory 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.entity.StringEntity
import org.apache.http.impl.client.CloseableHttpClient import org.apache.http.impl.client.CloseableHttpClient
import org.apache.http.impl.client.HttpClients 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.AutoCleanup
import spock.lang.Ignore import spock.lang.Ignore
import spock.lang.Shared import spock.lang.Shared
@ -23,7 +23,7 @@ import javax.net.ssl.SSLContext
import javax.net.ssl.SSLHandshakeException import javax.net.ssl.SSLHandshakeException
import java.security.KeyStore import java.security.KeyStore
@Ignore @Ignore('Upgrade of Java needed')
class MockServerHttpsTest extends Specification { class MockServerHttpsTest extends Specification {
RemoteMockServer remoteMockServer = new RemoteMockServer('localhost', 19000) RemoteMockServer remoteMockServer = new RemoteMockServer('localhost', 19000)
@ -48,7 +48,6 @@ class MockServerHttpsTest extends Specification {
.loadTrustMaterial(trustStore()) .loadTrustMaterial(trustStore())
.build() .build()
@Ignore("TODO: SSL peer shut down incorrectly")
def 'should handle HTTPS server' () { def 'should handle HTTPS server' () {
given: given:
remoteMockServer.addMock(new AddMock( remoteMockServer.addMock(new AddMock(
@ -73,7 +72,6 @@ class MockServerHttpsTest extends Specification {
restPostResponse.name() == 'goodResponse-request' restPostResponse.name() == 'goodResponse-request'
} }
@Ignore("TODO: SSL peer shut down incorrectly")
def 'should handle HTTPS server with client auth' () { def 'should handle HTTPS server with client auth' () {
given: given:
remoteMockServer.addMock(new AddMock( remoteMockServer.addMock(new AddMock(

30
mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerIntegrationTest.groovy → mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy
View file

@ -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.CloseableHttpResponse
import org.apache.http.client.methods.HttpDelete import org.apache.http.client.methods.HttpDelete
import org.apache.http.client.methods.HttpGet 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.CloseableHttpClient
import org.apache.http.impl.client.HttpClients import org.apache.http.impl.client.HttpClients
import org.apache.http.util.EntityUtils import org.apache.http.util.EntityUtils
import eu.ztsh.mockserver.api.common.ImportAlias import pl.touk.mockserver.api.common.ImportAlias
import eu.ztsh.mockserver.api.common.Method import pl.touk.mockserver.api.common.Method
import eu.ztsh.mockserver.api.request.AddMock import pl.touk.mockserver.api.request.AddMock
import eu.ztsh.mockserver.api.response.MockEventReport import pl.touk.mockserver.api.response.MockEventReport
import eu.ztsh.mockserver.api.response.MockReport import pl.touk.mockserver.api.response.MockReport
import eu.ztsh.mockserver.client.InvalidMockDefinition import pl.touk.mockserver.client.InvalidMockDefinition
import eu.ztsh.mockserver.client.InvalidMockRequestSchema import pl.touk.mockserver.client.InvalidMockRequestSchema
import eu.ztsh.mockserver.client.MockAlreadyExists import pl.touk.mockserver.client.MockAlreadyExists
import eu.ztsh.mockserver.client.MockDoesNotExist import pl.touk.mockserver.client.MockDoesNotExist
import eu.ztsh.mockserver.client.RemoteMockServer import pl.touk.mockserver.client.RemoteMockServer
import eu.ztsh.mockserver.client.Util import pl.touk.mockserver.client.Util
import eu.ztsh.mockserver.server.HttpMockServer import pl.touk.mockserver.server.HttpMockServer
import spock.lang.AutoCleanup import spock.lang.AutoCleanup
import spock.lang.Ignore
import spock.lang.Specification import spock.lang.Specification
class MockServerIntegrationTest extends Specification { class MockServerIntegrationTest extends Specification {
@ -66,7 +65,6 @@ class MockServerIntegrationTest extends Specification {
remoteMockServer.removeMock('testRest')?.size() == 1 remoteMockServer.removeMock('testRest')?.size() == 1
} }
@Ignore("TODO: restPostResponse.name()")
def "should add working rest mock on endpoint with utf"() { def "should add working rest mock on endpoint with utf"() {
expect: expect:
remoteMockServer.addMock(new AddMock( remoteMockServer.addMock(new AddMock(

9
mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerMaxUsesTest.groovy → mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerMaxUsesTest.groovy
View file

@ -1,4 +1,4 @@
package eu.ztsh.mockserver.tests package pl.touk.mockserver.tests
import org.apache.http.client.methods.CloseableHttpResponse 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.entity.StringEntity
import org.apache.http.impl.client.CloseableHttpClient import org.apache.http.impl.client.CloseableHttpClient
import org.apache.http.impl.client.HttpClients import org.apache.http.impl.client.HttpClients
import eu.ztsh.mockserver.api.request.AddMock import pl.touk.mockserver.api.request.AddMock
import eu.ztsh.mockserver.client.RemoteMockServer import pl.touk.mockserver.client.RemoteMockServer
import eu.ztsh.mockserver.server.HttpMockServer import pl.touk.mockserver.server.HttpMockServer
import spock.lang.AutoCleanup import spock.lang.AutoCleanup
import spock.lang.Shared
import spock.lang.Specification import spock.lang.Specification
class MockServerMaxUsesTest extends Specification { class MockServerMaxUsesTest extends Specification {

67
mockserver/pom.xml
View file

@ -1,49 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>eu.ztsh.mockserver</groupId>
<artifactId>http-mock-server</artifactId> <artifactId>http-mock-server</artifactId>
<version>3.0.0-SNAPSHOT</version> <groupId>pl.touk.mockserver</groupId>
<version>2.8.4</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mockserver</artifactId> <artifactId>mockserver</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>eu.ztsh.mockserver</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>mockserver-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId> <artifactId>groovy</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-json</artifactId> <artifactId>groovy-json</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-xml</artifactId> <artifactId>groovy-xml</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
@ -56,21 +34,25 @@
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>pl.touk.mockserver</groupId>
<artifactId>mockserver-api</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>clean package assembly:single install</defaultGoal> <defaultGoal>clean package assembly:single install</defaultGoal>
<plugins> <plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
</plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
<mainClass>eu.ztsh.mockserver.server.Main</mainClass> <mainClass>pl.touk.mockserver.server.Main</mainClass>
</manifest> </manifest>
</archive> </archive>
<descriptorRefs> <descriptorRefs>
@ -79,17 +61,16 @@
<finalName>mockserver-full</finalName> <finalName>mockserver-full</finalName>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>create-archive</id> <id>create-archive</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

4
mockserver/src/main/groovy/eu/ztsh/mockserver/server/ContextExecutor.groovy → mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
View file

@ -1,9 +1,9 @@
package eu.ztsh.mockserver.server package pl.touk.mockserver.server
import com.sun.net.httpserver.HttpExchange import com.sun.net.httpserver.HttpExchange
import groovy.transform.PackageScope import groovy.transform.PackageScope
import groovy.util.logging.Slf4j import groovy.util.logging.Slf4j
import eu.ztsh.mockserver.api.common.Method import pl.touk.mockserver.api.common.Method
import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CopyOnWriteArrayList

122
mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpMockServer.groovy → mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy
View file

@ -1,32 +1,32 @@
package eu.ztsh.mockserver.server package pl.touk.mockserver.server
import com.sun.net.httpserver.HttpExchange import com.sun.net.httpserver.HttpExchange
import groovy.util.logging.Slf4j import groovy.util.logging.Slf4j
import eu.ztsh.mockserver.api.common.Https import pl.touk.mockserver.api.common.Https
import eu.ztsh.mockserver.api.common.ImportAlias import pl.touk.mockserver.api.common.ImportAlias
import eu.ztsh.mockserver.api.common.Method import pl.touk.mockserver.api.common.Method
import eu.ztsh.mockserver.api.request.AddMock import pl.touk.mockserver.api.request.AddMock
import eu.ztsh.mockserver.api.request.MockServerRequest import pl.touk.mockserver.api.request.MockServerRequest
import eu.ztsh.mockserver.api.request.PeekMock import pl.touk.mockserver.api.request.PeekMock
import eu.ztsh.mockserver.api.request.RemoveMock import pl.touk.mockserver.api.request.RemoveMock
import eu.ztsh.mockserver.api.response.ExceptionOccured import pl.touk.mockserver.api.response.ExceptionOccured
import eu.ztsh.mockserver.api.response.MockAdded import pl.touk.mockserver.api.response.MockAdded
import eu.ztsh.mockserver.api.response.MockEventReport import pl.touk.mockserver.api.response.MockEventReport
import eu.ztsh.mockserver.api.response.MockPeeked import pl.touk.mockserver.api.response.MockPeeked
import eu.ztsh.mockserver.api.response.MockRemoved import pl.touk.mockserver.api.response.MockRemoved
import eu.ztsh.mockserver.api.response.MockReport import pl.touk.mockserver.api.response.MockReport
import eu.ztsh.mockserver.api.response.MockRequestReport import pl.touk.mockserver.api.response.MockRequestReport
import eu.ztsh.mockserver.api.response.MockResponseReport import pl.touk.mockserver.api.response.MockResponseReport
import eu.ztsh.mockserver.api.response.Mocks import pl.touk.mockserver.api.response.Mocks
import eu.ztsh.mockserver.api.response.Parameter 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.ConcurrentHashMap
import java.util.concurrent.CopyOnWriteArraySet import java.util.concurrent.CopyOnWriteArraySet
import java.util.concurrent.Executor import java.util.concurrent.Executor
import java.util.concurrent.Executors import java.util.concurrent.Executors
import static eu.ztsh.mockserver.server.Util.createResponse import static pl.touk.mockserver.server.Util.createResponse
@Slf4j @Slf4j
class HttpMockServer { class HttpMockServer {
@ -79,22 +79,22 @@ class HttpMockServer {
void listMocks(HttpExchange ex) { void listMocks(HttpExchange ex) {
Mocks mockListing = new Mocks( Mocks mockListing = new Mocks(
mocks: listMocks().collect { mocks: listMocks().collect {
new MockReport( new MockReport(
name: it.name, name: it.name,
path: it.path, path: it.path,
port: it.port, port: it.port,
predicate: it.predicateClosureText, predicate: it.predicateClosureText,
response: it.responseClosureText, response: it.responseClosureText,
responseHeaders: it.responseHeadersClosureText, responseHeaders: it.responseHeadersClosureText,
soap: it.soap, soap: it.soap,
method: it.method, method: it.method,
statusCode: it.statusCode as int, statusCode: it.statusCode as int,
schema: it.schema, schema: it.schema,
imports: it.imports.collect { new ImportAlias(alias: it.key, fullClassName: it.value) }, imports: it.imports.collect { new ImportAlias(alias: it.key, fullClassName: it.value) },
preserveHistory: it.preserveHistory preserveHistory: it.preserveHistory
) )
} }
) )
createResponse(ex, mockListing, 200) createResponse(ex, mockListing, 200)
} }
@ -182,12 +182,12 @@ class HttpMockServer {
mock.preserveHistory = co.preserveHistory != false mock.preserveHistory = co.preserveHistory != false
if (co.https) { if (co.https) {
mock.https = new Https( mock.https = new Https(
keystorePath: co.https.keystorePath ?: null, keystorePath: co.https.keystorePath ?: null,
keystorePassword: co.https.keystorePassword, keystorePassword: co.https.keystorePassword,
keyPassword: co.https.keyPassword, keyPassword: co.https.keyPassword,
truststorePath: co.https.truststorePath, truststorePath: co.https.truststorePath,
truststorePassword: co.https.truststorePassword, truststorePassword: co.https.truststorePassword,
requireClientAuth: co.https?.requireClientAuth?.asBoolean() ?: false requireClientAuth: co.https?.requireClientAuth?.asBoolean() ?: false
) )
} }
mock.maxUses = co.maxUses ?: null mock.maxUses = co.maxUses ?: null
@ -217,7 +217,7 @@ class HttpMockServer {
mockNames.remove(name) mockNames.remove(name)
configuration.remove(name) configuration.remove(name)
MockRemoved mockRemoved = new MockRemoved( MockRemoved mockRemoved = new MockRemoved(
mockEvents: createMockEventReports(mockEvents) mockEvents: createMockEventReports(mockEvents)
) )
createResponse(ex, mockRemoved, 200) createResponse(ex, mockRemoved, 200)
} }
@ -225,23 +225,23 @@ class HttpMockServer {
private static List<MockEventReport> createMockEventReports(List<MockEvent> mockEvents) { private static List<MockEventReport> createMockEventReports(List<MockEvent> mockEvents) {
return mockEvents.collect { return mockEvents.collect {
new MockEventReport( new MockEventReport(
request: new MockRequestReport( request: new MockRequestReport(
text: it.request.text, text: it.request.text,
headers: new MockRequestReport.Headers(headers: it.request.headers.collect { headers: new MockRequestReport.Headers(headers: it.request.headers.collect {
new Parameter(name: it.key, value: it.value) new Parameter(name: it.key, value: it.value)
}), }),
queryParams: new MockRequestReport.QueryParams(queryParams: it.request.query.collect { queryParams: new MockRequestReport.QueryParams(queryParams: it.request.query.collect {
new Parameter(name: it.key, value: it.value) new Parameter(name: it.key, value: it.value)
}), }),
path: new MockRequestReport.Path(pathParts: it.request.path) path: new MockRequestReport.Path(pathParts: it.request.path)
), ),
response: new MockResponseReport( response: new MockResponseReport(
statusCode: it.response.statusCode, statusCode: it.response.statusCode,
text: it.response.text, text: it.response.text,
headers: new MockResponseReport.Headers(headers: it.response.headers.collect { headers: new MockResponseReport.Headers(headers: it.response.headers.collect {
new Parameter(name: it.key, value: it.value) new Parameter(name: it.key, value: it.value)
}) })
) )
) )
} }
} }
@ -254,7 +254,7 @@ class HttpMockServer {
log.trace("Peeking mock $name") log.trace("Peeking mock $name")
List<MockEvent> mockEvents = childServers.values().collect { it.peekMock(name) }.flatten() as List<MockEvent> List<MockEvent> mockEvents = childServers.values().collect { it.peekMock(name) }.flatten() as List<MockEvent>
MockPeeked mockPeeked = new MockPeeked( MockPeeked mockPeeked = new MockPeeked(
mockEvents: createMockEventReports(mockEvents) mockEvents: createMockEventReports(mockEvents)
) )
createResponse(ex, mockPeeked, 200) createResponse(ex, mockPeeked, 200)
} }

4
mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpServerWrapper.groovy → mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy
View file

@ -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.HttpHandler
import com.sun.net.httpserver.HttpServer import com.sun.net.httpserver.HttpServer
import com.sun.net.httpserver.HttpsServer import com.sun.net.httpserver.HttpsServer
import groovy.transform.PackageScope import groovy.transform.PackageScope
import groovy.util.logging.Slf4j 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.KeyManager
import javax.net.ssl.KeyManagerFactory import javax.net.ssl.KeyManagerFactory

4
mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpsConfig.groovy → mockserver/src/main/groovy/pl/touk/mockserver/server/HttpsConfig.groovy
View file

@ -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.HttpsConfigurator
import com.sun.net.httpserver.HttpsParameters import com.sun.net.httpserver.HttpsParameters
import groovy.transform.CompileStatic 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.SSLContext
import javax.net.ssl.SSLParameters import javax.net.ssl.SSLParameters

2
mockserver/src/main/groovy/eu/ztsh/mockserver/server/Main.groovy → mockserver/src/main/groovy/pl/touk/mockserver/server/Main.groovy
View file

@ -1,4 +1,4 @@
package eu.ztsh.mockserver.server package pl.touk.mockserver.server
import groovy.util.logging.Slf4j import groovy.util.logging.Slf4j

6
mockserver/src/main/groovy/eu/ztsh/mockserver/server/Mock.groovy → mockserver/src/main/groovy/pl/touk/mockserver/server/Mock.groovy
View file

@ -1,12 +1,12 @@
package eu.ztsh.mockserver.server package pl.touk.mockserver.server
import groovy.transform.EqualsAndHashCode import groovy.transform.EqualsAndHashCode
import groovy.transform.PackageScope import groovy.transform.PackageScope
import groovy.util.logging.Slf4j import groovy.util.logging.Slf4j
import org.codehaus.groovy.control.CompilerConfiguration import org.codehaus.groovy.control.CompilerConfiguration
import org.codehaus.groovy.control.customizers.ImportCustomizer import org.codehaus.groovy.control.customizers.ImportCustomizer
import eu.ztsh.mockserver.api.common.Https import pl.touk.mockserver.api.common.Https
import eu.ztsh.mockserver.api.common.Method import pl.touk.mockserver.api.common.Method
import javax.xml.XMLConstants import javax.xml.XMLConstants
import javax.xml.transform.stream.StreamSource import javax.xml.transform.stream.StreamSource

2
mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockEvent.groovy → mockserver/src/main/groovy/pl/touk/mockserver/server/MockEvent.groovy
View file

@ -1,4 +1,4 @@
package eu.ztsh.mockserver.server package pl.touk.mockserver.server
import groovy.transform.PackageScope import groovy.transform.PackageScope

5
mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockRequest.groovy → mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy
View file

@ -1,10 +1,9 @@
package eu.ztsh.mockserver.server package pl.touk.mockserver.server
import com.sun.net.httpserver.Headers import com.sun.net.httpserver.Headers
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import groovy.transform.PackageScope import groovy.transform.PackageScope
import groovy.xml.XmlSlurper import groovy.util.slurpersupport.GPathResult
import groovy.xml.slurpersupport.GPathResult
import groovy.xml.XmlUtil import groovy.xml.XmlUtil
@PackageScope @PackageScope

2
mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockResponse.groovy → mockserver/src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy
View file

@ -1,4 +1,4 @@
package eu.ztsh.mockserver.server package pl.touk.mockserver.server
import groovy.transform.PackageScope import groovy.transform.PackageScope

6
mockserver/src/main/groovy/eu/ztsh/mockserver/server/Util.groovy → mockserver/src/main/groovy/pl/touk/mockserver/server/Util.groovy
View file

@ -1,9 +1,9 @@
package eu.ztsh.mockserver.server package pl.touk.mockserver.server
import com.sun.net.httpserver.HttpExchange 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 { class Util {

14
performance-tests/pom.xml
View file

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>eu.ztsh.mockserver</groupId>
<artifactId>http-mock-server</artifactId> <artifactId>http-mock-server</artifactId>
<version>3.0.0-SNAPSHOT</version> <groupId>pl.touk.mockserver</groupId>
<version>2.8.4</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mockserver-performance-tests</artifactId> <artifactId>mockserver-performance-tests</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>eu.ztsh.mockserver</groupId> <groupId>pl.touk.mockserver</groupId>
<artifactId>mockserver</artifactId> <artifactId>mockserver</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>eu.ztsh.mockserver</groupId> <groupId>pl.touk.mockserver</groupId>
<artifactId>mockserver-client</artifactId> <artifactId>mockserver-client</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openjdk.jmh</groupId> <groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId> <artifactId>jmh-core</artifactId>

6
performance-tests/src/test/java/eu/ztsh/mockserver/client/MockserverTest.java → performance-tests/src/test/java/pl/touk/mockserver/client/MockserverTest.java
View file

@ -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.HttpClient;
import org.apache.http.client.methods.CloseableHttpResponse; 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.annotations.Warmup;
import org.openjdk.jmh.infra.Blackhole; import org.openjdk.jmh.infra.Blackhole;
import org.openjdk.jmh.infra.ThreadParams; import org.openjdk.jmh.infra.ThreadParams;
import eu.ztsh.mockserver.api.request.AddMock; import pl.touk.mockserver.api.request.AddMock;
import eu.ztsh.mockserver.server.HttpMockServer; import pl.touk.mockserver.server.HttpMockServer;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

161
pom.xml
View file

@ -1,13 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>eu.ztsh.mockserver</groupId> <parent>
<groupId>pl.touk</groupId>
<artifactId>top</artifactId>
<version>1.0.7</version>
</parent>
<groupId>pl.touk.mockserver</groupId>
<artifactId>http-mock-server</artifactId> <artifactId>http-mock-server</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>3.0.0-SNAPSHOT</version> <version>2.8.4</version>
<modules> <modules>
<module>mockserver-client</module> <module>mockserver-client</module>
<module>mockserver</module> <module>mockserver</module>
@ -17,74 +21,58 @@
</modules> </modules>
<properties> <properties>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<groovy.version>4.0.12</groovy.version> <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<groovy.version>2.5.7</groovy.version>
<httpclient.version>4.5.13</httpclient.version> <httpclient.version>4.5.13</httpclient.version>
<spock-core.version>2.2-groovy-4.0</spock-core.version> <spock-core.version>1.3-groovy-2.5</spock-core.version>
<commons-lang3.version>3.3.2</commons-lang3.version> <commons-lang3.version>3.3.2</commons-lang3.version>
<slf4j-api.version>1.7.30</slf4j-api.version> <slf4j-api.version>1.7.30</slf4j-api.version>
<logback.version>1.3.12</logback.version> <logback.version>1.2.9</logback.version>
<lombok.version>1.18.26</lombok.version> <lombok.version>1.16.6</lombok.version>
<jaxb.version>4.0.4</jaxb.version>
<autoVersionSubmodules>true</autoVersionSubmodules> <autoVersionSubmodules>true</autoVersionSubmodules>
<jmh.version>1.37</jmh.version> <jmh.version>1.11.2</jmh.version>
<gmavenplus-plugin.version>3.0.2</gmavenplus-plugin.version> <maven-release-plugin.version>2.5.2</maven-release-plugin.version>
<jaxb2-maven-plugin.version>3.1.0</jaxb2-maven-plugin.version> <gmavenplus-plugin.version>1.4</gmavenplus-plugin.version>
<spock-global-unroll.version>0.5.1</spock-global-unroll.version>
</properties> </properties>
<scm>
<connection>scm:git:git@github.com:TouK/http-mock-server.git</connection>
<developerConnection>scm:git:git@github.com:TouK/http-mock-server.git</developerConnection>
<tag>http-mock-server-2.8.4</tag>
</scm>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>eu.ztsh.mockserver</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>mockserver-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>eu.ztsh.mockserver</groupId>
<artifactId>mockserver</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>eu.ztsh.mockserver</groupId>
<artifactId>mockserver-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-bom</artifactId>
<version>${jaxb.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId> <artifactId>groovy</artifactId>
<version>${groovy.version}</version> <version>${groovy.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-json</artifactId> <artifactId>groovy-json</artifactId>
<version>${groovy.version}</version> <version>${groovy.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-xml</artifactId> <artifactId>groovy-xml</artifactId>
<version>${groovy.version}</version> <version>${groovy.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${httpclient.version}</version> <version>${httpclient.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
<version>${spock-core.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
@ -110,12 +98,10 @@
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>${lombok.version}</version> <version>${lombok.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.spockframework</groupId> <groupId>pl.touk.mockserver</groupId>
<artifactId>spock-core</artifactId> <artifactId>mockserver-api</artifactId>
<version>${spock-core.version}</version> <version>${project.version}</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openjdk.jmh</groupId> <groupId>org.openjdk.jmh</groupId>
@ -129,32 +115,63 @@
<version>${jmh.version}</version> <version>${jmh.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>info.solidsoft.spock</groupId>
<artifactId>spock-global-unroll</artifactId>
<version>${spock-global-unroll.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build> <build>
<pluginManagement> <defaultGoal>clean install</defaultGoal>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <artifactId>maven-compiler-plugin</artifactId>
<artifactId>jaxb2-maven-plugin</artifactId> <version>${maven-compiler-plugin.version}</version>
<version>${jaxb2-maven-plugin.version}</version> <configuration>
</plugin> <source>1.8</source>
<plugin> <target>1.8</target>
<groupId>org.codehaus.gmavenplus</groupId> </configuration>
<artifactId>gmavenplus-plugin</artifactId> </plugin>
<version>${gmavenplus-plugin.version}</version> <plugin>
<executions> <groupId>org.codehaus.gmavenplus</groupId>
<execution> <artifactId>gmavenplus-plugin</artifactId>
<goals> <version>${gmavenplus-plugin.version}</version>
<goal>compile</goal> <executions>
<goal>compileTests</goal> <execution>
</goals> <goals>
</execution> <goal>compile</goal>
</executions> <goal>testCompile</goal>
</plugin> </goals>
</plugins> </execution>
</pluginManagement> </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
<configuration>
<autoversionsubmodules>true</autoversionsubmodules>
</configuration>
</plugin>
</plugins>
</build> </build>
<contributors>
<contributor>
<name>Dominik Przybysz</name>
<email>alien11689@gmail.com</email>
</contributor>
</contributors>
<repositories>
<repository>
<id>touk</id>
<name>TouK Open source repository</name>
<url>https://philanthropist.touk.pl/nexus/content/repositories/releases</url>
</repository>
</repositories>
</project> </project>