Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert CDI #2293

Merged
merged 4 commits into from
May 8, 2021
Merged

Revert CDI #2293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b0c5ad
Revert "migrate to native image build mysql #2281"
yurake May 7, 2021
78ad03d
revert cdi for redis #2279
yurake May 7, 2021
669be98
revert cdi for redis consumer #2279
yurake May 7, 2021
6714bd7
revert cdi for rabbitmq. fix #2279
yurake May 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/java-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions ...onsumer-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqDeliverSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
5 changes: 2 additions & 3 deletions ...tion/consumer-redis-quarkus/src/main/java/webapp/tier/service/RedisDeliverSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
3 changes: 0 additions & 3 deletions application/jaxrs-mysql-quarkus/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 3 additions & 9 deletions application/jaxrs-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
38 changes: 11 additions & 27 deletions application/jaxrs-rabbitmq-quarkus/src/main/java/webapp/tier/service/RabbitmqService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
27 changes: 8 additions & 19 deletions application/jaxrs-redis-quarkus/src/main/java/webapp/tier/service/RedisService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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...");
Expand Down
11 changes: 3 additions & 8 deletions application/jaxrs-redis-quarkus/src/main/java/webapp/tier/service/RedisSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down