Jakarta migration - fix FW injection by migration remaining imports

#668 follow-up where I missed javax Inject
quarkus-qe · Feb 9, 2023 · d4d8ff5 · d4d8ff5
1 parent 1563214
commit d4d8ff5
Show file tree

Hide file tree

Showing 56 changed files with 139 additions and 114 deletions.
diff --git a/examples/amq-amqp/src/main/java/io/quarkus/qe/amqp/PriceConsumer.java b/examples/amq-amqp/src/main/java/io/quarkus/qe/amqp/PriceConsumer.java
@@ -3,11 +3,11 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.jboss.logging.Logger;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 @ApplicationScoped
 public class PriceConsumer {
 

diff --git a/examples/amq-amqp/src/main/java/io/quarkus/qe/amqp/PriceProducer.java b/examples/amq-amqp/src/main/java/io/quarkus/qe/amqp/PriceProducer.java
@@ -2,11 +2,12 @@
 
 import java.time.Duration;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
 import org.jboss.logging.Logger;
 
 import io.smallrye.mutiny.Multi;
-import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class PriceProducer {

diff --git a/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceProducer.java b/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceProducer.java
@@ -9,11 +9,12 @@
 import javax.jms.JMSContext;
 import javax.jms.Session;
 
-import io.quarkus.runtime.ShutdownEvent;
-import io.quarkus.runtime.StartupEvent;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Observes;
 
+import io.quarkus.runtime.ShutdownEvent;
+import io.quarkus.runtime.StartupEvent;
+
 /**
  * A bean producing random prices every 5 seconds and sending them to the prices JMS queue.
  */

diff --git a/examples/consul/src/main/java/io/quarkus/qe/GreetingResource.java b/examples/consul/src/main/java/io/quarkus/qe/GreetingResource.java
@@ -1,12 +1,12 @@
 package io.quarkus.qe;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
 @Path("/api")
 public class GreetingResource {
 

diff --git a/...database-mysql/src/main/java/io/quarkus/qe/database/mysql/ApplicationExceptionMapper.java b/...database-mysql/src/main/java/io/quarkus/qe/database/mysql/ApplicationExceptionMapper.java
@@ -1,13 +1,13 @@
 package io.quarkus.qe.database.mysql;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 @Provider
 public class ApplicationExceptionMapper implements ExceptionMapper<Exception> {
     @Override

diff --git a/examples/database-mysql/src/main/java/io/quarkus/qe/database/mysql/Book.java b/examples/database-mysql/src/main/java/io/quarkus/qe/database/mysql/Book.java
@@ -1,10 +1,11 @@
 package io.quarkus.qe.database.mysql;
 
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotBlank;
 
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
 @Entity
 @Table(name = "book")
 public class Book extends PanacheEntity {

diff --git a/examples/database-mysql/src/main/java/io/quarkus/qe/database/mysql/BookResource.java b/examples/database-mysql/src/main/java/io/quarkus/qe/database/mysql/BookResource.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import io.quarkus.panache.common.Sort;
 import jakarta.transaction.Transactional;
 import jakarta.validation.Valid;
 import jakarta.ws.rs.ClientErrorException;
@@ -18,6 +17,8 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
+import io.quarkus.panache.common.Sort;
+
 @Path("/book")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

diff --git a/.../database-mysql/src/main/java/io/quarkus/qe/database/mysql/ValidationExceptionMapper.java b/.../database-mysql/src/main/java/io/quarkus/qe/database/mysql/ValidationExceptionMapper.java
@@ -1,15 +1,15 @@
 package io.quarkus.qe.database.mysql;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+
 @Provider
 public class ValidationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
 

diff --git a/...tabase-oracle/src/main/java/io/quarkus/qe/database/oracle/ApplicationExceptionMapper.java b/...tabase-oracle/src/main/java/io/quarkus/qe/database/oracle/ApplicationExceptionMapper.java
@@ -1,13 +1,13 @@
 package io.quarkus.qe.database.oracle;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 @Provider
 public class ApplicationExceptionMapper implements ExceptionMapper<Exception> {
     @Override

diff --git a/examples/database-oracle/src/main/java/io/quarkus/qe/database/oracle/Book.java b/examples/database-oracle/src/main/java/io/quarkus/qe/database/oracle/Book.java
@@ -1,10 +1,11 @@
 package io.quarkus.qe.database.oracle;
 
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotBlank;
 
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
 @Entity
 @Table(name = "book")
 public class Book extends PanacheEntity {

diff --git a/examples/database-oracle/src/main/java/io/quarkus/qe/database/oracle/BookResource.java b/examples/database-oracle/src/main/java/io/quarkus/qe/database/oracle/BookResource.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import io.quarkus.panache.common.Sort;
 import jakarta.transaction.Transactional;
 import jakarta.validation.Valid;
 import jakarta.ws.rs.ClientErrorException;
@@ -18,6 +17,8 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
+import io.quarkus.panache.common.Sort;
+
 @Path("/book")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

diff --git a/...atabase-oracle/src/main/java/io/quarkus/qe/database/oracle/ValidationExceptionMapper.java b/...atabase-oracle/src/main/java/io/quarkus/qe/database/oracle/ValidationExceptionMapper.java
@@ -1,15 +1,15 @@
 package io.quarkus.qe.database.oracle;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+
 @Provider
 public class ValidationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
 

diff --git a/...ostgresql/src/main/java/io/quarkus/qe/database/postgresql/ApplicationExceptionMapper.java b/...ostgresql/src/main/java/io/quarkus/qe/database/postgresql/ApplicationExceptionMapper.java
@@ -1,13 +1,13 @@
 package io.quarkus.qe.database.postgresql;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 @Provider
 public class ApplicationExceptionMapper implements ExceptionMapper<Exception> {
     @Override

diff --git a/examples/database-postgresql/src/main/java/io/quarkus/qe/database/postgresql/Book.java b/examples/database-postgresql/src/main/java/io/quarkus/qe/database/postgresql/Book.java
@@ -1,10 +1,11 @@
 package io.quarkus.qe.database.postgresql;
 
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotBlank;
 
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
 @Entity
 @Table(name = "book")
 public class Book extends PanacheEntity {

diff --git a/...les/database-postgresql/src/main/java/io/quarkus/qe/database/postgresql/BookResource.java b/...les/database-postgresql/src/main/java/io/quarkus/qe/database/postgresql/BookResource.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import io.quarkus.panache.common.Sort;
 import jakarta.transaction.Transactional;
 import jakarta.validation.Valid;
 import jakarta.ws.rs.ClientErrorException;
@@ -18,6 +17,8 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
+import io.quarkus.panache.common.Sort;
+
 @Path("/book")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

diff --git a/...postgresql/src/main/java/io/quarkus/qe/database/postgresql/ValidationExceptionMapper.java b/...postgresql/src/main/java/io/quarkus/qe/database/postgresql/ValidationExceptionMapper.java
@@ -1,15 +1,15 @@
 package io.quarkus.qe.database.postgresql;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+
 @Provider
 public class ValidationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
 

diff --git a/...es/funqy-knative-events/src/main/java/io/quarkus/qe/funqy/knativeevents/BrokerClient.java b/...es/funqy-knative-events/src/main/java/io/quarkus/qe/funqy/knativeevents/BrokerClient.java
@@ -2,11 +2,6 @@
 
 import java.util.UUID;
 
-import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam;
-import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
-import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory;
-import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
-
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.HeaderParam;
@@ -16,6 +11,11 @@
 import jakarta.ws.rs.core.MultivaluedHashMap;
 import jakarta.ws.rs.core.MultivaluedMap;
 
+import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam;
+import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
+import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
 /**
  * BrokerClient enables sending of events to the broker.
  */

diff --git a/examples/greetings/src/main/java/io/quarkus/qe/GreetingResource.java b/examples/greetings/src/main/java/io/quarkus/qe/GreetingResource.java
@@ -2,13 +2,13 @@
 
 import java.io.IOException;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
 @Path("/greeting")
 public class GreetingResource {
 

diff --git a/examples/greetings/src/main/java/io/quarkus/qe/ReactiveGreetingResource.java b/examples/greetings/src/main/java/io/quarkus/qe/ReactiveGreetingResource.java
@@ -1,13 +1,14 @@
 package io.quarkus.qe;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
-import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import io.smallrye.mutiny.Uni;
+
 @Path("/reactive-greeting")
 public class ReactiveGreetingResource {
 

diff --git a/examples/greetings/src/main/java/io/quarkus/qe/ValidateCustomProperty.java b/examples/greetings/src/main/java/io/quarkus/qe/ValidateCustomProperty.java
@@ -1,11 +1,12 @@
 package io.quarkus.qe;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 
 import io.quarkus.runtime.StartupEvent;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.event.Observes;
 
 @ApplicationScoped
 public class ValidateCustomProperty {

diff --git a/examples/infinispan/src/main/java/io/quarkus/qe/books/Book.java b/examples/infinispan/src/main/java/io/quarkus/qe/books/Book.java
@@ -2,11 +2,11 @@
 
 import java.util.Objects;
 
+import jakarta.validation.constraints.NotBlank;
+
 import org.infinispan.protostream.annotations.ProtoFactory;
 import org.infinispan.protostream.annotations.ProtoField;
 
-import jakarta.validation.constraints.NotBlank;
-
 public class Book {
 
     private static final int ONE = 1;

diff --git a/examples/infinispan/src/main/java/io/quarkus/qe/books/BookCacheInitializer.java b/examples/infinispan/src/main/java/io/quarkus/qe/books/BookCacheInitializer.java
@@ -1,12 +1,13 @@
 package io.quarkus.qe.books;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+
 import org.infinispan.client.hotrod.RemoteCacheManager;
 import org.infinispan.commons.configuration.XMLStringConfiguration;
 
 import io.quarkus.runtime.StartupEvent;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.event.Observes;
-import jakarta.inject.Inject;
 
 @ApplicationScoped
 public class BookCacheInitializer {

diff --git a/examples/infinispan/src/main/java/io/quarkus/qe/books/BookResource.java b/examples/infinispan/src/main/java/io/quarkus/qe/books/BookResource.java
@@ -1,8 +1,5 @@
 package io.quarkus.qe.books;
 
-import org.infinispan.client.hotrod.RemoteCache;
-
-import io.quarkus.infinispan.client.Remote;
 import jakarta.inject.Inject;
 import jakarta.validation.Valid;
 import jakarta.ws.rs.Consumes;
@@ -13,6 +10,10 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
+import org.infinispan.client.hotrod.RemoteCache;
+
+import io.quarkus.infinispan.client.Remote;
+
 @Path("/book")
 public class BookResource {
 

diff --git a/examples/jaeger/src/main/java/io/quarkus/qe/ClientResource.java b/examples/jaeger/src/main/java/io/quarkus/qe/ClientResource.java
@@ -1,11 +1,12 @@
 package io.quarkus.qe;
 
-import io.opentelemetry.api.trace.Span;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
+import io.opentelemetry.api.trace.Span;
+
 @Path("/client")
 public class ClientResource {