diff --git a/pom.xml b/pom.xml index 9782ace..605e150 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.7 + 3.0.0 com.uci @@ -18,7 +18,7 @@ adapter - 11 + 17 @@ -69,7 +69,7 @@ org.projectlombok lombok - 1.18.12 + 1.18.22 org.springframework.boot @@ -131,10 +131,17 @@ 5.1.0 + + + + + - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 + 5.2.1 + io.fusionauth fusionauth-java-client @@ -193,6 +200,18 @@ cloud-store-sdk_2.12 1.4.3 + + org.springframework.boot + spring-boot-properties-migrator + 3.0.3 + runtime + + + + jakarta.validation + jakarta.validation-api + 3.0.2 + diff --git a/src/main/java/com/uci/adapter/Enums/MessageType.java b/src/main/java/com/uci/adapter/Enums/MessageType.java index 92a7f55..b41ca0d 100644 --- a/src/main/java/com/uci/adapter/Enums/MessageType.java +++ b/src/main/java/com/uci/adapter/Enums/MessageType.java @@ -2,7 +2,7 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnum; import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/src/main/java/com/uci/adapter/Enums/PayLoadType.java b/src/main/java/com/uci/adapter/Enums/PayLoadType.java index c311d97..b39b5dd 100644 --- a/src/main/java/com/uci/adapter/Enums/PayLoadType.java +++ b/src/main/java/com/uci/adapter/Enums/PayLoadType.java @@ -2,7 +2,7 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnum; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/uci/adapter/app/config/AppConfiguration1.java b/src/main/java/com/uci/adapter/app/config/AppConfiguration1.java index e0da1df..b1bb4bb 100644 --- a/src/main/java/com/uci/adapter/app/config/AppConfiguration1.java +++ b/src/main/java/com/uci/adapter/app/config/AppConfiguration1.java @@ -10,13 +10,13 @@ import java.time.Duration; -import org.apache.http.auth.AuthScope; -import org.apache.http.auth.Credentials; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.CredentialsProvider; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.BasicCredentialsProvider; -import org.apache.http.impl.client.HttpClients; +import org.apache.hc.client5.http.auth.CredentialsProvider; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; +import org.apache.hc.client5.http.auth.AuthScope; +import org.apache.hc.client5.http.auth.Credentials; +import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; @@ -48,9 +48,9 @@ public RestTemplate getRestTemplate() { @Bean @Qualifier("custom") public RestTemplate getCustomTemplate(RestTemplateBuilder builder) { - Credentials credentials = new UsernamePasswordCredentials("test","abcd1234"); + Credentials credentials = new UsernamePasswordCredentials("test","abcd1234".toCharArray()); CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); - credentialsProvider.setCredentials(AuthScope.ANY, credentials); + ((BasicCredentialsProvider) credentialsProvider).setCredentials(new AuthScope(null, -1), credentials); HttpClient httpClient = HttpClients .custom() diff --git a/src/main/java/com/uci/adapter/cdac/CDACClient.java b/src/main/java/com/uci/adapter/cdac/CDACClient.java index 493141b..92ca782 100644 --- a/src/main/java/com/uci/adapter/cdac/CDACClient.java +++ b/src/main/java/com/uci/adapter/cdac/CDACClient.java @@ -9,8 +9,8 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; import java.io.ByteArrayInputStream; import java.net.URI; import java.util.ArrayList; diff --git a/src/main/java/com/uci/adapter/cdac/DeliveryDetails.java b/src/main/java/com/uci/adapter/cdac/DeliveryDetails.java index 39ff60b..e02c857 100644 --- a/src/main/java/com/uci/adapter/cdac/DeliveryDetails.java +++ b/src/main/java/com/uci/adapter/cdac/DeliveryDetails.java @@ -2,7 +2,7 @@ import lombok.*; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElement; import java.util.List; @Data diff --git a/src/main/java/com/uci/adapter/cdac/PhoneNumberStatus.java b/src/main/java/com/uci/adapter/cdac/PhoneNumberStatus.java index 2d823be..921c685 100644 --- a/src/main/java/com/uci/adapter/cdac/PhoneNumberStatus.java +++ b/src/main/java/com/uci/adapter/cdac/PhoneNumberStatus.java @@ -4,8 +4,8 @@ import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlValue; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/uci/adapter/cdac/TrackDetails.java b/src/main/java/com/uci/adapter/cdac/TrackDetails.java index c0ddb00..47aaed3 100644 --- a/src/main/java/com/uci/adapter/cdac/TrackDetails.java +++ b/src/main/java/com/uci/adapter/cdac/TrackDetails.java @@ -2,8 +2,8 @@ import lombok.*; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Data @XmlRootElement(name = "dept") diff --git a/src/main/java/com/uci/adapter/firebase/web/FirebaseNotificationAdapter.java b/src/main/java/com/uci/adapter/firebase/web/FirebaseNotificationAdapter.java index 530bac5..4363112 100644 --- a/src/main/java/com/uci/adapter/firebase/web/FirebaseNotificationAdapter.java +++ b/src/main/java/com/uci/adapter/firebase/web/FirebaseNotificationAdapter.java @@ -8,16 +8,17 @@ import com.uci.adapter.provider.factory.IProvider; import com.uci.utils.BotService; import com.uci.utils.service.VaultService; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import messagerosa.core.model.*; -import org.jetbrains.annotations.NotNull; + import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.HashMap; diff --git a/src/main/java/com/uci/adapter/firebase/web/inbound/FirebaseWebMessage.java b/src/main/java/com/uci/adapter/firebase/web/inbound/FirebaseWebMessage.java index cadbc22..a6d598e 100644 --- a/src/main/java/com/uci/adapter/firebase/web/inbound/FirebaseWebMessage.java +++ b/src/main/java/com/uci/adapter/firebase/web/inbound/FirebaseWebMessage.java @@ -5,8 +5,7 @@ import com.sun.istack.Nullable; import lombok.Getter; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; -import java.util.Map; +import jakarta.xml.bind.annotation.XmlRootElement; @Getter @Setter diff --git a/src/main/java/com/uci/adapter/gs/sms/GupShupSMSAdapter.java b/src/main/java/com/uci/adapter/gs/sms/GupShupSMSAdapter.java index 2b148ff..a19dad4 100644 --- a/src/main/java/com/uci/adapter/gs/sms/GupShupSMSAdapter.java +++ b/src/main/java/com/uci/adapter/gs/sms/GupShupSMSAdapter.java @@ -1,37 +1,23 @@ package com.uci.adapter.gs.sms; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.uci.adapter.gs.sms.outbound.GSSMSResponse; import com.uci.adapter.gs.sms.outbound.GupshupSMSResponse; -import com.uci.adapter.gs.whatsapp.GSWhatsappOutBoundResponse; -import com.uci.adapter.gs.whatsapp.GSWhatsappService; import com.uci.adapter.provider.factory.AbstractProvider; import com.uci.adapter.provider.factory.IProvider; -import com.uci.adapter.utils.GupShupUtills; import com.uci.utils.BotService; -import lombok.Builder; import lombok.extern.slf4j.Slf4j; import messagerosa.core.model.MessageId; import messagerosa.core.model.XMessage; -import org.apache.http.client.utils.URLEncodedUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; import reactor.core.publisher.Mono; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.net.URI; -import java.nio.charset.Charset; -import java.util.*; import java.util.function.Consumer; import java.util.function.Function; diff --git a/src/main/java/com/uci/adapter/gs/whatsapp/GSWhatsAppMessage.java b/src/main/java/com/uci/adapter/gs/whatsapp/GSWhatsAppMessage.java index b94eeb6..7211c57 100644 --- a/src/main/java/com/uci/adapter/gs/whatsapp/GSWhatsAppMessage.java +++ b/src/main/java/com/uci/adapter/gs/whatsapp/GSWhatsAppMessage.java @@ -1,11 +1,10 @@ package com.uci.adapter.gs.whatsapp; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; import com.uci.adapter.Request.CommonMessage; -import com.uci.adapter.netcore.whatsapp.inbound.InteractiveContent; import com.sun.istack.Nullable; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/uci/adapter/gs/whatsapp/GSWhatsappReport.java b/src/main/java/com/uci/adapter/gs/whatsapp/GSWhatsappReport.java index 1ec54f0..7aed80d 100644 --- a/src/main/java/com/uci/adapter/gs/whatsapp/GSWhatsappReport.java +++ b/src/main/java/com/uci/adapter/gs/whatsapp/GSWhatsappReport.java @@ -3,7 +3,7 @@ import lombok.Getter; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Getter @Setter diff --git a/src/main/java/com/uci/adapter/gs/whatsapp/GupShupWhatsappAdapter.java b/src/main/java/com/uci/adapter/gs/whatsapp/GupShupWhatsappAdapter.java index d293d03..a1582e8 100644 --- a/src/main/java/com/uci/adapter/gs/whatsapp/GupShupWhatsappAdapter.java +++ b/src/main/java/com/uci/adapter/gs/whatsapp/GupShupWhatsappAdapter.java @@ -22,13 +22,13 @@ import com.uci.utils.BotService; import com.uci.utils.bot.util.FileUtil; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import messagerosa.core.model.*; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/NetcoreWhatsappAdapter.java b/src/main/java/com/uci/adapter/netcore/whatsapp/NetcoreWhatsappAdapter.java index 0051ee2..a3ddbd3 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/NetcoreWhatsappAdapter.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/NetcoreWhatsappAdapter.java @@ -28,13 +28,13 @@ import com.uci.utils.bot.util.FileUtil; import io.fusionauth.domain.Application; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import messagerosa.core.model.*; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.client.RestTemplate; diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/MessageContext.java b/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/MessageContext.java index 645b06c..c905ac3 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/MessageContext.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/MessageContext.java @@ -4,7 +4,7 @@ import lombok.Getter; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Getter @Setter diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/NetcoreMessageFormat.java b/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/NetcoreMessageFormat.java index 3630e8f..1a4d935 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/NetcoreMessageFormat.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/NetcoreMessageFormat.java @@ -4,7 +4,7 @@ import lombok.Getter; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Getter @Setter diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/NetcoreWhatsAppMessage.java b/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/NetcoreWhatsAppMessage.java index c429696..b7c5159 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/NetcoreWhatsAppMessage.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/NetcoreWhatsAppMessage.java @@ -6,7 +6,7 @@ import lombok.Getter; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Getter @Setter diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/TextType.java b/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/TextType.java index 0bb2a8b..d81497e 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/TextType.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/inbound/TextType.java @@ -3,7 +3,7 @@ import lombok.Getter; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Getter @Setter diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/ManageUserRequestMessage.java b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/ManageUserRequestMessage.java index b8ea131..eb78e2e 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/ManageUserRequestMessage.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/ManageUserRequestMessage.java @@ -3,7 +3,7 @@ import lombok.Getter; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Getter @Setter diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/SingleMessage.java b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/SingleMessage.java index 921f5ea..fb7f9c2 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/SingleMessage.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/SingleMessage.java @@ -8,7 +8,7 @@ import lombok.*; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Getter @Setter diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/Text.java b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/Text.java index 3bc1838..dcf5785 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/Text.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/Text.java @@ -6,7 +6,7 @@ import lombok.Getter; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Getter @Setter diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/Action.java b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/Action.java index e3c69b9..684230d 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/Action.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/Action.java @@ -2,10 +2,8 @@ import java.util.ArrayList; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; -import com.fasterxml.jackson.annotation.JsonAlias; -import com.fasterxml.jackson.annotation.JsonProperty; import com.sun.istack.Nullable; import com.uci.adapter.netcore.whatsapp.outbound.interactive.list.Section; import com.uci.adapter.netcore.whatsapp.outbound.interactive.quickreply.Button; diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/InteractiveContent.java b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/InteractiveContent.java index 310333b..25b4d1e 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/InteractiveContent.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/InteractiveContent.java @@ -1,13 +1,6 @@ package com.uci.adapter.netcore.whatsapp.outbound.interactive; -import java.util.ArrayList; - -import javax.xml.bind.annotation.XmlRootElement; - -import com.fasterxml.jackson.annotation.JsonAlias; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.sun.istack.Nullable; -import com.uci.adapter.netcore.whatsapp.outbound.SingleMessage.SingleMessageBuilder; +import jakarta.xml.bind.annotation.XmlRootElement; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/list/SectionRow.java b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/list/SectionRow.java index 077e65b..32db3c3 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/list/SectionRow.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/list/SectionRow.java @@ -1,8 +1,6 @@ package com.uci.adapter.netcore.whatsapp.outbound.interactive.list; -import java.util.ArrayList; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/quickreply/Button.java b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/quickreply/Button.java index 3c5864b..53f04d2 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/quickreply/Button.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/quickreply/Button.java @@ -1,8 +1,6 @@ package com.uci.adapter.netcore.whatsapp.outbound.interactive.quickreply; -import java.util.ArrayList; - -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/media/Attachment.java b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/media/Attachment.java index 01720aa..39d6549 100644 --- a/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/media/Attachment.java +++ b/src/main/java/com/uci/adapter/netcore/whatsapp/outbound/media/Attachment.java @@ -1,6 +1,6 @@ package com.uci.adapter.netcore.whatsapp.outbound.media; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import lombok.Builder; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/uci/adapter/provider/factory/IProvider.java b/src/main/java/com/uci/adapter/provider/factory/IProvider.java index b9d9ebe..fa327d4 100644 --- a/src/main/java/com/uci/adapter/provider/factory/IProvider.java +++ b/src/main/java/com/uci/adapter/provider/factory/IProvider.java @@ -2,10 +2,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import messagerosa.core.model.XMessage; -import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; public interface IProvider { diff --git a/src/main/java/com/uci/adapter/pwa/PwaWebPortalAdapter.java b/src/main/java/com/uci/adapter/pwa/PwaWebPortalAdapter.java index 3d8ece9..7e91e9d 100644 --- a/src/main/java/com/uci/adapter/pwa/PwaWebPortalAdapter.java +++ b/src/main/java/com/uci/adapter/pwa/PwaWebPortalAdapter.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import com.uci.adapter.cdn.FileCdnProvider; -import com.uci.adapter.gs.whatsapp.GSWhatsAppMessage; -import com.uci.adapter.gs.whatsapp.outbound.MessageType; import com.uci.adapter.provider.factory.AbstractProvider; import com.uci.adapter.provider.factory.IProvider; import com.uci.adapter.pwa.web.inbound.PwaWebMedia; @@ -13,29 +11,20 @@ import com.uci.adapter.pwa.web.inbound.PwaWebMessage; import com.uci.adapter.pwa.web.outbound.OutboundMessage; import com.uci.adapter.pwa.web.outbound.PwaMessage; -import com.uci.adapter.pwa.web.outbound.PwaWebResponse; import com.uci.adapter.utils.CommonUtils; -import com.uci.adapter.utils.PropertiesCache; import com.uci.utils.bot.util.FileUtil; import lombok.Builder; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import messagerosa.core.model.*; -import org.apache.http.HttpStatus; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.util.MimeTypeUtils; import org.springframework.web.client.RestTemplate; -import org.springframework.web.util.UriComponentsBuilder; import reactor.core.publisher.Mono; -import javax.xml.bind.JAXBException; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; +import jakarta.xml.bind.JAXBException; + import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.*; diff --git a/src/main/java/com/uci/adapter/pwa/web/inbound/PwaWebMessage.java b/src/main/java/com/uci/adapter/pwa/web/inbound/PwaWebMessage.java index cbc35fe..79b2fdb 100644 --- a/src/main/java/com/uci/adapter/pwa/web/inbound/PwaWebMessage.java +++ b/src/main/java/com/uci/adapter/pwa/web/inbound/PwaWebMessage.java @@ -5,7 +5,7 @@ import com.sun.istack.Nullable; import lombok.Getter; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.Map; @Getter diff --git a/src/main/java/com/uci/adapter/pwa/web/outbound/PwaMessage.java b/src/main/java/com/uci/adapter/pwa/web/outbound/PwaMessage.java index 864ac30..767d09a 100644 --- a/src/main/java/com/uci/adapter/pwa/web/outbound/PwaMessage.java +++ b/src/main/java/com/uci/adapter/pwa/web/outbound/PwaMessage.java @@ -3,7 +3,7 @@ import lombok.*; import messagerosa.core.model.*; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; @Getter diff --git a/src/main/java/com/uci/adapter/pwa/web/outbound/PwaWebResponse.java b/src/main/java/com/uci/adapter/pwa/web/outbound/PwaWebResponse.java index 0f511f5..f31bcd1 100644 --- a/src/main/java/com/uci/adapter/pwa/web/outbound/PwaWebResponse.java +++ b/src/main/java/com/uci/adapter/pwa/web/outbound/PwaWebResponse.java @@ -5,7 +5,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Getter @Setter diff --git a/src/main/java/com/uci/adapter/sunbird/web/SunbirdWebPortalAdapter.java b/src/main/java/com/uci/adapter/sunbird/web/SunbirdWebPortalAdapter.java index c12a19e..f837c1b 100644 --- a/src/main/java/com/uci/adapter/sunbird/web/SunbirdWebPortalAdapter.java +++ b/src/main/java/com/uci/adapter/sunbird/web/SunbirdWebPortalAdapter.java @@ -7,20 +7,17 @@ import com.uci.adapter.sunbird.web.outbound.OutboundMessage; import com.uci.adapter.sunbird.web.outbound.SunbirdMessage; import com.uci.adapter.sunbird.web.outbound.SunbirdWebResponse; -import com.uci.adapter.utils.PropertiesCache; import lombok.Builder; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import messagerosa.core.model.*; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.client.RestTemplate; import reactor.core.publisher.Mono; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/src/main/java/com/uci/adapter/sunbird/web/inbound/SunbirdWebMessage.java b/src/main/java/com/uci/adapter/sunbird/web/inbound/SunbirdWebMessage.java index 8910220..248d487 100644 --- a/src/main/java/com/uci/adapter/sunbird/web/inbound/SunbirdWebMessage.java +++ b/src/main/java/com/uci/adapter/sunbird/web/inbound/SunbirdWebMessage.java @@ -5,7 +5,7 @@ import com.sun.istack.Nullable; import lombok.Getter; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.Map; @Getter diff --git a/src/main/java/com/uci/adapter/sunbird/web/outbound/SunbirdMessage.java b/src/main/java/com/uci/adapter/sunbird/web/outbound/SunbirdMessage.java index be22e7b..6a7339a 100644 --- a/src/main/java/com/uci/adapter/sunbird/web/outbound/SunbirdMessage.java +++ b/src/main/java/com/uci/adapter/sunbird/web/outbound/SunbirdMessage.java @@ -3,7 +3,7 @@ import lombok.*; import messagerosa.core.model.*; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; @Getter diff --git a/src/main/java/com/uci/adapter/sunbird/web/outbound/SunbirdWebResponse.java b/src/main/java/com/uci/adapter/sunbird/web/outbound/SunbirdWebResponse.java index 29af68a..85f2e1b 100644 --- a/src/main/java/com/uci/adapter/sunbird/web/outbound/SunbirdWebResponse.java +++ b/src/main/java/com/uci/adapter/sunbird/web/outbound/SunbirdWebResponse.java @@ -5,7 +5,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Getter @Setter diff --git a/src/test/java/com/samagra/adapter/sunbird/web/SunbirdWebPortalAdapterTest.java b/src/test/java/com/samagra/adapter/sunbird/web/SunbirdWebPortalAdapterTest.java index a2eb2a4..fcba30b 100644 --- a/src/test/java/com/samagra/adapter/sunbird/web/SunbirdWebPortalAdapterTest.java +++ b/src/test/java/com/samagra/adapter/sunbird/web/SunbirdWebPortalAdapterTest.java @@ -16,7 +16,7 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.function.Consumer; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/uci/adapter/cdac/CdacBulkClientTest.java b/src/test/java/com/uci/adapter/cdac/CdacBulkClientTest.java index c31c391..6b637e0 100644 --- a/src/test/java/com/uci/adapter/cdac/CdacBulkClientTest.java +++ b/src/test/java/com/uci/adapter/cdac/CdacBulkClientTest.java @@ -1,20 +1,8 @@ package com.uci.adapter.cdac; -import com.fasterxml.jackson.databind.ObjectMapper; -import messagerosa.core.model.SenderReceiverInfo; -import messagerosa.core.model.XMessage; -import messagerosa.core.model.XMessagePayload; -import org.junit.jupiter.api.Test; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.ByteArrayInputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutionException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/uci/adapter/cdac/CdacBulkSmsAdapterTest.java b/src/test/java/com/uci/adapter/cdac/CdacBulkSmsAdapterTest.java index 826645d..b47e1de 100644 --- a/src/test/java/com/uci/adapter/cdac/CdacBulkSmsAdapterTest.java +++ b/src/test/java/com/uci/adapter/cdac/CdacBulkSmsAdapterTest.java @@ -1,21 +1,8 @@ package com.uci.adapter.cdac; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import messagerosa.core.model.SenderReceiverInfo; -import messagerosa.core.model.XMessage; -import messagerosa.core.model.XMessagePayload; -import org.junit.jupiter.api.Test; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; - -import java.io.ByteArrayInputStream; -import java.util.HashMap; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.*; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; class CdacBulkSmsAdapterTest { diff --git a/src/test/java/com/uci/adapter/gs/sms/GupshupSMSAdapterTest.java b/src/test/java/com/uci/adapter/gs/sms/GupshupSMSAdapterTest.java index 1370da0..c345335 100644 --- a/src/test/java/com/uci/adapter/gs/sms/GupshupSMSAdapterTest.java +++ b/src/test/java/com/uci/adapter/gs/sms/GupshupSMSAdapterTest.java @@ -1,28 +1,6 @@ package com.uci.adapter.gs.sms; -import java.util.ArrayList; - -import javax.xml.bind.JAXBException; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.client.RestTemplate; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.uci.adapter.netcore.whatsapp.NetcoreWhatsappAdapter; -import com.uci.adapter.netcore.whatsapp.inbound.NetcoreWhatsAppMessage; -import com.uci.utils.BotService; - -import lombok.SneakyThrows; -import messagerosa.core.model.ButtonChoice; -import messagerosa.core.model.SenderReceiverInfo; -import messagerosa.core.model.XMessage; -import messagerosa.core.model.XMessagePayload; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import jakarta.xml.bind.JAXBException; public class GupshupSMSAdapterTest { // GupShupSMSAdapter adapter; diff --git a/src/test/java/com/uci/adapter/gs/whatsapp/GupShupWhatsappAdapterTest.java b/src/test/java/com/uci/adapter/gs/whatsapp/GupShupWhatsappAdapterTest.java index b58a91c..23f8923 100644 --- a/src/test/java/com/uci/adapter/gs/whatsapp/GupShupWhatsappAdapterTest.java +++ b/src/test/java/com/uci/adapter/gs/whatsapp/GupShupWhatsappAdapterTest.java @@ -13,16 +13,13 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.ArrayList; -import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.notNull; -import static org.mockito.Mockito.when; @Slf4j @ExtendWith(MockitoExtension.class)