From 4ef805567781ee9a602ec754e1cdf63511769532 Mon Sep 17 00:00:00 2001
From: Pinapelz <donaldshan1@outlook.com>
Date: Wed, 5 Apr 2023 15:40:35 -0700
Subject: General cleanup

---
 .gitignore                                 |  2 +-
 .idea/.gitignore                           |  6 ++-
 pom.xml                                    | 73 ++++++++++++------------------
 src/main/java/App.java                     |  4 +-
 src/main/java/com/pina/Holodex.java        |  2 +-
 src/main/java/com/pina/HolodexService.java |  4 +-
 src/test/java/HolodexServiceTest.java      | 11 -----
 7 files changed, 41 insertions(+), 61 deletions(-)
 delete mode 100644 src/test/java/HolodexServiceTest.java

diff --git a/.gitignore b/.gitignore
index 5ff6309..c11c8db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-target/
+../../Documents/IntellijProjects/HldexWrapper/target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 5583ee6..13566b8 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,4 +1,8 @@
 # Default ignored files
 /shelf/
 /workspace.xml
-.idea
\ No newline at end of file
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/pom.xml b/pom.xml
index 350ae4d..af109b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,45 +1,32 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.pinapelz</groupId>
-  <artifactId>JHolodex</artifactId>
-  <version>0.01</version>
-  <packaging>jar</packaging>
-
-  <name>JHolodex</name>
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>18</maven.compiler.source>
-    <maven.compiler.target>18</maven.compiler.target>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>retrofit</artifactId>
-      <version>2.9.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-jackson</artifactId>
-      <version>2.9.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <version>RELEASE</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.pina</groupId>
+    <artifactId>jholodex</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>JHolodex</name>
+    <url>http://maven.apache.org</url>
+    <properties>
+        <maven.compiler.source>18</maven.compiler.source>
+        <maven.compiler.target>18</maven.compiler.target>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>retrofit</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>converter-jackson</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+    </dependencies>
 </project>
+
diff --git a/src/main/java/App.java b/src/main/java/App.java
index c3d8024..1a21620 100644
--- a/src/main/java/App.java
+++ b/src/main/java/App.java
@@ -3,8 +3,8 @@ import com.pina.HolodexException;
 import com.pina.datatypes.Channel;
 import com.pina.datatypes.Video;
 import com.pina.query.ChannelQueryBuilder;
-import com.pina.query.VideoQueryBuilder;
 import com.pina.query.VideoMetadataQueryBuilder;
+import com.pina.query.VideoQueryBuilder;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@ public class App
     public static void main( String[] args )
     {
         try {
-            Holodex holodex = new Holodex("b33eda39-dfb0-4337-9c8a-49cd8e69f5d5"); //API key here is not active
+            Holodex holodex = new Holodex("API_KEY"); //API key here is not active
             Channel channel = holodex.getChannel("UC4WvIIAo89_AzGUh1AZ6Dkg");
             System.out.println(channel.name + " is a member of " + channel.org + " and has " + channel.suborg + " as a suborg");
 
diff --git a/src/main/java/com/pina/Holodex.java b/src/main/java/com/pina/Holodex.java
index 58a11c0..fa100f5 100644
--- a/src/main/java/com/pina/Holodex.java
+++ b/src/main/java/com/pina/Holodex.java
@@ -3,8 +3,8 @@ package com.pina;
 import com.pina.datatypes.Channel;
 import com.pina.datatypes.Video;
 import com.pina.query.ChannelQueryBuilder;
-import com.pina.query.VideoQueryBuilder;
 import com.pina.query.VideoMetadataQueryBuilder;
+import com.pina.query.VideoQueryBuilder;
 import com.pina.query.VideosByChannelIDQueryBuilder;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
diff --git a/src/main/java/com/pina/HolodexService.java b/src/main/java/com/pina/HolodexService.java
index 719134c..4b42433 100644
--- a/src/main/java/com/pina/HolodexService.java
+++ b/src/main/java/com/pina/HolodexService.java
@@ -1,7 +1,5 @@
 package com.pina;
 
-import java.util.List;
-
 import com.pina.datatypes.Channel;
 import com.pina.datatypes.Video;
 import retrofit2.Call;
@@ -9,6 +7,8 @@ import retrofit2.http.GET;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
 
+import java.util.List;
+
 public interface HolodexService {
     @GET("/api/v2/live")
     Call<List<Video>> getLiveVideos(
diff --git a/src/test/java/HolodexServiceTest.java b/src/test/java/HolodexServiceTest.java
deleted file mode 100644
index f749000..0000000
--- a/src/test/java/HolodexServiceTest.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import org.junit.jupiter.api.Test;
-
-public class HolodexServiceTest {
-
-    @Test
-    public void testGetLiveStreams() throws Exception {
-        //TOOD: Implement testcase using mocking
-    }
-
-
-}
-- 
cgit v1.2.3