Skip to content

Commit 55e8293

Browse files
jknackjknack
committed
build: format source code
1 parent f632652 commit 55e8293

36 files changed

Lines changed: 697 additions & 558 deletions

File tree

‎modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -376,16 +376,18 @@ private static <E extends Throwable> E sneakyThrow0(final Throwable x) throws E
376376
private void verifyBeanValidationDependency(Collection<MvcRouter> routers) {
377377
var hasBeanValidation = routers.stream().anyMatch(MvcRouter::hasBeanValidation);
378378
if (hasBeanValidation) {
379-
TypeElement validatorElement = processingEnv.getElementUtils()
380-
.getTypeElement("io.jooby.validation.BeanValidator");
379+
TypeElement validatorElement =
380+
processingEnv.getElementUtils().getTypeElement("io.jooby.validation.BeanValidator");
381381

382382
if (validatorElement == null) {
383-
processingEnv.getMessager().printMessage(
383+
processingEnv
384+
.getMessager()
385+
.printMessage(
384386
Diagnostic.Kind.ERROR,
385-
"Unable to load 'BeanValidator' class. " +
386-
"Bean validation usage (@Valid) was detected, but the appropriate dependency is missing. " +
387-
"Please ensure that you have added the corresponding validation dependency " +
388-
"(e.g., jooby-hibernate-validator).");
387+
"Unable to load 'BeanValidator' class. Bean validation usage (@Valid) was detected,"
388+
+ " but the appropriate dependency is missing. Please ensure that you have"
389+
+ " added the corresponding validation dependency (e.g.,"
390+
+ " jooby-hibernate-validator).");
389391
}
390392
}
391393
}

