Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit a6c221e

Browse files
author
Stefan Kock
committed
SORMAS-Foundation#3584: Updated com.nexmo:client 3.3.0 -> 5.6.0
- SmsService: Refactor to current nexmo API - Other: Replace com.auth0.jwt.internal.org.apache.commons usages, partially cleaned up dirty imports
1 parent bc84282 commit a6c221e

9 files changed

Lines changed: 28 additions & 31 deletions

File tree

‎sormas-backend/src/main/java/de/symeda/sormas/backend/common/SmsService.java‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929

3030
import com.nexmo.client.NexmoClient;
3131
import com.nexmo.client.NexmoClientException;
32-
import com.nexmo.client.auth.AuthMethod;
33-
import com.nexmo.client.auth.TokenAuthMethod;
3432
import com.nexmo.client.insight.CarrierDetails.NetworkType;
3533
import com.nexmo.client.insight.InsightClient;
36-
import com.nexmo.client.insight.standard.StandardInsightResponse;
37-
import com.nexmo.client.sms.SmsSubmissionResult;
34+
import com.nexmo.client.insight.InsightStatus;
35+
import com.nexmo.client.insight.StandardInsightResponse;
36+
import com.nexmo.client.sms.MessageStatus;
37+
import com.nexmo.client.sms.SmsSubmissionResponse;
38+
import com.nexmo.client.sms.SmsSubmissionResponseMessage;
3839
import com.nexmo.client.sms.messages.TextMessage;
3940

4041
import de.symeda.sormas.backend.common.ConfigFacadeEjb.ConfigFacadeEjbLocal;
@@ -56,24 +57,26 @@ public void sendSms(String phoneNumber, String subject, String content) throws I
5657
phoneNumber = phoneNumber.substring(1);
5758
}
5859

59-
AuthMethod auth = new TokenAuthMethod(configFacade.getSmsAuthKey(), configFacade.getSmsAuthSecret());
60-
NexmoClient client = new NexmoClient(auth);
60+
NexmoClient client = NexmoClient.builder().apiKey(configFacade.getSmsAuthKey()).apiSecret(configFacade.getSmsAuthSecret()).build();
6161

