diff --git a/restservice/pom.xml b/restservice/pom.xml index 7c82417..4ba0b83 100755 --- a/restservice/pom.xml +++ b/restservice/pom.xml @@ -17,21 +17,21 @@ http://www.example.com - - dev - - dev - - - true - - - - prod - - prod - - + + dev + + dev + + + true + + + + prod + + prod + + diff --git a/restservice/src/main/java/com/plannaplan/Swagger2Config.java b/restservice/src/main/java/com/plannaplan/Swagger2Config.java index 755928d..19ad14d 100755 --- a/restservice/src/main/java/com/plannaplan/Swagger2Config.java +++ b/restservice/src/main/java/com/plannaplan/Swagger2Config.java @@ -24,14 +24,10 @@ public class Swagger2Config extends WebMvcConfigurationSupport { @Bean public Docket createRestApi() { - Parameter authHeader = new ParameterBuilder() - .parameterType("header") - .name("Authorization") - .modelRef(new ModelRef("string")) - .build(); + Parameter authHeader = new ParameterBuilder().parameterType("header").name("Authorization") + .modelRef(new ModelRef("string")).build(); return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select() - .apis(RequestHandlerSelectors.basePackage("com.plannaplan")).paths(PathSelectors.any()) - .build() + .apis(RequestHandlerSelectors.basePackage("com.plannaplan")).paths(PathSelectors.any()).build() .globalOperationParameters(Collections.singletonList(authHeader)); } diff --git a/restservice/src/main/java/com/plannaplan/controllers/GroupController.java b/restservice/src/main/java/com/plannaplan/controllers/GroupController.java index bdadac4..2e73b76 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/GroupController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/GroupController.java @@ -64,8 +64,8 @@ public class GroupController { @PutMapping("/{id}/capacity") @ApiOperation(value = "Change capacity of given group. You need to provide DEANERY token to be ale to change capacity") public ResponseEntity updateCapacity( - @PathVariable(name = "id") @ApiParam(value = "id of group to change capacity") Long id, - @RequestParam(name = "newcapacity") @ApiParam(value = "capacity to be set") int newcapacity) { + @PathVariable(name = "id", required = true) @ApiParam(value = "id of group to change capacity") Long id, + @RequestParam(name = "newcapacity", required = true) Integer newcapacity) { final Groups group = this.groupService.getGroupById(id).get(); if (group == null) { return new ResponseEntity<>("Given group doens't exist", HttpStatus.NOT_FOUND); diff --git a/restservice/src/main/resources/application-dev.properties b/restservice/src/main/resources/application-dev.properties index 7b49197..37863ad 100755 --- a/restservice/src/main/resources/application-dev.properties +++ b/restservice/src/main/resources/application-dev.properties @@ -8,6 +8,7 @@ spring.jpa.hibernate.ddl-auto=create-drop spring.jackson.serialization.fail-on-empty-beans=false spring.main.allow-bean-definition-overriding=true spring.jackson.default-property-inclusion = NON_NULL +logging.level.io.swagger.models.parameters.AbstractSerializableParameter=ERROR server.port=1285 plannaplan.dev = true plannaplan.frontendUrl= http://localhost:3000 \ No newline at end of file diff --git a/restservice/src/main/resources/application-prod.properties b/restservice/src/main/resources/application-prod.properties index 46e3b11..84077c0 100755 --- a/restservice/src/main/resources/application-prod.properties +++ b/restservice/src/main/resources/application-prod.properties @@ -8,6 +8,7 @@ spring.jpa.hibernate.ddl-auto=update spring.jackson.serialization.fail-on-empty-beans=false spring.main.allow-bean-definition-overriding=true spring.jackson.default-property-inclusion = NON_NULL +logging.level.io.swagger.models.parameters.AbstractSerializableParameter=ERROR server.port=1285