Repository: camel Updated Branches: refs/heads/master cc4f05ec9 -> 112ef7851
CAMEL-11006 Auto generate REST DSL for Camel fr... ...om Swagger2.0/OAI specification Refactored `directRouteGenerator` to `destinationGenerator` and made `RestDslDefinitionGenerator` public -- otherwise it could not be used. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/39ae85bd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/39ae85bd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/39ae85bd Branch: refs/heads/master Commit: 39ae85bd238c2ce21e8fa6751b858fdd504e7048 Parents: cc4f05e Author: Zoran Regvart <zregv...@apache.org> Authored: Wed Mar 29 11:43:44 2017 +0200 Committer: Zoran Regvart <zregv...@apache.org> Committed: Wed Mar 29 11:43:44 2017 +0200 ---------------------------------------------------------------------- .../generator/swagger/RestDslDefinitionGenerator.java | 4 ++-- .../apache/camel/generator/swagger/RestDslGenerator.java | 10 +++++----- .../generator/swagger/RestDslSourceCodeGenerator.java | 2 +- .../camel/generator/swagger/RestDslGeneratorTest.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/39ae85bd/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslDefinitionGenerator.java ---------------------------------------------------------------------- diff --git a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslDefinitionGenerator.java b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslDefinitionGenerator.java index c8d74b3..3cdde1d 100644 --- a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslDefinitionGenerator.java +++ b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslDefinitionGenerator.java @@ -21,7 +21,7 @@ import io.swagger.models.Swagger; import org.apache.camel.CamelContext; import org.apache.camel.model.rest.RestsDefinition; -class RestDslDefinitionGenerator extends RestDslGenerator<RestDslDefinitionGenerator> { +public final class RestDslDefinitionGenerator extends RestDslGenerator<RestDslDefinitionGenerator> { RestDslDefinitionGenerator(final Swagger swagger) { super(swagger); @@ -30,7 +30,7 @@ class RestDslDefinitionGenerator extends RestDslGenerator<RestDslDefinitionGener public RestsDefinition generate(final CamelContext context) { final RestDefinitionEmitter emitter = new RestDefinitionEmitter(context); - final PathVisitor<RestsDefinition> restDslStatement = new PathVisitor<>(emitter, directRouteGenerator()); + final PathVisitor<RestsDefinition> restDslStatement = new PathVisitor<>(emitter, destinationGenerator()); swagger.getPaths().forEach(restDslStatement::visit); http://git-wip-us.apache.org/repos/asf/camel/blob/39ae85bd/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslGenerator.java ---------------------------------------------------------------------- diff --git a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslGenerator.java b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslGenerator.java index e47fddf..5972f86 100644 --- a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslGenerator.java +++ b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslGenerator.java @@ -40,15 +40,15 @@ public abstract class RestDslGenerator<G> { private final AtomicInteger directRouteCount = new AtomicInteger(0); - private Function<Operation, String> directRouteGenerator = this::generateDirectRouteName; + private Function<Operation, String> destinationGenerator = this::generateDirectRouteName; RestDslGenerator(final Swagger swagger) { this.swagger = notNull(swagger, "swagger"); } - public G withDirectRouteGenerator(final Function<Operation, String> directRouteGenerator) { + public G withDestinationGenerator(final Function<Operation, String> directRouteGenerator) { notNull(directRouteGenerator, "directRouteGenerator"); - this.directRouteGenerator = directRouteGenerator; + this.destinationGenerator = directRouteGenerator; @SuppressWarnings("unchecked") final G that = (G) this; @@ -56,8 +56,8 @@ public abstract class RestDslGenerator<G> { return that; } - Function<Operation, String> directRouteGenerator() { - return directRouteGenerator; + Function<Operation, String> destinationGenerator() { + return destinationGenerator; } String generateDirectName() { http://git-wip-us.apache.org/repos/asf/camel/blob/39ae85bd/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java ---------------------------------------------------------------------- diff --git a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java index c2b9ce1..cd27c3b 100644 --- a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java +++ b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java @@ -79,7 +79,7 @@ public abstract class RestDslSourceCodeGenerator<T> extends RestDslGenerator<Res final MethodBodySourceCodeEmitter emitter = new MethodBodySourceCodeEmitter(configure); - final PathVisitor<MethodSpec> restDslStatement = new PathVisitor<>(emitter, directRouteGenerator()); + final PathVisitor<MethodSpec> restDslStatement = new PathVisitor<>(emitter, destinationGenerator()); swagger.getPaths().forEach(restDslStatement::visit); return emitter.result(); http://git-wip-us.apache.org/repos/asf/camel/blob/39ae85bd/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslGeneratorTest.java ---------------------------------------------------------------------- diff --git a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslGeneratorTest.java b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslGeneratorTest.java index 113fbef..3602654 100644 --- a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslGeneratorTest.java +++ b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslGeneratorTest.java @@ -63,7 +63,7 @@ public class RestDslGeneratorTest { final StringBuilder code = new StringBuilder(); RestDslGenerator.toAppendable(swagger).withClassName("MyRestRoute").withPackageName("com.example") - .withIndent("\t").withDirectRouteGenerator(o -> "direct:rest-" + o.getOperationId()).generate(code); + .withIndent("\t").withDestinationGenerator(o -> "direct:rest-" + o.getOperationId()).generate(code); final URI file = RestDslGeneratorTest.class.getResource("/MyRestRoute.txt").toURI(); final String expectedContent = new String(Files.readAllBytes(Paths.get(file)), StandardCharsets.UTF_8);
