From b8095f476cca299178b18bd065d7b8b50293ba01 Mon Sep 17 00:00:00 2001
From: LO Kam Tao Leo <leolo@leolo.org>
Date: Sun, 23 Oct 2022 17:48:21 +0100
Subject: [PATCH] Refactoring for the incorrect package

---
 src/main/java/org/leolo/nrdatad/App.java           |  2 +-
 .../org/leolo/nrdatad/cron/ReferenceDataJob.java   | 71 ++++++++++++++++++
 src/main/java/org/leolo/nrdatad/db/CORPUSDao.java  |  2 +-
 .../org/leolo/nrdatad/db/mariadb/CORPUSDao.java    |  2 +-
 src/main/java/org/leolo/nrdatad/model/CORPUS.java  | 84 ++++++++++++++++++++++
 .../org/leolo/nrdatad/cron/ReferenceDataJob.java   | 71 ------------------
 .../nrdatad/org/leolo/nrdatad/model/CORPUS.java    | 84 ----------------------
 .../nrdatad/org/leolo/nrdatad/util/HttpUtil.java   | 63 ----------------
 src/main/java/org/leolo/nrdatad/util/HttpUtil.java | 63 ++++++++++++++++
 9 files changed, 221 insertions(+), 221 deletions(-)
 create mode 100644 src/main/java/org/leolo/nrdatad/cron/ReferenceDataJob.java
 create mode 100644 src/main/java/org/leolo/nrdatad/model/CORPUS.java
 delete mode 100644 src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/cron/ReferenceDataJob.java
 delete mode 100644 src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/model/CORPUS.java
 delete mode 100644 src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/util/HttpUtil.java
 create mode 100644 src/main/java/org/leolo/nrdatad/util/HttpUtil.java

diff --git a/src/main/java/org/leolo/nrdatad/App.java b/src/main/java/org/leolo/nrdatad/App.java
index 4665cb3..2292666 100644
--- a/src/main/java/org/leolo/nrdatad/App.java
+++ b/src/main/java/org/leolo/nrdatad/App.java
@@ -5,7 +5,7 @@ import org.apache.commons.cli.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.leolo.nrdatad.db.DatabaseManager;
-import org.leolo.nrdatad.org.leolo.nrdatad.cron.ReferenceDataJob;
+import org.leolo.nrdatad.cron.ReferenceDataJob;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
 
diff --git a/src/main/java/org/leolo/nrdatad/cron/ReferenceDataJob.java b/src/main/java/org/leolo/nrdatad/cron/ReferenceDataJob.java
new file mode 100644
index 0000000..bfa46ff
--- /dev/null
+++ b/src/main/java/org/leolo/nrdatad/cron/ReferenceDataJob.java
@@ -0,0 +1,71 @@
+package org.leolo.nrdatad.cron;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.leolo.nrdatad.ConfigurationManager;
+import org.leolo.nrdatad.Constants;
+import org.leolo.nrdatad.db.CORPUSDao;
+import org.leolo.nrdatad.model.CORPUS;
+import org.leolo.nrdatad.util.HttpUtil;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+public class ReferenceDataJob implements Job {
+
+    Logger log = LogManager.getLogger();
+
+    @Override
+    public void execute(JobExecutionContext context) throws JobExecutionException {
+        log.atInfo().log("Load reference data triggered at {}", context.getFireTime());
+        //There are 3 different kind of reference data. Create 3 thread and deal with them
+        new Thread(()->{processCORPUS();}).start();
+    }
+
+    private void processCORPUS(){
+        ConfigurationManager conf = ConfigurationManager.getInstance();
+        log.atInfo().log("Loading CORPUS");
+        String json = null;
+        try {
+            json = HttpUtil.sendHttpRequestForGZipFile(
+                    Constants.NetworkRailURI.CORPUS_URL,
+                    conf.getProperty(Constants.Configuration.NETWORK_RAIL_USER),
+                    conf.getProperty(Constants.Configuration.NETWORK_RAIL_PASSWORD)
+            );
+        } catch (IOException|URISyntaxException e) {
+            log.atError().withThrowable(e).log("Error when getting CORPUS data");
+            return;
+        }
+        JSONObject rootObj = new JSONObject(json);
+        JSONArray rootArray = rootObj.getJSONArray("TIPLOCDATA");
+        log.atInfo().log("{} entries found", rootArray.length());
+        ArrayList<CORPUS> corpusList = new ArrayList<>();
+        for(int i=0;i<rootArray.length();i++){
+            JSONObject obj = rootArray.getJSONObject(i);
+            CORPUS corpus = new CORPUS();
+            corpus.setStanoxCode(obj.optString("STANOX"));
+            corpus.setUicCode(obj.optString("UIC"));
+            corpus.setCrsCode(obj.optString("3ALPHA"));
+            corpus.setTiplocCode(obj.optString("TIPLOC"));
+            corpus.setNlcCode(obj.optString("NLC"));
+            corpus.setLongDescription(obj.optString("NLCDESC"));
+            corpus.setShortDescription(obj.optString("NLCDESC16"));
+            corpusList.add(corpus);
+        }
+        log.atInfo().log("Going to replace the data");
+        try {
+            CORPUSDao cDao = conf.getDatabaseManager().getCORPUSDao();
+            cDao.replaceAll(corpusList);
+        } catch (SQLException e) {
+            log.atError().withThrowable(e).log("Unable to insert records");
+        }
+        log.atInfo().log("Done inserting CORPUS");
+    }
+}
diff --git a/src/main/java/org/leolo/nrdatad/db/CORPUSDao.java b/src/main/java/org/leolo/nrdatad/db/CORPUSDao.java
index 6e60e7e..8fab54e 100644
--- a/src/main/java/org/leolo/nrdatad/db/CORPUSDao.java
+++ b/src/main/java/org/leolo/nrdatad/db/CORPUSDao.java
@@ -1,6 +1,6 @@
 package org.leolo.nrdatad.db;
 
