Refactor away Constants class

Author: hybras

build.gradle

@@ -1,16 +1,15 @@
-apply plugin: 'java'
-
+plugins {
+	'java'
+	'java-library'
+}
 
 repositories {
     jcenter()
 }
 
 
 dependencies {
-
-    compile 'org.slf4j:slf4j-api:1.7.21'
-
-
-    testCompile 'junit:junit:4.12'
-    compile 'com.google.code.gson:gson:2.2.4'
+    implementation 'org.slf4j:slf4j-api:1.7.21'
+    testImplementation 'junit:junit:4.13'
+    implementation 'com.google.code.gson:gson:2.8.6'
 }

src/main/java/com/thebluealliance/api/v3/Constants.java

@@ -3,11 +3,3 @@
 /**
  * Collection of constants used to access The Blue Alliance API
  */
-public class Constants {
-
-    public static final String TBA_BASE_URL = "https://www.thebluealliance.com/api/v3";
-    public static final String HEADER_AUTH = "X-TBA-Auth-Key";
-    public static final String HEADER_MODIFIED = "If-Modified-Since";
-
-
-}

src/main/java/com/thebluealliance/api/v3/requests/DataRequest.java

@@ -1,7 +1,5 @@
 package com.thebluealliance.api.v3.requests;
 
-import com.thebluealliance.api.v3.Constants;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -13,6 +11,10 @@
  */
 public class DataRequest {
 
+	public static final String TBA_BASE_URL = "https://www.thebluealliance.com/api/v3";
+	public static final String HEADER_AUTH = "X-TBA-Auth-Key";
+    public static final String HEADER_MODIFIED = "If-Modified-Since";
+
     private String AUTH_KEY;
 
     /**
@@ -34,9 +36,9 @@ public DataRequest(String authKey) {
     public APIResponse getDataTBA(String urlDirectory) throws IOException {
 
         URL url;
-        url = new URL(Constants.TBA_BASE_URL + urlDirectory);
+        url = new URL(TBA_BASE_URL + urlDirectory);
         HttpURLConnection con = (HttpURLConnection) url.openConnection();
-        con.addRequestProperty(Constants.HEADER_AUTH, AUTH_KEY);
+        con.addRequestProperty(HEADER_AUTH, AUTH_KEY);
         return getData(con);
 
     }
@@ -80,10 +82,10 @@ private APIResponse getData(HttpURLConnection con) {
      * @return An {@link APIResponse} object with the API's response
      */
     public APIResponse getDataTBA(String urlDirectory, String ifModifiedSince) throws IOException {
-        URL url = new URL(Constants.TBA_BASE_URL + urlDirectory);
+        URL url = new URL(TBA_BASE_URL + urlDirectory);
         HttpURLConnection con = (HttpURLConnection) url.openConnection();
-        con.addRequestProperty(Constants.HEADER_AUTH, AUTH_KEY);
-        con.addRequestProperty(Constants.HEADER_MODIFIED, ifModifiedSince);
+        con.addRequestProperty(HEADER_AUTH, AUTH_KEY);
+        con.addRequestProperty(HEADER_MODIFIED, ifModifiedSince);
         return getData(con);