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

Rebranding

Browse source
This commit is contained in:
Piotr Dec 2024-02-22 22:42:33 +01:00
parent afaab504da
commit 36bc5dd14b
Signed by: stawros
GPG key ID: F89F27AD8F881A91
32 changed files with 120 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

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.8.7/apache-maven-3.8.7-bin.zip distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

2
Dockerfile
View file

@ -8,4 +8,4 @@ RUN mkdir /externalSchema
VOLUME /externalSchema VOLUME /externalSchema
CMD java -cp /mockserver.jar:/externalSchema pl.touk.mockserver.server.Main CMD java -cp /mockserver.jar:/externalSchema eu.ztsh.mockserver.server.Main

24
README.md
View file

@ -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://touk.pl/mockserver/api/request"> <addMock xmlns="http://ztsh.eu/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://touk.pl/mockserver/api/response"/> <mockAdded xmlns="http://ztsh.eu/mockserver/api/response"/>
``` ```
Response with error message if failure: Response with error message if failure:
```xml ```xml
<exceptionOccured xmlns="http://touk.pl/mockserver/api/response">...</exceptionOccured> <exceptionOccured xmlns="http://ztsh.eu/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://touk.pl/mockserver/api/request"> <peekMock xmlns="http://ztsh.eu/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://touk.pl/mockserver/api/response"> <mockPeeked xmlns="http://ztsh.eu/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://touk.pl/mockserver/api/response">...</exceptionOccured> <exceptionOccured xmlns="http://ztsh.eu/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://touk.pl/mockserver/api/request"> <removeMock xmlns="http://ztsh.eu/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://touk.pl/mockserver/api/response"> <mockRemoved xmlns="http://ztsh.eu/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://touk.pl/mockserver/api/response"/> <mockRemoved xmlns="http://ztsh.eu/mockserver/api/response"/>
``` ```
Response with error message if failure: Response with error message if failure:
```xml ```xml
<exceptionOccured xmlns="http://touk.pl/mockserver/api/response">...</exceptionOccured> <exceptionOccured xmlns="http://ztsh.eu/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.touk.pl`. Mockserver is available at `philanthropist.ztsh.eu`.
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.touk.pl/nexus/content/repositories/releases</url> <url>https://philanthropist.ztsh.eu/nexus/content/repositories/releases</url>
</repository> </repository>
... ...
</repositories> </repositories>

4
mockserver-api/pom.xml
View file

@ -2,8 +2,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">
<parent> <parent>
<artifactId>http-mock-server</artifactId> <artifactId>http-mock-server</artifactId>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<version>2.8.5-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
mockserver-api/src/main/xsd/pl/touk/mockserver/api/common.xsd → mockserver-api/src/main/xsd/eu/ztsh/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://touk.pl/mockserver/api/common" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:schema version="1.0" targetNamespace="http://ztsh.eu/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/pl/touk/mockserver/api/request.xsd → mockserver-api/src/main/xsd/eu/ztsh/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://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: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:import namespace="http://touk.pl/mockserver/api/common" schemaLocation="common.xsd"/> <xs:import namespace="http://ztsh.eu/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/pl/touk/mockserver/api/response.xsd → mockserver-api/src/main/xsd/eu/ztsh/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://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: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:import namespace="http://touk.pl/mockserver/api/common" schemaLocation="common.xsd"/> <xs:import namespace="http://ztsh.eu/mockserver/api/common" schemaLocation="common.xsd"/>
<xs:element name="exceptionOccured" type="tns:exceptionOccured"/> <xs:element name="exceptionOccured" type="tns:exceptionOccured"/>

6
mockserver-client/pom.xml
View file

@ -2,8 +2,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">
<parent> <parent>
<artifactId>http-mock-server</artifactId> <artifactId>http-mock-server</artifactId>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<version>2.8.5-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -34,7 +34,7 @@
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<artifactId>mockserver-api</artifactId> <artifactId>mockserver-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>

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

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

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

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

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

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

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

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

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

