From 989f435c332fd47ebcc62876392c6f777152cd76 Mon Sep 17 00:00:00 2001 From: Maryna Longnickel <37321032+MarynaLongnickel@users.noreply.github.com> Date: Mon, 11 Feb 2019 23:57:01 -0500 Subject: [PATCH 1/2] Add files via upload --- CalculationController.java | 23 ++++ CheckCountry.java | 6 + CountriesApplication.java | 18 +++ Country.java | 56 +++++++++ CountryController.java | 131 +++++++++++++++++++++ CountryList.java | 225 +++++++++++++++++++++++++++++++++++++ 6 files changed, 459 insertions(+) create mode 100644 CalculationController.java create mode 100644 CheckCountry.java create mode 100644 CountriesApplication.java create mode 100644 Country.java create mode 100644 CountryController.java create mode 100644 CountryList.java diff --git a/CalculationController.java b/CalculationController.java new file mode 100644 index 00000000..6e601a8f --- /dev/null +++ b/CalculationController.java @@ -0,0 +1,23 @@ +package com.example.countries; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +// localhost:8080/calc/salary?id=1&raise=0.5 +@RestController +@RequestMapping("/calc") +public class CalculationController +{ + @RequestMapping("/salary") + public Country checkRaise(@RequestParam(value = "name") String name, + @RequestParam(value = "population") int population) + { + Country tempCountry = new Country(CountriesApplication.ourCountryList.findCountry(c -> (c.getName().equals(name)))); + tempCountry.setPopulation(tempCountry.getPopulation() * (1 + population)); + return tempCountry; + } + + + +} \ No newline at end of file diff --git a/CheckCountry.java b/CheckCountry.java new file mode 100644 index 00000000..0d994678 --- /dev/null +++ b/CheckCountry.java @@ -0,0 +1,6 @@ +package com.example.countries; + +public interface CheckCountry +{ + boolean test(Country c); +} \ No newline at end of file diff --git a/CountriesApplication.java b/CountriesApplication.java new file mode 100644 index 00000000..26d61669 --- /dev/null +++ b/CountriesApplication.java @@ -0,0 +1,18 @@ +package com.example.countries; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CountriesApplication { + + static CountryList ourCountryList; + public static void main(String[] args) + { + ourCountryList = new CountryList(); + SpringApplication.run(CountriesApplication.class, args); + + } +} + + diff --git a/Country.java b/Country.java new file mode 100644 index 00000000..280f2906 --- /dev/null +++ b/Country.java @@ -0,0 +1,56 @@ +package com.example.countries; + +public class Country +{ + private String name; + private int population; + private double landMass; + private int medianAge; + + public Country(String name, int population, double landMass, int medianAge) { + this.name = name; + this.population = population; + this.landMass = landMass; + this.medianAge = medianAge; + } + + public Country(Country toClone) + { + this.name = toClone.getName(); + this.population = toClone.getPopulation(); + this.landMass = toClone.getLandMass(); + this.medianAge = toClone.getMedianAge(); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getPopulation() { + return population; + } + + public void setPopulation(int population) { + this.population = population; + } + + public double getLandMass() { + return landMass; + } + + public void setLandMass(double landMass) { + this.landMass = landMass; + } + + public int getMedianAge() { + return medianAge; + } + + public void setMedianAge(int medianAge) { + this.medianAge = medianAge; + } +} \ No newline at end of file diff --git a/CountryController.java b/CountryController.java new file mode 100644 index 00000000..bf55d156 --- /dev/null +++ b/CountryController.java @@ -0,0 +1,131 @@ +package com.example.countries; +//localhost:8080/data/allCountries + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; + +@RestController +public class CountryController +{ +// return the names of all the countries alphabetically + @RequestMapping("/names/allCountries") + public ArrayList getAllCountries() + { + ArrayList newList = new ArrayList<>(); + for (Country c : CountriesApplication.ourCountryList.countryList) + newList.add(c.getName()); + newList.sort((c1, c2) -> c1.compareToIgnoreCase(c2)); + return newList; + } + +// return the countries alphabetically that begin with the given letter + @RequestMapping("/names/begin") + public ArrayList getCountryDetail(@RequestParam(value = "letter") char letter) + { + ArrayList newList = new ArrayList<>(); + for (Country c : CountriesApplication.ourCountryList.countryList) + if (c.getName().charAt(0) == Character.toUpperCase(letter)) + newList.add(c); + newList.sort((c1, c2) -> c1.getName().compareToIgnoreCase(c2.getName())); + return newList; + } + +// return the countries alphabetically that have a name equal to or longer than the given length + @RequestMapping("/names/size") + public ArrayList getCountrySize(@RequestParam(value = "letters") int letters) + { + ArrayList newList = new ArrayList<>(); + for (Country c : CountriesApplication.ourCountryList.countryList) + if (c.getName().length() == letters) + newList.add(c); + newList.sort((c1, c2) -> c1.getName().compareToIgnoreCase(c2.getName())); + return newList; + } + +// return the countries that have a population equal to or greater than the given population + @RequestMapping("/population/size") + public ArrayList getPopulationSize(@RequestParam(value = "people") int people) + { + ArrayList newList = new ArrayList<>(); + for (Country c : CountriesApplication.ourCountryList.countryList) + if (c.getPopulation() >= people) + newList.add(c); + newList.sort((c1, c2) -> c1.getName().compareToIgnoreCase(c2.getName())); + return newList; + } + +// return the country with the smallest population + @RequestMapping("/population/min") + public Country getMinPopulation() + { + int min = 1000000000; + Country minCountry = new Country("NA", 0, 0, 0); + for (Country c : CountriesApplication.ourCountryList.countryList) { + if (c.getPopulation() <= min) { + min = c.getPopulation(); + minCountry = c; + } + } + return minCountry; + } + +// return the country with the largest population + @RequestMapping("/population/min") + public Country getMaxPopulation() + { + int max = 0; + Country maxCountry = new Country("NA", 0, 0, 0); + for (Country c : CountriesApplication.ourCountryList.countryList) { + if (c.getPopulation() >= max) { + max = c.getPopulation(); + maxCountry = c; + } + } + return maxCountry; + } + +// return the countries that have a median age equal to or greater than the given age + @RequestMapping("/age/age") + public ArrayList getByAge(@RequestParam(value = "age") int age) + { + ArrayList newList = new ArrayList<>(); + for (Country c : CountriesApplication.ourCountryList.countryList) + if (c.getMedianAge() == age) + newList.add(c); + newList.sort((c1, c2) -> c1.getName().compareToIgnoreCase(c2.getName())); + return newList; + } + +// return the country with the smallest population + @RequestMapping("/age/min") + public Country getMinAge() + { + int min = 1000; + Country minCountry = new Country("NA", 0, 0, 0); + for (Country c : CountriesApplication.ourCountryList.countryList) { + if (c.getMedianAge() <= min) { + min = c.getMedianAge(); + minCountry = c; + } + } + return minCountry; + } + +// return the country with the largest population + @RequestMapping("/age/max") + public Country getMaxAge() + { + int max = 0; + Country maxCountry = new Country("NA", 0, 0, 0); + for (Country c : CountriesApplication.ourCountryList.countryList) { + if (c.getMedianAge() >= max) { + max = c.getMedianAge(); + maxCountry = c; + } + } + return maxCountry; + } +} diff --git a/CountryList.java b/CountryList.java new file mode 100644 index 00000000..b0b4ea29 --- /dev/null +++ b/CountryList.java @@ -0,0 +1,225 @@ +package com.example.countries; + +import java.util.ArrayList; + +public class CountryList +{ + public ArrayList countryList = new ArrayList(); + + public CountryList() + { + countryList.add(new Country("China",1420062022,9388211,39)); + countryList.add(new Country("India",1368737513,2973190,28)); + countryList.add(new Country("U.S.",329093110,9147420,38)); + countryList.add(new Country("Indonesia",269536482,1811570,29)); + countryList.add(new Country("Brazil",212392717,8358140,33)); + countryList.add(new Country("Pakistan",204596442,770880,23)); + countryList.add(new Country("Nigeria",200962417,910770,18)); + countryList.add(new Country("Bangladesh",168065920,130170,27)); + countryList.add(new Country("Russia",143895551,16376870,40)); + countryList.add(new Country("Mexico",132328035,1943950,29)); + countryList.add(new Country("Japan",126854745,364555,48)); + countryList.add(new Country("Ethiopia",110135635,1000000,20)); + countryList.add(new Country("Philippines",108106310,298170,25)); + countryList.add(new Country("Egypt",101168745,995450,25)); + countryList.add(new Country("Vietnam",97429061,310070,33)); + countryList.add(new Country("DR Congo",86727573,2267050,17)); + countryList.add(new Country("Turkey",82961805,769630,32)); + countryList.add(new Country("Iran",82820766,1628550,32)); + countryList.add(new Country("Germany",82438639,348560,47)); + countryList.add(new Country("Thailand",69306160,510890,40)); + countryList.add(new Country("U.K.",66959016,241930,41)); + countryList.add(new Country("France",65480710,547557,42)); + countryList.add(new Country("Tanzania",60913557,885800,18)); + countryList.add(new Country("Italy",59216525,294140,48)); + countryList.add(new Country("South Africa",58065097,1213090,27)); + countryList.add(new Country("Myanmar",54336138,653290,29)); + countryList.add(new Country("Kenya",52214791,569140,20)); + countryList.add(new Country("South Korea",51339238,97230,43)); + countryList.add(new Country("Colombia",49849818,1109500,32)); + countryList.add(new Country("Spain",46441049,498800,46)); + countryList.add(new Country("Uganda",45711874,199810,16)); + countryList.add(new Country("Argentina",45101781,2736690,32)); + countryList.add(new Country("Ukraine",43795220,579320,41)); + countryList.add(new Country("Algeria",42679018,2381740,29)); + countryList.add(new Country("Sudan",42514094,1765048,20)); + countryList.add(new Country("Iraq",40412299,434320,20)); + countryList.add(new Country("Poland",38028278,306230,42)); + countryList.add(new Country("Canada",37279811,9093510,41)); + countryList.add(new Country("Afghanistan",37209007,652860,19)); + countryList.add(new Country("Morocco",36635156,446300,30)); + countryList.add(new Country("Saudi Arabia",34140662,2149690,32)); + countryList.add(new Country("Peru",32933835,1280000,29)); + countryList.add(new Country("Uzbekistan",32807368,425400,28)); + countryList.add(new Country("Venezuela",32779868,882050,29)); + countryList.add(new Country("Malaysia",32454455,328550,30)); + countryList.add(new Country("Angola",31787566,1246700,17)); + countryList.add(new Country("Mozambique",31408823,786380,18)); + countryList.add(new Country("Ghana",30096970,227540,21)); + countryList.add(new Country("Nepal",29942018,143350,25)); + countryList.add(new Country("Yemen",29579986,527970,20)); + countryList.add(new Country("Madagascar",26969642,581795,20)); + countryList.add(new Country("North Korea",25727408,120410,35)); + countryList.add(new Country("Cote d'Ivoire",25531083,318000,19)); + countryList.add(new Country("Cameroon",25312993,472710,19)); + countryList.add(new Country("Australia",25088636,7682300,38)); + countryList.add(new Country("Taiwan",23758247,35410,42)); + countryList.add(new Country("Niger",23176691,1266700,15)); + countryList.add(new Country("Sri Lanka",21018859,62710,34)); + countryList.add(new Country("Burkina Faso",20321560,273600,18)); + countryList.add(new Country("Malawi",19718743,94280,18)); + countryList.add(new Country("Mali",19689140,1220190,16)); + countryList.add(new Country("Romania",19483360,230170,43)); + countryList.add(new Country("Kazakhstan",18592970,2699700,31)); + countryList.add(new Country("Syria",18499181,183630,22)); + countryList.add(new Country("Chile",18336653,743532,35)); + countryList.add(new Country("Zambia",18137369,743390,18)); + countryList.add(new Country("Guatemala",17577842,107160,23)); + countryList.add(new Country("Zimbabwe",17297495,386850,20)); + countryList.add(new Country("Netherlands",17132908,33720,43)); + countryList.add(new Country("Ecuador",17100444,248360,28)); + countryList.add(new Country("Senegal",16743859,192530,19)); + countryList.add(new Country("Cambodia",16482646,176520,26)); + countryList.add(new Country("Chad",15814345,1259200,17)); + countryList.add(new Country("Somalia",15636171,627340,17)); + countryList.add(new Country("Guinea",13398180,245720,19)); + countryList.add(new Country("South Sudan",13263184,610952,19)); + countryList.add(new Country("Rwanda",12794412,24670,20)); + countryList.add(new Country("Benin",11801595,112760,19)); + countryList.add(new Country("Tunisia",11783168,155360,33)); + countryList.add(new Country("Burundi",11575964,25680,18)); + countryList.add(new Country("Belgium",11562784,30280,42)); + countryList.add(new Country("Cuba",11492046,106440,43)); + countryList.add(new Country("Bolivia",11379861,1083300,25)); + countryList.add(new Country("Haiti",11242856,27560,24)); + countryList.add(new Country("Greece",11124603,128900,45)); + countryList.add(new Country("Dominican Republic",10996774,48320,28)); + countryList.add(new Country("Czech Republic",10630589,77240,43)); + countryList.add(new Country("Portugal",10254666,91590,46)); + countryList.add(new Country("Jordan",10069794,88780,23)); + countryList.add(new Country("Sweden",10053135,410340,41)); + countryList.add(new Country("Azerbaijan",10014575,82658,32)); + countryList.add(new Country("United Arab Emirates",9682088,83600,34)); + countryList.add(new Country("Hungary",9655361,90530,43)); + countryList.add(new Country("Honduras",9568688,111890,25)); + countryList.add(new Country("Belarus",9433874,202910,40)); + countryList.add(new Country("Tajikistan",9292000,139960,23)); + countryList.add(new Country("Austria",8766201,82409,44)); + countryList.add(new Country("Serbia",8733407,87460,41)); + countryList.add(new Country("Switzerland",8608259,39516,43)); + countryList.add(new Country("Papua New Guinea",8586525,452860,23)); + countryList.add(new Country("Israel",8583916,21640,31)); + countryList.add(new Country("Togo",8186384,54390,19)); + countryList.add(new Country("Sierra Leone",7883123,72180,19)); + countryList.add(new Country("Hong Kong",7490776,1050,45)); + countryList.add(new Country("Laos",7064242,230800,24)); + countryList.add(new Country("Bulgaria",6988739,108560,45)); + countryList.add(new Country("Paraguay",6981981,397300,27)); + countryList.add(new Country("Libya",6569864,1759540,29)); + countryList.add(new Country("El Salvador",6445405,20720,28)); + countryList.add(new Country("Nicaragua",6351157,120340,27)); + countryList.add(new Country("Kyrgyzstan",6218616,191800,26)); + countryList.add(new Country("Lebanon",6065922,10230,31)); + countryList.add(new Country("Turkmenistan",5942561,469930,27)); + countryList.add(new Country("Singapore",5868104,700,42)); + countryList.add(new Country("Denmark",5775224,42430,42)); + countryList.add(new Country("Finland",5561389,303890,43)); + countryList.add(new Country("Congo",5542197,341500,19)); + countryList.add(new Country("Slovakia",5450987,48088,41)); + countryList.add(new Country("Norway",5400916,365268,40)); + countryList.add(new Country("Eritrea",5309659,101000,19)); + countryList.add(new Country("State of Palestine",5186790,6020,20)); + countryList.add(new Country("Oman",5001875,309500,31)); + countryList.add(new Country("Costa Rica",4999384,51060,34)); + countryList.add(new Country("Liberia",4977720,96320,19)); + countryList.add(new Country("Ireland",4847139,68890,39)); + countryList.add(new Country("Central African Republic",4825711,622980,18)); + countryList.add(new Country("New Zealand",4792409,263310,38)); + countryList.add(new Country("Mauritania",4661149,1030700,20)); + countryList.add(new Country("Kuwait",4248974,17820,34)); + countryList.add(new Country("Panama",4226197,74340,30)); + countryList.add(new Country("Croatia",4140148,55960,44)); + countryList.add(new Country("Moldova",4029750,32850,38)); + countryList.add(new Country("Georgia",3904204,69490,39)); + countryList.add(new Country("Puerto Rico",3654978,8870,38)); + countryList.add(new Country("Bosnia & Herzegovina",3501774,51000,42)); + countryList.add(new Country("Uruguay",3482156,175020,36)); + countryList.add(new Country("Mongolia",3166244,1553560,29)); + countryList.add(new Country("Albania",2938428,27400,38)); + countryList.add(new Country("Armenia",2936706,28470,36)); + countryList.add(new Country("Jamaica",2906339,10830,31)); + countryList.add(new Country("Lithuania",2864459,62674,43)); + countryList.add(new Country("Qatar",2743901,11610,32)); + countryList.add(new Country("Namibia",2641996,823290,22)); + countryList.add(new Country("Botswana",2374636,566730,26)); + countryList.add(new Country("Lesotho",2292682,30360,22)); + countryList.add(new Country("Gambia",2228075,10120,18)); + countryList.add(new Country("Gabon",2109099,257670,23)); + countryList.add(new Country("TFYR Macedonia",2086720,25220,39)); + countryList.add(new Country("Slovenia",2081900,20140,45)); + countryList.add(new Country("Guinea-Bissau",1953723,28120,19)); + countryList.add(new Country("Latvia",1911108,62200,44)); + countryList.add(new Country("Bahrain",1637896,760,32)); + countryList.add(new Country("Swaziland",1415414,17200,21)); + countryList.add(new Country("Trinidad and Tobago",1375443,5130,36)); + countryList.add(new Country("Equatorial Guinea",1360104,28050,22)); + countryList.add(new Country("Timor-Leste",1352360,14870,18)); + countryList.add(new Country("Estonia",1303798,42390,43)); + countryList.add(new Country("Mauritius",1271368,2030,37)); + countryList.add(new Country("Cyprus",1198427,9240,37)); + countryList.add(new Country("Djibouti",985690,23180,25)); + countryList.add(new Country("Fiji",918757,18270,29)); + countryList.add(new Country("Reunion",889918,2500,36)); + countryList.add(new Country("Comoros",850910,1861,20)); + countryList.add(new Country("Bhutan",826229,38117,29)); + countryList.add(new Country("Guyana",786508,196850,26)); + countryList.add(new Country("Macao",642090,30,39)); + countryList.add(new Country("Solomon Islands",635254,27990,21)); + countryList.add(new Country("Montenegro",629355,13450,39)); + countryList.add(new Country("Luxembourg",596992,2590,40)); + countryList.add(new Country("Western Sahara",582478,266000,28)); + countryList.add(new Country("Suriname",573085,156000,30)); + countryList.add(new Country("Cabo Verde",560349,4030,26)); + countryList.add(new Country("Maldives",451738,300,31)); + countryList.add(new Country("Guadeloupe",448798,1690,43)); + countryList.add(new Country("Brunei",439336,5270,32)); + countryList.add(new Country("Malta",433245,320,42)); + countryList.add(new Country("Bahamas",403095,10010,34)); + countryList.add(new Country("Belize",390231,22810,25)); + countryList.add(new Country("Martinique",385320,1060,46)); + countryList.add(new Country("Iceland",340566,100250,37)); + countryList.add(new Country("French Guiana",296847,82200,25)); + countryList.add(new Country("French Polynesia",288506,3660,33)); + countryList.add(new Country("Vanuatu",288017,12190,23)); + countryList.add(new Country("Barbados",287010,430,40)); + countryList.add(new Country("New Caledonia",283376,18280,33)); + countryList.add(new Country("Mayotte",266380,375,20)); + countryList.add(new Country("Sao Tome & Principe",213379,960,19)); + countryList.add(new Country("Samoa",198909,2830,22)); + countryList.add(new Country("Saint Lucia",180454,610,35)); + countryList.add(new Country("Guam",167245,540,31)); + countryList.add(new Country("Channel Islands",166828,190,44)); + countryList.add(new Country("Curacao",162547,444,42)); + countryList.add(new Country("Kiribati",120428,810,23)); + countryList.add(new Country("St. Vincent & Grenadines",110488,390,32)); + countryList.add(new Country("Tonga",110041,720,22)); + countryList.add(new Country("Grenada",108825,340,29)); + countryList.add(new Country("Micronesia",106983,700,23)); + countryList.add(new Country("Aruba",106053,180,41)); + countryList.add(new Country("U.S. Virgin Islands",104909,350,42)); + countryList.add(new Country("Antigua and Barbuda",104084,440,32)); + countryList.add(new Country("Seychelles",95702,460,36)); + } + + public Country findCountry(CheckCountry tester) + { + for (Country c : countryList) + { + if (tester.test(c)) + { + return c; + } + } + return null; + } +} \ No newline at end of file From 9d039f2b6e10cefc0f11c52695e8415eea00cd9e Mon Sep 17 00:00:00 2001 From: Maryna Longnickel <37321032+MarynaLongnickel@users.noreply.github.com> Date: Tue, 12 Feb 2019 00:02:56 -0500 Subject: [PATCH 2/2] Update CountryController.java --- CountryController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CountryController.java b/CountryController.java index bf55d156..bf5ce3e4 100644 --- a/CountryController.java +++ b/CountryController.java @@ -73,7 +73,7 @@ public Country getMinPopulation() } // return the country with the largest population - @RequestMapping("/population/min") + @RequestMapping("/population/max") public Country getMaxPopulation() { int max = 0;