Merge pull request #29 from specmesh/publishing-actions-repackage

re-package for publish
specmesh · Mar 7, 2024 · 98f7ceb · 98f7ceb
2 parents 77b9bc4 + 4543298
commit 98f7ceb
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 33 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
 
 }
-group = "io.specmesh"
+group = "io.specmesh.blackbox"
 project.version = scmVersion.version
 version = scmVersion.version
 

diff --git a/demo-test-containers-schema-ref/src/main/java/io/specmesh/blackbox/Main.java b/demo-test-containers-schema-ref/src/main/java/io/specmesh/blackbox/Main.java
@@ -18,7 +18,7 @@
 
 import io.confluent.kafka.serializers.KafkaAvroSerializer;
 import io.specmesh.blackbox.example.shared.Currency;
-import io.specmesh.blackbox.testharness.kafka.clients.TestClients;
+import io.specmesh.blackbox.kafka.clients.TestClients;
 import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/demo-test-containers-schema-ref/src/main/java/io/specmesh/blackbox/Trade.java b/demo-test-containers-schema-ref/src/main/java/io/specmesh/blackbox/Trade.java
@@ -17,7 +17,7 @@
 package io.specmesh.blackbox;
 
 import io.specmesh.blackbox.example.shared.Currency;
-import io.specmesh.blackbox.testharness.kafka.clients.AvroSerde;
+import io.specmesh.blackbox.kafka.clients.AvroSerde;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/...est-containers-schema-ref/src/main/java/io/specmesh/blackbox/example/shared/Currency.java b/...est-containers-schema-ref/src/main/java/io/specmesh/blackbox/example/shared/Currency.java
@@ -16,7 +16,7 @@
 
 package io.specmesh.blackbox.example.shared;
 
-import io.specmesh.blackbox.testharness.kafka.clients.AvroSerde;
+import io.specmesh.blackbox.kafka.clients.AvroSerde;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/demo-test-containers-schema-ref/src/test/java/io/specmesh/blackbox/SchemaRefTest.java b/demo-test-containers-schema-ref/src/test/java/io/specmesh/blackbox/SchemaRefTest.java
@@ -29,9 +29,10 @@
 import io.confluent.kafka.serializers.KafkaAvroSerializerConfig;
 import io.specmesh.avro.random.generator.API;
 import io.specmesh.blackbox.example.shared.Currency;
-import io.specmesh.blackbox.testharness.kafka.DockerKafkaEnvironment;
-import io.specmesh.blackbox.testharness.kafka.KafkaEnvironment;
-import io.specmesh.blackbox.testharness.kafka.clients.TestClients;
+import io.specmesh.blackbox.kafka.DockerKafkaEnvironment;
+import io.specmesh.blackbox.kafka.KafkaEnvironment;
+import io.specmesh.blackbox.kafka.clients.Clients;
+import io.specmesh.blackbox.kafka.clients.TestClients;
 import io.specmesh.cli.Provision;
 import io.specmesh.kafka.provision.Status;
 import java.io.IOException;
@@ -94,9 +95,7 @@ void validateSerialisationWorksBothWays() throws Exception {
                         1,
                         true);
 
-        final var srClient =
-                io.specmesh.blackbox.testharness.kafka.clients.Clients.srClient(
-                        KAFKA_ENV.schemeRegistryServer());
+        final var srClient = Clients.srClient(KAFKA_ENV.schemeRegistryServer());
 
         //  register both schemas prior for SerDe to work
         srClient.register("com.example.shared.Currency", currencySchema);

diff --git a/demo-test-containers-simple/src/main/java/io/specmesh/blackbox/Main.java b/demo-test-containers-simple/src/main/java/io/specmesh/blackbox/Main.java
@@ -17,9 +17,9 @@
 package io.specmesh.blackbox;
 
 import io.confluent.kafka.serializers.KafkaAvroSerializer;
