From e62250ff7ba1b5cc7a1ebb763d7ab004ef1aa033 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Tue, 11 Apr 2017 12:54:37 +0200 Subject: [PATCH] Minor: auto-format of module: webserver --- .../src/main/kotlin/net/corda/webserver/WebArgsParser.kt | 6 +++--- .../net/corda/webserver/internal/AllExceptionMapper.kt | 4 ++-- .../net/corda/webserver/servlets/DataUploadServlet.kt | 2 +- webserver/webcapsule/build.gradle | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt b/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt index 3f8e2377dc..539b812a44 100644 --- a/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt +++ b/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt @@ -61,9 +61,9 @@ data class CmdLineOptions(val baseDirectory: Path, } private fun loadConfig(baseDirectory: Path, - configFile: Path = baseDirectory / "node.conf", - allowMissingConfig: Boolean = false, - configOverrides: Map = emptyMap()): Config { + configFile: Path = baseDirectory / "node.conf", + allowMissingConfig: Boolean = false, + configOverrides: Map = emptyMap()): Config { val parseOptions = ConfigParseOptions.defaults() val defaultConfig = ConfigFactory.parseResources("web-reference.conf", parseOptions.setAllowMissing(false)) val appConfig = ConfigFactory.parseFile(configFile.toFile(), parseOptions.setAllowMissing(allowMissingConfig)) diff --git a/webserver/src/main/kotlin/net/corda/webserver/internal/AllExceptionMapper.kt b/webserver/src/main/kotlin/net/corda/webserver/internal/AllExceptionMapper.kt index a2c138b35e..3a8687fcf5 100644 --- a/webserver/src/main/kotlin/net/corda/webserver/internal/AllExceptionMapper.kt +++ b/webserver/src/main/kotlin/net/corda/webserver/internal/AllExceptionMapper.kt @@ -7,11 +7,11 @@ import javax.ws.rs.ext.Provider // Provides basic exception logging to all APIs @Provider -class AllExceptionMapper: ExceptionMapper { +class AllExceptionMapper : ExceptionMapper { companion object { val logger = loggerFor() } - + override fun toResponse(exception: Exception?): Response { logger.error("Unhandled exception in API", exception) return Response.status(500).build() diff --git a/webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt b/webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt index eb1efb7268..9bf30893d7 100644 --- a/webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt +++ b/webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt @@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse /** * Uploads to the node via the [CordaRPCOps] uploadFile interface. */ -class DataUploadServlet: HttpServlet() { +class DataUploadServlet : HttpServlet() { private val log = loggerFor() override fun doPost(req: HttpServletRequest, resp: HttpServletResponse) { diff --git a/webserver/webcapsule/build.gradle b/webserver/webcapsule/build.gradle index e4dc6e85db..d036066d29 100644 --- a/webserver/webcapsule/build.gradle +++ b/webserver/webcapsule/build.gradle @@ -40,10 +40,10 @@ task buildWebserverJar(type: FatCapsule) { applicationClass 'net.corda.webserver.WebServer' archiveName "corda-webserver-${corda_version}.jar" applicationSource = files( - project.tasks.findByName('jar'), - new File(project(':node').rootDir, 'node/build/classes/main/CordaCaplet.class'), - new File(project(':node').rootDir, 'node/build/classes/main/CordaCaplet$1.class'), - 'config/dev/log4j2.xml' + project.tasks.findByName('jar'), + new File(project(':node').rootDir, 'node/build/classes/main/CordaCaplet.class'), + new File(project(':node').rootDir, 'node/build/classes/main/CordaCaplet$1.class'), + 'config/dev/log4j2.xml' ) from 'NOTICE' // Copy CDDL notice