Julian/tlw-database-tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add error handling everywhere

Browse Source
This commit is contained in:
Julian Arndt
2021-01-10 21:34:27 +01:00
parent a6145eed64
commit b100e4e2e8
6 changed files with 79 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/jeyp91/App.java
View File

@@ -28,7 +28,7 @@ public class App {
private static String configFile;
private static final Logger logger = LogManager.getLogger(App.class);
public static void main(String[] args) throws Exception {
public static void main(String[] args) {
ConfigurationBuilder<BuiltConfiguration> builder
= ConfigurationBuilderFactory.newConfigurationBuilder();
@@ -74,11 +74,11 @@ public class App {
int forumId;
if (season == 2021) {
forumId = 15;
} else {
throw new Exception("Season does not exist");
}
String checksum = con.getChecksumOfPost(forumId, configFile);
System.out.println(checksum);
} else {
logger.error("Season does not exist");
}
break;
default:
break;

21
src/main/java/de/jeyp91/apifootball/APIFootballUpdater.java
View File

@@ -2,10 +2,13 @@ package de.jeyp91.apifootball;
import de.jeyp91.ResourceProvider;
import de.jeyp91.S3Provider;
import de.jeyp91.teamidmatcher.TeamIDMatcher;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
@@ -15,36 +18,46 @@ import java.util.HashSet;
public class APIFootballUpdater {
private static final Logger logger = LogManager.getLogger(APIFootballUpdater.class);
public APIFootballUpdater() {
}
public void updateFixtures(int league) throws Exception {
public void updateFixtures(int league) {
String apiFootballUrl = "https://v2.api-football.com/fixtures/league/" + league + "?timezone=Europe/Berlin";
try {
String content = getRawData(apiFootballUrl);
S3Provider prov = new S3Provider();
prov.writeFixturesToS3(league, content);
} catch (Exception e) {
logger.error(e.getMessage());
}
}
public void updateAllFixtures() throws Exception {
public void updateAllFixtures() {
HashSet<Integer> leagues = getLeagues();
for (Integer league : leagues) {
updateFixtures(league);
}
}
public void updateAllRounds() throws Exception {
public void updateAllRounds() {
HashSet<Integer> leagues = getLeagues();
for (Integer league : leagues) {
updateRounds(league);
}
}
public void updateRounds(int league) throws Exception {
public void updateRounds(int league) {
String apiFootballUrl = "https://v2.api-football.com/fixtures/rounds/" + league;
try {
String content = getRawData(apiFootballUrl);
S3Provider prov = new S3Provider();
prov.writeRoundsToS3(league, content);
} catch (Exception e) {
logger.error(e.getMessage());
}
}
public String getRawData(String requestUrl) throws Exception {

2
src/main/java/de/jeyp91/tippliga/TLWMatch.java
View File

@@ -14,8 +14,6 @@ import org.apache.logging.log4j.Logger;
*/
public class TLWMatch extends BaseMatch{
private final Logger logger = LogManager.getLogger(TLWMatch.class);
public final Integer STATUS_NOTSTARTED = 0;
public final Integer STATUS_STARTED = 1;
public final Integer STATUS_PROVISIONAL_RESULT_AVAILABLE = 2;

23
src/main/java/de/jeyp91/tippliga/TLWMatchdaysUpdater.java
View File

@@ -1,6 +1,8 @@
package de.jeyp91.tippliga;
import de.jeyp91.tippligaforum.TippligaSQLConnector;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -9,6 +11,8 @@ import java.util.Date;
public class TLWMatchdaysUpdater {
private final Logger logger = LogManager.getLogger(TLWMatch.class);
int season;
int league;
ArrayList<TLWMatchday> matchdaysOriginal;
@@ -28,20 +32,20 @@ public class TLWMatchdaysUpdater {
this.matchdaysUpdated.sort(Comparator.comparing(TLWMatchday::getMatchday));
}
public String getUpdateSql() throws Exception {
public String getUpdateSql() {
String updateSql = "";
if(this.matchdaysUpdated.size() != this.matchdaysOriginal.size()) {
throw new Exception("Wrong matchdays config");
}
this.logger.error("Wrong matchdays config!");
} else {
for(int i = 0; i < this.matchdaysUpdated.size(); i++) {
for (int i = 0; i < this.matchdaysUpdated.size(); i++) {
TLWMatchday matchdayOriginal = this.matchdaysOriginal.get(i);
TLWMatchday matchdayUpdated = this.matchdaysUpdated.get(i);
if(matchdayOriginal.getMatchday() != matchdayUpdated.getMatchday()) {
throw new Exception("BUUUUG!");
}
if (matchdayOriginal.getMatchday() != matchdayUpdated.getMatchday()) {
this.logger.error("BUUUUG!");
} else {
Date now = new Date(System.currentTimeMillis());
@@ -52,7 +56,7 @@ public class TLWMatchdaysUpdater {
e.printStackTrace();
}
if(earliestDate.after(now)) {
if (earliestDate.after(now)) {
String updateStart = "UPDATE phpbb_footb_matchdays SET ";
String condition = "WHERE season = " + matchdayOriginal.getSeason() + " " +
@@ -87,7 +91,8 @@ public class TLWMatchdaysUpdater {
}
}
}
}
}
return updateSql;
}

2
src/main/java/de/jeyp91/tippliga/TLWMatchesUpdaterFootball.java
View File

@@ -15,7 +15,7 @@ import java.time.*;
import java.util.ArrayList;
public class TLWMatchesUpdaterFootball extends TLWMatchesManagerBase {
private static final Logger logger = LogManager.getLogger(App.class);
private static final Logger logger = LogManager.getLogger(TLWMatchesUpdaterFootball.class);
ArrayList<TLWMatch> tlwMatchesOriginal;
ArrayList<TLWMatch> tlwMatchesUpdated;

2
src/main/java/de/jeyp91/tippliga/TLWTeamsUpdater.java
View File

@@ -13,7 +13,7 @@ public class TLWTeamsUpdater {
ArrayList<TLWMatch> matchesUpdated;
ArrayList<TLWTeam> missingTeams;
public TLWTeamsUpdater(int season, int league, String configFileName) throws Exception {
public TLWTeamsUpdater(int season, int league, String configFileName) {
TippligaSQLConnector conn = TippligaSQLConnector.getInstance();