+import io.specmesh.blackbox.kafka.clients.TestClients;
 import io.specmesh.blackbox.passengers.Passenger;
 import io.specmesh.blackbox.signedupvalue.UserSignedUp;
-import io.specmesh.blackbox.testharness.kafka.clients.TestClients;
 import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/demo-test-containers-simple/src/main/java/io/specmesh/blackbox/passengers/Passenger.java b/demo-test-containers-simple/src/main/java/io/specmesh/blackbox/passengers/Passenger.java
@@ -16,7 +16,7 @@
 
 package io.specmesh.blackbox.passengers;
 
-import io.specmesh.blackbox.testharness.kafka.clients.AvroSerde;
+import io.specmesh.blackbox.kafka.clients.AvroSerde;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/...test-containers-simple/src/main/java/io/specmesh/blackbox/signedupvalue/UserSignedUp.java b/...test-containers-simple/src/main/java/io/specmesh/blackbox/signedupvalue/UserSignedUp.java
@@ -16,7 +16,7 @@
 
 package io.specmesh.blackbox.signedupvalue;
 
-import io.specmesh.blackbox.testharness.kafka.clients.AvroSerde;
+import io.specmesh.blackbox.kafka.clients.AvroSerde;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/demo-test-containers-simple/src/test/java/io/specmesh/blackbox/MainTest.java b/demo-test-containers-simple/src/test/java/io/specmesh/blackbox/MainTest.java
@@ -23,9 +23,10 @@
 import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
 import io.confluent.kafka.serializers.KafkaAvroSerializer;
 import io.specmesh.avro.random.generator.API;
-import io.specmesh.blackbox.testharness.kafka.DockerKafkaEnvironment;
-import io.specmesh.blackbox.testharness.kafka.KafkaEnvironment;
-import io.specmesh.blackbox.testharness.kafka.clients.TestClients;
+import io.specmesh.blackbox.kafka.DockerKafkaEnvironment;
+import io.specmesh.blackbox.kafka.KafkaEnvironment;
+import io.specmesh.blackbox.kafka.clients.Clients;
+import io.specmesh.blackbox.kafka.clients.TestClients;
 import io.specmesh.cli.Provision;
 import io.specmesh.kafka.provision.Status;
 import java.io.IOException;
