diff --git a/build.gradle b/build.gradle index f04da1a9b1be..1195d34defe3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,9 @@ +buildscript { + repositories { + mavenCentral() + } +} + allprojects { group = "io.dataline.${rootProject.name}" version = rootProject.file('.version').text.trim() diff --git a/conduit-commons/build.gradle b/conduit-commons/build.gradle index e69de29bb2d1..aeff9e92d7c9 100644 --- a/conduit-commons/build.gradle +++ b/conduit-commons/build.gradle @@ -0,0 +1,11 @@ +plugins { + id "com.diffplug.spotless" version "5.1.1" +} + +compileJava.dependsOn 'spotlessApply' + +spotless { + java { + googleJavaFormat('1.8') + } +} diff --git a/conduit-commons/src/main/java/io/dataline/conduit/commons/HelloWorld.java b/conduit-commons/src/main/java/io/dataline/conduit/commons/HelloWorld.java index 29ebe7facae8..4bbebefa8d56 100644 --- a/conduit-commons/src/main/java/io/dataline/conduit/commons/HelloWorld.java +++ b/conduit-commons/src/main/java/io/dataline/conduit/commons/HelloWorld.java @@ -3,7 +3,7 @@ import com.google.common.base.Strings; public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello World" + Strings.repeat("!", 3)); - } + public static void main(String[] args) { + System.out.println("Hello World" + Strings.repeat("!", 3)); + } } diff --git a/conduit-commons/src/test/java/io/dataline/conduit/commons/HelloWorldTest.java b/conduit-commons/src/test/java/io/dataline/conduit/commons/HelloWorldTest.java index 2b93da2a3f44..b30ae1c6bdb3 100644 --- a/conduit-commons/src/test/java/io/dataline/conduit/commons/HelloWorldTest.java +++ b/conduit-commons/src/test/java/io/dataline/conduit/commons/HelloWorldTest.java @@ -1,12 +1,12 @@ package io.dataline.conduit.commons; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + class HelloWorldTest { - @Test - void name() { - assertEquals(1, 1); - } -} \ No newline at end of file + @Test + void name() { + assertEquals(1, 1); + } +} diff --git a/conduit-server/build.gradle b/conduit-server/build.gradle index a0081dbb2203..3752bbbeb730 100644 --- a/conduit-server/build.gradle +++ b/conduit-server/build.gradle @@ -1,5 +1,14 @@ plugins { id 'application' + id "com.diffplug.spotless" version "5.1.1" +} + +compileJava.dependsOn 'spotlessApply' + +spotless { + java { + googleJavaFormat('1.8') + } } dependencies { diff --git a/conduit-server/src/main/java/io/dataline/conduit/server/ServerApp.java b/conduit-server/src/main/java/io/dataline/conduit/server/ServerApp.java index d75cc0e05a72..4a357375ebc9 100644 --- a/conduit-server/src/main/java/io/dataline/conduit/server/ServerApp.java +++ b/conduit-server/src/main/java/io/dataline/conduit/server/ServerApp.java @@ -10,32 +10,30 @@ import org.slf4j.LoggerFactory; public class ServerApp { - private final static Logger LOGGER = LoggerFactory.getLogger(ServerApp.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ServerApp.class); - public ServerApp() { - } + public ServerApp() {} - public void start() throws Exception { - Server server = new Server(8080); + public void start() throws Exception { + Server server = new Server(8080); - ServletContextHandler handler = new ServletContextHandler(); + ServletContextHandler handler = new ServletContextHandler(); - ResourceConfig rc = new ResourceConfig() - .registerClasses(PetApi.class); + ResourceConfig rc = new ResourceConfig().registerClasses(PetApi.class); - ServletHolder conduitServlet = new ServletHolder(new ServletContainer(rc)); + ServletHolder conduitServlet = new ServletHolder(new ServletContainer(rc)); - handler.addServlet(conduitServlet, "/api/v1/*"); + handler.addServlet(conduitServlet, "/api/v1/*"); - server.setHandler(handler); + server.setHandler(handler); - server.start(); - server.join(); - } + server.start(); + server.join(); + } - public static void main(String[] args) throws Exception { - LOGGER.info("Starting server..."); + public static void main(String[] args) throws Exception { + LOGGER.info("Starting server..."); - new ServerApp().start(); - } + new ServerApp().start(); + } } diff --git a/conduit-server/src/main/java/io/dataline/conduit/server/apis/PetApi.java b/conduit-server/src/main/java/io/dataline/conduit/server/apis/PetApi.java index 735975c52bc4..1ffae2a2d0b0 100644 --- a/conduit-server/src/main/java/io/dataline/conduit/server/apis/PetApi.java +++ b/conduit-server/src/main/java/io/dataline/conduit/server/apis/PetApi.java @@ -1,55 +1,50 @@ package io.dataline.conduit.server.apis; -import javax.validation.Valid; -import javax.ws.rs.Path; -import java.io.File; -import java.util.List; - import io.dataline.conduit.api.model.ModelApiResponse; import io.dataline.conduit.api.model.Pet; +import java.io.File; +import java.util.List; +import javax.validation.Valid; +import javax.ws.rs.Path; @Path("/pet") public class PetApi implements io.dataline.conduit.api.PetApi { - @Override - public Pet addPet(@Valid Pet pet) { - return null; - } - - @Override - public void deletePet(Long petId, String apiKey) { - - } - - @Override - public List findPetsByStatus(String status) { - return null; - } - - @Override - public List findPetsByTags(List tags) { - return null; - } - - @Override - public Pet getPetById(Long petId) { - final Pet pet = new Pet(); - pet.setId(petId); - return pet; - } - - @Override - public Pet updatePet(@Valid Pet pet) { - return null; - } - - @Override - public void updatePetWithForm(Long petId, String name, String status) { - - } - - @Override - public ModelApiResponse uploadFile(Long petId, String additionalMetadata, @Valid File body) { - return null; - } + @Override + public Pet addPet(@Valid Pet pet) { + return null; + } + + @Override + public void deletePet(Long petId, String apiKey) {} + + @Override + public List findPetsByStatus(String status) { + return null; + } + + @Override + public List findPetsByTags(List tags) { + return null; + } + + @Override + public Pet getPetById(Long petId) { + final Pet pet = new Pet(); + pet.setId(petId); + return pet; + } + + @Override + public Pet updatePet(@Valid Pet pet) { + return null; + } + + @Override + public void updatePetWithForm(Long petId, String name, String status) {} + + @Override + public ModelApiResponse uploadFile(Long petId, String additionalMetadata, @Valid File body) { + return null; + } } diff --git a/conduit-server/src/test/java/io/dataline/conduit/server/ServerAppTest.java b/conduit-server/src/test/java/io/dataline/conduit/server/ServerAppTest.java index d47abd4733d9..fdfa34691574 100644 --- a/conduit-server/src/test/java/io/dataline/conduit/server/ServerAppTest.java +++ b/conduit-server/src/test/java/io/dataline/conduit/server/ServerAppTest.java @@ -1,12 +1,12 @@ package io.dataline.conduit.server; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + class ServerAppTest { - @Test - void name() { - assertEquals(1, 1); - } + @Test + void name() { + assertEquals(1, 1); + } }