Skip to content

Commit 0e01cf4

Browse files
committed
remove: MvcFactory
- now remove MvcExtension - ref #3705
1 parent ded9a21 commit 0e01cf4

File tree

14 files changed

+16
-91
lines changed

14 files changed

+16
-91
lines changed

jooby/src/main/java/io/jooby/Jooby.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ public Jooby mount(@NonNull Router router) {
507507
}
508508

509509
@NonNull @Override
510-
public Jooby mvc(@NonNull MvcExtension router) {
510+
public Jooby mvc(@NonNull Extension router) {
511511
try {
512512
router.install(this);
513513
return this;

jooby/src/main/java/io/jooby/MvcExtension.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

jooby/src/main/java/io/jooby/Router.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,12 +417,12 @@ default Object execute(@NonNull Context context) {
417417
*/
418418

419419
/**
420-
* Import all route method from the given controller class.
420+
* Import all routes from the given controller class.
421421
*
422422
* @param router Router extension.
423423
* @return This router.
424424
*/
425-
@NonNull Router mvc(@NonNull MvcExtension router);
425+
@NonNull Router mvc(@NonNull Extension router);
426426

427427
/**
428428
* Add a websocket handler.

jooby/src/main/java/io/jooby/internal/RouterImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ public Router mount(@NonNull Router router) {
329329
}
330330

331331
@NonNull @Override
332-
public Router mvc(@NonNull MvcExtension router) {
332+
public Router mvc(@NonNull Extension router) {
333333
throw new UnsupportedOperationException();
334334
}
335335

modules/jooby-apt/src/main/resources/io/jooby/internal/apt/Source.java

Lines changed: 1 addition & 1 deletion
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 {
4+
public class ${generatedClassName} implements io.jooby.Extension {
55
protected java.util.function.Function<io.jooby.Context, ${className}> factory;
66
${constructors}
77
public ${generatedClassName}(${className} instance) {

modules/jooby-apt/src/main/resources/io/jooby/internal/apt/Source.kt

Lines changed: 1 addition & 1 deletion
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-
open class ${generatedClassName} : io.jooby.MvcExtension {
4+
open class ${generatedClassName} : io.jooby.Extension {
55
private lateinit var factory: java.util.function.Function<io.jooby.Context, ${className}>
66

77
${constructors}

modules/jooby-apt/src/test/java/io/jooby/apt/ProcessorRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public ProcessorRunner withRouter(SneakyThrows.Consumer2<Jooby, JavaFileObject>
125125
throws Exception {
126126
var classLoader = processor.createClassLoader();
127127
var factoryName = classLoader.getClassName();
128-
var factoryClass = (Class<? extends MvcExtension>) classLoader.loadClass(factoryName);
128+
var factoryClass = (Class<? extends Extension>) classLoader.loadClass(factoryName);
129129
var constructor = factoryClass.getDeclaredConstructor();
130130
var extension = constructor.newInstance();
131131
var application = new Jooby();

modules/jooby-apt/src/test/java/tests/i3705/C3705.java

Lines changed: 0 additions & 8 deletions
This file was deleted.

modules/jooby-apt/src/test/java/tests/i3705/C3705_.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/TypeFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class TypeFactory {
3030

3131
public static final Type CONTEXT = Type.getType(Context.class);
3232

33-
public static final Type MVC_EXTENSION = Type.getType("Lio/jooby/MvcExtension;");
33+
public static final Type MVC_EXTENSION = Type.getType("Lio/jooby/Extension;");
3434
public static final Type GENERATED = Type.getType("Lio/jooby/annotation/Generated;");
3535

3636
public static final Type KOOBY = Type.getType("Lio/jooby/kt/Kooby;");

0 commit comments

Comments
 (0)