Skip to content

Commit 6e9ac61

Browse files
committed
MvcFactory deprecated but used in generated mvc-classes by jooby-apt fix #3695
1 parent e6d0dd8 commit 6e9ac61

File tree

3 files changed

+4
-20
lines changed

3 files changed

+4
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public String getPackageName() {
9999
* Generate the controller extension for MVC controller:
100100
*
101101
* <pre>{@code
102-
* public class Controller_ implements MvcExtension, MvcFactory {
102+
* public class Controller_ implements MvcExtension {
103103
* ....
104104
* }
105105
*
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ${packageName};
22
${imports}
33
@io.jooby.annotation.Generated(${className}.class)
4-
public class ${generatedClassName} implements io.jooby.MvcExtension, io.jooby.MvcFactory<${className}> {
4+
public class ${generatedClassName} implements io.jooby.MvcExtension {
55
protected final java.util.function.Function<io.jooby.Context, ${className}> factory;
66
${constructors}
77
public ${generatedClassName}(${className} instance) {
@@ -17,12 +17,4 @@ public class ${generatedClassName} implements io.jooby.MvcExtension, io.jooby.Mv
1717
}
1818

1919
${methods}
20-
21-
public boolean supports(Class<${className}> type) {
22-
return type == ${className}.class;
23-
}
24-
25-
public io.jooby.Extension create(java.util.function.Supplier<${className}> provider) {
26-
return new ${generatedClassName}(provider);
27-
}
2820
}
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
package ${packageName}
22
${imports}
33
@io.jooby.annotation.Generated(${className}::class)
4-
open class ${generatedClassName}(protected val factory: java.util.function.Function<io.jooby.Context, ${className}>) : io.jooby.MvcExtension, io.jooby.MvcFactory<${className}?> {
4+
open class ${generatedClassName}(protected val factory: java.util.function.Function<io.jooby.Context, ${className}>) : io.jooby.MvcExtension {
55
${constructors}
66
constructor(instance: ${className}) : this(java.util.function.Function<io.jooby.Context, ${className}> { instance })
77

88
constructor(provider: java.util.function.Supplier<${className}?>) : this(java.util.function.Function<io.jooby.Context, ${className}> { provider.get()!! })
99

1010
${methods}
11-
12-
override fun supports(type: Class<${className}?>): Boolean {
13-
return type == ${className}::class.java
14-
}
15-
16-
override fun create(provider: java.util.function.Supplier<${className}?>): io.jooby.Extension {
17-
return ${generatedClassName}(provider)
18-
}
19-
}
11+
}

0 commit comments

Comments
 (0)