From b5300a492c3e4ece8264828f200ae102eaff197d Mon Sep 17 00:00:00 2001 From: abhishekGupta-Plivo <84371673+abhishekGupta-Plivo@users.noreply.github.com> Date: Wed, 18 Oct 2023 12:30:31 +0530 Subject: [PATCH 1/2] Revert "Revert "Vt 6710"" --- CHANGELOG.md | 4 + README.md | 6 +- pom.properties | 2 +- pom.xml | 2 +- .../java/com/plivo/api/PlivoAPIService.java | 20 +++++ .../models/verify/GetVerifiedCallerId.java | 26 +++++++ .../verify/GetVerifiedCallerIdResponse.java | 56 ++++++++++++++ .../api/models/verify/InitiateVerify.java | 58 +++++++++++++++ .../models/verify/InitiateVerifyResponse.java | 15 ++++ .../models/verify/ListVerifiedCallerId.java | 74 +++++++++++++++++++ .../verify/ListVerifiedCallerIdResponse.java | 35 +++++++++ .../verify/ListVerifiedCallerIdStructure.java | 47 ++++++++++++ .../api/models/verify/ListVerifyResponse.java | 13 ++++ .../models/verify/UpdateVerifiedCallerID.java | 48 ++++++++++++ .../UpdateVerifiedCallerIdResponse.java | 43 +++++++++++ .../verify/VerifiedCallerIdDeleter.java | 28 +++++++ .../com/plivo/api/models/verify/Verify.java | 36 +++++++++ .../api/models/verify/VerifyCallerId.java | 42 +++++++++++ .../models/verify/VerifyCallerIdResponse.java | 43 +++++++++++ .../plivo/api/models/verify/VerifyMeta.java | 32 ++++++++ src/main/resources/com/plivo/api/version.txt | 2 +- src/test/java/com/plivo/api/VerifyTest.java | 74 +++++++++++++++++++ .../api/deleteVerifiedCallerIdResponse.json | 1 + .../com/plivo/api/initiateVerifyResponse.json | 5 ++ .../api/listVerifiedCallerIdResponse.json | 22 ++++++ .../api/updateVerifiedCallerIdResponse.json | 10 +++ .../com/plivo/api/verifyCallerIdResponse.json | 9 +++ 27 files changed, 747 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/plivo/api/models/verify/GetVerifiedCallerId.java create mode 100644 src/main/java/com/plivo/api/models/verify/GetVerifiedCallerIdResponse.java create mode 100644 src/main/java/com/plivo/api/models/verify/InitiateVerify.java create mode 100644 src/main/java/com/plivo/api/models/verify/InitiateVerifyResponse.java create mode 100644 src/main/java/com/plivo/api/models/verify/ListVerifiedCallerId.java create mode 100644 src/main/java/com/plivo/api/models/verify/ListVerifiedCallerIdResponse.java create mode 100644 src/main/java/com/plivo/api/models/verify/ListVerifiedCallerIdStructure.java create mode 100644 src/main/java/com/plivo/api/models/verify/ListVerifyResponse.java create mode 100644 src/main/java/com/plivo/api/models/verify/UpdateVerifiedCallerID.java create mode 100644 src/main/java/com/plivo/api/models/verify/UpdateVerifiedCallerIdResponse.java create mode 100644 src/main/java/com/plivo/api/models/verify/VerifiedCallerIdDeleter.java create mode 100644 src/main/java/com/plivo/api/models/verify/Verify.java create mode 100644 src/main/java/com/plivo/api/models/verify/VerifyCallerId.java create mode 100644 src/main/java/com/plivo/api/models/verify/VerifyCallerIdResponse.java create mode 100644 src/main/java/com/plivo/api/models/verify/VerifyMeta.java create mode 100644 src/test/java/com/plivo/api/VerifyTest.java create mode 100644 src/test/resources/com/plivo/api/deleteVerifiedCallerIdResponse.json create mode 100644 src/test/resources/com/plivo/api/initiateVerifyResponse.json create mode 100644 src/test/resources/com/plivo/api/listVerifiedCallerIdResponse.json create mode 100644 src/test/resources/com/plivo/api/updateVerifiedCallerIdResponse.json create mode 100644 src/test/resources/com/plivo/api/verifyCallerIdResponse.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d514960..ce25ee4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## [5.32.0](https://github.com/plivo/plivo-java/tree/v5.32.0) (2023-10-18) +**Feature - Verify Caller Id API support** +- API support for verifying, updating, getting and deleting caller IDs. + ## [5.31.1](https://github.com/plivo/plivo-java/tree/v5.31.1) (2023-10-05) **Feature - WhatsApp message support** - Version bump diff --git a/README.md b/README.md index b7aefc83..d895a060 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The Plivo Java SDK makes it simpler to integrate communications into your Java a ### To Install Stable release -You can use this SDK by adding it as a dependency in your dependency management tool. Alternatively, you can use the [JAR file](https://search.maven.org/remotecontent?filepath=com/plivo/plivo-java/5.31.1/plivo-java-5.31.1.jar). +You can use this SDK by adding it as a dependency in your dependency management tool. Alternatively, you can use the [JAR file](https://search.maven.org/remotecontent?filepath=com/plivo/plivo-java/5.32.1/plivo-java-5.32.1.jar). If you are using Maven, use the following XML to include the Plivo SDK as a dependency. @@ -18,13 +18,13 @@ If you are using Maven, use the following XML to include the Plivo SDK as a depe com.plivo plivo-java - 5.31.1 + 5.32.1 ``` If you are using Gradle, use the following line in your dependencies. ``` -compile 'com.plivo:plivo-java:5.31.1' +compile 'com.plivo:plivo-java:5.32.1' ``` ### To Install Beta release diff --git a/pom.properties b/pom.properties index 996cbac7..3fb5f477 100644 --- a/pom.properties +++ b/pom.properties @@ -1,5 +1,5 @@ # Written manually. -version=5.31.1 +version=5.32.1 groupId=com.plivo artifactId=plivo-java diff --git a/pom.xml b/pom.xml index cebf0fa6..9aec335c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.plivo plivo-java - 5.31.1 + 5.32.1 plivo-java A Java SDK to make voice calls & send SMS using Plivo and to generate Plivo XML diff --git a/src/main/java/com/plivo/api/PlivoAPIService.java b/src/main/java/com/plivo/api/PlivoAPIService.java index 9ca065a0..62811470 100644 --- a/src/main/java/com/plivo/api/PlivoAPIService.java +++ b/src/main/java/com/plivo/api/PlivoAPIService.java @@ -41,6 +41,7 @@ import com.plivo.api.models.profile.*; import com.plivo.api.models.token.TokenCreateResponse; import com.plivo.api.models.token.TokenCreator; +import com.plivo.api.models.verify.*; import okhttp3.RequestBody; import okhttp3.ResponseBody; import retrofit2.Call; @@ -738,4 +739,23 @@ Call callStreamDeleteSpecific(@Path("authId") String authId, @Path @GET("Account/{authId}/Call/{callId}/Stream/{streamId}") Call callStreamGetSpecific(@Path("authId") String authId, @Path("callId") String callId, @Path("streamId") String streamId); + + //Verify + @POST("Account/{authId}/VerifiedCallerId/") + Call initiateVerify(@Path("authId") String authId, @Body InitiateVerify initiateVerify); + + @POST("Account/{authId}/VerifiedCallerId/Verification/{verificationUuid}/") + Call verifyCallerID(@Path("authId") String authId, @Path("verificationUuid") String verificationUuid, @Body VerifyCallerId verifyCallerId); + + @POST("Account/{authId}/VerifiedCallerId/{phoneNumber}") + Call updateVerifiedCallerID(@Path("authId") String authId, @Path("phoneNumber") String phoneNumber, @Body UpdateVerifiedCallerID updateVerifiedCallerID); + + @GET("Account/{authId}/VerifiedCallerId/{phoneNumber}") + Call getVerifiedCallerID(@Path("authId") String authId, @Path("phoneNumber") String phoneNumber); + + @GET("Account/{authId}/VerifiedCallerId/") + Call listVerifiedCallerID(@Path("authId") String authId, @QueryMap Map listVerifiedCallerId); + + @DELETE("Account/{authId}/VerifiedCallerId/{phoneNumber}") + Call deleteVerifiedCallerID(@Path("authId") String authId, @Path("phoneNumber") String phoneNumber); } diff --git a/src/main/java/com/plivo/api/models/verify/GetVerifiedCallerId.java b/src/main/java/com/plivo/api/models/verify/GetVerifiedCallerId.java new file mode 100644 index 00000000..b65a80d0 --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/GetVerifiedCallerId.java @@ -0,0 +1,26 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.exceptions.PlivoValidationException; +import com.plivo.api.models.base.VoiceGetter; +import retrofit2.Call; + +public class GetVerifiedCallerId extends VoiceGetter { + public GetVerifiedCallerId(String id) { + super(id); + } + + @Override + protected Call obtainCall() throws PlivoValidationException { + return client().getVoiceApiService().getVerifiedCallerID(client().getAuthId(), id); + } + + @Override + protected Call obtainFallback1Call() throws PlivoValidationException { + return client().getVoiceFallback1Service().getVerifiedCallerID(client().getAuthId(), id); + } + + @Override + protected Call obtainFallback2Call() throws PlivoValidationException { + return client().getVoiceFallback2Service().getVerifiedCallerID(client().getAuthId(), id); + } +} diff --git a/src/main/java/com/plivo/api/models/verify/GetVerifiedCallerIdResponse.java b/src/main/java/com/plivo/api/models/verify/GetVerifiedCallerIdResponse.java new file mode 100644 index 00000000..92149b34 --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/GetVerifiedCallerIdResponse.java @@ -0,0 +1,56 @@ +package com.plivo.api.models.verify; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.plivo.api.exceptions.PlivoValidationException; +import com.plivo.api.models.base.BaseResource; + +@JsonIgnoreProperties("id") +public class GetVerifiedCallerIdResponse extends BaseResource { + + private String alias; + private String apiId; + private String country; + private String createdAt; + private String modifiedAt; + private String phoneNumber; + private String subaccount; + private String verificationUuid; + + public String getAlias() { + return alias; + } + + public String getCountry() { + return country; + } + + public String getCreatedAt() { + return createdAt; + } + + public String getModifiedAt() { + return modifiedAt; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public String getSubaccount() { + return subaccount; + } + + public String getVerificationUuid() { + return verificationUuid; + } + + @Override + public String getApiId() { + return apiId; + } + + @Override + public String getId() throws PlivoValidationException { + return null; + } +} diff --git a/src/main/java/com/plivo/api/models/verify/InitiateVerify.java b/src/main/java/com/plivo/api/models/verify/InitiateVerify.java new file mode 100644 index 00000000..69f727b2 --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/InitiateVerify.java @@ -0,0 +1,58 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.models.base.VoiceCreator; +import retrofit2.Call; + +public class InitiateVerify extends VoiceCreator { + + private String phoneNumber; + private String alias; + private String channel; + private String subaccount; + + public String getPhoneNumber() { + return phoneNumber; + } + public String getAlias() { + return alias; + } + public String getChannel() { + return channel; + } + public String getSubaccount() { + return subaccount; + } + + public InitiateVerify phoneNumber(final String phoneNumber) { + this.phoneNumber = phoneNumber; + return this; + } + public InitiateVerify alias(final String alias) { + this.alias = alias; + return this; + } + public InitiateVerify channel(final String channel) { + this.channel = channel; + return this; + } + public InitiateVerify subaccount(final String subaccount) { + this.subaccount = subaccount; + return this; + } + + @Override + protected Call obtainCall() { + return client().getVoiceApiService().initiateVerify(client().getAuthId(),this); + } + + @Override + protected Call obtainFallback1Call() { + return client().getVoiceFallback1Service().initiateVerify(client().getAuthId(), this); + } + + @Override + protected Call obtainFallback2Call() { + return client().getVoiceFallback2Service().initiateVerify(client().getAuthId(), this); + } + +} diff --git a/src/main/java/com/plivo/api/models/verify/InitiateVerifyResponse.java b/src/main/java/com/plivo/api/models/verify/InitiateVerifyResponse.java new file mode 100644 index 00000000..2c9f6202 --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/InitiateVerifyResponse.java @@ -0,0 +1,15 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.models.base.BaseResponse; + +public class InitiateVerifyResponse extends BaseResponse { + private String apiId; + + private String message; + + private String verificationUuid; + + public String getVerificationUuid() { + return verificationUuid; + } +} diff --git a/src/main/java/com/plivo/api/models/verify/ListVerifiedCallerId.java b/src/main/java/com/plivo/api/models/verify/ListVerifiedCallerId.java new file mode 100644 index 00000000..a1419bc5 --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/ListVerifiedCallerId.java @@ -0,0 +1,74 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.exceptions.PlivoValidationException; +import com.plivo.api.models.base.VoiceGetter; +import retrofit2.Call; + +public class ListVerifiedCallerId extends VoiceGetter { + + private String country; + private String subaccount; + private String alias; + private Integer limit; + private Integer offset; + + public String getCountry() { + return country; + } + + public String getSubaccount() { + return subaccount; + } + + public String getAlias() { + return alias; + } + + public Integer getLimit() { + return limit; + } + + public Integer getOffset() { + return offset; + } + + public ListVerifiedCallerId country(final String country) { + this.country = country; + return this; + } + public ListVerifiedCallerId subaccount(final String subaccount) { + this.subaccount = subaccount; + return this; + } + public ListVerifiedCallerId alias(final String alias) { + this.alias = alias; + return this; + } + public ListVerifiedCallerId limit(final Integer limit) { + this.limit = limit; + return this; + } + public ListVerifiedCallerId offset(final Integer offset) { + this.offset = offset; + return this; + } + + public ListVerifiedCallerId() { + super(""); + } + + @Override + protected Call obtainCall() throws PlivoValidationException { + return client().getVoiceApiService().listVerifiedCallerID(client().getAuthId(), toMap()); + } + + @Override + protected Call obtainFallback1Call() throws PlivoValidationException { + return client().getVoiceFallback1Service().listVerifiedCallerID(client().getAuthId(), toMap()); + } + + @Override + protected Call obtainFallback2Call() throws PlivoValidationException { + return client().getVoiceFallback2Service().listVerifiedCallerID(client().getAuthId(), toMap()); + } +} diff --git a/src/main/java/com/plivo/api/models/verify/ListVerifiedCallerIdResponse.java b/src/main/java/com/plivo/api/models/verify/ListVerifiedCallerIdResponse.java new file mode 100644 index 00000000..d44e8f65 --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/ListVerifiedCallerIdResponse.java @@ -0,0 +1,35 @@ +package com.plivo.api.models.verify; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.plivo.api.exceptions.PlivoValidationException; +import com.plivo.api.models.base.BaseResource; + +import java.util.List; + +@JsonIgnoreProperties("id") +public class ListVerifiedCallerIdResponse extends BaseResource { + + private String apiId; + + private VerifyMeta meta; + + private List objects; + + public VerifyMeta getMeta() { + return meta; + } + + public List getObjects() { + return objects; + } + + @Override + public String getId() throws PlivoValidationException { + return null; + } + + @Override + public String getApiId() { + return apiId; + } +} diff --git a/src/main/java/com/plivo/api/models/verify/ListVerifiedCallerIdStructure.java b/src/main/java/com/plivo/api/models/verify/ListVerifiedCallerIdStructure.java new file mode 100644 index 00000000..277e085d --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/ListVerifiedCallerIdStructure.java @@ -0,0 +1,47 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.models.base.BaseResponse; + +public class ListVerifiedCallerIdStructure extends BaseResponse { + + private String alias; + private String country; + private String createdAt; + private String modifiedAt; + private String phoneNumber; + private String resourceUri; + private String subaccount; + private String verificationUuid; + + public String getAlias() { + return alias; + } + + public String getCountry() { + return country; + } + + public String getCreatedAt() { + return createdAt; + } + + public String getModifiedAt() { + return modifiedAt; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public String getResourceUri() { + return resourceUri; + } + + public String getSubaccount() { + return subaccount; + } + + public String getVerificationUuid() { + return verificationUuid; + } +} diff --git a/src/main/java/com/plivo/api/models/verify/ListVerifyResponse.java b/src/main/java/com/plivo/api/models/verify/ListVerifyResponse.java new file mode 100644 index 00000000..9b13d3a1 --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/ListVerifyResponse.java @@ -0,0 +1,13 @@ +package com.plivo.api.models.verify; + +public class ListVerifyResponse{ + + private String alias; + private String country; + private String createdAt; + private String modifiedAt; + private String phoneNumber; + private String resourceUri; + private String subaccount; + private String verificationUuid; +} diff --git a/src/main/java/com/plivo/api/models/verify/UpdateVerifiedCallerID.java b/src/main/java/com/plivo/api/models/verify/UpdateVerifiedCallerID.java new file mode 100644 index 00000000..41773b06 --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/UpdateVerifiedCallerID.java @@ -0,0 +1,48 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.exceptions.PlivoValidationException; +import com.plivo.api.models.base.VoiceUpdater; +import retrofit2.Call; + +public class UpdateVerifiedCallerID extends VoiceUpdater { + + private String alias; + private String subaccount; + + public UpdateVerifiedCallerID(String id) { + super(id); + } + + public String getAlias() { + return alias; + } + + public String getSubaccount() { + return subaccount; + } + + public UpdateVerifiedCallerID alias(final String alias) { + this.alias = alias; + return this; + } + + public UpdateVerifiedCallerID subaccount(final String subaccount) { + this.subaccount = subaccount; + return this; + } + + @Override + protected Call obtainCall() throws PlivoValidationException { + return client().getVoiceApiService().updateVerifiedCallerID(client().getAuthId(), id, this); + } + + @Override + protected Call obtainFallback1Call() throws PlivoValidationException { + return client().getVoiceFallback1Service().updateVerifiedCallerID(client().getAuthId(), id, this); + } + + @Override + protected Call obtainFallback2Call() throws PlivoValidationException { + return client().getVoiceFallback2Service().updateVerifiedCallerID(client().getAuthId(), id, this); + } +} diff --git a/src/main/java/com/plivo/api/models/verify/UpdateVerifiedCallerIdResponse.java b/src/main/java/com/plivo/api/models/verify/UpdateVerifiedCallerIdResponse.java new file mode 100644 index 00000000..7b91ca8d --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/UpdateVerifiedCallerIdResponse.java @@ -0,0 +1,43 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.models.base.BaseResponse; + +public class UpdateVerifiedCallerIdResponse extends BaseResponse { + + private String alias; + private String apiId; + private String country; + private String createdAt; + private String modifiedAt; + private String phoneNumber; + private String subaccount; + private String verificationUuid; + + public String getAlias() { + return alias; + } + + public String getCountry() { + return country; + } + + public String getCreatedAt() { + return createdAt; + } + + public String getModifiedAt() { + return modifiedAt; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public String getSubaccount() { + return subaccount; + } + + public String getVerificationUuid() { + return verificationUuid; + } +} diff --git a/src/main/java/com/plivo/api/models/verify/VerifiedCallerIdDeleter.java b/src/main/java/com/plivo/api/models/verify/VerifiedCallerIdDeleter.java new file mode 100644 index 00000000..2c985bac --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/VerifiedCallerIdDeleter.java @@ -0,0 +1,28 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.exceptions.PlivoValidationException; +import com.plivo.api.models.base.VoiceDeleter; +import okhttp3.ResponseBody; + +public class VerifiedCallerIdDeleter extends VoiceDeleter { + + public VerifiedCallerIdDeleter(String id) { + super(id); + } + + @Override + protected retrofit2.Call obtainCall() throws PlivoValidationException { + return client().getVoiceApiService().deleteVerifiedCallerID(client().getAuthId(), id); + } + + @Override + protected retrofit2.Call obtainFallback1Call() throws PlivoValidationException { + return client().getVoiceFallback1Service().deleteVerifiedCallerID(client().getAuthId(), id); + } + + @Override + protected retrofit2.Call obtainFallback2Call() throws PlivoValidationException { + return client().getVoiceFallback2Service().deleteVerifiedCallerID(client().getAuthId(), id); + } + +} diff --git a/src/main/java/com/plivo/api/models/verify/Verify.java b/src/main/java/com/plivo/api/models/verify/Verify.java new file mode 100644 index 00000000..179c421c --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/Verify.java @@ -0,0 +1,36 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.exceptions.PlivoValidationException; +import com.plivo.api.models.base.BaseResource; + +public class Verify extends BaseResource { + + public static InitiateVerify initiateVerify() { + return new InitiateVerify(); + } + + public static VerifyCallerId verifyCallerId(String verificationUuid) { + return new VerifyCallerId(verificationUuid); + } + + public static UpdateVerifiedCallerID updateVerifiedCallerID(String phoneNumber) { + return new UpdateVerifiedCallerID(phoneNumber); + } + + public static GetVerifiedCallerId getVerifiedCallerID(String phoneNumber) { + return new GetVerifiedCallerId(phoneNumber); + } + + public static ListVerifiedCallerId listVerifiedCallerID() { + return new ListVerifiedCallerId(); + } + + public static VerifiedCallerIdDeleter deleteVerifiedCallerID(String phoneNumber) { + return new VerifiedCallerIdDeleter(phoneNumber); + } + + @Override + public String getId() throws PlivoValidationException { + return null; + } +} diff --git a/src/main/java/com/plivo/api/models/verify/VerifyCallerId.java b/src/main/java/com/plivo/api/models/verify/VerifyCallerId.java new file mode 100644 index 00000000..d3b15e01 --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/VerifyCallerId.java @@ -0,0 +1,42 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.models.base.VoiceCreator; +import retrofit2.Call; + +public class VerifyCallerId extends VoiceCreator { + + private String otp; + + private final String id; + + public VerifyCallerId(String id) { + if (id == null) { + throw new IllegalArgumentException("verification uuid cannot be null"); + } + this.id = id; + } + + public String getOtp() { + return otp; + } + + public VerifyCallerId otp(final String otp) { + this.otp = otp; + return this; + } + + @Override + protected Call obtainCall() { + return client().getVoiceApiService().verifyCallerID(client().getAuthId(),id,this); + } + + @Override + protected Call obtainFallback1Call() { + return client().getVoiceFallback1Service().verifyCallerID(client().getAuthId(),id,this); + } + + @Override + protected Call obtainFallback2Call() { + return client().getVoiceFallback2Service().verifyCallerID(client().getAuthId(),id,this); + } +} diff --git a/src/main/java/com/plivo/api/models/verify/VerifyCallerIdResponse.java b/src/main/java/com/plivo/api/models/verify/VerifyCallerIdResponse.java new file mode 100644 index 00000000..7d340cde --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/VerifyCallerIdResponse.java @@ -0,0 +1,43 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.models.base.BaseResponse; + +public class VerifyCallerIdResponse extends BaseResponse { + + private String alias; + private String apiId; + private String channel; + private String country; + private String createdAt; + private String phoneNumber; + private String verificationUuid; + private String subaccount; + + public String getAlias() { + return alias; + } + + public String getChannel() { + return channel; + } + + public String getCountry() { + return country; + } + + public String getCreatedAt() { + return createdAt; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public String getVerificationUuid() { + return verificationUuid; + } + + public String getSubaccount() { + return subaccount; + } +} diff --git a/src/main/java/com/plivo/api/models/verify/VerifyMeta.java b/src/main/java/com/plivo/api/models/verify/VerifyMeta.java new file mode 100644 index 00000000..355a4265 --- /dev/null +++ b/src/main/java/com/plivo/api/models/verify/VerifyMeta.java @@ -0,0 +1,32 @@ +package com.plivo.api.models.verify; + +import com.plivo.api.models.base.BaseResponse; + +public class VerifyMeta extends BaseResponse { + + private int limit; + private String next; + private String offset; + private String previous; + private int totalCount; + + public int getLimit() { + return limit; + } + + public String getNext() { + return next; + } + + public String getOffset() { + return offset; + } + + public String getPrevious() { + return previous; + } + + public int getTotalCount() { + return totalCount; + } +} diff --git a/src/main/resources/com/plivo/api/version.txt b/src/main/resources/com/plivo/api/version.txt index f455a488..c46a5919 100644 --- a/src/main/resources/com/plivo/api/version.txt +++ b/src/main/resources/com/plivo/api/version.txt @@ -1 +1 @@ -5.31.1 +5.32.1 diff --git a/src/test/java/com/plivo/api/VerifyTest.java b/src/test/java/com/plivo/api/VerifyTest.java new file mode 100644 index 00000000..7a44b4c2 --- /dev/null +++ b/src/test/java/com/plivo/api/VerifyTest.java @@ -0,0 +1,74 @@ +package com.plivo.api; + +import com.plivo.api.models.verify.Verify; +import org.junit.Before; +import org.junit.Test; + +public class VerifyTest extends BaseTest{ + + private PlivoClient client; + + @Before + public void setUp() throws Exception { + super.setUp(); + client = new PlivoClient("MA123456789012345678", + "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + } + + @Test + public void initiateVerifyShouldWork() throws Exception { + expectResponse("initiateVerifyResponse.json", 200); + + Verify.initiateVerify().phoneNumber("91999999999").create(); + + assertRequest("POST", "VerifiedCallerId/"); + } + + @Test + public void verifyCallerIdShouldWork() throws Exception { + expectResponse("verifyCallerIdResponse.json", 200); + final String verificationUuid = "verificationUuid"; + Verify.verifyCallerId(verificationUuid).otp("otp").create(); + + assertRequest("POST", "VerifiedCallerId/Verification/%s/",verificationUuid); + } + + @Test + public void updateVerifiedCallerIdShouldWork() throws Exception { + expectResponse("updateVerifiedCallerIdResponse.json", 200); + final String phoneNumber = "phoneNumber"; + Verify.updateVerifiedCallerID(phoneNumber).alias("test").update(); + + assertRequest("POST", "VerifiedCallerId/%s",phoneNumber); + } + + @Test + public void getVerifiedCallerIdShouldWork() throws Exception { + expectResponse("updateVerifiedCallerIdResponse.json", 200); + final String phoneNumber = "phoneNumber"; + Verify.getVerifiedCallerID(phoneNumber).get(); + + assertRequest("GET", "VerifiedCallerId/%s",phoneNumber); + } + + @Test + public void listVerifiedCallerIdShouldWork() throws Exception { + expectResponse("listVerifiedCallerIdResponse.json", 200); + + Verify.listVerifiedCallerID().country("IN").get(); + + assertRequest("GET", "VerifiedCallerId/"); + } + + @Test + public void deleteVerifiedCallerIdShouldWork() throws Exception { + expectResponse("deleteVerifiedCallerIdResponse.json", 204); + + final String phoneNumber = "phoneNumber"; + Verify.deleteVerifiedCallerID(phoneNumber).delete(); + + assertRequest("DELETE", "VerifiedCallerId/%s",phoneNumber); + } + + +} diff --git a/src/test/resources/com/plivo/api/deleteVerifiedCallerIdResponse.json b/src/test/resources/com/plivo/api/deleteVerifiedCallerIdResponse.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/src/test/resources/com/plivo/api/deleteVerifiedCallerIdResponse.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/test/resources/com/plivo/api/initiateVerifyResponse.json b/src/test/resources/com/plivo/api/initiateVerifyResponse.json new file mode 100644 index 00000000..2b85e95b --- /dev/null +++ b/src/test/resources/com/plivo/api/initiateVerifyResponse.json @@ -0,0 +1,5 @@ +{ + "api_id": "b1e04bbb-9cb3-435e-946a-aea5e4f4709e", + "message": "Verification code is sent to number +919999999999 which is valid for 15 minutes", + "verification_uuid": "74df1f8f-056d-4c9c-8fc5-11615fbb23a0" +} \ No newline at end of file diff --git a/src/test/resources/com/plivo/api/listVerifiedCallerIdResponse.json b/src/test/resources/com/plivo/api/listVerifiedCallerIdResponse.json new file mode 100644 index 00000000..b68ae0ba --- /dev/null +++ b/src/test/resources/com/plivo/api/listVerifiedCallerIdResponse.json @@ -0,0 +1,22 @@ +{ + "api_id": "5449144c-ff78-4da3-b6a2-9b22abdb7bd4", + "meta": { + "limit": 20, + "next": null, + "offset": 0, + "previous": null, + "total_count": 1 + }, + "objects": [ + { + "alias": "test", + "country": "IN", + "created_at": "2023-09-26T07:58:10.345732Z", + "modified_at": "2023-09-26T07:58:10.345732Z", + "phone_number": "+919999999999", + "resource_uri": "/v1/Account/authID/VerifiedCallerId/919999999999", + "subaccount": "subaccount", + "verification_uuid": "30fe8cc9-be93-4315-afa8-7fe26d05bb01" + } + ] +} \ No newline at end of file diff --git a/src/test/resources/com/plivo/api/updateVerifiedCallerIdResponse.json b/src/test/resources/com/plivo/api/updateVerifiedCallerIdResponse.json new file mode 100644 index 00000000..fdaddb47 --- /dev/null +++ b/src/test/resources/com/plivo/api/updateVerifiedCallerIdResponse.json @@ -0,0 +1,10 @@ +{ + "alias": "test", + "api_id": "35c999a4-f1ad-4af7-9cc6-c8ccac7fd283", + "country": "US", + "created_at": "2023-10-13T11:46:58.334899Z", + "modified_at": "2023-10-13T11:46:58.334899Z", + "phone_number": "+919999999999", + "subaccount": "", + "verification_uuid": "605c75f2-02b6-4cb8-883d-69cf37b21e5a" +} \ No newline at end of file diff --git a/src/test/resources/com/plivo/api/verifyCallerIdResponse.json b/src/test/resources/com/plivo/api/verifyCallerIdResponse.json new file mode 100644 index 00000000..2db982e5 --- /dev/null +++ b/src/test/resources/com/plivo/api/verifyCallerIdResponse.json @@ -0,0 +1,9 @@ +{ + "alias": "QA Test", + "api_id": "910cc1e1-c5fc-4f58-b9de-aa30e1cfd241", + "channel": "call", + "country": "US", + "created_at": "2023-10-13T11:46:58.334898885Z", + "phone_number": "+919999999999", + "verification_uuid": "605c75f2-02b6-4cb8-883d-69cf37b21e5a" +} \ No newline at end of file From e25dca7b64c7d12100b9f564dc900ca2e2d19591 Mon Sep 17 00:00:00 2001 From: abhishekGupta-Plivo Date: Wed, 18 Oct 2023 13:34:57 +0530 Subject: [PATCH 2/2] version changes --- README.md | 2 +- pom.properties | 3 ++- pom.xml | 2 +- src/main/java/com/plivo/examples/verificationCallerID.java | 2 ++ src/main/resources/com/plivo/api/version.txt | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/plivo/examples/verificationCallerID.java diff --git a/README.md b/README.md index d895a060..07abc3b1 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you are using Maven, use the following XML to include the Plivo SDK as a depe com.plivo plivo-java - 5.32.1 + 5.32.0 ``` diff --git a/pom.properties b/pom.properties index 3fb5f477..3e69ab3a 100644 --- a/pom.properties +++ b/pom.properties @@ -1,5 +1,6 @@ # Written manually. -version=5.32.1 +version=5.32.0 groupId=com.plivo artifactId=plivo-java + diff --git a/pom.xml b/pom.xml index 9aec335c..4423338b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.plivo plivo-java - 5.32.1 + 5.32.0 plivo-java A Java SDK to make voice calls & send SMS using Plivo and to generate Plivo XML diff --git a/src/main/java/com/plivo/examples/verificationCallerID.java b/src/main/java/com/plivo/examples/verificationCallerID.java new file mode 100644 index 00000000..3093e93b --- /dev/null +++ b/src/main/java/com/plivo/examples/verificationCallerID.java @@ -0,0 +1,2 @@ +package com.plivo.examples;public class verificationCallerID { +} diff --git a/src/main/resources/com/plivo/api/version.txt b/src/main/resources/com/plivo/api/version.txt index c46a5919..f13f7e7d 100644 --- a/src/main/resources/com/plivo/api/version.txt +++ b/src/main/resources/com/plivo/api/version.txt @@ -1 +1 @@ -5.32.1 +5.32.0