From 038f88e3d26ef5ffd65961d21c8a8b21134c1dcc Mon Sep 17 00:00:00 2001 From: simon987 Date: Sun, 7 Apr 2019 13:50:07 -0400 Subject: [PATCH] Cleanup --- pom.xml | 26 ++++++++------- .../java/net/simon987/models/ApiInfo.java | 20 ------------ .../net/simon987/{ => musicgraph}/Main.java | 10 +++--- .../simon987/musicgraph/entities/ApiInfo.java | 32 +++++++++++++++++++ .../{ => musicgraph}/logging/LogManager.java | 5 +-- .../logging/MusicGraphFormatter.java | 2 +- .../logging/StdOutHandler.java | 2 +- .../{ => musicgraph}/webapi/Index.java | 10 +++--- 8 files changed, 63 insertions(+), 44 deletions(-) delete mode 100644 src/main/java/net/simon987/models/ApiInfo.java rename src/main/java/net/simon987/{ => musicgraph}/Main.java (82%) create mode 100644 src/main/java/net/simon987/musicgraph/entities/ApiInfo.java rename src/main/java/net/simon987/{ => musicgraph}/logging/LogManager.java (75%) rename src/main/java/net/simon987/{ => musicgraph}/logging/MusicGraphFormatter.java (93%) rename src/main/java/net/simon987/{ => musicgraph}/logging/StdOutHandler.java (90%) rename src/main/java/net/simon987/{ => musicgraph}/webapi/Index.java (55%) diff --git a/pom.xml b/pom.xml index b19c31c..876edef 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ - net.simon987.Main + net.simon987.musicgraph.Main @@ -43,19 +43,13 @@ - - - - org.neo4j - neo4j-ogm-core - 3.1.8 - - + + - org.neo4j - neo4j-ogm-bolt-driver - 3.1.8 + org.neo4j.driver + neo4j-java-driver + 1.7.3 @@ -98,5 +92,13 @@ 2.3.0.1 + + + org.slf4j + slf4j-simple + 1.7.26 + test + + \ No newline at end of file diff --git a/src/main/java/net/simon987/models/ApiInfo.java b/src/main/java/net/simon987/models/ApiInfo.java deleted file mode 100644 index 3defd56..0000000 --- a/src/main/java/net/simon987/models/ApiInfo.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.simon987.models; - -public class ApiInfo { - - private String name; - private String version; - - public ApiInfo(String name, String version) { - this.name = name; - this.version = version; - } - - public String getName() { - return name; - } - - public String getVersion() { - return version; - } -} diff --git a/src/main/java/net/simon987/Main.java b/src/main/java/net/simon987/musicgraph/Main.java similarity index 82% rename from src/main/java/net/simon987/Main.java rename to src/main/java/net/simon987/musicgraph/Main.java index b12fa6e..d00d706 100644 --- a/src/main/java/net/simon987/Main.java +++ b/src/main/java/net/simon987/musicgraph/Main.java @@ -1,7 +1,7 @@ -package net.simon987; +package net.simon987.musicgraph; -import net.simon987.logging.LogManager; -import net.simon987.webapi.Index; +import net.simon987.musicgraph.logging.LogManager; +import net.simon987.musicgraph.webapi.Index; import org.glassfish.grizzly.http.server.HttpServer; import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; import org.glassfish.jersey.jackson.JacksonFeature; @@ -17,6 +17,7 @@ public class Main { public static void main(String[] args) { LOGGER.info("test"); + startHttpServer(); } @@ -25,11 +26,12 @@ public class Main { ResourceConfig rc = new ResourceConfig(); rc.registerClasses(Index.class); + rc.registerClasses(JacksonFeature.class); try { HttpServer server = GrizzlyHttpServerFactory.createHttpServer( - new URI("http://localhost:8080/"), + new URI("http://localhost:3030/"), rc); server.start(); diff --git a/src/main/java/net/simon987/musicgraph/entities/ApiInfo.java b/src/main/java/net/simon987/musicgraph/entities/ApiInfo.java new file mode 100644 index 0000000..e7782fd --- /dev/null +++ b/src/main/java/net/simon987/musicgraph/entities/ApiInfo.java @@ -0,0 +1,32 @@ +package net.simon987.musicgraph.entities; + +public class ApiInfo { + + private String name; + private String version; + private String wadl; + private String source; + + public ApiInfo(String name, String version, String wadl, String source) { + this.name = name; + this.version = version; + this.wadl = wadl; + this.source = source; + } + + public String getName() { + return name; + } + + public String getVersion() { + return version; + } + + public String getWadl() { + return wadl; + } + + public String getSource() { + return source; + } +} diff --git a/src/main/java/net/simon987/logging/LogManager.java b/src/main/java/net/simon987/musicgraph/logging/LogManager.java similarity index 75% rename from src/main/java/net/simon987/logging/LogManager.java rename to src/main/java/net/simon987/musicgraph/logging/LogManager.java index 512e70f..321b6d9 100644 --- a/src/main/java/net/simon987/logging/LogManager.java +++ b/src/main/java/net/simon987/musicgraph/logging/LogManager.java @@ -1,6 +1,7 @@ -package net.simon987.logging; +package net.simon987.musicgraph.logging; -import java.util.logging.*; +import java.util.logging.Handler; +import java.util.logging.Logger; public class LogManager { diff --git a/src/main/java/net/simon987/logging/MusicGraphFormatter.java b/src/main/java/net/simon987/musicgraph/logging/MusicGraphFormatter.java similarity index 93% rename from src/main/java/net/simon987/logging/MusicGraphFormatter.java rename to src/main/java/net/simon987/musicgraph/logging/MusicGraphFormatter.java index 773ec64..7d2593a 100644 --- a/src/main/java/net/simon987/logging/MusicGraphFormatter.java +++ b/src/main/java/net/simon987/musicgraph/logging/MusicGraphFormatter.java @@ -1,4 +1,4 @@ -package net.simon987.logging; +package net.simon987.musicgraph.logging; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/src/main/java/net/simon987/logging/StdOutHandler.java b/src/main/java/net/simon987/musicgraph/logging/StdOutHandler.java similarity index 90% rename from src/main/java/net/simon987/logging/StdOutHandler.java rename to src/main/java/net/simon987/musicgraph/logging/StdOutHandler.java index e8b2a73..74f8f52 100644 --- a/src/main/java/net/simon987/logging/StdOutHandler.java +++ b/src/main/java/net/simon987/musicgraph/logging/StdOutHandler.java @@ -1,4 +1,4 @@ -package net.simon987.logging; +package net.simon987.musicgraph.logging; import java.util.logging.Level; import java.util.logging.LogRecord; diff --git a/src/main/java/net/simon987/webapi/Index.java b/src/main/java/net/simon987/musicgraph/webapi/Index.java similarity index 55% rename from src/main/java/net/simon987/webapi/Index.java rename to src/main/java/net/simon987/musicgraph/webapi/Index.java index eca4f16..709386b 100644 --- a/src/main/java/net/simon987/webapi/Index.java +++ b/src/main/java/net/simon987/musicgraph/webapi/Index.java @@ -1,6 +1,6 @@ -package net.simon987.webapi; +package net.simon987.musicgraph.webapi; -import net.simon987.models.ApiInfo; +import net.simon987.musicgraph.entities.ApiInfo; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -11,8 +11,10 @@ import javax.ws.rs.core.MediaType; public class Index { private static final ApiInfo INFO = new ApiInfo( - "music-graph", - "0.1" + "music-graph-api", + "0.1", + "http://localhost:3030/application.wadl", + "https://github.com/simon987/music-graph-api" ); @GET