Amended the PrintCityValues.java

Author: YevisoChiedza1

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:latest
+FROM eclipse-temurin:17-jdk
 COPY ./target/devops-0.1.0.3-jar-with-dependencies.jar /tmp
 WORKDIR /tmp
 ENTRYPOINT ["java", "-jar", "devops-0.1.0.3-jar-with-dependencies.jar"]

src/main/java/com/napier/sem/App.java

@@ -61,57 +61,7 @@ public void disconnect() {
         }
     }
 
-    /**
-     * Gets all cities and sorts them by population in descending order
-     * returns a list of cities sorted by population in descending order, or return null if thrown exception
-     */
-
-    public ArrayList<City> getAllCities() {
-        try {
-            // Create an SQL statement
-            Statement stmt = con.createStatement();
-
-            // Modified SQL query to get all cities with their country and population
-            String strSelect =
-                    "SELECT city.Name AS CityName, " +
-                            "country.Name AS Country, " +
-                            "city.Population AS Population " +
-                            "FROM city " +
-                            "JOIN country ON city.CountryCode = country.Code " +
-                            "ORDER BY city.Population DESC";
-
-            // Execute SQL statement
-            ResultSet rset = stmt.executeQuery(strSelect);
-
-            // Extract city information
-            ArrayList<City> cities = new ArrayList<City>();
-            while (rset.next()) {
-                City city = new City();
-                city.name = rset.getString("CityName");
-                city.country = rset.getString("Country");
-                city.population = rset.getInt("Population");
-
-                cities.add(city);
-            }
 
-            return cities;
-
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-            System.out.println("Failed to get the cities");
-            return null;
-        }
-
-    }
-    public void Display(List<City> cities) {
-        if (cities != null && !cities.isEmpty()) {
-            for (City c : cities) {
-                System.out.println("City: " + c.name + ", Country: " + c.country + ", Population: " + c.population);
-            }
-        } else {
-            System.out.println("No capital cities found.");
-        }
-    }
     public static void main(String[] args)
     {
         // Create new Application
@@ -121,11 +71,11 @@ public static void main(String[] args)
         a.connect();
 
         // Extract city information
-        ArrayList<City> cityList = a.getAllCities();
-        a.Display(cityList);
+        PrintCityValues printCityValues = new PrintCityValues();
+        printCityValues.getAllCities(a.con);
+
 
 
-        System.out.println(cityList.size());
 
         // Disconnect from database
         a.disconnect();

src/main/java/com/napier/sem/PrintCityValues.java

@@ -0,0 +1,52 @@
+package com.napier.sem;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+
+public class PrintCityValues {
+
+    public void getAllCities(Connection con) {
+        ArrayList<City> cities = new ArrayList<>();
+
+        try {
+            Statement stmt = con.createStatement();
+
+            String strSelect =
+                    "SELECT city.name AS CityName, " +
+                            "country.name AS Country, " +
+                            "city.population AS Population " +
+                            "FROM city " +
+                            "JOIN country ON city.countryCode = country.code " +
+                            "ORDER BY city.population DESC";
+
+            ResultSet rset = stmt.executeQuery(strSelect);
+
+            while (rset.next()) {
+                City city = new City();
+                city.name = rset.getString("CityName");
+                city.country = rset.getString("Country");
+                city.population = rset.getInt("Population");
+                cities.add(city);
+            }
+
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            System.out.println("Failed to get the cities");
+        }
+
+        // Print table header
+        System.out.printf("%-30s %-20s %-15s\n", "City", "Country", "Population");
+        System.out.println("--------------------------------------------------------------");
+
+        // Print rows
+        for (City city : cities) {
+            System.out.printf("%-30s %-20s %,15d\n",
+                    city.name,
+                    city.country,
+                    city.population);
+        }
+    }
+}
+