http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java index cfa3875..26dbf47 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java @@ -71,13 +71,12 @@ public class DomainsRoutesTest { webAdminServer.await(); RestAssured.requestSpecification = new RequestSpecBuilder() - .setContentType(ContentType.JSON) - .setAccept(ContentType.JSON) - .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) - .setPort(webAdminServer.getPort().get().getValue()) - .setBasePath(DomainsRoutes.DOMAINS) - .build(); - + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) + .setPort(webAdminServer.getPort().get().getValue()) + .setBasePath(DomainsRoutes.DOMAINS) + .build(); } @After
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java index bcc2d1f..a3d1072 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java @@ -73,12 +73,12 @@ public class UsersRoutesTest { webAdminServer.await(); RestAssured.requestSpecification = new RequestSpecBuilder() - .setContentType(ContentType.JSON) - .setAccept(ContentType.JSON) - .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) - .setPort(webAdminServer.getPort().get().getValue()) - .setBasePath(UserRoutes.USERS) - .build(); + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) + .setPort(webAdminServer.getPort().get().getValue()) + .setBasePath(UserRoutes.USERS) + .build(); } @After http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java index 0c97839..397381a 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java @@ -134,7 +134,7 @@ public class GlobalQuotaRoutes implements Routes { @ApiOperation( value = "Reading count and size at the same time", notes = "If there is no limitation for count and/or size, the returned value will be -1" - ) + ) @ApiResponses(value = { @ApiResponse(code = HttpStatus.OK_200, message = "OK", response = QuotaDTO.class), @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal server error - Something went bad on the server side.") http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/webadmin/webadmin-swagger/src/main/java/org/apache/james/webadmin/swagger/SwaggerParser.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-swagger/src/main/java/org/apache/james/webadmin/swagger/SwaggerParser.java b/server/protocols/webadmin/webadmin-swagger/src/main/java/org/apache/james/webadmin/swagger/SwaggerParser.java index 730caa6..9500b36 100644 --- a/server/protocols/webadmin/webadmin-swagger/src/main/java/org/apache/james/webadmin/swagger/SwaggerParser.java +++ b/server/protocols/webadmin/webadmin-swagger/src/main/java/org/apache/james/webadmin/swagger/SwaggerParser.java @@ -36,49 +36,49 @@ import io.swagger.models.Swagger; @SwaggerDefinition public class SwaggerParser { - private static final String[] SCHEMES = new String[]{SwaggerDefinition.Scheme.HTTP.name(), SwaggerDefinition.Scheme.HTTPS.name()}; - private static final String JSON_TYPE = "application/json"; - private static final String API_DOC_VERSION = "V1.0"; - private static final String API_DOC_TITLE = "JAMES Web Admin API"; - private static final String API_DOC_DESCRIPTION = "All the web administration API for JAMES"; - public static final String HOST_PORT_SEPARATOR = ":"; + private static final String[] SCHEMES = new String[]{SwaggerDefinition.Scheme.HTTP.name(), SwaggerDefinition.Scheme.HTTPS.name()}; + private static final String JSON_TYPE = "application/json"; + private static final String API_DOC_VERSION = "V1.0"; + private static final String API_DOC_TITLE = "JAMES Web Admin API"; + private static final String API_DOC_DESCRIPTION = "All the web administration API for JAMES"; + public static final String HOST_PORT_SEPARATOR = ":"; - @Inject - public static String getSwaggerJson(String packageName, WebAdminConfiguration configuration) throws JsonProcessingException { - return swaggerToJson(getSwagger(packageName, configuration)); - } + @Inject + public static String getSwaggerJson(String packageName, WebAdminConfiguration configuration) throws JsonProcessingException { + return swaggerToJson(getSwagger(packageName, configuration)); + } - private static Swagger getSwagger(String packageName, WebAdminConfiguration configuration) { - return new Reader(getSwagger(getBeanConfig(packageName, configuration))) - .read(new Reflections(packageName) - .getTypesAnnotatedWith(Api.class)); - } + private static Swagger getSwagger(String packageName, WebAdminConfiguration configuration) { + return new Reader(getSwagger(getBeanConfig(packageName, configuration))) + .read(new Reflections(packageName) + .getTypesAnnotatedWith(Api.class)); + } - private static Swagger getSwagger(BeanConfig beanConfig) { - Swagger swagger = beanConfig.getSwagger(); + private static Swagger getSwagger(BeanConfig beanConfig) { + Swagger swagger = beanConfig.getSwagger(); - swagger.addConsumes(JSON_TYPE); - swagger.addProduces(JSON_TYPE); - return swagger; - } + swagger.addConsumes(JSON_TYPE); + swagger.addProduces(JSON_TYPE); + return swagger; + } - private static BeanConfig getBeanConfig(String packageName, WebAdminConfiguration configuration) { - BeanConfig beanConfig = new BeanConfig(); - beanConfig.setResourcePackage(packageName); - beanConfig.setVersion(API_DOC_VERSION); - beanConfig.setTitle(API_DOC_TITLE); - beanConfig.setDescription(API_DOC_DESCRIPTION); - beanConfig.setHost(configuration.getHost() + HOST_PORT_SEPARATOR + configuration.getPort().get().getValue()); - beanConfig.setSchemes(SCHEMES); - beanConfig.setScan(true); - beanConfig.scanAndRead(); - return beanConfig; - } + private static BeanConfig getBeanConfig(String packageName, WebAdminConfiguration configuration) { + BeanConfig beanConfig = new BeanConfig(); + beanConfig.setResourcePackage(packageName); + beanConfig.setVersion(API_DOC_VERSION); + beanConfig.setTitle(API_DOC_TITLE); + beanConfig.setDescription(API_DOC_DESCRIPTION); + beanConfig.setHost(configuration.getHost() + HOST_PORT_SEPARATOR + configuration.getPort().get().getValue()); + beanConfig.setSchemes(SCHEMES); + beanConfig.setScan(true); + beanConfig.scanAndRead(); + return beanConfig; + } - public static String swaggerToJson(Swagger swagger) throws JsonProcessingException { - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.setSerializationInclusion(Include.NON_EMPTY); - return objectMapper.writeValueAsString(swagger); - } + public static String swaggerToJson(Swagger swagger) throws JsonProcessingException { + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.setSerializationInclusion(Include.NON_EMPTY); + return objectMapper.writeValueAsString(swagger); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