@ -1,4 +1,4 @@
package pl.touk.mockserver.client package eu.ztsh.mockserver.client
import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.CloseableHttpResponse
import org.apache.http.client.methods.HttpGet import org.apache.http.client.methods.HttpGet
@ -7,15 +7,15 @@ import org.apache.http.entity.ContentType
import org.apache.http.entity.StringEntity import org.apache.http.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.request.AddMock import eu.ztsh.mockserver.api.request.AddMock
import pl.touk.mockserver.api.request.MockServerRequest import eu.ztsh.mockserver.api.request.MockServerRequest
import pl.touk.mockserver.api.request.PeekMock import eu.ztsh.mockserver.api.request.PeekMock
import pl.touk.mockserver.api.request.RemoveMock import eu.ztsh.mockserver.api.request.RemoveMock
import pl.touk.mockserver.api.response.MockEventReport import eu.ztsh.mockserver.api.response.MockEventReport
import pl.touk.mockserver.api.response.MockPeeked import eu.ztsh.mockserver.api.response.MockPeeked
import pl.touk.mockserver.api.response.MockRemoved import eu.ztsh.mockserver.api.response.MockRemoved
import pl.touk.mockserver.api.response.MockReport import eu.ztsh.mockserver.api.response.MockReport
import pl.touk.mockserver.api.response.Mocks import eu.ztsh.mockserver.api.response.Mocks
import javax.xml.bind.JAXBContext import javax.xml.bind.JAXBContext

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

@ -1,4 +1,4 @@
package pl.touk.mockserver.client package eu.ztsh.mockserver.client
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import groovy.transform.CompileStatic import groovy.transform.CompileStatic
@ -7,9 +7,9 @@ import groovy.util.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 pl.touk.mockserver.api.response.ExceptionOccured import eu.ztsh.mockserver.api.response.ExceptionOccured
import pl.touk.mockserver.api.response.MockAdded import eu.ztsh.mockserver.api.response.MockAdded
import pl.touk.mockserver.api.response.MockServerResponse import eu.ztsh.mockserver.api.response.MockServerResponse
import javax.xml.bind.JAXBContext import javax.xml.bind.JAXBContext

8
mockserver-tests/pom.xml
View file

@ -2,8 +2,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">
<parent> <parent>
<artifactId>http-mock-server</artifactId> <artifactId>http-mock-server</artifactId>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<version>2.8.5-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -35,12 +35,12 @@
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<artifactId>mockserver</artifactId> <artifactId>mockserver</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<artifactId>mockserver-client</artifactId> <artifactId>mockserver-client</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>

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

@ -1,4 +1,4 @@
package pl.touk.mockserver.tests package eu.ztsh.mockserver.tests
import groovy.util.slurpersupport.GPathResult import groovy.util.slurpersupport.GPathResult
import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.CloseableHttpResponse
@ -9,11 +9,11 @@ import org.apache.http.entity.ContentType
import org.apache.http.entity.StringEntity import org.apache.http.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 eu.ztsh.mockserver.api.common.Https
import pl.touk.mockserver.api.request.AddMock import eu.ztsh.mockserver.api.request.AddMock
import pl.touk.mockserver.client.RemoteMockServer import eu.ztsh.mockserver.client.RemoteMockServer
import pl.touk.mockserver.client.Util import eu.ztsh.mockserver.client.Util
import pl.touk.mockserver.server.HttpMockServer import eu.ztsh.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

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

@ -1,4 +1,4 @@
package pl.touk.mockserver.tests package eu.ztsh.mockserver.tests
import groovy.util.slurpersupport.GPathResult import groovy.util.slurpersupport.GPathResult
import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.CloseableHttpResponse
@ -15,18 +15,18 @@ import org.apache.http.entity.StringEntity
import org.apache.http.impl.client.CloseableHttpClient import org.apache.http.impl.client.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 pl.touk.mockserver.api.common.ImportAlias import eu.ztsh.mockserver.api.common.ImportAlias
import pl.touk.mockserver.api.common.Method import eu.ztsh.mockserver.api.common.Method
import pl.touk.mockserver.api.request.AddMock import eu.ztsh.mockserver.api.request.AddMock
import pl.touk.mockserver.api.response.MockEventReport import eu.ztsh.mockserver.api.response.MockEventReport
import pl.touk.mockserver.api.response.MockReport import eu.ztsh.mockserver.api.response.MockReport
import pl.touk.mockserver.client.InvalidMockDefinition import eu.ztsh.mockserver.client.InvalidMockDefinition
import pl.touk.mockserver.client.InvalidMockRequestSchema import eu.ztsh.mockserver.client.InvalidMockRequestSchema
import pl.touk.mockserver.client.MockAlreadyExists import eu.ztsh.mockserver.client.MockAlreadyExists
import pl.touk.mockserver.client.MockDoesNotExist import eu.ztsh.mockserver.client.MockDoesNotExist
import pl.touk.mockserver.client.RemoteMockServer import eu.ztsh.mockserver.client.RemoteMockServer
import pl.touk.mockserver.client.Util import eu.ztsh.mockserver.client.Util
import pl.touk.mockserver.server.HttpMockServer import eu.ztsh.mockserver.server.HttpMockServer
import spock.lang.AutoCleanup import spock.lang.AutoCleanup
import spock.lang.Specification import spock.lang.Specification

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

