From 477ea387591dabd17ab8004fb906e264e964f466 Mon Sep 17 00:00:00 2001 From: Arnold Schrijver Date: Mon, 25 Jul 2016 14:47:52 +0200 Subject: [PATCH] Fixed maven pom files, bumped version to 0.9.1 (issue #1) --- README.md | 33 +++++++++++-------- build.gradle | 5 +-- examples/droids-microservice/build.gradle | 2 +- examples/starwars-client/build.gradle | 2 +- examples/starwars-microservice/build.gradle | 2 +- gradle/publishing.gradle | 7 ++-- graphql-consumer/gradle.properties | 1 - graphql-core/gradle.properties | 1 - graphql-publisher/gradle.properties | 1 - .../build.gradle | 6 ++-- graphql-service-consumer/gradle.properties | 2 ++ .../src/main/asciidoc/dataobjects.adoc | 0 .../graphql/client/GraphQLClient.java | 0 .../graphql/consumer/DiscoveryRegistrar.java | 0 .../consumer/DiscoveryRegistration.java | 0 .../graphql/consumer/SchemaConsumer.java | 0 .../graphql/package-info.java | 0 .../graphql/client/GraphQLClientTest.java | 0 .../consumer/DiscoveryRegistrarTest.java | 0 .../consumer/DiscoveryRegistrationTest.java | 0 .../graphql/consumer/SchemaConsumerTest.java | 0 .../build.gradle | 2 +- graphql-service-publisher/gradle.properties | 2 ++ .../graphql/package-info.java | 0 .../publisher/PartialPublishException.java | 0 .../graphql/publisher/SchemaDefinition.java | 0 .../graphql/publisher/SchemaPublisher.java | 0 .../graphql/publisher/SchemaRegistrar.java | 0 .../graphql/publisher/SchemaRegistration.java | 0 .../graphql/service/GraphQLService.java | 0 .../service/impl/GraphQLServiceImpl.java | 0 .../io.vertx.servicediscovery.spi.ServiceType | 0 .../graphql/data/DroidsSchema.java | 0 .../graphql/data/StarWarsData.java | 0 .../graphql/data/StarWarsSchema.java | 0 .../PartialPublishExceptionTest.java | 0 .../publisher/SchemaPublisherTest.java | 0 .../publisher/SchemaRegistrarTest.java | 0 .../publisher/SchemaRegistrationTest.java | 0 .../graphql/service/GraphQLServiceTest.java | 0 .../service/impl/GraphQLServiceImplTest.java | 0 .../graphql/utils/MapBuilder.java | 0 .../build.gradle | 4 +-- .../gradle.properties | 2 ++ .../src/main/asciidoc/dataobjects.adoc | 0 .../graphql/query/QueryableVertxEBProxy.java | 0 .../query/QueryableVertxProxyHandler.java | 0 .../graphql/discovery/Registrar.java | 0 .../graphql/discovery/Registration.java | 0 .../discovery/impl/AbstractRegistrar.java | 0 .../discovery/impl/AbstractRegistration.java | 0 .../impl/ManagedServiceDiscovery.java | 0 .../graphql/events/SchemaAnnounceHandler.java | 0 .../events/SchemaPublishedHandler.java | 0 .../graphql/events/SchemaReferenceData.java | 0 .../events/SchemaUnpublishedHandler.java | 0 .../graphql/events/SchemaUsageHandler.java | 0 .../events/impl/SchemaMessageConsumers.java | 0 .../graphql/package-info.java | 0 .../graphql/query/QueryResult.java | 0 .../graphql/query/Queryable.java | 0 .../discovery/impl/AbstractRegistrarTest.java | 0 .../impl/AbstractRegistrationTest.java | 0 .../impl/ManagedServiceDiscoveryTest.java | 0 .../events/SchemaReferenceDataTest.java | 0 .../impl/SchemaMessageConsumersTest.java | 0 .../graphql/query/QueryResultTest.java | 0 settings.gradle | 2 +- 68 files changed, 43 insertions(+), 31 deletions(-) delete mode 100644 graphql-consumer/gradle.properties delete mode 100644 graphql-core/gradle.properties delete mode 100644 graphql-publisher/gradle.properties rename {graphql-consumer => graphql-service-consumer}/build.gradle (54%) create mode 100644 graphql-service-consumer/gradle.properties rename {graphql-consumer => graphql-service-consumer}/src/main/asciidoc/dataobjects.adoc (100%) rename {graphql-consumer => graphql-service-consumer}/src/main/java/io/engagingspaces/servicediscovery/graphql/client/GraphQLClient.java (100%) rename {graphql-consumer => graphql-service-consumer}/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrar.java (100%) rename {graphql-consumer => graphql-service-consumer}/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistration.java (100%) rename {graphql-consumer => graphql-service-consumer}/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/SchemaConsumer.java (100%) rename {graphql-consumer => graphql-service-consumer}/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java (100%) rename {graphql-consumer => graphql-service-consumer}/src/test/java/io/engagingspaces/servicediscovery/graphql/client/GraphQLClientTest.java (100%) rename {graphql-consumer => graphql-service-consumer}/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrarTest.java (100%) rename {graphql-consumer => graphql-service-consumer}/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrationTest.java (100%) rename {graphql-consumer => graphql-service-consumer}/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/SchemaConsumerTest.java (100%) rename {graphql-publisher => graphql-service-publisher}/build.gradle (91%) create mode 100644 graphql-service-publisher/gradle.properties rename {graphql-publisher => graphql-service-publisher}/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/PartialPublishException.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaDefinition.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisher.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrar.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistration.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/main/java/io/engagingspaces/servicediscovery/graphql/service/GraphQLService.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/main/java/io/engagingspaces/servicediscovery/graphql/service/impl/GraphQLServiceImpl.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/main/resources/META-INF/services/io.vertx.servicediscovery.spi.ServiceType (100%) rename {graphql-publisher => graphql-service-publisher}/src/test/java/io/engagingspaces/servicediscovery/graphql/data/DroidsSchema.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/test/java/io/engagingspaces/servicediscovery/graphql/data/StarWarsData.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/test/java/io/engagingspaces/servicediscovery/graphql/data/StarWarsSchema.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/PartialPublishExceptionTest.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisherTest.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrarTest.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrationTest.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/test/java/io/engagingspaces/servicediscovery/graphql/service/GraphQLServiceTest.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/test/java/io/engagingspaces/servicediscovery/graphql/service/impl/GraphQLServiceImplTest.java (100%) rename {graphql-publisher => graphql-service-publisher}/src/test/java/io/engagingspaces/servicediscovery/graphql/utils/MapBuilder.java (100%) rename {graphql-core => graphql-servicediscovery-core}/build.gradle (88%) create mode 100644 graphql-servicediscovery-core/gradle.properties rename {graphql-core => graphql-servicediscovery-core}/src/main/asciidoc/dataobjects.adoc (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/generated/io/engagingspaces/servicediscovery/graphql/query/QueryableVertxEBProxy.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/generated/io/engagingspaces/servicediscovery/graphql/query/QueryableVertxProxyHandler.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/Registrar.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/Registration.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrar.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistration.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/ManagedServiceDiscovery.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaAnnounceHandler.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaPublishedHandler.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaReferenceData.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaUnpublishedHandler.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaUsageHandler.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/events/impl/SchemaMessageConsumers.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/query/QueryResult.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/main/java/io/engagingspaces/servicediscovery/graphql/query/Queryable.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrarTest.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrationTest.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/ManagedServiceDiscoveryTest.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/test/java/io/engagingspaces/servicediscovery/graphql/events/SchemaReferenceDataTest.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/test/java/io/engagingspaces/servicediscovery/graphql/events/impl/SchemaMessageConsumersTest.java (100%) rename {graphql-core => graphql-servicediscovery-core}/src/test/java/io/engagingspaces/servicediscovery/graphql/query/QueryResultTest.java (100%) diff --git a/README.md b/README.md index 3b6e486..30d5f99 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ With GraphQL and this project you get an additional `graphql-service` discovery ### Using with Gradle -Publishers of a GraphQL schema need to add a dependency on `vertx-graphql-publisher`: +Publishers of a GraphQL schema need to add a dependency on `vertx-graphql-service-publisher`: ``` repositories { maven { @@ -116,10 +116,10 @@ repositories { } dependencies { - compile 'io.engagingspaces:vertx-graphql-publisher:0.9.0' + compile 'io.engagingspaces:vertx-graphql-service-publisher:0.9.1' } ``` -Consumers of a published GraphQL service that want to execute queries need a dependency on `vertx-graphql-consumer`: +Consumers of a published GraphQL service that want to execute queries need a dependency on `vertx-graphql-service-consumer`: ``` repositories { maven { @@ -128,7 +128,7 @@ repositories { } dependencies { - compile 'io.engagingspaces:vertx-graphql-consumer:0.9.0' + compile 'io.engagingspaces:vertx-graphql-service-consumer:0.9.1' } ``` ### Using with Maven @@ -172,22 +172,22 @@ In order to resolve the Bintray dependencies the following repository settings c ``` -Or you can add the repository defintion directly in your `pom.xml`. +Or you can add the repository definition directly in your `pom.xml`. When using Maven a publisher of a GraphQL schema needs to add the following dependency to the `pom.xml`: ``` io.engagingspaces - graphql-publisher - 0.9.0 + vertx-graphql-service-publisher + 0.9.1 ``` -And consumers of a GraphQL service need to add the `vertx-graphql-consumer` dependency to their `pom.xml`: +And consumers of a GraphQL service need to add the `vertx-graphql-service-consumer` dependency to their `pom.xml`: ``` io.engagingspaces - graphql-publisher - 0.9.0 + vertx-graphql-service-consumer + 0.9.1 ``` @@ -238,7 +238,7 @@ public class DroidsSchema implements SchemaDefinition { ### Using a `SchemaPublisher` implementation -Most convenient and easy to use is publication of GraphQL services using a [`SchemaPublisher`](https://github.com/engagingspaces/vertx-graphql-service-discovery/blob/master/graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisher.java). +Most convenient and easy to use is publication of GraphQL services using a [`SchemaPublisher`](https://github.com/engagingspaces/vertx-graphql-service-discovery/blob/master/graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisher.java). A schema publisher is implemented as an interface so you can attach it to any class without limiting its extensibility (e.g. your verticle can still derive from `AbstractVerticle`). The only requirement is that you provide a valid instance of a `SchemaRegistrar` from the overridden `SchemaPublisher.schemaRegistrar()` method. @@ -360,9 +360,13 @@ public class StarWarsClient extends AbstractVerticle implements SchemaConsumer { @Override public void schemaDiscoveryEvent(Record record) { - if (record.match(new JsonObject().put("name", "StarWarsQuery").put("status", "UP"))) { + if (record.match(new JsonObject().put("name", "DroidsQuery").put("status", "UP"))) { String schemaName = record.getName() // same as root query name in GraphQL schema - String graphQLQuery = "foo bar"; // your query here.. + String graphQLQuery = "query GetDroidNameR2(\\$id: String!) {\n" + + " droid(id: \\$id) {\n" + + " name\n" + + " }\n" + + "}"; JsonObject expected = new JsonObject(); executeQuery(discoveryName, schemaName, query, null, rh -> { @@ -370,7 +374,8 @@ public class StarWarsClient extends AbstractVerticle implements SchemaConsumer { QueryResult result = rh.result(); if (result.isSucceeded()) { JsonObject queryData = result.getData(); - // Do something interesting with your data.. + // Returns: {"droid":{"name": "R2-D2"}} + // Now do something interesting with your data.. } else { List errors = result.getErrors(); LOG.error("Failed to execute GraphQL query with " + errors.size() + " parse errors); diff --git a/build.gradle b/build.gradle index 5d9245c..c40bc76 100644 --- a/build.gradle +++ b/build.gradle @@ -35,9 +35,10 @@ subprojects { } group = 'io.engagingspaces' - version = '0.9.0' + version = '0.9.1' + sourceCompatibility = 1.8 - archivesBaseName = "vertx-$name-$rootProject.version" +// archivesBaseName = "vertx-$name" } task wrapper(type: Wrapper) { diff --git a/examples/droids-microservice/build.gradle b/examples/droids-microservice/build.gradle index 3e2fa68..4138fec 100644 --- a/examples/droids-microservice/build.gradle +++ b/examples/droids-microservice/build.gradle @@ -1,4 +1,4 @@ dependencies { - compile project(':graphql-publisher') + compile project(':graphql-service-publisher') compile "io.vertx:vertx-core:$vertxVersion" } \ No newline at end of file diff --git a/examples/starwars-client/build.gradle b/examples/starwars-client/build.gradle index 54e47ae..af947a8 100644 --- a/examples/starwars-client/build.gradle +++ b/examples/starwars-client/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':graphql-consumer') + compile project(':graphql-service-consumer') compile "io.vertx:vertx-core:$vertxVersion" compile "junit:junit:$junitVersion" } diff --git a/examples/starwars-microservice/build.gradle b/examples/starwars-microservice/build.gradle index 5a4b082..76ac38c 100644 --- a/examples/starwars-microservice/build.gradle +++ b/examples/starwars-microservice/build.gradle @@ -1,4 +1,4 @@ dependencies { - compile project(':graphql-publisher') + compile project(':graphql-service-publisher') compile "io.vertx:vertx-core:$vertxVersion" } diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle index fecb5aa..1f8438e 100644 --- a/gradle/publishing.gradle +++ b/gradle/publishing.gradle @@ -19,7 +19,7 @@ artifacts { publishing { publications { maven(MavenPublication) { - artifactId project.name + artifactId "vertx-$archivesBaseName" from components.java artifact sourcesJar { @@ -31,7 +31,7 @@ publishing { pom.withXml { asNode().children().last() + { def builder = delegate - builder.name project.name + builder.name projectTitle builder.description projectDescription builder.url 'https://github.com/engagingspaces/vertx-graphql-service-discovery' builder.licenses { @@ -50,6 +50,9 @@ publishing { builder.developer { builder.id 'aschrijver' builder.name 'Arnold Schrijver' + builder.url 'https://github.com/aschrijver/' + builder.organization 'engagingspaces' + builder.organizationUrl 'https://github.com/engagingspaces/' } } } diff --git a/graphql-consumer/gradle.properties b/graphql-consumer/gradle.properties deleted file mode 100644 index 45449a3..0000000 --- a/graphql-consumer/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -projectDescription = "Service discovery and querying of GraphQL schema's in Vert.x-based microservices environments" \ No newline at end of file diff --git a/graphql-core/gradle.properties b/graphql-core/gradle.properties deleted file mode 100644 index 93e3cf8..0000000 --- a/graphql-core/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -projectDescription = 'Base classes for GraphQL schema publishers and consumers in Vert.x microservices environments' diff --git a/graphql-publisher/gradle.properties b/graphql-publisher/gradle.properties deleted file mode 100644 index 2179c31..0000000 --- a/graphql-publisher/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -projectDescription = "Service discovery and querying of GraphQL schema's in Vert.x-based microservices environments" diff --git a/graphql-consumer/build.gradle b/graphql-service-consumer/build.gradle similarity index 54% rename from graphql-consumer/build.gradle rename to graphql-service-consumer/build.gradle index 21ca02e..da8286b 100644 --- a/graphql-consumer/build.gradle +++ b/graphql-service-consumer/build.gradle @@ -2,11 +2,11 @@ apply from: "$rootProject.projectDir/gradle/coverage.gradle" apply from: "$rootProject.projectDir/gradle/publishing.gradle" dependencies { - compile project(':graphql-core') + compile project(':graphql-servicediscovery-core') testCompile "junit:junit:$junitVersion" testCompile "io.vertx:vertx-unit:$vertxVersion" - testCompile project(path: ':graphql-publisher') - testCompile project(path: ':graphql-publisher', configuration: 'testOutput') + testCompile project(path: ':graphql-service-publisher') + testCompile project(path: ':graphql-service-publisher', configuration: 'testOutput') } \ No newline at end of file diff --git a/graphql-service-consumer/gradle.properties b/graphql-service-consumer/gradle.properties new file mode 100644 index 0000000..2cbf4c4 --- /dev/null +++ b/graphql-service-consumer/gradle.properties @@ -0,0 +1,2 @@ +projectTitle = Vert.x GraphQL Service Consumer +projectDescription = Service discovery and querying of GraphQL schema's in Vert.x-based microservices environments \ No newline at end of file diff --git a/graphql-consumer/src/main/asciidoc/dataobjects.adoc b/graphql-service-consumer/src/main/asciidoc/dataobjects.adoc similarity index 100% rename from graphql-consumer/src/main/asciidoc/dataobjects.adoc rename to graphql-service-consumer/src/main/asciidoc/dataobjects.adoc diff --git a/graphql-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/client/GraphQLClient.java b/graphql-service-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/client/GraphQLClient.java similarity index 100% rename from graphql-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/client/GraphQLClient.java rename to graphql-service-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/client/GraphQLClient.java diff --git a/graphql-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrar.java b/graphql-service-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrar.java similarity index 100% rename from graphql-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrar.java rename to graphql-service-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrar.java diff --git a/graphql-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistration.java b/graphql-service-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistration.java similarity index 100% rename from graphql-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistration.java rename to graphql-service-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistration.java diff --git a/graphql-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/SchemaConsumer.java b/graphql-service-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/SchemaConsumer.java similarity index 100% rename from graphql-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/SchemaConsumer.java rename to graphql-service-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/consumer/SchemaConsumer.java diff --git a/graphql-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java b/graphql-service-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java similarity index 100% rename from graphql-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java rename to graphql-service-consumer/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java diff --git a/graphql-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/client/GraphQLClientTest.java b/graphql-service-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/client/GraphQLClientTest.java similarity index 100% rename from graphql-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/client/GraphQLClientTest.java rename to graphql-service-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/client/GraphQLClientTest.java diff --git a/graphql-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrarTest.java b/graphql-service-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrarTest.java similarity index 100% rename from graphql-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrarTest.java rename to graphql-service-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrarTest.java diff --git a/graphql-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrationTest.java b/graphql-service-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrationTest.java similarity index 100% rename from graphql-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrationTest.java rename to graphql-service-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/DiscoveryRegistrationTest.java diff --git a/graphql-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/SchemaConsumerTest.java b/graphql-service-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/SchemaConsumerTest.java similarity index 100% rename from graphql-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/SchemaConsumerTest.java rename to graphql-service-consumer/src/test/java/io/engagingspaces/servicediscovery/graphql/consumer/SchemaConsumerTest.java diff --git a/graphql-publisher/build.gradle b/graphql-service-publisher/build.gradle similarity index 91% rename from graphql-publisher/build.gradle rename to graphql-service-publisher/build.gradle index d6cc1cc..436590e 100644 --- a/graphql-publisher/build.gradle +++ b/graphql-service-publisher/build.gradle @@ -2,7 +2,7 @@ apply from: "$rootProject.projectDir/gradle/coverage.gradle" apply from: "$rootProject.projectDir/gradle/publishing.gradle" dependencies { - compile project(':graphql-core') + compile project(':graphql-servicediscovery-core') compile "io.vertx:vertx-core:$vertxVersion" compile "io.vertx:vertx-service-discovery:$vertxVersion" compile "com.graphql-java:graphql-java:$graphqlVersion" diff --git a/graphql-service-publisher/gradle.properties b/graphql-service-publisher/gradle.properties new file mode 100644 index 0000000..102f581 --- /dev/null +++ b/graphql-service-publisher/gradle.properties @@ -0,0 +1,2 @@ +projectTitle = Vert.x GraphQL Service Publisher +projectDescription = Publishing and service discovery of GraphQL schema's in Vert.x-based microservices environments diff --git a/graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java b/graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java similarity index 100% rename from graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java rename to graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java diff --git a/graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/PartialPublishException.java b/graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/PartialPublishException.java similarity index 100% rename from graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/PartialPublishException.java rename to graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/PartialPublishException.java diff --git a/graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaDefinition.java b/graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaDefinition.java similarity index 100% rename from graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaDefinition.java rename to graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaDefinition.java diff --git a/graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisher.java b/graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisher.java similarity index 100% rename from graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisher.java rename to graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisher.java diff --git a/graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrar.java b/graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrar.java similarity index 100% rename from graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrar.java rename to graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrar.java diff --git a/graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistration.java b/graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistration.java similarity index 100% rename from graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistration.java rename to graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistration.java diff --git a/graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/service/GraphQLService.java b/graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/service/GraphQLService.java similarity index 100% rename from graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/service/GraphQLService.java rename to graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/service/GraphQLService.java diff --git a/graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/service/impl/GraphQLServiceImpl.java b/graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/service/impl/GraphQLServiceImpl.java similarity index 100% rename from graphql-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/service/impl/GraphQLServiceImpl.java rename to graphql-service-publisher/src/main/java/io/engagingspaces/servicediscovery/graphql/service/impl/GraphQLServiceImpl.java diff --git a/graphql-publisher/src/main/resources/META-INF/services/io.vertx.servicediscovery.spi.ServiceType b/graphql-service-publisher/src/main/resources/META-INF/services/io.vertx.servicediscovery.spi.ServiceType similarity index 100% rename from graphql-publisher/src/main/resources/META-INF/services/io.vertx.servicediscovery.spi.ServiceType rename to graphql-service-publisher/src/main/resources/META-INF/services/io.vertx.servicediscovery.spi.ServiceType diff --git a/graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/DroidsSchema.java b/graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/DroidsSchema.java similarity index 100% rename from graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/DroidsSchema.java rename to graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/DroidsSchema.java diff --git a/graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/StarWarsData.java b/graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/StarWarsData.java similarity index 100% rename from graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/StarWarsData.java rename to graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/StarWarsData.java diff --git a/graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/StarWarsSchema.java b/graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/StarWarsSchema.java similarity index 100% rename from graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/StarWarsSchema.java rename to graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/data/StarWarsSchema.java diff --git a/graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/PartialPublishExceptionTest.java b/graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/PartialPublishExceptionTest.java similarity index 100% rename from graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/PartialPublishExceptionTest.java rename to graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/PartialPublishExceptionTest.java diff --git a/graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisherTest.java b/graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisherTest.java similarity index 100% rename from graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisherTest.java rename to graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaPublisherTest.java diff --git a/graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrarTest.java b/graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrarTest.java similarity index 100% rename from graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrarTest.java rename to graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrarTest.java diff --git a/graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrationTest.java b/graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrationTest.java similarity index 100% rename from graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrationTest.java rename to graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/publisher/SchemaRegistrationTest.java diff --git a/graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/service/GraphQLServiceTest.java b/graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/service/GraphQLServiceTest.java similarity index 100% rename from graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/service/GraphQLServiceTest.java rename to graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/service/GraphQLServiceTest.java diff --git a/graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/service/impl/GraphQLServiceImplTest.java b/graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/service/impl/GraphQLServiceImplTest.java similarity index 100% rename from graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/service/impl/GraphQLServiceImplTest.java rename to graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/service/impl/GraphQLServiceImplTest.java diff --git a/graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/utils/MapBuilder.java b/graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/utils/MapBuilder.java similarity index 100% rename from graphql-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/utils/MapBuilder.java rename to graphql-service-publisher/src/test/java/io/engagingspaces/servicediscovery/graphql/utils/MapBuilder.java diff --git a/graphql-core/build.gradle b/graphql-servicediscovery-core/build.gradle similarity index 88% rename from graphql-core/build.gradle rename to graphql-servicediscovery-core/build.gradle index 879b753..e449442 100644 --- a/graphql-core/build.gradle +++ b/graphql-servicediscovery-core/build.gradle @@ -7,8 +7,8 @@ dependencies { compile "io.vertx:vertx-service-proxy:$vertxVersion" compile "io.vertx:vertx-service-discovery:$vertxVersion" - testCompile project(path: ':graphql-publisher') - testCompile project(path: ':graphql-publisher', configuration: 'testOutput') + testCompile project(path: ':graphql-service-publisher') + testCompile project(path: ':graphql-service-publisher', configuration: 'testOutput') testCompile "junit:junit:$junitVersion" testCompile "io.vertx:vertx-unit:$vertxVersion" diff --git a/graphql-servicediscovery-core/gradle.properties b/graphql-servicediscovery-core/gradle.properties new file mode 100644 index 0000000..501214b --- /dev/null +++ b/graphql-servicediscovery-core/gradle.properties @@ -0,0 +1,2 @@ +projectTitle = Vert.x GraphQL Service Discovery Core +projectDescription = Base classes for GraphQL schema publishers and consumers in Vert.x microservices environments diff --git a/graphql-core/src/main/asciidoc/dataobjects.adoc b/graphql-servicediscovery-core/src/main/asciidoc/dataobjects.adoc similarity index 100% rename from graphql-core/src/main/asciidoc/dataobjects.adoc rename to graphql-servicediscovery-core/src/main/asciidoc/dataobjects.adoc diff --git a/graphql-core/src/main/generated/io/engagingspaces/servicediscovery/graphql/query/QueryableVertxEBProxy.java b/graphql-servicediscovery-core/src/main/generated/io/engagingspaces/servicediscovery/graphql/query/QueryableVertxEBProxy.java similarity index 100% rename from graphql-core/src/main/generated/io/engagingspaces/servicediscovery/graphql/query/QueryableVertxEBProxy.java rename to graphql-servicediscovery-core/src/main/generated/io/engagingspaces/servicediscovery/graphql/query/QueryableVertxEBProxy.java diff --git a/graphql-core/src/main/generated/io/engagingspaces/servicediscovery/graphql/query/QueryableVertxProxyHandler.java b/graphql-servicediscovery-core/src/main/generated/io/engagingspaces/servicediscovery/graphql/query/QueryableVertxProxyHandler.java similarity index 100% rename from graphql-core/src/main/generated/io/engagingspaces/servicediscovery/graphql/query/QueryableVertxProxyHandler.java rename to graphql-servicediscovery-core/src/main/generated/io/engagingspaces/servicediscovery/graphql/query/QueryableVertxProxyHandler.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/Registrar.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/Registrar.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/Registrar.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/Registrar.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/Registration.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/Registration.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/Registration.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/Registration.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrar.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrar.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrar.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrar.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistration.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistration.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistration.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistration.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/ManagedServiceDiscovery.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/ManagedServiceDiscovery.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/ManagedServiceDiscovery.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/ManagedServiceDiscovery.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaAnnounceHandler.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaAnnounceHandler.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaAnnounceHandler.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaAnnounceHandler.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaPublishedHandler.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaPublishedHandler.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaPublishedHandler.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaPublishedHandler.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaReferenceData.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaReferenceData.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaReferenceData.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaReferenceData.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaUnpublishedHandler.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaUnpublishedHandler.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaUnpublishedHandler.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaUnpublishedHandler.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaUsageHandler.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaUsageHandler.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaUsageHandler.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/SchemaUsageHandler.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/impl/SchemaMessageConsumers.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/impl/SchemaMessageConsumers.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/impl/SchemaMessageConsumers.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/events/impl/SchemaMessageConsumers.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/package-info.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/query/QueryResult.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/query/QueryResult.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/query/QueryResult.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/query/QueryResult.java diff --git a/graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/query/Queryable.java b/graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/query/Queryable.java similarity index 100% rename from graphql-core/src/main/java/io/engagingspaces/servicediscovery/graphql/query/Queryable.java rename to graphql-servicediscovery-core/src/main/java/io/engagingspaces/servicediscovery/graphql/query/Queryable.java diff --git a/graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrarTest.java b/graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrarTest.java similarity index 100% rename from graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrarTest.java rename to graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrarTest.java diff --git a/graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrationTest.java b/graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrationTest.java similarity index 100% rename from graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrationTest.java rename to graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/AbstractRegistrationTest.java diff --git a/graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/ManagedServiceDiscoveryTest.java b/graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/ManagedServiceDiscoveryTest.java similarity index 100% rename from graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/ManagedServiceDiscoveryTest.java rename to graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/discovery/impl/ManagedServiceDiscoveryTest.java diff --git a/graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/events/SchemaReferenceDataTest.java b/graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/events/SchemaReferenceDataTest.java similarity index 100% rename from graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/events/SchemaReferenceDataTest.java rename to graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/events/SchemaReferenceDataTest.java diff --git a/graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/events/impl/SchemaMessageConsumersTest.java b/graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/events/impl/SchemaMessageConsumersTest.java similarity index 100% rename from graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/events/impl/SchemaMessageConsumersTest.java rename to graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/events/impl/SchemaMessageConsumersTest.java diff --git a/graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/query/QueryResultTest.java b/graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/query/QueryResultTest.java similarity index 100% rename from graphql-core/src/test/java/io/engagingspaces/servicediscovery/graphql/query/QueryResultTest.java rename to graphql-servicediscovery-core/src/test/java/io/engagingspaces/servicediscovery/graphql/query/QueryResultTest.java diff --git a/settings.gradle b/settings.gradle index cbe7f9c..a847859 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ rootProject.name='vertx-graphql-service-discovery' -include 'graphql-core', 'graphql-publisher', 'graphql-consumer', +include 'graphql-servicediscovery-core', 'graphql-service-publisher', 'graphql-service-consumer', ':examples:droids-microservice', ':examples:starwars-microservice', ':examples:starwars-client'