-import org.leolo.nrdatad.org.leolo.nrdatad.model.CORPUS;
+import org.leolo.nrdatad.model.CORPUS;
 
 import java.sql.SQLException;
 import java.util.Collection;
diff --git a/src/main/java/org/leolo/nrdatad/db/mariadb/CORPUSDao.java b/src/main/java/org/leolo/nrdatad/db/mariadb/CORPUSDao.java
index 75550bd..badcc3e 100644
--- a/src/main/java/org/leolo/nrdatad/db/mariadb/CORPUSDao.java
+++ b/src/main/java/org/leolo/nrdatad/db/mariadb/CORPUSDao.java
@@ -4,7 +4,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.leolo.nrdatad.db.DatabaseManager;
-import org.leolo.nrdatad.org.leolo.nrdatad.model.CORPUS;
+import org.leolo.nrdatad.model.CORPUS;
 
 import java.sql.*;
 import java.util.Collection;
diff --git a/src/main/java/org/leolo/nrdatad/model/CORPUS.java b/src/main/java/org/leolo/nrdatad/model/CORPUS.java
new file mode 100644
index 0000000..7106ba7
--- /dev/null
+++ b/src/main/java/org/leolo/nrdatad/model/CORPUS.java
@@ -0,0 +1,84 @@
+package org.leolo.nrdatad.model;
+
+import java.util.Objects;
+
+public class CORPUS {
+
+    private String stanoxCode;
+    private String uicCode;
+    private String crsCode;
+    private String tiplocCode;
+    private String nlcCode;
+
+    private String longDescription;
+    private String shortDescription;
+
+    public String getStanoxCode() {
+        return stanoxCode;
+    }
+
+    public void setStanoxCode(String stanoxCode) {
+        this.stanoxCode = stanoxCode;
+    }
+
+    public String getUicCode() {
+        return uicCode;
+    }
+
+    public void setUicCode(String uicCode) {
+        this.uicCode = uicCode;
+    }
+
+    public String getCrsCode() {
+        return crsCode;
+    }
+
+    public void setCrsCode(String crsCode) {
+        this.crsCode = crsCode;
+    }
+
+    public String getTiplocCode() {
+        return tiplocCode;
+    }
+
+    public void setTiplocCode(String tiplocCode) {
+        this.tiplocCode = tiplocCode;
+    }
+
+    public String getNlcCode() {
+        return nlcCode;
+    }
+
+    public void setNlcCode(String nlcCode) {
+        this.nlcCode = nlcCode;
+    }
+
+    public String getLongDescription() {
+        return longDescription;
+    }
+
+    public void setLongDescription(String longDescription) {
+        this.longDescription = longDescription;
+    }
+
+    public String getShortDescription() {
+        return shortDescription;
+    }
+
+    public void setShortDescription(String shortDescription) {
+        this.shortDescription = shortDescription;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CORPUS corpus = (CORPUS) o;
+        return Objects.equals(stanoxCode, corpus.stanoxCode) && Objects.equals(uicCode, corpus.uicCode) && Objects.equals(crsCode, corpus.crsCode) && Objects.equals(tiplocCode, corpus.tiplocCode) && Objects.equals(nlcCode, corpus.nlcCode) && Objects.equals(longDescription, corpus.longDescription) && Objects.equals(shortDescription, corpus.shortDescription);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(stanoxCode, uicCode, crsCode, tiplocCode, nlcCode, longDescription, shortDescription);
+    }
+}
diff --git a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/cron/ReferenceDataJob.java b/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/cron/ReferenceDataJob.java
deleted file mode 100644
index b9dbc04..0000000
--- a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/cron/ReferenceDataJob.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.leolo.nrdatad.org.leolo.nrdatad.cron;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.leolo.nrdatad.ConfigurationManager;
-import org.leolo.nrdatad.Constants;
-import org.leolo.nrdatad.db.CORPUSDao;
-import org.leolo.nrdatad.org.leolo.nrdatad.model.CORPUS;
-import org.leolo.nrdatad.org.leolo.nrdatad.util.HttpUtil;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-
-public class ReferenceDataJob implements Job {
-
-    Logger log = LogManager.getLogger();
-
-    @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException {
-        log.atInfo().log("Load reference data triggered at {}", context.getFireTime());
-        //There are 3 different kind of reference data. Create 3 thread and deal with them
-        new Thread(()->{processCORPUS();}).start();
-    }
-
-    private void processCORPUS(){
-        ConfigurationManager conf = ConfigurationManager.getInstance();
-        log.atInfo().log("Loading CORPUS");
-        String json = null;
-        try {
-            json = HttpUtil.sendHttpRequestForGZipFile(
-                    Constants.NetworkRailURI.CORPUS_URL,
-                    conf.getProperty(Constants.Configuration.NETWORK_RAIL_USER),
-                    conf.getProperty(Constants.Configuration.NETWORK_RAIL_PASSWORD)
-            );
-        } catch (IOException|URISyntaxException e) {
-            log.atError().withThrowable(e).log("Error when getting CORPUS data");
-            return;
-        }
-        JSONObject rootObj = new JSONObject(json);
-        JSONArray rootArray = rootObj.getJSONArray("TIPLOCDATA");
-        log.atInfo().log("{} entries found", rootArray.length());
-        ArrayList<CORPUS> corpusList = new ArrayList<>();
-        for(int i=0;i<rootArray.length();i++){
-            JSONObject obj = rootArray.getJSONObject(i);
-            CORPUS corpus = new CORPUS();
-            corpus.setStanoxCode(obj.optString("STANOX"));
-            corpus.setUicCode(obj.optString("UIC"));
-            corpus.setCrsCode(obj.optString("3ALPHA"));
-            corpus.setTiplocCode(obj.optString("TIPLOC"));
-            corpus.setNlcCode(obj.optString("NLC"));
-            corpus.setLongDescription(obj.optString("NLCDESC"));
-            corpus.setShortDescription(obj.optString("NLCDESC16"));
-            corpusList.add(corpus);
-        }
-        log.atInfo().log("Going to replace the data");
-        try {
-            CORPUSDao cDao = conf.getDatabaseManager().getCORPUSDao();
-            cDao.replaceAll(corpusList);
-        } catch (SQLException e) {
-            log.atError().withThrowable(e).log("Unable to insert records");
-        }
-        log.atInfo().log("Done inserting CORPUS");
-    }
-}
diff --git a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/model/CORPUS.java b/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/model/CORPUS.java
deleted file mode 100644
index 0b84652..0000000
--- a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/model/CORPUS.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.leolo.nrdatad.org.leolo.nrdatad.model;
-
-import java.util.Objects;
-
-public class CORPUS {
-
-    private String stanoxCode;
-    private String uicCode;
-    private String crsCode;
-    private String tiplocCode;
-    private String nlcCode;
-
-    private String longDescription;
-    private String shortDescription;
-
-    public String getStanoxCode() {
-        return stanoxCode;
-    }
-
-    public void setStanoxCode(String stanoxCode) {
-        this.stanoxCode = stanoxCode;
-    }
-
-    public String getUicCode() {
-        return uicCode;
-    }
-
-    public void setUicCode(String uicCode) {
-        this.uicCode = uicCode;
-    }
-
-    public String getCrsCode() {
-        return crsCode;
-    }
-
-    public void setCrsCode(String crsCode) {
-        this.crsCode = crsCode;
-    }
-
-    public String getTiplocCode() {
-        return tiplocCode;
-    }
-
-    public void setTiplocCode(String tiplocCode) {
-        this.tiplocCode = tiplocCode;
-    }
-
-    public String getNlcCode() {
-        return nlcCode;
-    }
-
-    public void setNlcCode(String nlcCode) {
-        this.nlcCode = nlcCode;
-    }
-
-    public String getLongDescription() {
-        return longDescription;
-    }
-
-    public void setLongDescription(String longDescription) {
-        this.longDescription = longDescription;
-    }
-
-    public String getShortDescription() {
-        return shortDescription;
-    }
-
-    public void setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        CORPUS corpus = (CORPUS) o;
-        return Objects.equals(stanoxCode, corpus.stanoxCode) && Objects.equals(uicCode, corpus.uicCode) && Objects.equals(crsCode, corpus.crsCode) && Objects.equals(tiplocCode, corpus.tiplocCode) && Objects.equals(nlcCode, corpus.nlcCode) && Objects.equals(longDescription, corpus.longDescription) && Objects.equals(shortDescription, corpus.shortDescription);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(stanoxCode, uicCode, crsCode, tiplocCode, nlcCode, longDescription, shortDescription);
-    }
-}
diff --git a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/util/HttpUtil.java b/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/util/HttpUtil.java
deleted file mode 100644
index c4ae852..0000000
--- a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/util/HttpUtil.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.leolo.nrdatad.org.leolo.nrdatad.util;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.leolo.nrdatad.ConfigurationManager;
-import org.leolo.nrdatad.Constants;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Base64;
-import java.util.zip.GZIPInputStream;
-
-public class HttpUtil {
-
-    Logger log = LogManager.getLogger();
-
-    public static String sendHttpRequest(URL url, String userName, String password) throws IOException {
-        URLConnection conn = url.openConnection();
-        String userpwd = userName+":"+password;
-        conn.addRequestProperty("Authorization", "Basic "+ Base64.getEncoder().encodeToString(userpwd.getBytes()));
-        conn.connect();
-        StringBuilder sb = new StringBuilder();
-        try(BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()))){
-            while(true){
-                String line = br.readLine();
-                if(line == null) break;
-                sb.append(line).append("\n");
-            }
-        }
-        return sb.toString();
-    }
-
-    public static String sendHttpRequest(String url, String userName, String password) throws IOException, URISyntaxException {
-        return sendHttpRequest(new URL(url), userName, password);
-    }
-    public static String sendHttpRequestForGZipFile(URL url, String userName, String password) throws IOException {
-        URLConnection conn = url.openConnection();
-        String userpwd = userName+":"+password;
-        conn.addRequestProperty("Authorization", "Basic "+ Base64.getEncoder().encodeToString(userpwd.getBytes()));
-        conn.connect();
-        StringBuilder sb = new StringBuilder();
-        try(
-                GZIPInputStream gis = new GZIPInputStream(conn.getInputStream());
-                BufferedReader br = new BufferedReader(new InputStreamReader(gis))
-        ){
-            while(true){
-                String line = br.readLine();
-                if(line == null) break;
-                sb.append(line).append("\n");
-            }
-        }
-        return sb.toString();
-    }
-
-    public static String sendHttpRequestForGZipFile(String url, String userName, String password) throws IOException, URISyntaxException {
-        return sendHttpRequestForGZipFile(new URL(url), userName, password);
-    }
-
-}
diff --git a/src/main/java/org/leolo/nrdatad/util/HttpUtil.java b/src/main/java/org/leolo/nrdatad/util/HttpUtil.java
new file mode 100644
index 0000000..a9a9fa1
--- /dev/null
+++ b/src/main/java/org/leolo/nrdatad/util/HttpUtil.java
@@ -0,0 +1,63 @@
+package org.leolo.nrdatad.util;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.leolo.nrdatad.ConfigurationManager;
+import org.leolo.nrdatad.Constants;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Base64;
+import java.util.zip.GZIPInputStream;
+
+public class HttpUtil {
+
+    Logger log = LogManager.getLogger();
+
+    public static String sendHttpRequest(URL url, String userName, String password) throws IOException {
+        URLConnection conn = url.openConnection();
+        String userpwd = userName+":"+password;
+        conn.addRequestProperty("Authorization", "Basic "+ Base64.getEncoder().encodeToString(userpwd.getBytes()));
+        conn.connect();
+        StringBuilder sb = new StringBuilder();
+        try(BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()))){
+            while(true){
+                String line = br.readLine();
+                if(line == null) break;
+                sb.append(line).append("\n");
+            }
+        }
+        return sb.toString();
+    }
+
+    public static String sendHttpRequest(String url, String userName, String password) throws IOException, URISyntaxException {
+        return sendHttpRequest(new URL(url), userName, password);
+    }
+    public static String sendHttpRequestForGZipFile(URL url, String userName, String password) throws IOException {
+        URLConnection conn = url.openConnection();
+        String userpwd = userName+":"+password;
+        conn.addRequestProperty("Authorization", "Basic "+ Base64.getEncoder().encodeToString(userpwd.getBytes()));
+        conn.connect();
+        StringBuilder sb = new StringBuilder();
+        try(
+                GZIPInputStream gis = new GZIPInputStream(conn.getInputStream());
+                BufferedReader br = new BufferedReader(new InputStreamReader(gis))
+        ){
+            while(true){
+                String line = br.readLine();
+                if(line == null) break;
+                sb.append(line).append("\n");
+            }
+        }
+        return sb.toString();
+    }
+
+    public static String sendHttpRequestForGZipFile(String url, String userName, String password) throws IOException, URISyntaxException {
+        return sendHttpRequestForGZipFile(new URL(url), userName, password);
+    }
+
+}