‎modules/jooby-apt/src/main/java/io/jooby/internal/apt/MvcRoute.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,9 @@ public List<String> generateHandlerCall(boolean kt) {
208208
for (var parameter : getParameters(true)) {
209209
String generatedParameter = parameter.generateMapping(kt);
210210
if (parameter.isRequireBeanValidation()) {
211-
generatedParameter = CodeBlock.of(
212-
"io.jooby.validation.BeanValidator.validate(",
213-
"ctx, ",
214-
generatedParameter,
215-
")");
211+
generatedParameter =
212+
CodeBlock.of(
213+
"io.jooby.validation.BeanValidator.validate(", "ctx, ", generatedParameter, ")");
216214
}
217215

218216
paramList.add(generatedParameter);

‎modules/jooby-apt/src/test/java/tests/validation/Bean.java‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
1+
/*
2+
* Jooby https://jooby.io
3+
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
4+
* Copyright 2014 Edgar Espina
5+
*/
16
package tests.validation;
27

38
import io.jooby.Context;
49

510
class Bean {
6-
private String name;
11+
private String name;
712

8-
public String getName() {
9-
return name;
10-
}
13+
public String getName() {
14+
return name;
15+
}
1116

12-
public void setName(String name) {
13-
this.name = name;
14-
}
17+
public void setName(String name) {
18+
this.name = name;
19+
}
1520

16-
public static Bean map(Context ctx) {
17-
return ctx.body(Bean.class);
18-
}
21+
public static Bean map(Context ctx) {
22+
return ctx.body(Bean.class);
23+
}
1924
}

‎modules/jooby-apt/src/test/java/tests/validation/BeanValidationGeneratorTest.java‎

Lines changed: 44 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,52 @@
1+
/*
2+
* Jooby https://jooby.io
3+
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
4+
* Copyright 2014 Edgar Espina
5+
*/
16
package tests.validation;
27

3-
import io.jooby.apt.ProcessorRunner;
8+
import static org.junit.jupiter.api.Assertions.assertTrue;
9+
410
import org.junit.jupiter.api.Test;
511

6-
import static org.junit.jupiter.api.Assertions.assertTrue;
12+
import io.jooby.apt.ProcessorRunner;
713

814
public class BeanValidationGeneratorTest {
915

10-
@Test
11-
public void generate_validation_forBean() throws Exception {
12-
new ProcessorRunner(new BeanValidationsController()).withSource(
13-
false,
14-
source -> {
15-
assertTrue(source.contains(
16-
"c.validateQueryBean(io.jooby.validation.BeanValidator.validate(ctx, ctx.query(\"bean\").isMissing() ? ctx.query().toNullable(tests.validation.Bean.class) : ctx.query(\"bean\").toNullable(tests.validation.Bean.class)))")
17-
);
18-
19-
assertTrue(source.contains(
20-
"c.validateFormBean(io.jooby.validation.BeanValidator.validate(ctx, ctx.form(\"bean\").isMissing() ? ctx.form().toNullable(tests.validation.Bean.class) : ctx.form(\"bean\").toNullable(tests.validation.Bean.class)))")
21-
);
22-
23-
assertTrue(source.contains(
24-
"c.validateBindParamBean(io.jooby.validation.BeanValidator.validate(ctx, tests.validation.Bean.map(ctx)))")
25-
);
26-
27-
assertTrue(source.contains(
28-
"c.validateBodyBean(io.jooby.validation.BeanValidator.validate(ctx, ctx.body(tests.validation.Bean.class)))")
29-
);
30-
31-
assertTrue(source.contains(
32-
"c.validateListOfBodyBeans(io.jooby.validation.BeanValidator.validate(ctx, ctx.body(io.jooby.Reified.list(tests.validation.Bean.class).getType())))")
33-
);
34-
});
35-
}
16+
@Test
17+
public void generate_validation_forBean() throws Exception {
18+
new ProcessorRunner(new BeanValidationsController())
19+
.withSource(
20+
false,
21+
source -> {
22+
assertTrue(
23+
source.contains(
24+
"c.validateQueryBean(io.jooby.validation.BeanValidator.validate(ctx,"
25+
+ " ctx.query(\"bean\").isMissing() ?"
26+
+ " ctx.query().toNullable(tests.validation.Bean.class) :"
27+
+ " ctx.query(\"bean\").toNullable(tests.validation.Bean.class)))"));
28+
29+
assertTrue(
30+
source.contains(
31+
"c.validateFormBean(io.jooby.validation.BeanValidator.validate(ctx,"
32+
+ " ctx.form(\"bean\").isMissing() ?"
33+
+ " ctx.form().toNullable(tests.validation.Bean.class) :"
34+
+ " ctx.form(\"bean\").toNullable(tests.validation.Bean.class)))"));
35+
36+
assertTrue(
37+
source.contains(
38+
"c.validateBindParamBean(io.jooby.validation.BeanValidator.validate(ctx,"
39+
+ " tests.validation.Bean.map(ctx)))"));
40+
41+
assertTrue(
42+
source.contains(
43+
"c.validateBodyBean(io.jooby.validation.BeanValidator.validate(ctx,"
44+
+ " ctx.body(tests.validation.Bean.class)))"));
45+
46+
assertTrue(
47+
source.contains(
48+
"c.validateListOfBodyBeans(io.jooby.validation.BeanValidator.validate(ctx,"
49+
+ " ctx.body(io.jooby.Reified.list(tests.validation.Bean.class).getType())))"));
50+
});
51+
}
3652
}

‎modules/jooby-apt/src/test/java/tests/validation/BeanValidationsController.java‎

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,45 @@
1+
/*
2+
* Jooby https://jooby.io
3+
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
4+
* Copyright 2014 Edgar Espina
5+
*/
16
package tests.validation;
27

8+
import java.util.List;
9+
310
import io.jooby.annotation.*;
411
import jakarta.validation.Valid;
512

6-
import java.util.List;
7-
813
public class BeanValidationsController {
914

10-
@POST("/validate/query-bean")
11-
public Bean validateQueryBean(@Valid @QueryParam Bean bean) {
12-
return bean;
13-
}
14-
15-
@POST("/validate/form-bean")
16-
public Bean validateFormBean(@Valid @FormParam Bean bean) {
17-
return bean;
18-
}
19-
20-
//todo: revive when flash `toNullable` will be fixed
21-
// @POST("/validate/flash-bean")
22-
// public Bean validateFlashBean(@Valid @FlashParam Bean bean) {
23-
// return bean;
24-
// }
25-
26-
@POST("/validate/bind-param-bean")
27-
public Bean validateBindParamBean(@Valid @BindParam Bean bean) {
28-
return bean;
29-
}
30-
31-
@POST("/validate/body-bean")
32-
public Bean validateBodyBean(@Valid Bean bean) {
33-
return bean;
34-
}
35-
36-
@POST("/validate/list-of-body-beans")
37-
public List<Bean> validateListOfBodyBeans(@Valid List<Bean> bean) {
38-
return bean;
39-
}
15+
@POST("/validate/query-bean")
16+
public Bean validateQueryBean(@Valid @QueryParam Bean bean) {
17+
return bean;
18+
}
19+
20+
@POST("/validate/form-bean")
21+
public Bean validateFormBean(@Valid @FormParam Bean bean) {
22+
return bean;
23+
}
24+
25+
// todo: revive when flash `toNullable` will be fixed
26+
// @POST("/validate/flash-bean")
27+
// public Bean validateFlashBean(@Valid @FlashParam Bean bean) {
28+
// return bean;
29+
// }
30+
31+
@POST("/validate/bind-param-bean")
32+
public Bean validateBindParamBean(@Valid @BindParam Bean bean) {
33+
return bean;
34+
}
35+
36+
@POST("/validate/body-bean")
37+
public Bean validateBodyBean(@Valid Bean bean) {
38+
return bean;
39+
}
40+
41+
@POST("/validate/list-of-body-beans")
42+
public List<Bean> validateListOfBodyBeans(@Valid List<Bean> bean) {
43+
return bean;
44+
}
4045
}

‎modules/jooby-avaje-inject/src/main/java/io/jooby/avaje/inject/JoobyPropertyPlugin.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import java.util.Optional;
1010

1111
import com.typesafe.config.Config;
12-
1312
import io.avaje.inject.spi.ConfigPropertyPlugin;
1413

1514
class JoobyPropertyPlugin implements ConfigPropertyPlugin {

‎modules/jooby-avaje-validator/src/main/java/module-info.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
44
* Copyright 2014 Edgar Espina
55
*/
6-
/**
7-
* Avaje Validator Module.
8-
*/
6+
/** Avaje Validator Module. */
97
module io.jooby.avaje.validator {
10-
exports io.jooby.avaje.validator;
8+
exports io.jooby.avaje.validator;
119

12-
requires transitive io.jooby;
13-
requires static com.github.spotbugs.annotations;
14-
requires typesafe.config;
15-
requires transitive io.avaje.validation;
16-
requires transitive io.jooby.validation;
10+
requires transitive io.jooby;
11+
requires static com.github.spotbugs.annotations;
12+
requires typesafe.config;
13+
requires transitive io.avaje.validation;
14+
requires transitive io.jooby.validation;
1715
}

‎modules/jooby-avaje-validator/src/test/java/io/jooby/avaje/validator/AvajeValidatorModuleTest.java‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
1+
/*
2+
* Jooby https://jooby.io
3+
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
4+
* Copyright 2014 Edgar Espina
5+
*/
16
package io.jooby.avaje.validator;
27

8+
import static io.jooby.StatusCode.UNPROCESSABLE_ENTITY_CODE;
9+
import static io.jooby.avaje.validator.app.App.DEFAULT_TITLE;
10+
import static io.restassured.RestAssured.given;
11+
12+
import java.util.List;
13+
import java.util.Map;
14+
15+
import org.assertj.core.api.Assertions;
16+
import org.junit.jupiter.api.Test;
17+
318
import io.jooby.avaje.validator.app.App;
419
import io.jooby.avaje.validator.app.NewAccountRequest;
520
import io.jooby.avaje.validator.app.Person;
@@ -9,16 +24,6 @@
924
import io.restassured.builder.RequestSpecBuilder;
1025
import io.restassured.http.ContentType;
1126
import io.restassured.specification.RequestSpecification;
12-
import org.assertj.core.api.Assertions;
13-
import org.junit.jupiter.api.Test;
14-
15-
import java.util.ArrayList;
16-
import java.util.List;
17-
import java.util.Map;
18-
19-
import static io.jooby.StatusCode.UNPROCESSABLE_ENTITY_CODE;
20-
import static io.jooby.avaje.validator.app.App.DEFAULT_TITLE;
21-
import static io.restassured.RestAssured.given;
2227

2328
@JoobyTest(value = App.class, port = 8099)
2429
public class AvajeValidatorModuleTest {

‎modules/jooby-avaje-validator/src/test/java/io/jooby/avaje/validator/app/App.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Jooby https://jooby.io
3+
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
4+
* Copyright 2014 Edgar Espina
5+
*/
16
package io.jooby.avaje.validator.app;
27

38
import io.jooby.Jooby;

‎modules/jooby-avaje-validator/src/test/java/io/jooby/avaje/validator/app/Controller.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1+
/*
2+
* Jooby https://jooby.io
3+
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
4+
* Copyright 2014 Edgar Espina
5+
*/
16
package io.jooby.avaje.validator.app;
27

8+
import java.util.List;
9+
import java.util.Map;
10+
311
import io.jooby.annotation.POST;
412
import io.jooby.annotation.Path;
513
import jakarta.validation.Valid;
614

7-
import java.util.List;
8-
import java.util.Map;
9-
1015
@Path("")
1116
public class Controller {
1217

0 commit comments

Comments
 (0)