Skip to content

Commit 0a8aecc

Browse files
committed
apt: minor changes + fix travis build
1 parent da0aa6d commit 0a8aecc

6 files changed

Lines changed: 6 additions & 10 deletions

File tree

etc/maven.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ DIR=$(cd "$(dirname "$0")"; pwd)
44

55
echo "$@"
66

7-
mvn -pl '!docs,!tests,!examples' "$@"
7+
mvn -pl '!docs,!examples' "$@"

etc/release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
DIR=$(cd "$(dirname "$0")"; pwd)
44

5-
sh $DIR/javadoc.sh
6-
7-
sh $DIR/maven.sh clean deploy -P bom,central
5+
if sh $DIR/javadoc.sh; then
6+
sh $DIR/maven.sh -pl '!docs,!tests,!examples' clean deploy -P bom,central
7+
fi

modules/jooby-apt/src/main/java/io/jooby/internal/apt/FactoryCompiler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public FactoryCompiler(String controllerClass, String moduleClass) {
3838
this.controllerClass = controllerClass;
3939
this.moduleClass = moduleClass;
4040
this.moduleFactoryClass = controllerClass + "$Factory";
41-
this.moduleFactoryJava = this.moduleFactoryClass + ".java";
41+
this.moduleFactoryJava = controllerClass + ".java";
4242
this.moduleFactoryInternalName = this.moduleFactoryClass.replace(".", "/");
4343
}
4444

modules/jooby-apt/src/main/java/io/jooby/internal/apt/HandlerCompiler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import javax.annotation.processing.ProcessingEnvironment;
2727
import javax.inject.Provider;
28-
import javax.lang.model.element.AnnotationMirror;
2928
import javax.lang.model.element.Element;
3029
import javax.lang.model.element.ExecutableElement;
3130
import javax.lang.model.element.TypeElement;

modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void queryParam() throws Exception {
8383
@Test
8484
public void cookieParam() throws Exception {
8585
new MvcHandlerCompilerRunner(new Provisioning())
86-
.debug("/p/cookieParam", handler -> {
86+
.compile("/p/cookieParam", handler -> {
8787
assertEquals("cookie",
8888
handler.apply(new MockContext().setCookieMap(mapOf("c", "cookie"))));
8989
})

modules/jooby-apt/src/test/java/tests/ModuleCompilerTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,8 @@ public void routes() throws Exception {
4242
assertTrue(router.post("/path/post").value() instanceof JavaBeanParam);
4343

4444
assertEquals("/path/pathAttributeWork", router.get("/path/pathAttributeWork").value());
45-
;
4645
assertEquals("/path/path", router.get("/path/path").value());
47-
;
4846
assertEquals("/path/value", router.get("/path/value").value());
49-
;
5047

5148
assertEquals("/path/path1", router.get("/path/path1").value());
5249
assertEquals("/path/path2", router.get("/path/path2").value());

0 commit comments

Comments
 (0)