SSCS-1116+ (#1646)

* Adding a port of entry and country of residence enum

* suppressing elasticsearch issue

config/owasp/suppressions.xml

@@ -4,5 +4,7 @@
     <cve>CVE-2023-2976</cve>
     <cve>CVE-2020-8908</cve>
     <cve>CVE-2023-35116</cve>
+    <!-- Requires update of elasticsearch lib that has lucene dependency version > 9.12.0 -->
+    <cve>CVE-2024-45772</cve>
   </suppress>
 </suppressions>

src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/CountryOfResidence.java

@@ -0,0 +1,209 @@
+package uk.gov.hmcts.reform.sscs.ccd.domain;
+
+import lombok.Getter;
+
+@Getter
+public enum CountryOfResidence {
+
+    AFGHANISTAN("Afghanistan", "The Islamic Republic of Afghanistan"),
+    ALBANIA("Albania", "The Republic of Albania"),
+    ALGERIA("Algeria", "The People's Democratic Republic of Algeria"),
+    ANDORRA("Andorra", "The Principality of Andorra"),
+    ANGOLA("Angola", "The Republic of Angola"),
+    ANTIGUA_AND_BARBUDA("Antigua and Barbuda", "Antigua and Barbuda"),
+    ARGENTINA("Argentina", "The Argentine Republic"),
+    ARMENIA("Armenia", "The Republic of Armenia"),
+    AUSTRALIA("Australia", "The Commonwealth of Australia"),
+    AUSTRIA("Austria", "The Republic of Austria"),
+    AZERBAIJAN("Azerbaijan", "The Republic of Azerbaijan"),
+    BAHRAIN("Bahrain", "The Kingdom of Bahrain"),
+    BANGLADESH("Bangladesh", "The People's Republic of Bangladesh"),
+    BARBADOS("Barbados", "Barbados"),
+    BELARUS("Belarus", "The Republic of Belarus"),
+    BELGIUM("Belgium", "The Kingdom of Belgium"),
+    BELIZE("Belize", "Belize"),
+    BENIN("Benin", "The Republic of Benin"),
+    BHUTAN("Bhutan", "The Kingdom of Bhutan"),
+    BOLIVIA("Bolivia", "The Plurinational State of Bolivia"),
+    BOSNIA_AND_HERZEGOVINA("Bosnia and Herzegovina", "Bosnia and Herzegovina"),
+    BOTSWANA("Botswana", "The Republic of Botswana"),
+    BRAZIL("Brazil", "The Federative Republic of Brazil"),
+    BRUNEI("Brunei", "Brunei Darussalam"),
+    BULGARIA("Bulgaria", "The Republic of Bulgaria"),
+    BURKINA_FASO("Burkina Faso", "Burkina Faso"),
+    BURUNDI("Burundi", "The Republic of Burundi"),
+    CAMBODIA("Cambodia", "The Kingdom of Cambodia"),
+    CAMEROON("Cameroon", "The Republic of Cameroon"),
+    CANADA("Canada", "Canada"),
+    CAPE_VERDE("Cape Verde", "The Republic of Cabo Verde"),
+    CENTRAL_AFRICAN_REPUBLIC("Central African Republic", "The Central African Republic"),
+    CHAD("Chad", "The Republic of Chad"),
+    CHILE("Chile", "The Republic of Chile"),
+    CHINA("China", "The People's Republic of China"),
+    COLOMBIA("Colombia", "The Republic of Colombia"),
+    COMOROS("Comoros", "The Union of the Comoros"),
+    CONGO("Congo", "The Republic of the Congo"),
+    CONGO_DEMOCRATIC_REPUBLIC("Congo (Democratic Republic)", "The Democratic Republic of the Congo"),
+    COSTA_RICA("Costa Rica", "The Republic of Costa Rica"),
+    CROATIA("Croatia", "The Republic of Croatia"),
+    CUBA("Cuba", "The Republic of Cuba"),
+    CYPRUS("Cyprus", "The Republic of Cyprus"),
+    CZECHIA("Czechia", "The Czech Republic"),
+    DENMARK("Denmark", "The Kingdom of Denmark"),
+    DJIBOUTI("Djibouti", "The Republic of Djibouti"),
+    DOMINICA("Dominica", "The Commonwealth of Dominica"),
+    DOMINICAN_REPUBLIC("Dominican Republic", "The Dominican Republic"),
+    EAST_TIMOR("East Timor", "The Democratic Republic of Timor-Leste"),
+    ECUADOR("Ecuador", "The Republic of Ecuador"),
+    EGYPT("Egypt", "The Arab Republic of Egypt"),
+    EL_SALVADOR("El Salvador", "The Republic of El Salvador"),
+    EQUATORIAL_GUINEA("Equatorial Guinea", "The Republic of Equatorial Guinea"),
+    ERITREA("Eritrea", "The State of Eritrea"),
+    ESTONIA("Estonia", "The Republic of Estonia"),
+    ESWATINI("Eswatini", "Kingdom of Eswatini"),
+    ETHIOPIA("Ethiopia", "The Federal Democratic Republic of Ethiopia"),
+    FIJI("Fiji", "The Republic of Fiji"),
+    FINLAND("Finland", "The Republic of Finland"),
+    FRANCE("France", "The French Republic"),
+    GABON("Gabon", "The Gabonese Republic"),
+    GEORGIA("Georgia", "Georgia"),
+    GERMANY("Germany", "The Federal Republic of Germany"),
+    GHANA("Ghana", "The Republic of Ghana"),
+    GREECE("Greece", "The Hellenic Republic"),
+    GRENADA("Grenada", "Grenada"),
+    GUATEMALA("Guatemala", "The Republic of Guatemala"),
+    GUINEA("Guinea", "The Republic of Guinea"),
+    GUINEA_BISSAU("Guinea-Bissau", "The Republic of Guinea-Bissau"),
+    GUYANA("Guyana", "The Co-operative Republic of Guyana"),
+    HAITI("Haiti", "The Republic of Haiti"),
+    HONDURAS("Honduras", "The Republic of Honduras"),
+    HUNGARY("Hungary", "Hungary"),
+    ICELAND("Iceland", "Iceland"),
+    INDIA("India", "The Republic of India"),
+    INDONESIA("Indonesia", "The Republic of Indonesia"),
+    IRAN("Iran", "The Islamic Republic of Iran"),
+    IRAQ("Iraq", "The Republic of Iraq"),
+    IRELAND("Ireland", "Ireland"),
+    ISRAEL("Israel", "The State of Israel"),
+    ITALY("Italy", "The Italian Republic"),
+    IVORY_COAST("Ivory Coast", "The Republic of Côte D’Ivoire"),
+    JAMAICA("Jamaica", "Jamaica"),
+    JAPAN("Japan", "Japan"),
+    JORDAN("Jordan", "The Hashemite Kingdom of Jordan"),
+    KAZAKHSTAN("Kazakhstan", "The Republic of Kazakhstan"),
+    KENYA("Kenya", "The Republic of Kenya"),
+    KIRIBATI("Kiribati", "The Republic of Kiribati"),
+    KOSOVO("Kosovo", "The Republic of Kosovo"),
+    KUWAIT("Kuwait", "The State of Kuwait"),
+    KYRGYZSTAN("Kyrgyzstan", "The Kyrgyz Republic"),
+    LAOS("Laos", "The Lao People's Democratic Republic"),
+    LATVIA("Latvia", "The Republic of Latvia"),
+    LEBANON("Lebanon", "The Lebanese Republic"),
+    LESOTHO("Lesotho", "The Kingdom of Lesotho"),
+    LIBERIA("Liberia", "The Republic of Liberia"),
+    LIBYA("Libya", "State of Libya"),
+    LIECHTENSTEIN("Liechtenstein", "The Principality of Liechtenstein"),
+    LITHUANIA("Lithuania", "The Republic of Lithuania"),
+    LUXEMBOURG("Luxembourg", "The Grand Duchy of Luxembourg"),
+    MADAGASCAR("Madagascar", "The Republic of Madagascar"),
+    MALAWI("Malawi", "The Republic of Malawi"),
+    MALAYSIA("Malaysia", "Malaysia"),
+    MALDIVES("Maldives", "The Republic of Maldives"),
+    MALI("Mali", "The Republic of Mali"),
+    MALTA("Malta", "The Republic of Malta"),
+    MARSHALL_ISLANDS("Marshall Islands", "The Republic of the Marshall Islands"),
+    MAURITANIA("Mauritania", "The Islamic Republic of Mauritania"),
+    MAURITIUS("Mauritius", "The Republic of Mauritius"),
+    MEXICO("Mexico", "The United Mexican States"),
+    FEDERATED_STATES_OF_MICRONESIA("Federated States of Micronesia", "Federated States of Micronesia"),
+    MOLDOVA("Moldova", "The Republic of Moldova"),
+    MONACO("Monaco", "The Principality of Monaco"),
+    MONGOLIA("Mongolia", "Mongolia"),
+    MONTENEGRO("Montenegro", "Montenegro"),
+    MOROCCO("Morocco", "The Kingdom of Morocco"),
+    MOZAMBIQUE("Mozambique", "The Republic of Mozambique"),
+    MYANMAR_BURMA("Myanmar (Burma)", "The Republic of the Union of Myanmar"),
+    NAMIBIA("Namibia", "The Republic of Namibia"),
+    NAURU("Nauru", "The Republic of Nauru"),
+    NEPAL("Nepal", "Nepal"),
+    NETHERLANDS("Netherlands", "The Kingdom of the Netherlands"),
+    NEW_ZEALAND("New Zealand", "New Zealand"),
+    NICARAGUA("Nicaragua", "The Republic of Nicaragua"),
+    NIGER("Niger", "The Republic of Niger"),
+    NIGERIA("Nigeria", "The Federal Republic of Nigeria"),
+    NORTH_KOREA("North Korea", "The Democratic People's Republic of Korea"),
+    NORTH_MACEDONIA("North Macedonia", "Republic of North Macedonia"),
+    NORWAY("Norway", "The Kingdom of Norway"),
+    OMAN("Oman", "The Sultanate of Oman"),
+    PAKISTAN("Pakistan", "The Islamic Republic of Pakistan"),
+    PALAU("Palau", "The Republic of Palau"),
+    PANAMA("Panama", "The Republic of Panama"),
+    PAPUA_NEW_GUINEA("Papua New Guinea", "The Independent State of Papua New Guinea"),
+    PARAGUAY("Paraguay", "The Republic of Paraguay"),
+    PERU("Peru", "The Republic of Peru"),
+    PHILIPPINES("Philippines", "The Republic of the Philippines"),
+    POLAND("Poland", "The Republic of Poland"),
+    PORTUGAL("Portugal", "The Portuguese Republic"),
+    QATAR("Qatar", "The State of Qatar"),
+    ROMANIA("Romania", "Romania"),
+    RUSSIA("Russia", "The Russian Federation"),
+    RWANDA("Rwanda", "The Republic of Rwanda"),
+    ST_KITTS_AND_NEVIS("St Kitts and Nevis", "The Federation of Saint Christopher and Nevis"),
+    ST_LUCIA("St Lucia", "Saint Lucia"),
+    ST_VINCENT("St Vincent", "Saint Vincent and the Grenadines"),
+    SAMOA("Samoa", "The Independent State of Samoa"),
+    SAN_MARINO("San Marino", "The Republic of San Marino"),
+    SAO_TOME_AND_PRINCIPE("Sao Tome and Principe", "The Democratic Republic of Sao Tome and Principe"),
+    SAUDI_ARABIA("Saudi Arabia", "The Kingdom of Saudi Arabia"),
+    SENEGAL("Senegal", "The Republic of Senegal"),
+    SERBIA("Serbia", "The Republic of Serbia"),
+    SEYCHELLES("Seychelles", "The Republic of Seychelles"),
+    SIERRA_LEONE("Sierra Leone", "The Republic of Sierra Leone"),
+    SINGAPORE("Singapore", "The Republic of Singapore"),
+    SLOVAKIA("Slovakia", "The Slovak Republic"),
+    SLOVENIA("Slovenia", "The Republic of Slovenia"),
+    SOLOMON_ISLANDS("Solomon Islands", "Solomon Islands"),
+    SOMALIA("Somalia", "Federal Republic of Somalia"),
+    SOUTH_AFRICA("South Africa", "The Republic of South Africa"),
+    SOUTH_KOREA("South Korea", "The Republic of Korea"),
+    SOUTH_SUDAN("South Sudan", "The Republic of South Sudan"),
+    SPAIN("Spain", "The Kingdom of Spain"),
+    SRI_LANKA("Sri Lanka", "The Democratic Socialist Republic of Sri Lanka"),
+    SUDAN("Sudan", "The Republic of the Sudan"),
+    SURINAME("Suriname", "The Republic of Suriname"),
+    SWEDEN("Sweden", "The Kingdom of Sweden"),
+    SWITZERLAND("Switzerland", "The Swiss Confederation"),
+    SYRIA("Syria", "The Syrian Arab Republic"),
+    TAJIKISTAN("Tajikistan", "The Republic of Tajikistan"),
+    TANZANIA("Tanzania", "The United Republic of Tanzania"),
+    THAILAND("Thailand", "The Kingdom of Thailand"),
+    THE_BAHAMAS("The Bahamas", "The Commonwealth of The Bahamas"),
+    THE_GAMBIA("The Gambia", "The Republic of The Gambia"),
+    TOGO("Togo", "The Togolese Republic"),
+    TONGA("Tonga", "The Kingdom of Tonga"),
+    TRINIDAD_AND_TOBAGO("Trinidad and Tobago", "The Republic of Trinidad and Tobago"),
+    TUNISIA("Tunisia", "Republic of Tunisia"),
+    TURKEY("Turkey", "Republic of Türkiye"),
+    TURKMENISTAN("Turkmenistan", "Turkmenistan"),
+    TUVALU("Tuvalu", "Tuvalu"),
+    UGANDA("Uganda", "The Republic of Uganda"),
+    UKRAINE("Ukraine", "Ukraine"),
+    UNITED_ARAB_EMIRATES("United Arab Emirates", "The United Arab Emirates"),
+    UNITED_STATES("United States", "The United States of America"),
+    URUGUAY("Uruguay", "The Oriental Republic of Uruguay"),
+    UZBEKISTAN("Uzbekistan", "The Republic of Uzbekistan"),
+    VANUATU("Vanuatu", "The Republic of Vanuatu"),
+    VATICAN_CITY("Vatican City", "Vatican City State"),
+    VENEZUELA("Venezuela", "The Bolivarian Republic of Venezuela"),
+    VIETNAM("Vietnam", "The Socialist Republic of Viet Nam"),
+    YEMEN("Yemen", "The Republic of Yemen"),
+    ZAMBIA("Zambia", "The Republic of Zambia"),
+    ZIMBABWE("Zimbabwe", "The Republic of Zimbabwe");
+
+    private final String label;
+    private final String officialName;
+    CountryOfResidence(String label, String trafficType) {
+        this.label = label;
+        this.officialName = trafficType;
+    }
+}

src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/UkPortOfEntry.java

@@ -0,0 +1,108 @@
+package uk.gov.hmcts.reform.sscs.ccd.domain;
+
+import lombok.Getter;
+
+@Getter
+public enum UkPortOfEntry {
+
+    ABERDEEN("Aberdeen", "Sea traffic", "GB000434"),
+    ABERDEEN_AIRPORT("Aberdeen Airport", "Air traffic", "GB000411"),
+    AVONMOUTH_1("Avonmouth 1", "Sea traffic", "GB000033"),
+    BARROW_IN_FURNESS("Barrow in Furness", "Sea traffic", "GB003010"),
+    BARRY_DOCK("Barry Dock", "Sea traffic", "GB000125"),
+    BERWICK_UPON_TWEED("Berwick upon Tweed", "Sea traffic", "GB003020"),
+    BIGGIN_HILL("Biggin Hill", "Air traffic", "GB003290"),
+    BIRMINGHAM_AIRPORT("Birmingham Airport", "Air traffic", "GB000011"),
+    BLACKPOOL_INTERNATIONAL_AIRPORT("Blackpool International Airport", "Air traffic", "GB003030"),
+    BORDER_FORCE_HARWICH("Border Force, Harwich", "Sea traffic", "GB000052"),
+    BOSTON("Boston", "Sea traffic", "GB000244"),
+    BOURNEMOUTH_HURN_AIRPORT("Bournemouth (Hurn) Airport", "Air traffic", "GB003060"),
+    BRIZE_NORTON("Brize Norton", "Air traffic", "GB003070"),
+    CAMBRIDGE_AIRPORT("Cambridge Airport", "Air traffic", "GB003080"),
+    CARDIFF("Cardiff", "Sea traffic", "GB000328"),
+    CARDIFF_INTERNATIONAL_AIRPORT("Cardiff International Airport", "Air traffic", "GB000122"),
+    CHATHAM("Chatham", "Sea traffic", "GB000480"),
+    COVENTRY_INTERNATIONAL_HUB("Coventry International Hub", "Not applicable", "GB000500"),
+    DONCASTER("Doncaster", "Air traffic", "GB001011"),
+    DOVER_OTS_FREIGHT_CLEARANCE("Dover (OTS) Freight Clearance", "Sea traffic", "GB000040"),
+    DOVER_FOLKESTONE_EUROTUNNEL_FREIGHT("Dover/ Folkestone Eurotunnel Freight", "Road and rail traffic", "GB000060"),
+    DUNDEE_SEA("Dundee (Sea)", "Sea traffic", "GB003100"),
+    DURHAM_TEES_VALLEY_TEESIDE_APT("Durham Tees Valley (Teeside Apt)", "Air traffic", "GB003180"),
+    EDINBURGH_AIRPORT("Edinburgh Airport", "Air traffic", "GB000128"),
+    EXETER_AIRPORT("Exeter Airport", "Air traffic", "GB000297"),
+    FALMOUTH("Falmouth", "Sea traffic", "GB000108"),
+    FARNBOROUGH_AIRPORT("Farnborough Airport", "Air traffic", "GB003110"),
+    FELIXSTOWE("Felixstowe", "Sea traffic", "GB000051"),
+    FOLKESTONE("Folkestone", "Sea traffic", "GB000041"),
+    GLASGOW_DOCKS("Glasgow Docks", "Sea traffic", "GB003040"),
+    GLOUCESTER_STAVERTON_AIRPORT("Gloucester (Staverton) Airport", "Air traffic", "GB003120"),
+    GRANGEMOUTH("Grangemouth", "Sea traffic", "GB000059"),
+    GREAT_YARMOUTH("Great Yarmouth", "Sea traffic", "GB000054"),
+    GRIMSBY("Grimsby", "Sea traffic", "GB000073"),
+    HARTLEPOOL("Hartlepool", "Sea traffic", "GB003140"),
+    HOLYHEAD("Holyhead", "Sea traffic", "GB000124"),
+    HULL("Hull", "Sea and road traffic", "GB000072"),
+    HUMBERSIDE_INTERNATIONAL_AIRPORT("Humberside International Airport", "Air traffic", "GB003130"),
+    HWDC_LANGLEY("HWDC Langley", "Not applicable", "GB000501"),
+    IMMINGHAM("Immingham", "Sea and road traffic", "GB000074"),
+    INVERNESS("Inverness", "Sea traffic", "GB003150"),
+    ISLE_OF_MAN_CUSTOMS_EXCISE("Isle of Man Customs & Excise", "Air and sea traffic", "GB000450"),
+    JERSEY_CUSTOMS_AND_IMMIGRATION("Jersey Customs and Immigration", "Air and sea traffic", "GB000465"),
+    KEMBLE_AIRPORT("Kemble Airport", "Air traffic", "GB003160"),
+    KINGS_LYNN("King’s Lynn", "Sea traffic", "GB000055"),
+    KIRKWALL_ORKNEY_ISLANDS("Kirkwall (Orkney Islands)", "Sea traffic", "GB003170"),
+    LEEDS_BRADFORD_AIRPORT("Leeds Bradford Airport", "Air traffic", "GB000087"),
+    LERWICK("Lerwick", "Air and sea traffic", "GB001016"),
+    LIVERPOOL_JOHN_LENNON_AIRPORT("Liverpool John Lennon Airport", "Air traffic", "GB003190"),
+    LIVERPOOL_SEAFORTH_S2_BERTH("Liverpool Seaforth S2 berth", "Sea traffic", "GB000080"),
+    LONDON_ASHFORD_LYDD_AIRPORT("London Ashford (Lydd) Airport", "Air and sea traffic", "GB003200"),
+    LONDON_CITY_AIRPORT("London City Airport", "Air traffic", "GB000130"),
+    LONDON_GATEWAY_PORT("London Gateway Port", "Sea traffic", "GB000170"),
+    LONDON_GATWICK_AIRPORT_CARGO_DIST("London Gatwick Airport Cargo Dist", "Air traffic", "GB000085"),
+    LONDON_HEATHROW_CARGO("London Heathrow Cargo", "Air traffic", "GB000084"),
+    LONDON_SOUTHEND_AIRPORT("London Southend Airport", "Air traffic", "GB000091"),
+    LUTON_AIRPORT_FCT("Luton Airport FCT", "Air traffic", "GB000102"),
+    MANCHESTER("Manchester", "Air traffic", "GB000191"),
+    MANCHESTER_DOCKS("Manchester Docks", "Sea traffic", "GB003220"),
+    NEWCASTLE_AIRPORT("Newcastle Airport", "Air traffic", "GB000098"),
+    NEWCASTLE_UPON_TYNE("Newcastle-upon-Tyne", "Air, sea and road traffic", "GB000218"),
+    NEWHAVEN("Newhaven", "Sea and road traffic", "GB003250"),
+    NEWPORT("Newport", "Sea traffic", "GB000049"),
+    NORWICH_AIRPORT("Norwich Airport", "Air traffic", "GB000058"),
+    OXFORD_KIDLINGTON_AIRPORT("Oxford (Kidlington) Airport", "Air traffic", "GB003230"),
+    PEMBROKE_DOCK("Pembroke Dock", "Sea traffic", "GB000126"),
+    PETERHEAD("Peterhead", "Sea traffic", "GB000416"),
+    PLYMOUTH("Plymouth", "Air traffic", "GB000250"),
+    PLYMOUTH_DOCKS("Plymouth Docks", "Sea traffic", "GB003050"),
+    POOLE_FERRY_TERMINAL("Poole Ferry Terminal", "Sea traffic", "GB000291"),
+    PORTREE_ISLE_OF_SKYE("Portree (Isle of Skye)", "Sea traffic", "GB003240"),
+    PORTSMOUTH("Portsmouth", "Sea traffic", "GB000292"),
+    PRESTWICK_AIRPORT("Prestwick Airport", "Air traffic", "GB000070"),
+    RAMSGATE("Ramsgate", "Sea traffic", "GB000047"),
+    SCOTLAND_FRONTIER("Scotland Frontier", "Air traffic", "GB000067"),
+    SHEERNESS("Sheerness", "Sea traffic", "GB000045"),
+    SOUTHAMPTON("Southampton", "Sea traffic", "GB000290"),
+    SOUTHAMPTON_EASTLEIGH_AIRPORT("Southampton (Eastleigh) Airport", "Air traffic", "GB003090"),
+    ST_PETER_PORT_GUERNSEY("St Peter Port, Guernsey", "Air and sea traffic", "GB000461"),
+    STANSTED_AIRPORT_FCT("Stansted Airport FCT", "Air traffic", "GB000121"),
+    STORNOWAY_ISLE_OF_LEWIS("Stornoway (Isle of Lewis)", "Sea traffic", "GB003260"),
+    STORNOWAY_AIRPORT("Stornoway Airport", "Air traffic", "GB003270"),
+    SWANSEA("Swansea", "Sea traffic", "GB000123"),
+    TEESPORT("Teesport", "Sea traffic", "GB000219"),
+    THAMES_EUROPORT_DIFT("Thames Europort (DIFT)", "Sea traffic", "GB000099"),
+    THAMESPORT("Thamesport", "Sea traffic", "GB000150"),
+    TILBURY("Tilbury", "Sea traffic", "GB000093"),
+    UKBA_EAST_MIDLANDS_AIRPORT("UKBA, East Midlands Airport", "Air traffic", "GB000245"),
+    UKBF_BRISTOL_INTERNATIONAL_AIRPORT("UKBF, Bristol International Airport", "Air traffic", "GB000029"),
+    WORKINGTON("Workington", "Sea traffic", "GB003280");
+
+    private final String label;
+    private final String trafficType;
+    private final String locationCode;
+
+    UkPortOfEntry(String label, String trafficType, String locationCode) {
+        this.label = label;
+        this.trafficType = trafficType;
+        this.locationCode = locationCode;
+    }
+}