diff --git a/.github/workflows/java-ci.yml b/.github/workflows/java-ci.yml index 3713c15e1..b7038db3c 100644 --- a/.github/workflows/java-ci.yml +++ b/.github/workflows/java-ci.yml @@ -780,10 +780,10 @@ jobs: working-directory: ./application/jaxrs-mysql-quarkus env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./mvnw -B verify package --settings ../.m2/settings.xml -Pnative + run: ./mvnw -B verify package --settings ../.m2/settings.xml - name: Build Image working-directory: ./application/jaxrs-mysql-quarkus - run: docker build -t yurak/jaxrs-mysql-quarkus:latest -f src/main/docker/Dockerfile.native . + run: docker build -t yurak/jaxrs-mysql-quarkus:latest -f src/main/docker/Dockerfile.jvm . - name: Push Image if: github.event_name == 'push' run: docker push yurak/jaxrs-mysql-quarkus:latest diff --git a/application/consumer-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqDeliverSubscriber.java b/application/consumer-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqDeliverSubscriber.java index e90f4a2b5..88ffa555f 100644 --- a/application/consumer-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqDeliverSubscriber.java +++ b/application/consumer-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqDeliverSubscriber.java @@ -7,7 +7,7 @@ import javax.enterprise.inject.spi.CDI; -import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.rest.client.inject.RestClient; import com.rabbitmq.client.AMQP; @@ -20,9 +20,7 @@ public class RabbitmqDeliverSubscriber extends RabbitmqConsumer { private final Logger logger = Logger.getLogger(this.getClass().getSimpleName()); - - @ConfigProperty(name = "rabbitmq.split.key") - String splitkey; + private static String splitkey = ConfigProvider.getConfig().getValue("rabbitmq.split.key", String.class); public RabbitmqDeliverSubscriber(Channel channel) { super(channel); diff --git a/application/consumer-redis-quarkus/src/main/java/webapp/tier/service/RedisDeliverSubscriber.java b/application/consumer-redis-quarkus/src/main/java/webapp/tier/service/RedisDeliverSubscriber.java index 4bd94a698..f3e97eac4 100644 --- a/application/consumer-redis-quarkus/src/main/java/webapp/tier/service/RedisDeliverSubscriber.java +++ b/application/consumer-redis-quarkus/src/main/java/webapp/tier/service/RedisDeliverSubscriber.java @@ -6,7 +6,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.spi.CDI; -import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.rest.client.inject.RestClient; import webapp.tier.bean.MsgBean; @@ -17,8 +17,7 @@ public class RedisDeliverSubscriber extends RedisSubscriber { private final Logger logger = Logger.getLogger(this.getClass().getSimpleName()); - @ConfigProperty(name = "redis.split.key") - String splitkey; + private static String splitkey = ConfigProvider.getConfig().getValue("redis.split.key", String.class); @Override public void onMessage(String channel, String message) { diff --git a/application/jaxrs-mysql-quarkus/src/main/resources/application.properties b/application/jaxrs-mysql-quarkus/src/main/resources/application.properties index 98ea669d8..ab3ae6c52 100644 --- a/application/jaxrs-mysql-quarkus/src/main/resources/application.properties +++ b/application/jaxrs-mysql-quarkus/src/main/resources/application.properties @@ -1,9 +1,6 @@ # Configuration file # key = value -# native image package -quarkus.package.type=native - # log quarkus.log.console.enable=true quarkus.log.console.format=%d{HH:mm:ss} %-5p [%c{2.}] (%t) %s%e%n diff --git a/application/jaxrs-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqConsumer.java b/application/jaxrs-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqConsumer.java index 89ea24d80..3bc246886 100644 --- a/application/jaxrs-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqConsumer.java +++ b/application/jaxrs-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqConsumer.java @@ -5,9 +5,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.inject.Inject; - -import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.eclipse.microprofile.config.ConfigProvider; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; @@ -21,12 +19,8 @@ public class RabbitmqConsumer extends DefaultConsumer { private final Logger logger = Logger.getLogger(this.getClass().getSimpleName()); - - @Inject - RabbitmqSocket rmqsock; - - @ConfigProperty(name = "rabbitmq.split.key") - String splitkey; + private static String splitkey = ConfigProvider.getConfig().getValue("rabbitmq.split.key", String.class); + RabbitmqSocket rmqsock = new RabbitmqSocket(); public RabbitmqConsumer(Channel channel) { super(channel); diff --git a/application/jaxrs-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqService.java b/application/jaxrs-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqService.java index 296482ab2..95369b5fb 100644 --- a/application/jaxrs-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqService.java +++ b/application/jaxrs-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqService.java @@ -13,7 +13,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.eclipse.microprofile.config.ConfigProvider; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; @@ -33,32 +33,16 @@ public class RabbitmqService implements Runnable { private final ExecutorService scheduler = Executors.newSingleThreadExecutor(); static boolean isEnableReceived = true; - @ConfigProperty(name = "common.message") - String message; - - @ConfigProperty(name = "rabbitmq.queue.name") - String queuename; - - @ConfigProperty(name = "rabbitmq.exchange.name") - String exchangename; - - @ConfigProperty(name = "rabbitmq.exchange.routingkey") - String routingkey; - - @ConfigProperty(name = "rabbitmq.username") - String username; - - @ConfigProperty(name = "rabbitmq.password") - String password; - - @ConfigProperty(name = "rabbitmq.host") - String host; - - @ConfigProperty(name = "rabbitmq.vhost") - String vhost; - - @ConfigProperty(name = "rabbitmq.split.key") - String splitkey; + private static String message = ConfigProvider.getConfig().getValue("common.message", String.class); + private static String queuename = ConfigProvider.getConfig().getValue("rabbitmq.queue.name", String.class); + private static String exchangename = ConfigProvider.getConfig().getValue("rabbitmq.exchange.name", String.class); + private static String routingkey = ConfigProvider.getConfig().getValue("rabbitmq.exchange.routingkey", + String.class); + private static String username = ConfigProvider.getConfig().getValue("rabbitmq.username", String.class); + private static String password = ConfigProvider.getConfig().getValue("rabbitmq.password", String.class); + private static String host = ConfigProvider.getConfig().getValue("rabbitmq.host", String.class); + private static String vhost = ConfigProvider.getConfig().getValue("rabbitmq.vhost", String.class); + private static String splitkey = ConfigProvider.getConfig().getValue("rabbitmq.split.key", String.class); void onStart(@Observes StartupEvent ev) { scheduler.submit(this); diff --git a/application/jaxrs-redis-quarkus/src/main/java/webapp/tier/service/RedisService.java b/application/jaxrs-redis-quarkus/src/main/java/webapp/tier/service/RedisService.java index b180b9a30..eac50059e 100644 --- a/application/jaxrs-redis-quarkus/src/main/java/webapp/tier/service/RedisService.java +++ b/application/jaxrs-redis-quarkus/src/main/java/webapp/tier/service/RedisService.java @@ -14,7 +14,7 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.eclipse.microprofile.config.ConfigProvider; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; @@ -31,27 +31,16 @@ public class RedisService implements Runnable { private final Logger logger = Logger.getLogger(this.getClass().getSimpleName()); private final ExecutorService scheduler = Executors.newSingleThreadExecutor(); + private static String message = ConfigProvider.getConfig().getValue("common.message", String.class); + private static String servername = ConfigProvider.getConfig().getValue("redis.server", String.class); + private static int serverport = ConfigProvider.getConfig().getValue("redis.port.num", Integer.class); + private static String channel = ConfigProvider.getConfig().getValue("redis.channel", String.class); + private static String splitkey = ConfigProvider.getConfig().getValue("redis.splitkey", String.class); + private static int setexpire = ConfigProvider.getConfig().getValue("redis.set.expire", Integer.class); + @Inject WebappClientServiceMegBean svcmsgbean; - @ConfigProperty(name = "common.message") - String message; - - @ConfigProperty(name = "redis.server") - String servername; - - @ConfigProperty(name = "redis.port.num") - int serverport; - - @ConfigProperty(name = "redis.channel") - String channel; - - @ConfigProperty(name = "redis.splitkey") - String splitkey; - - @ConfigProperty(name = "redis.set.expire") - int setexpire; - void onStart(@Observes StartupEvent ev) { scheduler.submit(this); logger.log(Level.INFO, "Subscribe is starting..."); diff --git a/application/jaxrs-redis-quarkus/src/main/java/webapp/tier/service/RedisSubscriber.java b/application/jaxrs-redis-quarkus/src/main/java/webapp/tier/service/RedisSubscriber.java index ae9471aae..55a1ef984 100644 --- a/application/jaxrs-redis-quarkus/src/main/java/webapp/tier/service/RedisSubscriber.java +++ b/application/jaxrs-redis-quarkus/src/main/java/webapp/tier/service/RedisSubscriber.java @@ -4,9 +4,8 @@ import java.util.logging.Logger; import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.eclipse.microprofile.config.ConfigProvider; import redis.clients.jedis.JedisPubSub; import webapp.tier.bean.MsgBean; @@ -17,12 +16,8 @@ public class RedisSubscriber extends JedisPubSub { private final Logger logger = Logger.getLogger(this.getClass().getSimpleName()); - - @Inject - RedisSocket redissock; - - @ConfigProperty(name = "redis.splitkey") - String splitkey; + private static String splitkey = ConfigProvider.getConfig().getValue("redis.splitkey", String.class); + RedisSocket redissock = new RedisSocket(); @Override public void onMessage(String channel, String message) {