@@ -86,9 +87,7 @@ void doThings() throws Exception {
     }
 
     private static void sanityCheckSchemaCreation() throws IOException, RestClientException {
-        try (var srClient =
-                io.specmesh.blackbox.testharness.kafka.clients.Clients.srClient(
-                        KAFKA_ENV.schemeRegistryServer())) {
+        try (var srClient = Clients.srClient(KAFKA_ENV.schemeRegistryServer())) {
             final var allSubjects = srClient.getAllSubjects();
             assertThat("Should be 2 schemas in 2 subjects", allSubjects, hasSize(2));
             allSubjects.forEach(

diff --git a/...pecmesh/blackbox/testharness/Library.java → ...in/java/io/specmesh/blackbox/Library.java b/...pecmesh/blackbox/testharness/Library.java → ...in/java/io/specmesh/blackbox/Library.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.specmesh.blackbox.testharness;
+package io.specmesh.blackbox;
 
 public class Library {
     public boolean someLibraryMethod() {

diff --git a/...harness/kafka/DockerKafkaEnvironment.java → ...lackbox/kafka/DockerKafkaEnvironment.java b/...harness/kafka/DockerKafkaEnvironment.java → ...lackbox/kafka/DockerKafkaEnvironment.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package io.specmesh.blackbox.testharness.kafka;
+package io.specmesh.blackbox.kafka;
 
 import static java.util.Objects.requireNonNull;
 
 import io.confluent.kafka.schemaregistry.avro.AvroSchemaProvider;
 import io.confluent.kafka.schemaregistry.client.CachedSchemaRegistryClient;
 import io.confluent.kafka.schemaregistry.json.JsonSchemaProvider;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaProvider;
-import io.specmesh.blackbox.testharness.kafka.clients.Clients;
-import io.specmesh.blackbox.testharness.kafka.schema.SchemaRegistryContainer;
+import io.specmesh.blackbox.kafka.clients.Clients;
+import io.specmesh.blackbox.kafka.schema.SchemaRegistryContainer;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.HashMap;

diff --git a/...x/testharness/kafka/KafkaEnvironment.java → ...mesh/blackbox/kafka/KafkaEnvironment.java b/...x/testharness/kafka/KafkaEnvironment.java → ...mesh/blackbox/kafka/KafkaEnvironment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.specmesh.blackbox.testharness.kafka;
+package io.specmesh.blackbox.kafka;
 
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
 import org.apache.kafka.clients.admin.Admin;

diff --git a/.../testharness/kafka/clients/AvroSerde.java → ...esh/blackbox/kafka/clients/AvroSerde.java b/.../testharness/kafka/clients/AvroSerde.java → ...esh/blackbox/kafka/clients/AvroSerde.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.specmesh.blackbox.testharness.kafka.clients;
+package io.specmesh.blackbox.kafka.clients;
 
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
 import io.confluent.kafka.serializers.KafkaAvroDeserializer;

diff --git a/...ox/testharness/kafka/clients/Clients.java → ...cmesh/blackbox/kafka/clients/Clients.java b/...ox/testharness/kafka/clients/Clients.java → ...cmesh/blackbox/kafka/clients/Clients.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.specmesh.blackbox.testharness.kafka.clients;
+package io.specmesh.blackbox.kafka.clients;
 
 import io.confluent.kafka.schemaregistry.avro.AvroSchemaProvider;
 import io.confluent.kafka.schemaregistry.client.CachedSchemaRegistryClient;

diff --git a/...estharness/kafka/clients/TestClients.java → ...h/blackbox/kafka/clients/TestClients.java b/...estharness/kafka/clients/TestClients.java → ...h/blackbox/kafka/clients/TestClients.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.specmesh.blackbox.testharness.kafka.clients;
+package io.specmesh.blackbox.kafka.clients;
 
 import java.util.HashMap;
 import java.util.List;
@@ -140,7 +140,7 @@ private static <K, V> Producer<K, V> producer(
             final String userName,
             final Map<String, Object> additionalProps) {
         final Map<String, Object> props =
-                io.specmesh.blackbox.testharness.kafka.clients.Clients.producerProperties(
+                Clients.producerProperties(
                         domainId,
                         UUID.randomUUID().toString(),
                         bootstrapUrl,
@@ -150,9 +150,7 @@ private static <K, V> Producer<K, V> producer(
                         false,
                         additionalProps);
 
-        props.putAll(
-                io.specmesh.blackbox.testharness.kafka.clients.Clients.clientSaslAuthProperties(
-                        userName, userName + "-secret"));
+        props.putAll(Clients.clientSaslAuthProperties(userName, userName + "-secret"));
         valueSerializer.configure(props, false);
         return new KafkaProducer<>(props, keySerializer, (Serializer<V>) valueSerializer);
     }

diff --git a/...kafka/schema/SchemaRegistryContainer.java → ...kafka/schema/SchemaRegistryContainer.java b/...kafka/schema/SchemaRegistryContainer.java → ...kafka/schema/SchemaRegistryContainer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.specmesh.blackbox.testharness.kafka.schema;
+package io.specmesh.blackbox.kafka.schema;
 
 import java.net.MalformedURLException;
 import java.net.URL;

diff --git a/...esh/blackbox/testharness/LibraryTest.java → ...ava/io/specmesh/blackbox/LibraryTest.java b/...esh/blackbox/testharness/LibraryTest.java → ...ava/io/specmesh/blackbox/LibraryTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.specmesh.blackbox.testharness;
+package io.specmesh.blackbox;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;