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

Commit ca0ddfc

Browse files
lgallgal
authored andcommitted
SORMAS-Foundation#2959 use CountryHelper constants instead fo hardcoded locales
1 parent 74a510b commit ca0ddfc

1 file changed

Lines changed: 24 additions & 21 deletions

File tree

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
*******************************************************************************/
1818
package de.symeda.sormas.api.caze;
1919

20+
import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_GERMANY;
21+
import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_SWITZERLAND;
22+
2023
import java.util.Date;
2124

2225
import de.symeda.sormas.api.Disease;
@@ -360,20 +363,20 @@ public class CaseDataDto extends PseudonymizableDto {
360363
@SensitiveData
361364
private String quarantineHelpNeeded;
362365
@HideForCountriesExcept(countries = {
363-
"de",
364-
"ch" })
366+
COUNTRY_CODE_GERMANY,
367+
COUNTRY_CODE_SWITZERLAND })
365368
private boolean quarantineOrderedVerbally;
366369
@HideForCountriesExcept(countries = {
367-
"de",
368-
"ch" })
370+
COUNTRY_CODE_GERMANY,
371+
COUNTRY_CODE_SWITZERLAND })
369372
private boolean quarantineOrderedOfficialDocument;
370373
@HideForCountriesExcept(countries = {
371-
"de",
372-
"ch" })
374+
COUNTRY_CODE_GERMANY,
375+
COUNTRY_CODE_SWITZERLAND })
373376
private Date quarantineOrderedVerballyDate;
374377
@HideForCountriesExcept(countries = {
375-
"de",
376-
"ch" })
378+
COUNTRY_CODE_GERMANY,
379+
COUNTRY_CODE_SWITZERLAND })
377380
private Date quarantineOrderedOfficialDocumentDate;
378381
@HideForCountriesExcept
379382
private YesNoUnknown quarantineHomePossible;
@@ -388,12 +391,12 @@ public class CaseDataDto extends PseudonymizableDto {
388391
private boolean quarantineExtended;
389392
private boolean quarantineReduced;
390393
@HideForCountriesExcept(countries = {
391-
"de",
392-
"ch" })
394+
COUNTRY_CODE_GERMANY,
395+
COUNTRY_CODE_SWITZERLAND })
393396
private boolean quarantineOfficialOrderSent;
394397
@HideForCountriesExcept(countries = {
395-
"de",
396-
"ch" })
398+
COUNTRY_CODE_GERMANY,
399+
COUNTRY_CODE_SWITZERLAND })
397400
private Date quarantineOfficialOrderSentDate;
398401
private ReportingType reportingType;
399402
private YesNoUnknown postpartum;
@@ -403,25 +406,25 @@ public class CaseDataDto extends PseudonymizableDto {
403406
private Date followUpUntil;
404407
private boolean overwriteFollowUpUntil;
405408

406-
@HideForCountriesExcept(countries = "ch")
409+
@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
407410
private Integer caseIdIsm;
408-
@HideForCountriesExcept(countries = "ch")
411+
@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
409412
private CovidTestReason covidTestReason;
410-
@HideForCountriesExcept(countries = "ch")
413+
@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
411414
@SensitiveData
412415
private String covidTestReasonDetails;
413-
@HideForCountriesExcept(countries = "ch")
416+
@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
414417
private ContactTracingContactType contactTracingFirstContactType;
415-
@HideForCountriesExcept(countries = "ch")
418+
@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
416419
private Date contactTracingFirstContactDate;
417-
@HideForCountriesExcept(countries = "ch")
420+
@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
418421
private QuarantineReason quarantineReasonBeforeIsolation;
419-
@HideForCountriesExcept(countries = "ch")
422+
@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
420423
@SensitiveData
421424
private String quarantineReasonBeforeIsolationDetails;
422-
@HideForCountriesExcept(countries = "ch")
425+
@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
423426
private EndOfIsolationReason endOfIsolationReason;
424-
@HideForCountriesExcept(countries = "ch")
427+
@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
425428
@SensitiveData
426429
private String endOfIsolationReasonDetails;
427430

0 commit comments

Comments
 (0)