@ -1,4 +1,4 @@
package pl.touk.mockserver.tests package eu.ztsh.mockserver.tests
import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.CloseableHttpResponse
@ -7,11 +7,10 @@ import org.apache.http.entity.ContentType
import org.apache.http.entity.StringEntity import org.apache.http.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.request.AddMock import eu.ztsh.mockserver.api.request.AddMock
import pl.touk.mockserver.client.RemoteMockServer import eu.ztsh.mockserver.client.RemoteMockServer
import pl.touk.mockserver.server.HttpMockServer import eu.ztsh.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 {

8
mockserver/pom.xml
View file

@ -2,8 +2,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">
<parent> <parent>
<artifactId>http-mock-server</artifactId> <artifactId>http-mock-server</artifactId>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<version>2.8.5-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -39,7 +39,7 @@
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<artifactId>mockserver-api</artifactId> <artifactId>mockserver-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
@ -52,7 +52,7 @@
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
<mainClass>pl.touk.mockserver.server.Main</mainClass> <mainClass>eu.ztsh.mockserver.server.Main</mainClass>
</manifest> </manifest>
</archive> </archive>
<descriptorRefs> <descriptorRefs>

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

@ -1,9 +1,9 @@
package pl.touk.mockserver.server package eu.ztsh.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 pl.touk.mockserver.api.common.Method import eu.ztsh.mockserver.api.common.Method
import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CopyOnWriteArrayList

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

@ -1,24 +1,24 @@
package pl.touk.mockserver.server package eu.ztsh.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 pl.touk.mockserver.api.common.Https import eu.ztsh.mockserver.api.common.Https
import pl.touk.mockserver.api.common.ImportAlias import eu.ztsh.mockserver.api.common.ImportAlias
import pl.touk.mockserver.api.common.Method import eu.ztsh.mockserver.api.common.Method
import pl.touk.mockserver.api.request.AddMock import eu.ztsh.mockserver.api.request.AddMock
import pl.touk.mockserver.api.request.MockServerRequest import eu.ztsh.mockserver.api.request.MockServerRequest
import pl.touk.mockserver.api.request.PeekMock import eu.ztsh.mockserver.api.request.PeekMock
import pl.touk.mockserver.api.request.RemoveMock import eu.ztsh.mockserver.api.request.RemoveMock
import pl.touk.mockserver.api.response.ExceptionOccured import eu.ztsh.mockserver.api.response.ExceptionOccured
import pl.touk.mockserver.api.response.MockAdded import eu.ztsh.mockserver.api.response.MockAdded
import pl.touk.mockserver.api.response.MockEventReport import eu.ztsh.mockserver.api.response.MockEventReport
import pl.touk.mockserver.api.response.MockPeeked import eu.ztsh.mockserver.api.response.MockPeeked
import pl.touk.mockserver.api.response.MockRemoved import eu.ztsh.mockserver.api.response.MockRemoved
import pl.touk.mockserver.api.response.MockReport import eu.ztsh.mockserver.api.response.MockReport
import pl.touk.mockserver.api.response.MockRequestReport import eu.ztsh.mockserver.api.response.MockRequestReport
import pl.touk.mockserver.api.response.MockResponseReport import eu.ztsh.mockserver.api.response.MockResponseReport
import pl.touk.mockserver.api.response.Mocks import eu.ztsh.mockserver.api.response.Mocks
import pl.touk.mockserver.api.response.Parameter import eu.ztsh.mockserver.api.response.Parameter
import javax.xml.bind.JAXBContext import javax.xml.bind.JAXBContext
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
@ -26,7 +26,7 @@ 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 pl.touk.mockserver.server.Util.createResponse import static eu.ztsh.mockserver.server.Util.createResponse
@Slf4j @Slf4j
class HttpMockServer { class HttpMockServer {

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

@ -1,11 +1,11 @@
package pl.touk.mockserver.server package eu.ztsh.mockserver.server
import com.sun.net.httpserver.HttpHandler import com.sun.net.httpserver.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 pl.touk.mockserver.api.common.Https import eu.ztsh.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/pl/touk/mockserver/server/HttpsConfig.groovy → mockserver/src/main/groovy/eu/ztsh/mockserver/server/HttpsConfig.groovy
View file

@ -1,9 +1,9 @@
package pl.touk.mockserver.server package eu.ztsh.mockserver.server
import com.sun.net.httpserver.HttpsConfigurator import com.sun.net.httpserver.HttpsConfigurator
import com.sun.net.httpserver.HttpsParameters import com.sun.net.httpserver.HttpsParameters
import groovy.transform.CompileStatic import groovy.transform.CompileStatic
import pl.touk.mockserver.api.common.Https import eu.ztsh.mockserver.api.common.Https
import javax.net.ssl.SSLContext import javax.net.ssl.SSLContext
import javax.net.ssl.SSLParameters import javax.net.ssl.SSLParameters

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

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

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

@ -1,12 +1,12 @@
package pl.touk.mockserver.server package eu.ztsh.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 pl.touk.mockserver.api.common.Https import eu.ztsh.mockserver.api.common.Https
import pl.touk.mockserver.api.common.Method import eu.ztsh.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/pl/touk/mockserver/server/MockEvent.groovy → mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockEvent.groovy
View file

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

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

@ -1,4 +1,4 @@
package pl.touk.mockserver.server package eu.ztsh.mockserver.server
import com.sun.net.httpserver.Headers import com.sun.net.httpserver.Headers
import groovy.json.JsonSlurper import groovy.json.JsonSlurper

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

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

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

@ -1,7 +1,7 @@
package pl.touk.mockserver.server package eu.ztsh.mockserver.server
import com.sun.net.httpserver.HttpExchange import com.sun.net.httpserver.HttpExchange
import pl.touk.mockserver.api.response.MockAdded import eu.ztsh.mockserver.api.response.MockAdded
import javax.xml.bind.JAXBContext import javax.xml.bind.JAXBContext

8
performance-tests/pom.xml
View file

@ -2,8 +2,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">
<parent> <parent>
<artifactId>http-mock-server</artifactId> <artifactId>http-mock-server</artifactId>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<version>2.8.5-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -11,12 +11,12 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<artifactId>mockserver</artifactId> <artifactId>mockserver</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<artifactId>mockserver-client</artifactId> <artifactId>mockserver-client</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>

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

@ -1,4 +1,4 @@
package pl.touk.mockserver.client; package eu.ztsh.mockserver.client;
import org.apache.http.client.HttpClient; import org.apache.http.client.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 pl.touk.mockserver.api.request.AddMock; import eu.ztsh.mockserver.api.request.AddMock;
import pl.touk.mockserver.server.HttpMockServer; import eu.ztsh.mockserver.server.HttpMockServer;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

37
pom.xml
View file

@ -1,17 +1,13 @@
<?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> <modelVersion>4.0.0</modelVersion>
<parent> <groupId>eu.ztsh.mockserver</groupId>
<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>2.8.5-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<modules> <modules>
<module>mockserver-client</module> <module>mockserver-client</module>
<module>mockserver</module> <module>mockserver</module>
@ -39,12 +35,6 @@
<spock-global-unroll.version>0.5.1</spock-global-unroll.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>HEAD</tag>
</scm>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
@ -99,7 +89,7 @@
<version>${lombok.version}</version> <version>${lombok.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>pl.touk.mockserver</groupId> <groupId>eu.ztsh.mockserver</groupId>
<artifactId>mockserver-api</artifactId> <artifactId>mockserver-api</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
@ -159,19 +149,4 @@
</plugins> </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>