Replace println with logger
This commit is contained in:
parent
0b4f4e0cf8
commit
1bbaf72084
7 changed files with 32 additions and 9 deletions
12
pom.xml
12
pom.xml
|
@ -18,6 +18,8 @@
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
<spock-core.version>1.0-groovy-2.0-SNAPSHOT</spock-core.version>
|
<spock-core.version>1.0-groovy-2.0-SNAPSHOT</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.7</slf4j-api.version>
|
||||||
|
<logback-classic.version>1.0.13</logback-classic.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -43,6 +45,16 @@
|
||||||
<version>${commons-lang3.version}</version>
|
<version>${commons-lang3.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.slf4j</groupId>
|
||||||
|
<artifactId>slf4j-api</artifactId>
|
||||||
|
<version>${slf4j-api.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>ch.qos.logback</groupId>
|
||||||
|
<artifactId>logback-classic</artifactId>
|
||||||
|
<version>${logback-classic.version}</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -2,9 +2,11 @@ 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 java.util.concurrent.CopyOnWriteArrayList
|
import java.util.concurrent.CopyOnWriteArrayList
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
@PackageScope
|
@PackageScope
|
||||||
class ContextExecutor {
|
class ContextExecutor {
|
||||||
private final HttpServerWraper httpServerWraper
|
private final HttpServerWraper httpServerWraper
|
||||||
|
@ -18,7 +20,7 @@ class ContextExecutor {
|
||||||
httpServerWraper.createContext(path, {
|
httpServerWraper.createContext(path, {
|
||||||
HttpExchange ex ->
|
HttpExchange ex ->
|
||||||
MockRequest request = new MockRequest(ex.requestBody.text, ex.requestHeaders, ex.requestURI)
|
MockRequest request = new MockRequest(ex.requestBody.text, ex.requestHeaders, ex.requestURI)
|
||||||
println "Mock received input"
|
log.info("Mock received input")
|
||||||
for (Mock mock : mocks) {
|
for (Mock mock : mocks) {
|
||||||
try {
|
try {
|
||||||
if (mock.match(ex.requestMethod, request)) {
|
if (mock.match(ex.requestMethod, request)) {
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package pl.touk.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.slurpersupport.GPathResult
|
import groovy.util.slurpersupport.GPathResult
|
||||||
import groovy.xml.MarkupBuilder
|
import groovy.xml.MarkupBuilder
|
||||||
|
|
||||||
|
@ -9,6 +10,7 @@ import java.util.concurrent.CopyOnWriteArraySet
|
||||||
|
|
||||||
import static pl.touk.mockserver.server.Util.createResponse
|
import static pl.touk.mockserver.server.Util.createResponse
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
class HttpMockServer {
|
class HttpMockServer {
|
||||||
|
|
||||||
private final HttpServerWraper httpServerWraper
|
private final HttpServerWraper httpServerWraper
|
||||||
|
@ -101,7 +103,7 @@ class HttpMockServer {
|
||||||
if (!(name in mockNames)) {
|
if (!(name in mockNames)) {
|
||||||
throw new RuntimeException('mock not registered')
|
throw new RuntimeException('mock not registered')
|
||||||
}
|
}
|
||||||
println "Removing $name"
|
log.info("Removing mock $name")
|
||||||
List<MockEvent> mockEvents = childServers.collect { it.removeMock(name) }.flatten()
|
List<MockEvent> mockEvents = childServers.collect { it.removeMock(name) }.flatten()
|
||||||
mockNames.remove(name)
|
mockNames.remove(name)
|
||||||
StringWriter sw = new StringWriter()
|
StringWriter sw = new StringWriter()
|
||||||
|
|
|
@ -3,9 +3,11 @@ 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 groovy.transform.PackageScope
|
import groovy.transform.PackageScope
|
||||||
|
import groovy.util.logging.Slf4j
|
||||||
|
|
||||||
import java.util.concurrent.Executors
|
import java.util.concurrent.Executors
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
@PackageScope
|
@PackageScope
|
||||||
class HttpServerWraper {
|
class HttpServerWraper {
|
||||||
private final HttpServer httpServer
|
private final HttpServer httpServer
|
||||||
|
@ -18,9 +20,9 @@ class HttpServerWraper {
|
||||||
InetSocketAddress addr = new InetSocketAddress(Inet4Address.getByName("0.0.0.0"), port)
|
InetSocketAddress addr = new InetSocketAddress(Inet4Address.getByName("0.0.0.0"), port)
|
||||||
httpServer = HttpServer.create(addr, 0)
|
httpServer = HttpServer.create(addr, 0)
|
||||||
httpServer.executor = Executors.newCachedThreadPool()
|
httpServer.executor = Executors.newCachedThreadPool()
|
||||||
println("Http server statrting on port $port...")
|
log.info("Http server statrting on port $port...")
|
||||||
httpServer.start()
|
httpServer.start()
|
||||||
println('Http server is started')
|
log.info('Http server is started')
|
||||||
}
|
}
|
||||||
|
|
||||||
void createContext(String context, HttpHandler handler) {
|
void createContext(String context, HttpHandler handler) {
|
||||||
|
@ -34,7 +36,7 @@ class HttpServerWraper {
|
||||||
} else {
|
} else {
|
||||||
executors << new ContextExecutor(this, mock)
|
executors << new ContextExecutor(this, mock)
|
||||||
}
|
}
|
||||||
println "Added mock ${mock.name}"
|
log.info("Added mock ${mock.name}")
|
||||||
}
|
}
|
||||||
|
|
||||||
void stop() {
|
void stop() {
|
||||||
|
|
|
@ -1,13 +1,16 @@
|
||||||
package pl.touk.mockserver.server
|
package pl.touk.mockserver.server
|
||||||
|
|
||||||
|
import groovy.util.logging.Slf4j
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
class Main {
|
class Main {
|
||||||
static void main(String[] args) {
|
static void main(String[] args) {
|
||||||
HttpMockServer httpMockServer = new HttpMockServer()
|
HttpMockServer httpMockServer = new HttpMockServer()
|
||||||
|
|
||||||
Runtime.runtime.addShutdownHook(new Thread({
|
Runtime.runtime.addShutdownHook(new Thread({
|
||||||
println 'Http server is stopping...'
|
log.info('Http server is stopping...')
|
||||||
httpMockServer.stop()
|
httpMockServer.stop()
|
||||||
println 'Http server is stopped'
|
log.info('Http server is stopped')
|
||||||
} as Runnable))
|
} as Runnable))
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
|
|
|
@ -2,11 +2,13 @@ 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 java.util.concurrent.CopyOnWriteArrayList
|
import java.util.concurrent.CopyOnWriteArrayList
|
||||||
|
|
||||||
@PackageScope
|
@PackageScope
|
||||||
@EqualsAndHashCode(excludes = ["counter"])
|
@EqualsAndHashCode(excludes = ["counter"])
|
||||||
|
@Slf4j
|
||||||
class Mock implements Comparable<Mock> {
|
class Mock implements Comparable<Mock> {
|
||||||
final String name
|
final String name
|
||||||
final String path
|
final String path
|
||||||
|
@ -34,7 +36,7 @@ class Mock implements Comparable<Mock> {
|
||||||
}
|
}
|
||||||
|
|
||||||
MockResponse apply(MockRequest request) {
|
MockResponse apply(MockRequest request) {
|
||||||
println "Mock $name invoked"
|
log.debug("Mock $name invoked")
|
||||||
++counter
|
++counter
|
||||||
String responseText = response(request)
|
String responseText = response(request)
|
||||||
String response = soap ? wrapSoap(responseText) : responseText
|
String response = soap ? wrapSoap(responseText) : responseText
|
||||||
|
|
|
@ -46,7 +46,7 @@ class ServerMockPT extends Specification {
|
||||||
threads*.start()
|
threads*.start()
|
||||||
Thread.sleep(60000)
|
Thread.sleep(60000)
|
||||||
then:
|
then:
|
||||||
responses.eachWithIndex { res, i -> println "Checking $i"; assert res.name() == "goodResponse$i" }
|
responses.eachWithIndex { res, i -> assert res.name() == "goodResponse$i" }
|
||||||
cleanup:
|
cleanup:
|
||||||
httpMockServer.stop()
|
httpMockServer.stop()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue