Skip to content

Graal migration #27

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

Open
radhay-1199 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Graal migration #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 24 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.7</version>
<version>3.0.0</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>com.uci</groupId>
Expand All @@ -18,7 +18,7 @@
<description>adapter</description>

<properties>
<java.version>11</java.version>
<java.version>17</java.version>
</properties>
<!-- For Dao repository to upload to github packages -->
<profiles>
Expand Down Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
<version>1.18.22</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -131,10 +131,17 @@
<version>5.1.0</version>
</dependency>

<!-- <dependency>-->
<!-- <groupId>org.apache.httpcomponents</groupId>-->
<!-- <artifactId>httpclient</artifactId>-->
<!-- </dependency>-->
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5 -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.2.1</version>
</dependency>

<dependency>
<groupId>io.fusionauth</groupId>
<artifactId>fusionauth-java-client</artifactId>
Expand Down Expand Up @@ -193,6 +200,18 @@
<artifactId>cloud-store-sdk_2.12</artifactId>
<version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-properties-migrator</artifactId>
<version>3.0.3</version>
<scope>runtime</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api -->
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.2</version>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/Enums/MessageType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/Enums/PayLoadType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
18 changes: 9 additions & 9 deletions src/main/java/com/uci/adapter/app/config/AppConfiguration1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/uci/adapter/cdac/CDACClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/cdac/DeliveryDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.*;

import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElement;
import java.util.List;

@Data
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/uci/adapter/cdac/PhoneNumberStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/uci/adapter/cdac/TrackDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/uci/adapter/firebase/web/FirebaseNotificationAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/uci/adapter/firebase/web/inbound/FirebaseWebMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 1 addition & 15 deletions src/main/java/com/uci/adapter/gs/sms/GupShupSMSAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/uci/adapter/gs/whatsapp/GSWhatsAppMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/gs/whatsapp/GSWhatsappReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import lombok.Getter;
import lombok.Setter;

import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlRootElement;

@Getter
@Setter
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/gs/whatsapp/GupShupWhatsappAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/netcore/whatsapp/NetcoreWhatsappAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/netcore/whatsapp/inbound/MessageContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import lombok.Getter;
import lombok.Setter;

import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlRootElement;

@Getter
@Setter
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/netcore/whatsapp/inbound/NetcoreMessageFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import lombok.Getter;
import lombok.Setter;

import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlRootElement;

@Getter
@Setter
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/netcore/whatsapp/inbound/NetcoreWhatsAppMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import lombok.Getter;
import lombok.Setter;

import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlRootElement;

@Getter
@Setter
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/netcore/whatsapp/inbound/TextType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import lombok.Getter;
import lombok.Setter;

import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlRootElement;

@Getter
@Setter
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/netcore/whatsapp/outbound/ManageUserRequestMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import lombok.Getter;
import lombok.Setter;

import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlRootElement;

@Getter
@Setter
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/netcore/whatsapp/outbound/SingleMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import lombok.*;

import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlRootElement;

@Getter
@Setter
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/netcore/whatsapp/outbound/Text.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import lombok.Getter;
import lombok.Setter;

import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlRootElement;

@Getter
@Setter
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/Action.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 1 addition & 8 deletions src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/InteractiveContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/list/SectionRow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/uci/adapter/netcore/whatsapp/outbound/interactive/quickreply/Button.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uci/adapter/netcore/whatsapp/outbound/media/Attachment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading