Add server running config (MarquezProject#7)

* Add running section to README.md * Clean up config class * Add example config.yaml * Add admin link to README.md * Ignore marquez configuration * Migrate to jdbi3 * Add psql driver * Update config name for db in config.example.yaml
ShakirzyanovArsen · Jul 27, 2018 · 02ac2ef · 02ac2ef
1 parent ab46e86
commit 02ac2ef
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 64 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,6 @@
 bin/
 build/
 gradle/
+
+# Marquez configuration
+config.yaml
diff --git a/README.md b/README.md
@@ -10,14 +10,21 @@ The [Marquez design](https://drive.google.com/open?id=1zxvp-6jv4Gs7eAGFmK0fbKbYL
 
 ## Requirements
 
-* Java 8+
+* Java 8 or higher
 * Postgres Database
-* Gradle 4.8+
+* Gradle 4.8 or higher
 
 ## Building
 
 To build the entire project run:
 
 ```bash
-$ ./gradlew build
+./gradlew shadowJar
 ```
+
+## Running the [Application](https://github.com/MarquezProject/marquez/blob/master/src/main/java/marquez/MarquezApplication.java)
+
+```bash
+$ java -jar build/libs/marquez-all.jar server config.yaml
+```
+Then browse to the admin interface: https://localhost:8081
diff --git a/build.gradle b/build.gradle
@@ -20,8 +20,9 @@ if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
 
 dependencies {
  compile 'io.dropwizard:dropwizard-core:1.3.5'
- compile 'io.dropwizard:dropwizard-jdbi:1.3.5'
- compile 'io.dropwizard:dropwizard-migrations:1.3.5'
+ compile 'io.dropwizard:dropwizard-jdbi3:1.3.5'
+ compile 'org.jdbi:jdbi3-core:3.3.0'
+ compile 'org.postgresql:postgresql:42.2.4'
 
  testCompile 'io.dropwizard:dropwizard-testing:1.3.5'
  testCompile 'junit:junit:4.12'

diff --git a/config.example.yaml b/config.example.yaml
@@ -0,0 +1,5 @@
+database:
+ driverClass: org.postgresql.Driver
+ user: POSTGRESQL_USER
+ password: POSTGRESQL_PASSWORD
+ url: jdbc:postgresql:https://127.0.0.1:5432/POSTGRESQL_DATABASE
diff --git a/src/main/java/marquez/MarquezApplication.java b/src/main/java/marquez/MarquezApplication.java
@@ -1,44 +1,28 @@
 package marquez;
 
 import io.dropwizard.Application;
-import io.dropwizard.db.DataSourceFactory;
-import io.dropwizard.jdbi.DBIFactory;
-import io.dropwizard.migrations.MigrationsBundle;
+import io.dropwizard.jdbi3.JdbiFactory;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
-import marquez.db.JobDAO;
-import marquez.resources.JobResource;
-import org.skife.jdbi.v2.DBI;
+import org.jdbi.v3.core.Jdbi;
 
 public class MarquezApplication extends Application<MarquezConfiguration> {
 
  @Override
- public void run(final MarquezConfiguration configuration, final Environment environment) {
- final DBIFactory factory = new DBIFactory();
- final DBI jdbi = factory.build(environment, configuration.getDataSourceFactory(), "h2");
- final JobDAO jobDAO = jdbi.onDemand(JobDAO.class);
- final JobResource jobResource = new JobResource(jobDAO);
- environment.jersey().register(jobResource);
+ public void run(final MarquezConfiguration config, final Environment environment) {
+ final JdbiFactory factory = new JdbiFactory();
+ final Jdbi jdbi = factory.build(environment, config.getDataSourceFactory(), "postgresql");
  }
 
  @Override
  public String getName() {
- return "MarquezServer";
+ return "MarquezApp";
  }
 
  @Override
- public void initialize(Bootstrap<MarquezConfiguration> bootstrap) {
- bootstrap.addBundle(
- new MigrationsBundle<MarquezConfiguration>() {
- @Override
- public DataSourceFactory getDataSourceFactory(MarquezConfiguration configuration) {
- return configuration.getDataSourceFactory();
- }
- });
- }
+ public void initialize(Bootstrap<MarquezConfiguration> bootstrap) {}
 
  public static void main(final String[] args) throws Exception {
- final MarquezApplication application = new MarquezApplication();
- application.run(args);
+ new MarquezApplication().run(args);
  }
 }
diff --git a/src/main/java/marquez/MarquezConfiguration.java b/src/main/java/marquez/MarquezConfiguration.java
@@ -5,24 +5,14 @@
 import io.dropwizard.db.DataSourceFactory;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.NotEmpty;
 
 class MarquezConfiguration extends Configuration {
- @NotEmpty private String url;
-
- @Valid @NotNull @JsonProperty private DataSourceFactory database = new DataSourceFactory();
+ @Valid
+ @NotNull
+ @JsonProperty("database")
+ private DataSourceFactory database = new DataSourceFactory();
 
  public DataSourceFactory getDataSourceFactory() {
  return database;
  }
-
- @JsonProperty
- public String getUrl() {
- return url;
- }
-
- @JsonProperty
- public void setHttpURL(String Url) {
- this.url = Url;
- }
 }
diff --git a/src/main/java/marquez/db/DatasetDAO.java b/src/main/java/marquez/db/DatasetDAO.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import marquez.api.Dataset;
-import org.skife.jdbi.v2.sqlobject.Bind;
-import org.skife.jdbi.v2.sqlobject.SqlQuery;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
 
 public interface DatasetDAO {
  @SqlQuery("SELECT * FROM datasets WHERE id = :id")

diff --git a/src/main/java/marquez/db/DbDAO.java b/src/main/java/marquez/db/DbDAO.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import marquez.api.Db;
-import org.skife.jdbi.v2.sqlobject.Bind;
-import org.skife.jdbi.v2.sqlobject.SqlQuery;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
 
 public interface DbDAO {
  @SqlQuery("SELECT * FROM dbs WHERE id = :id")

diff --git a/src/main/java/marquez/db/DbTableVersionDAO.java b/src/main/java/marquez/db/DbTableVersionDAO.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import marquez.api.DbTableVersion;
-import org.skife.jdbi.v2.sqlobject.Bind;
-import org.skife.jdbi.v2.sqlobject.SqlQuery;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
 
 public interface DbTableVersionDAO {
  @SqlQuery("SELECT * FROM db_table_versions WHERE id = :id")
@@ -12,4 +12,3 @@ public interface DbTableVersionDAO {
  @SqlQuery("SELECT * FROM db_table_versions")
  List<DbTableVersion> findAll();
 }
-
diff --git a/src/main/java/marquez/db/IcebergTableVersionDAO.java b/src/main/java/marquez/db/IcebergTableVersionDAO.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import marquez.api.IcebergTableVersion;
-import org.skife.jdbi.v2.sqlobject.Bind;
-import org.skife.jdbi.v2.sqlobject.SqlQuery;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
 
 public interface IcebergTableVersionDAO {
  @SqlQuery("SELECT * FROM iceberg_table_versions WHERE id = :id")

diff --git a/src/main/java/marquez/db/JobDAO.java b/src/main/java/marquez/db/JobDAO.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import marquez.api.Job;
-import org.skife.jdbi.v2.sqlobject.Bind;
-import org.skife.jdbi.v2.sqlobject.SqlQuery;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
 
 public interface JobDAO {
  @SqlQuery("SELECT * FROM jobs WHERE id = :id")

diff --git a/src/main/java/marquez/db/JobRunDAO.java b/src/main/java/marquez/db/JobRunDAO.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import marquez.api.JobRun;
-import org.skife.jdbi.v2.sqlobject.Bind;
-import org.skife.jdbi.v2.sqlobject.SqlQuery;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
 
 public interface JobRunDAO {
  @SqlQuery("SELECT * FROM job_runs WHERE id = :id")

diff --git a/src/main/java/marquez/db/JobRunStateDAO.java b/src/main/java/marquez/db/JobRunStateDAO.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import marquez.api.JobRunState;
-import org.skife.jdbi.v2.sqlobject.Bind;
-import org.skife.jdbi.v2.sqlobject.SqlQuery;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
 
 public interface JobRunStateDAO {
  @SqlQuery("SELECT * FROM job_run_states WHERE id = :id")

diff --git a/src/main/java/marquez/db/JobVersionDAO.java b/src/main/java/marquez/db/JobVersionDAO.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import marquez.api.JobVersion;
-import org.skife.jdbi.v2.sqlobject.Bind;
-import org.skife.jdbi.v2.sqlobject.SqlQuery;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
 
 public interface JobVersionDAO {
  @SqlQuery("SELECT * FROM job_versions WHERE id = :id")

diff --git a/src/main/java/marquez/db/OwnerDAO.java b/src/main/java/marquez/db/OwnerDAO.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import marquez.api.Owner;
-import org.skife.jdbi.v2.sqlobject.Bind;
-import org.skife.jdbi.v2.sqlobject.SqlQuery;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
 
 public interface OwnerDAO {
  @SqlQuery("SELECT * FROM owners WHERE id = :id")

diff --git a/src/main/java/marquez/db/OwnershipDAO.java b/src/main/java/marquez/db/OwnershipDAO.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import marquez.api.Ownership;
-import org.skife.jdbi.v2.sqlobject.Bind;
-import org.skife.jdbi.v2.sqlobject.SqlQuery;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
 
 public interface OwnershipDAO {
  @SqlQuery("SELECT * FROM ownerships WHERE id = :id")