diff --git a/amazon-dynamodb-quickstart/src/main/java/org/acme/dynamodb/FruitAsyncResource.java b/amazon-dynamodb-quickstart/src/main/java/org/acme/dynamodb/FruitAsyncResource.java index 2f20285ab7..aa70f3b160 100644 --- a/amazon-dynamodb-quickstart/src/main/java/org/acme/dynamodb/FruitAsyncResource.java +++ b/amazon-dynamodb-quickstart/src/main/java/org/acme/dynamodb/FruitAsyncResource.java @@ -7,7 +7,6 @@ import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; @@ -28,7 +27,7 @@ public Uni> getAll() { @GET @Path("{name}") - public Uni getSingle(@PathParam("name") String name) { + public Uni getSingle(String name) { return service.get(name); } diff --git a/amazon-dynamodb-quickstart/src/main/java/org/acme/dynamodb/FruitResource.java b/amazon-dynamodb-quickstart/src/main/java/org/acme/dynamodb/FruitResource.java index 1f9bd39467..4174ae8904 100644 --- a/amazon-dynamodb-quickstart/src/main/java/org/acme/dynamodb/FruitResource.java +++ b/amazon-dynamodb-quickstart/src/main/java/org/acme/dynamodb/FruitResource.java @@ -7,7 +7,6 @@ import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; @@ -26,7 +25,7 @@ public List getAll() { @GET @Path("{name}") - public Fruit getSingle(@PathParam("name") String name) { + public Fruit getSingle(String name) { return service.get(name); } diff --git a/amazon-ssm-quickstart/src/main/java/org/acme/ssm/QuarkusSsmAsyncResource.java b/amazon-ssm-quickstart/src/main/java/org/acme/ssm/QuarkusSsmAsyncResource.java index 644599ef2f..dbe5fd903a 100644 --- a/amazon-ssm-quickstart/src/main/java/org/acme/ssm/QuarkusSsmAsyncResource.java +++ b/amazon-ssm-quickstart/src/main/java/org/acme/ssm/QuarkusSsmAsyncResource.java @@ -8,11 +8,11 @@ import javax.ws.rs.GET; import javax.ws.rs.PUT; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; +import org.jboss.resteasy.reactive.RestQuery; + import io.smallrye.mutiny.Uni; import software.amazon.awssdk.services.ssm.SsmAsyncClient; @@ -32,8 +32,8 @@ public Uni> getParameters() { @PUT @Path("/{name}") @Consumes(MediaType.TEXT_PLAIN) - public Uni setParameter(@PathParam("name") String name, - @QueryParam("secure") @DefaultValue("false") boolean secure, + public Uni setParameter(String name, + @RestQuery @DefaultValue("false") boolean secure, String value) { return Uni.createFrom().completionStage(ssm.putParameter(generatePutParameterRequest(name, value, secure))) @@ -43,7 +43,7 @@ public Uni setParameter(@PathParam("name") String name, @GET @Path("/{name}") @Produces(MediaType.TEXT_PLAIN) - public Uni getParameter(@PathParam("name") String name) { + public Uni getParameter(String name) { return Uni.createFrom().completionStage(ssm.getParameter(generateGetParameterRequest(name))) .onItem().transform(r -> r.parameter().value()); } diff --git a/amazon-ssm-quickstart/src/main/java/org/acme/ssm/QuarkusSsmSyncResource.java b/amazon-ssm-quickstart/src/main/java/org/acme/ssm/QuarkusSsmSyncResource.java index f046d03ce2..c7e6213510 100644 --- a/amazon-ssm-quickstart/src/main/java/org/acme/ssm/QuarkusSsmSyncResource.java +++ b/amazon-ssm-quickstart/src/main/java/org/acme/ssm/QuarkusSsmSyncResource.java @@ -8,11 +8,11 @@ import javax.ws.rs.GET; import javax.ws.rs.PUT; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; +import org.jboss.resteasy.reactive.RestQuery; + import software.amazon.awssdk.services.ssm.SsmClient; @Path("/sync") @@ -31,8 +31,8 @@ public Map getParameters() { @PUT @Path("/{name}") @Consumes(MediaType.TEXT_PLAIN) - public void setParameter(@PathParam("name") String name, - @QueryParam("secure") @DefaultValue("false") boolean secure, + public void setParameter(String name, + @RestQuery @DefaultValue("false") boolean secure, String value) { ssm.putParameter(generatePutParameterRequest(name, value, secure)); @@ -41,7 +41,7 @@ public void setParameter(@PathParam("name") String name, @GET @Path("/{name}") @Produces(MediaType.TEXT_PLAIN) - public String getParameter(@PathParam("name") String name) { + public String getParameter(String name) { return ssm.getParameter(generateGetParameterRequest(name)) .parameter().value(); } diff --git a/getting-started-async/src/main/java/org/acme/getting/started/async/GreetingResource.java b/getting-started-async/src/main/java/org/acme/getting/started/async/GreetingResource.java index 0746234399..ee49123ca0 100644 --- a/getting-started-async/src/main/java/org/acme/getting/started/async/GreetingResource.java +++ b/getting-started-async/src/main/java/org/acme/getting/started/async/GreetingResource.java @@ -6,8 +6,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.jboss.resteasy.reactive.RestPath; - import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.infrastructure.Infrastructure; @@ -20,7 +18,7 @@ public class GreetingResource { @GET @Produces(MediaType.TEXT_PLAIN) @Path("/greeting/{name}") - public Uni greeting(@RestPath String name) { + public Uni greeting(String name) { return service.greeting(name); } diff --git a/getting-started-knative/src/main/java/org/acme/getting/started/knative/GreetingResource.java b/getting-started-knative/src/main/java/org/acme/getting/started/knative/GreetingResource.java index 57f1e25839..7e78c59baf 100644 --- a/getting-started-knative/src/main/java/org/acme/getting/started/knative/GreetingResource.java +++ b/getting-started-knative/src/main/java/org/acme/getting/started/knative/GreetingResource.java @@ -6,8 +6,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.jboss.resteasy.reactive.RestPath; - @Path("/") public class GreetingResource { @@ -17,7 +15,7 @@ public class GreetingResource { @GET @Produces(MediaType.TEXT_PLAIN) @Path("/greeting/{name}") - public String greeting(@RestPath String name) { + public String greeting(String name) { return service.greeting(name); } diff --git a/getting-started-testing/src/main/java/org/acme/getting/started/testing/GreetingResource.java b/getting-started-testing/src/main/java/org/acme/getting/started/testing/GreetingResource.java index e061e97e99..f9a2d26efd 100644 --- a/getting-started-testing/src/main/java/org/acme/getting/started/testing/GreetingResource.java +++ b/getting-started-testing/src/main/java/org/acme/getting/started/testing/GreetingResource.java @@ -6,8 +6,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.jboss.resteasy.reactive.RestPath; - @Path("/hello") public class GreetingResource { @@ -17,7 +15,7 @@ public class GreetingResource { @GET @Produces(MediaType.TEXT_PLAIN) @Path("/greeting/{name}") - public String greeting(@RestPath String name) { + public String greeting(String name) { return service.greeting(name); } diff --git a/getting-started/src/main/java/org/acme/getting/started/GreetingResource.java b/getting-started/src/main/java/org/acme/getting/started/GreetingResource.java index a4f34e6826..5623255bb6 100644 --- a/getting-started/src/main/java/org/acme/getting/started/GreetingResource.java +++ b/getting-started/src/main/java/org/acme/getting/started/GreetingResource.java @@ -6,8 +6,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.jboss.resteasy.reactive.RestPath; - @Path("/hello") public class GreetingResource { @@ -17,7 +15,7 @@ public class GreetingResource { @GET @Produces(MediaType.TEXT_PLAIN) @Path("/greeting/{name}") - public String greeting(@RestPath String name) { + public String greeting(String name) { return service.greeting(name); } diff --git a/grpc-plain-text-quickstart/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java b/grpc-plain-text-quickstart/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java index 30aab13121..2bfc496626 100644 --- a/grpc-plain-text-quickstart/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java +++ b/grpc-plain-text-quickstart/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java @@ -2,7 +2,6 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import examples.Greeter; import examples.GreeterGrpc; @@ -22,7 +21,7 @@ public class HelloWorldEndpoint { @GET @Path("/blocking/{name}") - public String helloBlocking(@PathParam("name") String name) { + public String helloBlocking(String name) { HelloReply reply = blockingHelloService.sayHello(HelloRequest.newBuilder().setName(name).build()); return generateResponse(reply); @@ -30,7 +29,7 @@ public String helloBlocking(@PathParam("name") String name) { @GET @Path("/mutiny/{name}") - public Uni helloMutiny(@PathParam("name") String name) { + public Uni helloMutiny(String name) { return helloService.sayHello(HelloRequest.newBuilder().setName(name).build()) .onItem().transform((reply) -> generateResponse(reply)); } diff --git a/grpc-tls-quickstart/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java b/grpc-tls-quickstart/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java index 8fd4dd88eb..b3913a68d4 100644 --- a/grpc-tls-quickstart/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java +++ b/grpc-tls-quickstart/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java @@ -2,7 +2,6 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import examples.Greeter; import examples.GreeterGrpc; @@ -22,13 +21,13 @@ public class HelloWorldTlsEndpoint { @GET @Path("/blocking/{name}") - public String helloBlocking(@PathParam("name") String name) { + public String helloBlocking(String name) { return blockingHelloService.sayHello(HelloRequest.newBuilder().setName(name).build()).getMessage(); } @GET @Path("/mutiny/{name}") - public Uni helloMutiny(@PathParam("name") String name) { + public Uni helloMutiny(String name) { return helloService.sayHello(HelloRequest.newBuilder().setName(name).build()) .onItem().transform(HelloReply::getMessage); } diff --git a/hibernate-orm-multi-tenancy-quickstart/src/main/java/org/acme/hibernate/orm/FruitResource.java b/hibernate-orm-multi-tenancy-quickstart/src/main/java/org/acme/hibernate/orm/FruitResource.java index 883d89397a..74a0357676 100644 --- a/hibernate-orm-multi-tenancy-quickstart/src/main/java/org/acme/hibernate/orm/FruitResource.java +++ b/hibernate-orm-multi-tenancy-quickstart/src/main/java/org/acme/hibernate/orm/FruitResource.java @@ -13,14 +13,13 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.RestPath; +import org.jboss.resteasy.reactive.RestQuery; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -55,13 +54,13 @@ private Fruit[] get() { @GET @Path("fruits/{id}") - public Fruit getSingleDefault(@RestPath Integer id) { + public Fruit getSingleDefault(Integer id) { return findById(id); } @GET @Path("{tenant}/fruits/{id}") - public Fruit getSingleTenant(@RestPath Integer id) { + public Fruit getSingleTenant(Integer id) { return findById(id); } @@ -99,18 +98,18 @@ private Response create(Fruit fruit) { @PUT @Path("fruits/{id}") @Transactional - public Fruit updateDefault(@RestPath Integer id, Fruit fruit) { + public Fruit updateDefault(Integer id, Fruit fruit) { return update(id, fruit); } @PUT @Path("{tenant}/fruits/{id}") @Transactional - public Fruit updateTenant(@RestPath Integer id, Fruit fruit) { + public Fruit updateTenant(Integer id, Fruit fruit) { return update(id, fruit); } - public Fruit update(@RestPath Integer id, Fruit fruit) { + public Fruit update(Integer id, Fruit fruit) { if (fruit.getName() == null) { throw new WebApplicationException("Fruit Name was not set on request.", 422); } @@ -129,14 +128,14 @@ public Fruit update(@RestPath Integer id, Fruit fruit) { @DELETE @Path("fruits/{id}") @Transactional - public Response deleteDefault(@RestPath Integer id) { + public Response deleteDefault(Integer id) { return delete(id); } @DELETE @Path("{tenant}/fruits/{id}") @Transactional - public Response deleteTenant(@RestPath Integer id) { + public Response deleteTenant(Integer id) { return delete(id); } @@ -152,13 +151,13 @@ public Response delete(Integer id) { @GET @Path("fruitsFindBy") - public Response findByDefault(@QueryParam("type") String type, @QueryParam("value") String value) { + public Response findByDefault(@RestQuery String type, @RestQuery String value) { return findBy(type, value); } @GET @Path("{tenant}/fruitsFindBy") - public Response findByTenant(@QueryParam("type") String type, @QueryParam("value") String value) { + public Response findByTenant(@RestQuery String type, @RestQuery String value) { return findBy(type, value); } diff --git a/hibernate-orm-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/entity/FruitEntityResource.java b/hibernate-orm-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/entity/FruitEntityResource.java index 169703b3d5..13bff903a5 100644 --- a/hibernate-orm-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/entity/FruitEntityResource.java +++ b/hibernate-orm-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/entity/FruitEntityResource.java @@ -19,7 +19,6 @@ import org.acme.hibernate.orm.panache.repository.Fruit; import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.RestPath; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -41,7 +40,7 @@ public List get() { @GET @Path("{id}") - public FruitEntity getSingle(@RestPath Long id) { + public FruitEntity getSingle(Long id) { FruitEntity entity = FruitEntity.findById(id); if (entity == null) { throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404); @@ -63,7 +62,7 @@ public Response create(FruitEntity fruit) { @PUT @Path("{id}") @Transactional - public FruitEntity update(@RestPath Long id, Fruit fruit) { + public FruitEntity update(Long id, Fruit fruit) { if (fruit.name == null) { throw new WebApplicationException("Fruit Name was not set on request.", 422); } @@ -82,7 +81,7 @@ public FruitEntity update(@RestPath Long id, Fruit fruit) { @DELETE @Path("{id}") @Transactional - public Response delete(@RestPath Long id) { + public Response delete(Long id) { FruitEntity entity = FruitEntity.findById(id); if (entity == null) { throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404); diff --git a/hibernate-orm-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/repository/FruitRepositoryResource.java b/hibernate-orm-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/repository/FruitRepositoryResource.java index 76c82a742d..e3de7a51aa 100644 --- a/hibernate-orm-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/repository/FruitRepositoryResource.java +++ b/hibernate-orm-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/repository/FruitRepositoryResource.java @@ -18,7 +18,6 @@ import javax.ws.rs.ext.Provider; import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.RestPath; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -43,7 +42,7 @@ public List get() { @GET @Path("{id}") - public Fruit getSingle(@RestPath Long id) { + public Fruit getSingle(Long id) { Fruit entity = fruitRepository.findById(id); if (entity == null) { throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404); @@ -65,7 +64,7 @@ public Response create(Fruit fruit) { @PUT @Path("{id}") @Transactional - public Fruit update(@RestPath Long id, Fruit fruit) { + public Fruit update(Long id, Fruit fruit) { if (fruit.name == null) { throw new WebApplicationException("Fruit Name was not set on request.", 422); } @@ -84,7 +83,7 @@ public Fruit update(@RestPath Long id, Fruit fruit) { @DELETE @Path("{id}") @Transactional - public Response delete(@RestPath Long id) { + public Response delete(Long id) { Fruit entity = fruitRepository.findById(id); if (entity == null) { throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404); diff --git a/hibernate-orm-quickstart/src/main/java/org/acme/hibernate/orm/FruitResource.java b/hibernate-orm-quickstart/src/main/java/org/acme/hibernate/orm/FruitResource.java index 37e99a14a7..2c141eae9f 100644 --- a/hibernate-orm-quickstart/src/main/java/org/acme/hibernate/orm/FruitResource.java +++ b/hibernate-orm-quickstart/src/main/java/org/acme/hibernate/orm/FruitResource.java @@ -19,7 +19,6 @@ import javax.ws.rs.ext.Provider; import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.RestPath; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -43,7 +42,7 @@ public List get() { @GET @Path("{id}") - public Fruit getSingle(@RestPath Integer id) { + public Fruit getSingle(Integer id) { Fruit entity = entityManager.find(Fruit.class, id); if (entity == null) { throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404); @@ -65,7 +64,7 @@ public Response create(Fruit fruit) { @PUT @Path("{id}") @Transactional - public Fruit update(@RestPath Integer id, Fruit fruit) { + public Fruit update(Integer id, Fruit fruit) { if (fruit.getName() == null) { throw new WebApplicationException("Fruit Name was not set on request.", 422); } @@ -84,7 +83,7 @@ public Fruit update(@RestPath Integer id, Fruit fruit) { @DELETE @Path("{id}") @Transactional - public Response delete(@RestPath Integer id) { + public Response delete(Integer id) { Fruit entity = entityManager.getReference(Fruit.class, id); if (entity == null) { throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404); diff --git a/hibernate-reactive-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/FruitResource.java b/hibernate-reactive-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/FruitResource.java index 47c61cab7a..dba02e9fa8 100644 --- a/hibernate-reactive-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/FruitResource.java +++ b/hibernate-reactive-panache-quickstart/src/main/java/org/acme/hibernate/orm/panache/FruitResource.java @@ -21,7 +21,6 @@ import javax.ws.rs.ext.Provider; import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.RestPath; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -46,7 +45,7 @@ public Uni> get() { @GET @Path("{id}") - public Uni getSingle(@RestPath Long id) { + public Uni getSingle(Long id) { return Fruit.findById(id); } @@ -62,7 +61,7 @@ public Uni create(Fruit fruit) { @PUT @Path("{id}") - public Uni update(@RestPath Long id, Fruit fruit) { + public Uni update(Long id, Fruit fruit) { if (fruit == null || fruit.name == null) { throw new WebApplicationException("Fruit name was not set on request.", 422); } @@ -77,7 +76,7 @@ public Uni update(@RestPath Long id, Fruit fruit) { @DELETE @Path("{id}") - public Uni delete(@RestPath Long id) { + public Uni delete(Long id) { return Panache.withTransaction(() -> Fruit.deleteById(id)) .map(deleted -> deleted ? Response.ok().status(NO_CONTENT).build() diff --git a/hibernate-reactive-quickstart/src/main/java/org/acme/hibernate/reactive/FruitMutinyResource.java b/hibernate-reactive-quickstart/src/main/java/org/acme/hibernate/reactive/FruitMutinyResource.java index 6e0409813e..f21384961b 100644 --- a/hibernate-reactive-quickstart/src/main/java/org/acme/hibernate/reactive/FruitMutinyResource.java +++ b/hibernate-reactive-quickstart/src/main/java/org/acme/hibernate/reactive/FruitMutinyResource.java @@ -20,8 +20,6 @@ import org.hibernate.reactive.mutiny.Mutiny; -import org.jboss.resteasy.reactive.RestPath; - import io.smallrye.mutiny.Uni; @Path("fruits") @@ -43,7 +41,7 @@ public Uni> get() { @GET @Path("{id}") - public Uni getSingle(@RestPath Integer id) { + public Uni getSingle(Integer id) { return sf.withTransaction((s,t) -> s.find(Fruit.class, id)); } @@ -59,7 +57,7 @@ public Uni create(Fruit fruit) { @PUT @Path("{id}") - public Uni update(@RestPath Integer id, Fruit fruit) { + public Uni update(Integer id, Fruit fruit) { if (fruit == null || fruit.getName() == null) { throw new WebApplicationException("Fruit name was not set on request.", 422); } @@ -76,7 +74,7 @@ public Uni update(@RestPath Integer id, Fruit fruit) { @DELETE @Path("{id}") - public Uni delete(@RestPath Integer id) { + public Uni delete(Integer id) { return sf.withTransaction((s,t) -> s.find(Fruit.class, id) // If entity exists then delete it diff --git a/hibernate-search-orm-elasticsearch-quickstart/src/main/java/org/acme/hibernate/search/elasticsearch/LibraryResource.java b/hibernate-search-orm-elasticsearch-quickstart/src/main/java/org/acme/hibernate/search/elasticsearch/LibraryResource.java index 401638e57c..77c1299733 100644 --- a/hibernate-search-orm-elasticsearch-quickstart/src/main/java/org/acme/hibernate/search/elasticsearch/LibraryResource.java +++ b/hibernate-search-orm-elasticsearch-quickstart/src/main/java/org/acme/hibernate/search/elasticsearch/LibraryResource.java @@ -19,7 +19,6 @@ import org.acme.hibernate.search.elasticsearch.model.Book; import org.hibernate.search.mapper.orm.session.SearchSession; import org.jboss.resteasy.reactive.RestForm; -import org.jboss.resteasy.reactive.RestPath; import org.jboss.resteasy.reactive.RestQuery; import io.quarkus.runtime.StartupEvent; @@ -63,7 +62,7 @@ public void addBook(@RestForm String title, @RestForm Long authorId) { @DELETE @Path("book/{id}") @Transactional - public void deleteBook(@RestPath Long id) { + public void deleteBook(Long id) { Book book = Book.findById(id); if (book != null) { book.author.books.remove(book); @@ -86,7 +85,7 @@ public void addAuthor(@RestForm String firstName, @RestForm String lastName) { @Path("author/{id}") @Transactional @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - public void updateAuthor(@RestPath Long id, @RestForm String firstName, @RestForm String lastName) { + public void updateAuthor(Long id, @RestForm String firstName, @RestForm String lastName) { Author author = Author.findById(id); if (author == null) { return; @@ -99,7 +98,7 @@ public void updateAuthor(@RestPath Long id, @RestForm String firstName, @RestFor @DELETE @Path("author/{id}") @Transactional - public void deleteAuthor(@RestPath Long id) { + public void deleteAuthor(Long id) { Author author = Author.findById(id); if (author != null) { author.delete(); diff --git a/kafka-bare-quickstart/src/main/java/org/acme/kafka/KafkaEndpoint.java b/kafka-bare-quickstart/src/main/java/org/acme/kafka/KafkaEndpoint.java index d4b938f9b2..f660976da0 100644 --- a/kafka-bare-quickstart/src/main/java/org/acme/kafka/KafkaEndpoint.java +++ b/kafka-bare-quickstart/src/main/java/org/acme/kafka/KafkaEndpoint.java @@ -1,12 +1,11 @@ package org.acme.kafka; -import io.quarkus.runtime.ShutdownEvent; -import io.quarkus.runtime.StartupEvent; -import org.apache.kafka.clients.admin.AdminClient; -import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.ProducerRecord; +import java.time.Duration; +import java.util.Collections; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; @@ -15,14 +14,17 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -import java.time.Duration; -import java.util.Collections; -import java.util.Set; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; + +import org.apache.kafka.clients.admin.AdminClient; +import org.apache.kafka.clients.consumer.ConsumerRecords; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.jboss.resteasy.reactive.RestQuery; + +import io.quarkus.runtime.ShutdownEvent; +import io.quarkus.runtime.StartupEvent; @Path("/kafka") @ApplicationScoped @@ -76,7 +78,7 @@ public Set getTopics() throws InterruptedException, ExecutionException, } @POST - public long post(@QueryParam("key") String key, @QueryParam("value") String value) + public long post(@RestQuery String key, @RestQuery String value) throws InterruptedException, ExecutionException, TimeoutException { return producer.send(new ProducerRecord<>(TOPIC, key, value)).get(5, TimeUnit.SECONDS) .offset(); diff --git a/kafka-bare-quickstart/src/main/java/org/acme/kafka/VertxKafkaEndpoint.java b/kafka-bare-quickstart/src/main/java/org/acme/kafka/VertxKafkaEndpoint.java index 96b52bda6c..77377eadf1 100644 --- a/kafka-bare-quickstart/src/main/java/org/acme/kafka/VertxKafkaEndpoint.java +++ b/kafka-bare-quickstart/src/main/java/org/acme/kafka/VertxKafkaEndpoint.java @@ -1,13 +1,7 @@ package org.acme.kafka; -import io.quarkus.runtime.ShutdownEvent; -import io.quarkus.runtime.StartupEvent; -import io.smallrye.mutiny.Uni; -import io.vertx.kafka.client.producer.RecordMetadata; -import io.vertx.mutiny.kafka.admin.KafkaAdminClient; -import io.vertx.mutiny.kafka.client.consumer.KafkaConsumer; -import io.vertx.mutiny.kafka.client.producer.KafkaProducer; -import io.vertx.mutiny.kafka.client.producer.KafkaProducerRecord; +import java.util.Collections; +import java.util.Set; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; @@ -16,10 +10,18 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -import java.util.Collections; -import java.util.Set; + +import org.jboss.resteasy.reactive.RestQuery; + +import io.quarkus.runtime.ShutdownEvent; +import io.quarkus.runtime.StartupEvent; +import io.smallrye.mutiny.Uni; +import io.vertx.kafka.client.producer.RecordMetadata; +import io.vertx.mutiny.kafka.admin.KafkaAdminClient; +import io.vertx.mutiny.kafka.client.consumer.KafkaConsumer; +import io.vertx.mutiny.kafka.client.producer.KafkaProducer; +import io.vertx.mutiny.kafka.client.producer.KafkaProducerRecord; @Path("/vertx-kafka") @ApplicationScoped @@ -71,7 +73,7 @@ public String getLast() { @Path("/") @POST - public Uni post(@QueryParam("key") String key, @QueryParam("value") String value) { + public Uni post(@RestQuery String key, @RestQuery String value) { return producer.send(KafkaProducerRecord.create(TOPIC, key, value)) .onItem().transform(RecordMetadata::getOffset); } diff --git a/kafka-streams-quickstart/aggregator/src/main/java/org/acme/kafka/streams/aggregator/rest/WeatherStationEndpoint.java b/kafka-streams-quickstart/aggregator/src/main/java/org/acme/kafka/streams/aggregator/rest/WeatherStationEndpoint.java index 24e5c1bf41..da558d7b60 100644 --- a/kafka-streams-quickstart/aggregator/src/main/java/org/acme/kafka/streams/aggregator/rest/WeatherStationEndpoint.java +++ b/kafka-streams-quickstart/aggregator/src/main/java/org/acme/kafka/streams/aggregator/rest/WeatherStationEndpoint.java @@ -9,7 +9,6 @@ import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -18,7 +17,6 @@ import org.acme.kafka.streams.aggregator.streams.GetWeatherStationDataResult; import org.acme.kafka.streams.aggregator.streams.InteractiveQueries; import org.acme.kafka.streams.aggregator.streams.PipelineMetadata; -import org.eclipse.microprofile.config.inject.ConfigProperties; import org.eclipse.microprofile.config.inject.ConfigProperty; @ApplicationScoped @@ -35,7 +33,7 @@ public class WeatherStationEndpoint { @Path("/data/{id}") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - public Response getWeatherStationData(@PathParam("id") int id) { + public Response getWeatherStationData(int id) { GetWeatherStationDataResult result = interactiveQueries.getWeatherStationData(id); if (result.getResult().isPresent()) { diff --git a/lifecycle-quickstart/pom.xml b/lifecycle-quickstart/pom.xml index 6fda70d3e0..667954c487 100644 --- a/lifecycle-quickstart/pom.xml +++ b/lifecycle-quickstart/pom.xml @@ -30,18 +30,13 @@ io.quarkus - quarkus-resteasy-reactive + quarkus-arc io.quarkus quarkus-junit5 test - - io.rest-assured - rest-assured - test - diff --git a/lifecycle-quickstart/src/main/java/org/acme/lifecycle/GreetingResource.java b/lifecycle-quickstart/src/main/java/org/acme/lifecycle/GreetingResource.java deleted file mode 100644 index 5c280262a8..0000000000 --- a/lifecycle-quickstart/src/main/java/org/acme/lifecycle/GreetingResource.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.acme.lifecycle; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -@Path("/hello") -public class GreetingResource { - - @GET - @Produces(MediaType.TEXT_PLAIN) - public String hello() { - return "hello"; - } -} diff --git a/lifecycle-quickstart/src/test/java/org/acme/lifecycle/GreetingResourceIT.java b/lifecycle-quickstart/src/test/java/org/acme/lifecycle/GreetingResourceIT.java deleted file mode 100644 index c907859e3e..0000000000 --- a/lifecycle-quickstart/src/test/java/org/acme/lifecycle/GreetingResourceIT.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.acme.lifecycle; - -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -public class GreetingResourceIT extends GreetingResourceTest { - - // Execute the same tests but in native mode. -} \ No newline at end of file diff --git a/lifecycle-quickstart/src/test/java/org/acme/lifecycle/GreetingResourceTest.java b/lifecycle-quickstart/src/test/java/org/acme/lifecycle/GreetingResourceTest.java deleted file mode 100644 index 4613c41195..0000000000 --- a/lifecycle-quickstart/src/test/java/org/acme/lifecycle/GreetingResourceTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.acme.lifecycle; - -import static io.restassured.RestAssured.given; -import static org.hamcrest.CoreMatchers.is; - -import org.junit.jupiter.api.Test; - -import io.quarkus.test.junit.QuarkusTest; - -@QuarkusTest -public class GreetingResourceTest { - - @Test - public void testHelloEndpoint() { - given() - .when().get("/hello") - .then() - .statusCode(200) - .body(is("hello")); - } - -} diff --git a/liquibase-mongodb-quickstart/src/main/java/org/acme/FruitResource.java b/liquibase-mongodb-quickstart/src/main/java/org/acme/FruitResource.java index 63b990357c..130ef0ac01 100644 --- a/liquibase-mongodb-quickstart/src/main/java/org/acme/FruitResource.java +++ b/liquibase-mongodb-quickstart/src/main/java/org/acme/FruitResource.java @@ -1,14 +1,14 @@ package org.acme; -import org.bson.types.ObjectId; +import java.util.List; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import java.util.List; + +import org.bson.types.ObjectId; @Path("/fruits") @Produces(MediaType.APPLICATION_JSON) @@ -21,7 +21,7 @@ public List list() { @GET @Path("/{id}") - public Fruit get(@PathParam("id") String id) { + public Fruit get(String id) { return Fruit.findById(new ObjectId(id)); } diff --git a/mailer-quickstart/src/main/java/org/acme/extra/TypeSafeMailResource.java b/mailer-quickstart/src/main/java/org/acme/extra/TypeSafeMailResource.java index 3922874b6e..2daf31ea71 100644 --- a/mailer-quickstart/src/main/java/org/acme/extra/TypeSafeMailResource.java +++ b/mailer-quickstart/src/main/java/org/acme/extra/TypeSafeMailResource.java @@ -6,10 +6,11 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.jboss.resteasy.reactive.RestQuery; + import io.quarkus.mailer.MailTemplate; import io.quarkus.qute.CheckedTemplate; import io.smallrye.mutiny.Uni; @@ -20,8 +21,8 @@ public class TypeSafeMailResource { @GET @Produces(MediaType.TEXT_PLAIN) public Uni greeting( - @Valid @Email @QueryParam("email") String email, - @Valid @NotBlank @QueryParam("name") String name) { + @Valid @Email @RestQuery String email, + @Valid @NotBlank @RestQuery String name) { return Templates.hello(name) .to(email) .subject("Ahoy " + name + "!") diff --git a/micrometer-quickstart/src/main/java/org/acme/micrometer/ExampleResource.java b/micrometer-quickstart/src/main/java/org/acme/micrometer/ExampleResource.java index 60931353fe..65e1c72305 100644 --- a/micrometer-quickstart/src/main/java/org/acme/micrometer/ExampleResource.java +++ b/micrometer-quickstart/src/main/java/org/acme/micrometer/ExampleResource.java @@ -5,7 +5,6 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import io.micrometer.core.instrument.MeterRegistry; @@ -28,7 +27,7 @@ public class ExampleResource { @GET @Path("gauge/{number}") - public Long checkListSize(@PathParam("number") long number) { + public Long checkListSize(long number) { if (number == 2 || number % 2 == 0) { // add even numbers to the list list.add(number); @@ -45,7 +44,7 @@ public Long checkListSize(@PathParam("number") long number) { @GET @Path("prime/{number}") - public String checkIfPrime(@PathParam("number") long number) { + public String checkIfPrime(long number) { if (number < 1) { registry.counter("example.prime.number", "type", "not-natural").increment(); return "Only natural numbers can be prime numbers."; diff --git a/microprofile-fault-tolerance-quickstart/src/main/java/org/acme/microprofile/faulttolerance/CoffeeResource.java b/microprofile-fault-tolerance-quickstart/src/main/java/org/acme/microprofile/faulttolerance/CoffeeResource.java index ef502dad32..c5642bf74e 100644 --- a/microprofile-fault-tolerance-quickstart/src/main/java/org/acme/microprofile/faulttolerance/CoffeeResource.java +++ b/microprofile-fault-tolerance-quickstart/src/main/java/org/acme/microprofile/faulttolerance/CoffeeResource.java @@ -17,7 +17,6 @@ import org.eclipse.microprofile.faulttolerance.Retry; import org.eclipse.microprofile.faulttolerance.Timeout; import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.RestPath; /** * A JAX-RS resource that provides information about kinds of coffees we have on store and numbers of packages @@ -64,7 +63,7 @@ public List coffees() { */ @Path("/{id}") @GET - public Response coffeeDetail(@RestPath int id) { + public Response coffeeDetail(int id) { final Long invocationNumber = counter.getAndIncrement(); maybeFail(String.format("CoffeeResource#coffees() invocation #%d failed", invocationNumber)); @@ -89,7 +88,7 @@ public Response coffeeDetail(@RestPath int id) { */ @Path("/{id}/availability") @GET - public Response availability(@RestPath int id) { + public Response availability(int id) { final Long invocationNumber = counter.getAndIncrement(); Coffee coffee = coffeeRepository.getCoffeeById(id); @@ -116,7 +115,7 @@ public Response availability(@RestPath int id) { @Path("/{id}/recommendations") @Timeout(250) @Fallback(fallbackMethod = "fallbackRecommendations") - public List recommendations(@RestPath int id) { + public List recommendations(int id) { long started = System.currentTimeMillis(); final long invocationNumber = counter.getAndIncrement(); diff --git a/microprofile-health-quickstart/pom.xml b/microprofile-health-quickstart/pom.xml index d6a8d3e4e1..84810f0089 100644 --- a/microprofile-health-quickstart/pom.xml +++ b/microprofile-health-quickstart/pom.xml @@ -34,10 +34,6 @@ io.quarkus quarkus-smallrye-health - - io.quarkus - quarkus-resteasy-reactive - io.quarkus quarkus-junit5 diff --git a/microprofile-metrics-quickstart/src/main/java/org/acme/microprofile/metrics/PrimeNumberChecker.java b/microprofile-metrics-quickstart/src/main/java/org/acme/microprofile/metrics/PrimeNumberChecker.java index a534651e66..f05d0712cd 100644 --- a/microprofile-metrics-quickstart/src/main/java/org/acme/microprofile/metrics/PrimeNumberChecker.java +++ b/microprofile-metrics-quickstart/src/main/java/org/acme/microprofile/metrics/PrimeNumberChecker.java @@ -8,7 +8,6 @@ import org.eclipse.microprofile.metrics.annotation.Counted; import org.eclipse.microprofile.metrics.annotation.Gauge; import org.eclipse.microprofile.metrics.annotation.Timed; -import org.jboss.resteasy.reactive.RestPath; @Path("/") public class PrimeNumberChecker { @@ -20,7 +19,7 @@ public class PrimeNumberChecker { @Produces("text/plain") @Counted(name = "performedChecks", description = "How many primality checks have been performed.") @Timed(name = "checksTimer", description = "A measure how long it takes to perform the primality test.", unit = MetricUnits.MILLISECONDS) - public String checkIfPrime(@RestPath long number) { + public String checkIfPrime(long number) { if (number < 1) { return "Only natural numbers can be prime numbers."; } diff --git a/mongodb-panache-quickstart/src/main/java/org/acme/mongodb/panache/entity/PersonResource.java b/mongodb-panache-quickstart/src/main/java/org/acme/mongodb/panache/entity/PersonResource.java index 70a7f2fe4d..5106229677 100644 --- a/mongodb-panache-quickstart/src/main/java/org/acme/mongodb/panache/entity/PersonResource.java +++ b/mongodb-panache-quickstart/src/main/java/org/acme/mongodb/panache/entity/PersonResource.java @@ -1,7 +1,5 @@ package org.acme.mongodb.panache.entity; -import org.bson.types.ObjectId; - import java.util.List; import javax.ws.rs.Consumes; @@ -10,10 +8,11 @@ import javax.ws.rs.POST; import javax.ws.rs.PUT; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.Response; +import org.bson.types.ObjectId; + @Path("/entity/persons") @Consumes("application/json") @Produces("application/json") @@ -25,7 +24,7 @@ public List list() { @GET @Path("/{id}") - public Person get(@PathParam("id") String id) { + public Person get(String id) { return Person.findById(new ObjectId(id)); } @@ -37,20 +36,20 @@ public Response create(Person person) { @PUT @Path("/{id}") - public void update(@PathParam("id") String id, Person person) { + public void update(String id, Person person) { person.update(); } @DELETE @Path("/{id}") - public void delete(@PathParam("id") String id) { + public void delete(String id) { Person person = Person.findById(new ObjectId(id)); person.delete(); } @GET @Path("/search/{name}") - public Person search(@PathParam("name") String name) { + public Person search(String name) { return Person.findByName(name); } diff --git a/mongodb-panache-quickstart/src/main/java/org/acme/mongodb/panache/repository/PersonResource.java b/mongodb-panache-quickstart/src/main/java/org/acme/mongodb/panache/repository/PersonResource.java index 10709f8707..9e1cee6314 100644 --- a/mongodb-panache-quickstart/src/main/java/org/acme/mongodb/panache/repository/PersonResource.java +++ b/mongodb-panache-quickstart/src/main/java/org/acme/mongodb/panache/repository/PersonResource.java @@ -1,7 +1,5 @@ package org.acme.mongodb.panache.repository; -import org.bson.types.ObjectId; - import java.util.List; import javax.inject.Inject; @@ -11,10 +9,11 @@ import javax.ws.rs.POST; import javax.ws.rs.PUT; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.Response; +import org.bson.types.ObjectId; + @Path("/repository/persons") @Consumes("application/json") @Produces("application/json") @@ -29,7 +28,7 @@ public List list() { @GET @Path("/{id}") - public Person get(@PathParam("id") String id) { + public Person get(String id) { System.out.println("get =>" + id); return personRepository.findById(new ObjectId(id)); } @@ -42,20 +41,20 @@ public Response create(Person person) { @PUT @Path("/{id}") - public void update(@PathParam("id") String id, Person person) { + public void update(String id, Person person) { personRepository.update(person); } @DELETE @Path("/{id}") - public void delete(@PathParam("id") String id) { + public void delete(String id) { Person person = personRepository.findById(new ObjectId(id)); personRepository.delete(person); } @GET @Path("/search/{name}") - public Person search(@PathParam("name") String name) { + public Person search(String name) { return personRepository.findByName(name); } diff --git a/neo4j-quickstart/src/main/java/org/acme/neo4j/FruitResource.java b/neo4j-quickstart/src/main/java/org/acme/neo4j/FruitResource.java index 8fdcce1cc7..e9bca95cd3 100644 --- a/neo4j-quickstart/src/main/java/org/acme/neo4j/FruitResource.java +++ b/neo4j-quickstart/src/main/java/org/acme/neo4j/FruitResource.java @@ -10,7 +10,6 @@ import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -65,7 +64,7 @@ public CompletionStage create(Fruit fruit) { @GET @Path("{id}") - public CompletionStage getSingle(@PathParam("id") Long id) { + public CompletionStage getSingle(Long id) { AsyncSession session = driver.asyncSession(); return session .readTransactionAsync(tx -> tx @@ -91,7 +90,7 @@ public CompletionStage getSingle(@PathParam("id") Long id) { @DELETE @Path("{id}") - public CompletionStage delete(@PathParam("id") Long id) { + public CompletionStage delete(Long id) { AsyncSession session = driver.asyncSession(); return session diff --git a/optaplanner-quickstart/src/test/java/org/acme/optaplanner/rest/LessonResourceTest.java b/optaplanner-quickstart/src/test/java/org/acme/optaplanner/rest/LessonResourceTest.java index 4295810e1f..cd8eaf6dc5 100644 --- a/optaplanner-quickstart/src/test/java/org/acme/optaplanner/rest/LessonResourceTest.java +++ b/optaplanner-quickstart/src/test/java/org/acme/optaplanner/rest/LessonResourceTest.java @@ -1,7 +1,6 @@ package org.acme.optaplanner.rest; import static io.restassured.RestAssured.given; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/qute-quickstart/pom.xml b/qute-quickstart/pom.xml index fd71f034d1..cd07eef705 100644 --- a/qute-quickstart/pom.xml +++ b/qute-quickstart/pom.xml @@ -31,7 +31,7 @@ io.quarkus - quarkus-resteasy-qute + quarkus-resteasy-reactive-qute io.quarkus diff --git a/qute-quickstart/src/main/java/org/acme/qute/HelloResource.java b/qute-quickstart/src/main/java/org/acme/qute/HelloResource.java index f02162495d..cdae9a932c 100644 --- a/qute-quickstart/src/main/java/org/acme/qute/HelloResource.java +++ b/qute-quickstart/src/main/java/org/acme/qute/HelloResource.java @@ -4,9 +4,10 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; +import org.jboss.resteasy.reactive.RestQuery; + import io.quarkus.qute.Template; import io.quarkus.qute.TemplateInstance; @@ -18,7 +19,7 @@ public class HelloResource { @GET @Produces(MediaType.TEXT_HTML) - public TemplateInstance get(@QueryParam("name") String name) { + public TemplateInstance get(@RestQuery String name) { return hello.data("name", name); } diff --git a/redis-quickstart/src/main/java/org/acme/redis/IncrementResource.java b/redis-quickstart/src/main/java/org/acme/redis/IncrementResource.java index 67e5eb3d9b..d3a3ebd5e6 100644 --- a/redis-quickstart/src/main/java/org/acme/redis/IncrementResource.java +++ b/redis-quickstart/src/main/java/org/acme/redis/IncrementResource.java @@ -1,16 +1,16 @@ package org.acme.redis; +import java.util.List; + import javax.inject.Inject; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; import javax.ws.rs.GET; -import javax.ws.rs.PathParam; +import javax.ws.rs.POST; import javax.ws.rs.PUT; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; import javax.ws.rs.Path; -import javax.ws.rs.POST; -import javax.ws.rs.DELETE; +import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import java.util.List; import io.smallrye.mutiny.Uni; @@ -35,19 +35,19 @@ public Increment create(Increment increment) { @GET @Path("/{key}") - public Increment get(@PathParam("key") String key) { + public Increment get(String key) { return new Increment(key, Integer.valueOf(service.get(key))); } @PUT @Path("/{key}") - public void increment(@PathParam("key") String key, Integer value) { + public void increment(String key, Integer value) { service.increment(key, value); } @DELETE @Path("/{key}") - public Uni delete(@PathParam("key") String key) { + public Uni delete(String key) { return service.del(key); } } diff --git a/rest-client-reactive-quickstart/src/main/java/org/acme/rest/client/ExtensionsService.java b/rest-client-reactive-quickstart/src/main/java/org/acme/rest/client/ExtensionsService.java index 5640bf0b98..3d19d054a5 100644 --- a/rest-client-reactive-quickstart/src/main/java/org/acme/rest/client/ExtensionsService.java +++ b/rest-client-reactive-quickstart/src/main/java/org/acme/rest/client/ExtensionsService.java @@ -1,24 +1,26 @@ package org.acme.rest.client; -import io.smallrye.mutiny.Uni; -import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; +import java.util.Set; +import java.util.concurrent.CompletionStage; import javax.ws.rs.GET; import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import java.util.Set; -import java.util.concurrent.CompletionStage; + +import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; +import org.jboss.resteasy.reactive.RestQuery; + +import io.smallrye.mutiny.Uni; @Path("/extensions") @RegisterRestClient(configKey = "extensions-api") public interface ExtensionsService { @GET - Set getById(@QueryParam("id") String id); + Set getById(@RestQuery String id); @GET - CompletionStage> getByIdAsync(@QueryParam("id") String id); + CompletionStage> getByIdAsync(@RestQuery String id); @GET - Uni> getByIdAsUni(@QueryParam("id") String id); + Uni> getByIdAsUni(@RestQuery String id); } diff --git a/spring-data-jpa-quickstart/src/main/java/org/acme/spring/data/jpa/FruitResource.java b/spring-data-jpa-quickstart/src/main/java/org/acme/spring/data/jpa/FruitResource.java index e938fefd94..0108e1763a 100644 --- a/spring-data-jpa-quickstart/src/main/java/org/acme/spring/data/jpa/FruitResource.java +++ b/spring-data-jpa-quickstart/src/main/java/org/acme/spring/data/jpa/FruitResource.java @@ -10,8 +10,6 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; -import org.jboss.resteasy.reactive.RestPath; - @Path("/fruits") public class FruitResource { @@ -29,21 +27,21 @@ public Iterable findAll() { @DELETE @Path("{id}") - public void delete(@RestPath long id) { + public void delete(long id) { fruitRepository.deleteById(id); } @POST @Path("/name/{name}/color/{color}") @Produces("application/json") - public Fruit create(@RestPath String name, @RestPath String color) { + public Fruit create(String name, String color) { return fruitRepository.save(new Fruit(name, color)); } @PUT @Path("/id/{id}/color/{color}") @Produces("application/json") - public Fruit changeColor(@RestPath Long id, @RestPath String color) { + public Fruit changeColor(Long id, String color) { Optional optional = fruitRepository.findById(id); if (optional.isPresent()) { Fruit fruit = optional.get(); @@ -57,7 +55,7 @@ public Fruit changeColor(@RestPath Long id, @RestPath String color) { @GET @Path("/color/{color}") @Produces("application/json") - public List findByColor(@RestPath String color) { + public List findByColor(String color) { return fruitRepository.findByColor(color); } } diff --git a/tests-with-coverage-quickstart/src/main/java/org/acme/testcoverage/GreetingResource.java b/tests-with-coverage-quickstart/src/main/java/org/acme/testcoverage/GreetingResource.java index 31a40ee8b4..681052011b 100644 --- a/tests-with-coverage-quickstart/src/main/java/org/acme/testcoverage/GreetingResource.java +++ b/tests-with-coverage-quickstart/src/main/java/org/acme/testcoverage/GreetingResource.java @@ -3,7 +3,6 @@ import javax.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; @@ -20,7 +19,7 @@ public GreetingResource(GreetingService service) { @GET @Produces(MediaType.TEXT_PLAIN) @Path("/greeting/{name}") - public String greeting(@PathParam("name") String name) { + public String greeting(String name) { return service.greeting(name); } diff --git a/vertx-quickstart/src/main/java/org/acme/VertxResource.java b/vertx-quickstart/src/main/java/org/acme/VertxResource.java index 022e7f4ce7..2a5504b553 100644 --- a/vertx-quickstart/src/main/java/org/acme/VertxResource.java +++ b/vertx-quickstart/src/main/java/org/acme/VertxResource.java @@ -2,6 +2,12 @@ import java.nio.charset.StandardCharsets; +import javax.inject.Inject; +import javax.ws.rs.GET; +import javax.ws.rs.Path; + +import org.jboss.resteasy.reactive.RestQuery; + import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.vertx.core.file.OpenOptions; @@ -11,11 +17,6 @@ import io.vertx.mutiny.ext.web.client.HttpResponse; import io.vertx.mutiny.ext.web.client.WebClient; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; - @Path("/vertx") // <1> public class VertxResource { @@ -50,7 +51,7 @@ public Multi readLargeFile() { @GET @Path("/hello") - public Uni hello(@QueryParam("name") String name) { + public Uni hello(@RestQuery String name) { return bus.request("greetings", name) .onItem().transform(response -> response.body()); } diff --git a/vertx-quickstart/src/main/java/org/acme/extra/ResourceUsingWebClient.java b/vertx-quickstart/src/main/java/org/acme/extra/ResourceUsingWebClient.java index 653afb2b7c..34356d735d 100644 --- a/vertx-quickstart/src/main/java/org/acme/extra/ResourceUsingWebClient.java +++ b/vertx-quickstart/src/main/java/org/acme/extra/ResourceUsingWebClient.java @@ -1,16 +1,15 @@ package org.acme.extra; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + import io.smallrye.mutiny.Uni; import io.vertx.core.json.JsonObject; import io.vertx.ext.web.client.WebClientOptions; import io.vertx.mutiny.core.Vertx; import io.vertx.mutiny.ext.web.client.WebClient; -import org.jboss.resteasy.reactive.RestPath; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; @Path("/fruit-data") public class ResourceUsingWebClient { @@ -26,7 +25,7 @@ public ResourceUsingWebClient(Vertx vertx) { @GET @Produces(MediaType.APPLICATION_JSON) @Path("/{name}") - public Uni getFruitData(@RestPath("name") String name) { + public Uni getFruitData(String name) { return client.get("/api/fruit/" + name) .send() .map(resp -> { diff --git a/vertx-quickstart/src/main/java/org/acme/extra/StreamingResource.java b/vertx-quickstart/src/main/java/org/acme/extra/StreamingResource.java index 39b113ef72..4b60302e38 100644 --- a/vertx-quickstart/src/main/java/org/acme/extra/StreamingResource.java +++ b/vertx-quickstart/src/main/java/org/acme/extra/StreamingResource.java @@ -1,15 +1,15 @@ package org.acme.extra; -import io.smallrye.mutiny.Multi; -import io.vertx.mutiny.core.Vertx; -import org.jboss.resteasy.reactive.RestPath; +import java.util.Date; import javax.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import java.util.Date; + +import io.smallrye.mutiny.Multi; +import io.vertx.mutiny.core.Vertx; @Path("/hello") public class StreamingResource { @@ -20,7 +20,7 @@ public class StreamingResource { @GET @Produces(MediaType.SERVER_SENT_EVENTS) @Path("{name}/streaming") - public Multi greeting(@RestPath String name) { + public Multi greeting(String name) { return vertx.periodicStream(2000).toMulti().map(l -> String.format("Hello %s! (%s)%n", name, new Date())); } } diff --git a/vertx-quickstart/src/main/java/org/acme/extra/VertxJsonResource.java b/vertx-quickstart/src/main/java/org/acme/extra/VertxJsonResource.java index e05ff7613e..b72aaf9f47 100644 --- a/vertx-quickstart/src/main/java/org/acme/extra/VertxJsonResource.java +++ b/vertx-quickstart/src/main/java/org/acme/extra/VertxJsonResource.java @@ -1,27 +1,26 @@ package org.acme.extra; -import io.vertx.core.json.JsonArray; -import io.vertx.core.json.JsonObject; -import org.jboss.resteasy.reactive.RestPath; - import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import io.vertx.core.json.JsonArray; +import io.vertx.core.json.JsonObject; + @Path("/hello") @Produces(MediaType.APPLICATION_JSON) public class VertxJsonResource { @GET @Path("{name}/object") - public JsonObject jsonObject(@RestPath String name) { + public JsonObject jsonObject(String name) { return new JsonObject().put("Hello", name); } @GET @Path("{name}/array") - public JsonArray jsonArray(@RestPath String name) { + public JsonArray jsonArray(String name) { return new JsonArray().add("Hello").add(name); } }