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.

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

Release to production (Quarkus 3 migration) #51

Merged
merged 5 commits into from
Apr 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@

package com.abavilla.fpi.msgr;

import javax.enterprise.context.ApplicationScoped;

import com.abavilla.fpi.fw.FPIApplication;
import jakarta.enterprise.context.ApplicationScoped;

/**
* Application starting point
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@

package com.abavilla.fpi.msgr.config;

import javax.enterprise.context.ApplicationScoped;

import jakarta.enterprise.context.ApplicationScoped;
import lombok.Getter;
import org.eclipse.microprofile.config.inject.ConfigProperty;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@

package com.abavilla.fpi.msgr.config;

import javax.enterprise.context.ApplicationScoped;

import jakarta.enterprise.context.ApplicationScoped;
import lombok.Getter;
import org.eclipse.microprofile.config.inject.ConfigProperty;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@

package com.abavilla.fpi.msgr.config;

import javax.enterprise.context.ApplicationScoped;

import jakarta.enterprise.context.ApplicationScoped;
import lombok.Getter;
import org.eclipse.microprofile.config.inject.ConfigProperty;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@

package com.abavilla.fpi.msgr.controller;

import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;

import com.abavilla.fpi.fw.controller.AbsBaseResource;
import com.abavilla.fpi.fw.dto.IDto;
import com.abavilla.fpi.fw.dto.impl.RespDto;
Expand All @@ -32,6 +29,8 @@
import com.abavilla.fpi.msgr.ext.dto.MsgrMsgReqDto;
import com.abavilla.fpi.msgr.service.MsgReqSvc;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.HeaderParam;
import jakarta.ws.rs.POST;

public abstract class MsgReqResource<Q, I extends AbsItem, R extends AbsMongoRepo<I>, M extends IMapper, K, S extends
MsgReqSvc<Q, I, R, M, K>> extends AbsBaseResource<MsgrMsgReqDto, I, S> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@

package com.abavilla.fpi.msgr.controller;

import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;

import com.abavilla.fpi.fw.controller.AbsBaseResource;
import com.abavilla.fpi.fw.dto.IDto;
import com.abavilla.fpi.fw.dto.impl.RespDto;
Expand All @@ -36,6 +30,11 @@
import com.abavilla.fpi.msgr.ext.dto.MsgrMsgReqDto;
import com.abavilla.fpi.msgr.service.MsgrReqSvc;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.HeaderParam;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import org.apache.commons.lang3.BooleanUtils;
import org.jboss.resteasy.reactive.RestResponse;
import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@

package com.abavilla.fpi.msgr.controller;

import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;

import com.abavilla.fpi.fw.dto.IDto;
import com.abavilla.fpi.fw.dto.impl.RespDto;
import com.abavilla.fpi.fw.exceptions.FPISvcEx;
Expand All @@ -33,6 +29,9 @@
import com.abavilla.fpi.msgr.service.TelegramReqSvc;
import com.pengrad.telegrambot.response.SendResponse;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import org.jboss.resteasy.reactive.RestResponse;
import org.jboss.resteasy.reactive.server.ServerExceptionMapper;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@

package com.abavilla.fpi.msgr.controller;

import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;

import com.abavilla.fpi.fw.dto.IDto;
import com.abavilla.fpi.fw.dto.impl.RespDto;
import com.abavilla.fpi.fw.exceptions.FPISvcEx;
Expand All @@ -34,6 +29,10 @@
import com.abavilla.fpi.msgr.service.ViberReqSvc;
import com.abavilla.fpi.viber.ext.dto.SendResponse;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.HeaderParam;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import org.jboss.resteasy.reactive.RestResponse;
import org.jboss.resteasy.reactive.server.ServerExceptionMapper;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.abavilla.fpi.msgr.repo;

import javax.enterprise.context.ApplicationScoped;

import com.abavilla.fpi.fw.repo.AbsMongoRepo;
import com.abavilla.fpi.msgr.entity.MsgrLog;
import jakarta.enterprise.context.ApplicationScoped;

@ApplicationScoped
public class MsgrLogRepo extends AbsMongoRepo<MsgrLog> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.abavilla.fpi.msgr.repo;

import javax.enterprise.context.ApplicationScoped;

import com.abavilla.fpi.fw.repo.AbsMongoRepo;
import com.abavilla.fpi.msgr.entity.TelegramLog;
import jakarta.enterprise.context.ApplicationScoped;

@ApplicationScoped
public class TelegramLogRepo extends AbsMongoRepo<TelegramLog> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@

package com.abavilla.fpi.msgr.repo;

import javax.enterprise.context.ApplicationScoped;

import com.abavilla.fpi.fw.repo.AbsMongoRepo;
import com.abavilla.fpi.msgr.entity.ViberLog;
import jakarta.enterprise.context.ApplicationScoped;

@ApplicationScoped
public class ViberLogRepo extends AbsMongoRepo<ViberLog> {
Expand Down
15 changes: 7 additions & 8 deletions core/src/main/java/com/abavilla/fpi/msgr/rest/MetaGraphApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,18 @@

package com.abavilla.fpi.msgr.rest;

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.QueryParam;
import javax.ws.rs.core.MediaType;

import com.abavilla.fpi.fw.exceptions.handler.ApiRepoExHandler;
import com.abavilla.fpi.fw.rest.IApi;
import com.abavilla.fpi.meta.ext.dto.ProfileReqReply;
import com.abavilla.fpi.meta.ext.dto.msgr.MsgrReqReply;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;
import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
import org.jboss.resteasy.reactive.RestResponse;
Expand Down
15 changes: 7 additions & 8 deletions core/src/main/java/com/abavilla/fpi/msgr/rest/ViberApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,19 @@

package com.abavilla.fpi.msgr.rest;

import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

import com.abavilla.fpi.fw.exceptions.handler.ApiRepoExHandler;
import com.abavilla.fpi.fw.rest.IApi;
import com.abavilla.fpi.viber.ext.dto.MessageRequest;
import com.abavilla.fpi.viber.ext.dto.SendResponse;
import com.abavilla.fpi.viber.ext.dto.Sender;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.HeaderParam;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@

package com.abavilla.fpi.msgr.service;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;

import com.abavilla.fpi.fw.exceptions.FPISvcEx;
import com.abavilla.fpi.fw.rest.AbsApiSvc;
import com.abavilla.fpi.meta.ext.dto.ProfileReqReply;
Expand All @@ -31,6 +28,8 @@
import com.abavilla.fpi.msgr.entity.enums.SenderAction;
import com.abavilla.fpi.msgr.rest.MetaGraphApi;
import io.smallrye.mutiny.Uni;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.jboss.resteasy.reactive.RestResponse;

@ApplicationScoped
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package com.abavilla.fpi.msgr.service;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;

import com.abavilla.fpi.fw.entity.AbsItem;
import com.abavilla.fpi.fw.mapper.IMapper;
import com.abavilla.fpi.fw.repo.AbsMongoRepo;
import com.abavilla.fpi.fw.service.AbsRepoSvc;
import com.abavilla.fpi.msgr.ext.dto.MsgrMsgReqDto;
import io.quarkus.security.identity.SecurityIdentity;
import io.smallrye.mutiny.Uni;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

@ApplicationScoped
public abstract class
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package com.abavilla.fpi.msgr.service;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;

import com.abavilla.fpi.fw.exceptions.ApiSvcEx;
import com.abavilla.fpi.fw.exceptions.FPISvcEx;
import com.abavilla.fpi.fw.service.AbsRepoSvc;
Expand All @@ -18,6 +15,8 @@
import io.quarkus.logging.Log;
import io.quarkus.security.identity.SecurityIdentity;
import io.smallrye.mutiny.Uni;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.commons.lang3.StringUtils;

@ApplicationScoped
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package com.abavilla.fpi.msgr.service;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.enterprise.context.ApplicationScoped;

import com.abavilla.fpi.fw.util.DateUtil;
import com.abavilla.fpi.msgr.config.TelegramApiKeyConfig;
import com.abavilla.fpi.msgr.entity.TelegramLog;
Expand All @@ -18,6 +14,9 @@
import com.pengrad.telegrambot.response.BaseResponse;
import com.pengrad.telegrambot.response.SendResponse;
import io.smallrye.mutiny.Uni;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.enterprise.context.ApplicationScoped;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.abavilla.fpi.msgr.service;

import javax.enterprise.context.ApplicationScoped;

import com.abavilla.fpi.fw.util.DateUtil;
import com.abavilla.fpi.msgr.config.ViberApiKeyConfig;
import com.abavilla.fpi.msgr.entity.ViberLog;
Expand All @@ -12,6 +10,7 @@
import com.abavilla.fpi.viber.ext.dto.SendResponse;
import com.abavilla.fpi.viber.ext.dto.Sender;
import io.smallrye.mutiny.Uni;
import jakarta.enterprise.context.ApplicationScoped;
import org.eclipse.microprofile.rest.client.inject.RestClient;

@ApplicationScoped
Expand Down
17 changes: 8 additions & 9 deletions lib/src/main/java/com/abavilla/fpi/msgr/ext/rest/MsgrReqApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@

import java.time.temporal.ChronoUnit;

import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
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 com.abavilla.fpi.fw.dto.impl.RespDto;
import com.abavilla.fpi.fw.exceptions.AuthApiSvcEx;
import com.abavilla.fpi.fw.exceptions.handler.ApiRepoExHandler;
Expand All @@ -39,6 +30,14 @@
import com.abavilla.fpi.msgr.ext.dto.MsgrMsgReqDto;
import io.smallrye.faulttolerance.api.ExponentialBackoff;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.HeaderParam;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@

import java.time.temporal.ChronoUnit;

import javax.ws.rs.Consumes;
import javax.ws.rs.HeaderParam;
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 com.abavilla.fpi.fw.dto.IDto;
import com.abavilla.fpi.fw.dto.impl.RespDto;
import com.abavilla.fpi.fw.exceptions.AuthApiSvcEx;
Expand All @@ -37,6 +29,13 @@
import com.abavilla.fpi.msgr.ext.dto.MsgrMsgReqDto;
import io.smallrye.faulttolerance.api.ExponentialBackoff;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.HeaderParam;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@

import java.time.temporal.ChronoUnit;

import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
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 com.abavilla.fpi.fw.dto.impl.RespDto;
import com.abavilla.fpi.fw.exceptions.AuthApiSvcEx;
import com.abavilla.fpi.fw.exceptions.handler.ApiRepoExHandler;
Expand All @@ -39,6 +30,14 @@
import com.abavilla.fpi.viber.ext.dto.SendResponse;
import io.smallrye.faulttolerance.api.ExponentialBackoff;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.HeaderParam;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
Expand Down
Loading