6262
// If the phone number is invalid, e.g. because it is a landline number or malformed otherwise, throw an exception
6363
InsightClient insightClient = client.getInsightClient();
6464
StandardInsightResponse insightResponse = insightClient.getStandardNumberInsight(phoneNumber);
65-
if (insightResponse.getStatus() != 0 || insightResponse.getCurrentCarrier().getNetworkType() != NetworkType.MOBILE) {
65+
if (insightResponse.getStatus() != InsightStatus.SUCCESS || insightResponse.getCurrentCarrier().getNetworkType() != NetworkType.MOBILE) {
6666
throw new InvalidPhoneNumberException("Cannot send an SMS to the specified phone number", null);
6767
}
6868

69-
SmsSubmissionResult[] results =
69+
SmsSubmissionResponse response =
7070
client.getSmsClient().submitMessage(new TextMessage(configFacade.getSormasInstanceName(), phoneNumber, content));
71-
72-
for (SmsSubmissionResult result : results) {
73-
if (result.getStatus() == 0) {
71+
for (SmsSubmissionResponseMessage message : response.getMessages()) {
72+
if (message.getStatus() == MessageStatus.OK) {
7473
logger.info("SMS successfully sent to {}.", phoneNumber);
75-
} else if (result.getErrorText() != null) {
76-
logger.info("Error sending SMS to {} with following error: {}.", phoneNumber, result.getErrorText());
74+
} else if (message.getErrorText() != null) {
75+
logger.info(
76+
"Error sending SMS to {} with following error: status: {}, text: '{}'.",
77+
phoneNumber,
78+
message.getStatus(),
79+
message.getErrorText());
7780
}
7881
}
7982
}

‎sormas-backend/src/main/java/de/symeda/sormas/backend/importexport/ImportFacadeEjb.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,11 @@
6363
import javax.ejb.Stateless;
6464
import javax.inject.Provider;
6565

66-
import de.symeda.sormas.api.CountryHelper;
67-
import de.symeda.sormas.api.utils.HideForCountries;
68-
import de.symeda.sormas.api.utils.HideForCountriesExcept;
69-
import de.symeda.sormas.api.utils.fieldvisibility.checkers.CountryFieldVisibilityChecker;
7066
import org.apache.commons.lang3.StringUtils;
67+
import org.apache.commons.lang3.text.WordUtils;
7168
import org.slf4j.Logger;
7269
import org.slf4j.LoggerFactory;
7370

74-
import com.auth0.jwt.internal.org.apache.commons.lang3.text.WordUtils;
7571
import com.opencsv.CSVWriter;
7672

7773
import de.symeda.sormas.api.AgeGroup;
@@ -116,6 +112,7 @@
116112
import de.symeda.sormas.api.utils.CSVCommentLineValidator;
117113
import de.symeda.sormas.api.utils.CSVUtils;
118114
import de.symeda.sormas.api.utils.DependingOnFeatureType;
115+
import de.symeda.sormas.api.utils.fieldvisibility.checkers.CountryFieldVisibilityChecker;
119116
import de.symeda.sormas.backend.campaign.form.CampaignFormMetaFacadeEjb.CampaignFormMetaFacadeEjbLocal;
120117
import de.symeda.sormas.backend.common.ConfigFacadeEjb.ConfigFacadeEjbLocal;
121118
import de.symeda.sormas.backend.disease.DiseaseConfigurationFacadeEjb.DiseaseConfigurationFacadeEjbLocal;

‎sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*******************************************************************************/
1818
package de.symeda.sormas.backend.person;
1919

20-
import java.io.Serializable;
2120
import java.sql.Timestamp;
2221
import java.util.ArrayList;
2322
import java.util.Collections;
@@ -44,18 +43,19 @@
4443
import javax.persistence.criteria.Root;
4544
import javax.validation.constraints.NotNull;
4645

47-
import com.auth0.jwt.internal.org.apache.commons.lang3.StringUtils;
46+
import org.apache.commons.lang3.StringUtils;
4847

4948
import com.google.i18n.phonenumbers.NumberParseException;
5049
import com.google.i18n.phonenumbers.PhoneNumberUtil;
5150
import com.google.i18n.phonenumbers.Phonenumber;
51+
5252
import de.symeda.sormas.api.Disease;
5353
import de.symeda.sormas.api.caze.CaseCriteria;
5454
import de.symeda.sormas.api.caze.CaseDataDto;
5555
import de.symeda.sormas.api.caze.CaseOutcome;
56-
import de.symeda.sormas.api.externaljournal.ExternalJournalValidation;
5756
import de.symeda.sormas.api.contact.FollowUpStatus;
5857
import de.symeda.sormas.api.contact.FollowUpStatusDto;
58+
import de.symeda.sormas.api.externaljournal.ExternalJournalValidation;
5959
import de.symeda.sormas.api.i18n.I18nProperties;
6060
import de.symeda.sormas.api.i18n.Validations;
6161
import de.symeda.sormas.api.location.LocationDto;

‎sormas-backend/src/main/java/de/symeda/sormas/backend/therapy/PrescriptionService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import javax.persistence.criteria.Predicate;
1616
import javax.persistence.criteria.Root;
1717

18-
import com.auth0.jwt.internal.org.apache.commons.lang3.StringUtils;
18+
import org.apache.commons.lang3.StringUtils;
1919

2020
import de.symeda.sormas.api.therapy.PrescriptionCriteria;
2121
import de.symeda.sormas.backend.caze.Case;

‎sormas-backend/src/main/java/de/symeda/sormas/backend/therapy/TreatmentService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import javax.persistence.criteria.Predicate;
1616
import javax.persistence.criteria.Root;
1717

18-
import com.auth0.jwt.internal.org.apache.commons.lang3.StringUtils;
18+
import org.apache.commons.lang3.StringUtils;
1919

2020
import de.symeda.sormas.api.therapy.TreatmentCriteria;
2121
import de.symeda.sormas.backend.caze.Case;

‎sormas-backend/src/test/java/de/symeda/sormas/backend/contact/ContactFacadeEjbTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@
3737
import java.util.List;
3838
import java.util.stream.Collectors;
3939

40+
import org.apache.commons.lang3.StringUtils;
4041
import org.apache.commons.lang3.time.DateUtils;
4142
import org.junit.Assert;
4243
import org.junit.Test;
4344

44-
import com.auth0.jwt.internal.org.apache.commons.lang3.StringUtils;
45-
4645
import de.symeda.sormas.api.Disease;
4746
import de.symeda.sormas.api.Language;
4847
import de.symeda.sormas.api.VisitOrigin;

‎sormas-backend/src/test/java/de/symeda/sormas/backend/docgeneration/QuarantineOrderFacadeEjbTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
import java.util.List;
1616
import java.util.Properties;
1717

18+
import org.apache.commons.io.FileUtils;
19+
import org.apache.commons.io.IOUtils;
1820
import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
1921
import org.apache.poi.xwpf.usermodel.XWPFDocument;
2022
import org.junit.Before;
2123
import org.junit.Test;
2224

23-
import com.auth0.jwt.internal.org.apache.commons.io.FileUtils;
24-
import com.auth0.jwt.internal.org.apache.commons.io.IOUtils;
25-
2625
import de.symeda.sormas.api.Disease;
2726
import de.symeda.sormas.api.ReferenceDto;
2827
import de.symeda.sormas.api.caze.CaseDataDto;

‎sormas-backend/src/test/java/de/symeda/sormas/backend/docgeneration/TemplateEngineServiceTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
import java.util.Set;
1313

1414
import org.apache.commons.io.FilenameUtils;
15+
import org.apache.commons.io.IOUtils;
1516
import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
1617
import org.apache.poi.xwpf.usermodel.XWPFDocument;
1718
import org.junit.Before;
1819
import org.junit.Test;
1920

20-
import com.auth0.jwt.internal.org.apache.commons.io.IOUtils;
21-
2221
import de.symeda.sormas.api.person.PersonDto;
2322
import de.symeda.sormas.backend.AbstractBeanTest;
2423
import fr.opensagres.xdocreport.core.XDocReportException;

‎sormas-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@
584584
<dependency>
585585
<groupId>com.nexmo</groupId>
586586
<artifactId>client</artifactId>
587-
<version>3.3.0</version>
587+
<version>5.6.0</version>
588588
</dependency>
589589

590590
<dependency>

0 commit comments

Comments
 (0)