From e1a8d88363df2def612123acaeaeb85ef0cb7675 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 05:02:28 +0200
Subject: [PATCH 1/7] Update folder and class packages
---
src/jvm/knet/pom.xml | 27 -------------------
.../clients/consumer/KNetConsumer.java | 2 +-
.../consumer/KNetConsumerCallback.java | 2 +-
.../clients/producer/KNetProducer.java | 2 +-
.../serialization/ByteBufferDeserializer.java | 2 +-
.../serialization/ByteBufferSerializer.java | 2 +-
.../common/serialization/Serdes.java | 2 +-
.../connect/KNetConnectLogging.java | 2 +-
.../connect/KNetConnectProxy.java | 4 +--
.../connect/cli/ConnectDistributed.java | 2 +-
.../connect/cli/ConnectStandalone.java | 2 +-
.../connect/sink/KNetSinkConnector.java | 6 ++---
.../connect/sink/KNetSinkTask.java | 6 ++---
.../connect/source/KNetSourceConnector.java | 6 ++---
.../connect/source/KNetSourceTask.java | 6 ++---
.../kstream/KNetPredicateEqualityTest.java | 2 +-
.../streams/kstream/TransformerSupplier.java | 4 +--
.../kstream/ValueTransformerSupplier.java | 2 +-
.../ValueTransformerWithKeySupplier.java | 2 +-
.../api/FixedKeyProcessorSupplier.java | 2 +-
.../processor/api/ProcessorSupplier.java | 2 +-
.../Streams/Kstream/TransformerSupplier.cs | 2 +-
.../Kstream/ValueTransformerSupplier.cs | 2 +-
.../ValueTransformerWithKeySupplier.cs | 2 +-
.../Api/FixedKeyProcessorSupplier.cs | 2 +-
.../Processor/Api/ProcessorSupplier.cs | 2 +-
.../Connect/KNetConnectDistributed.cs | 2 +-
.../Specific/Connect/KNetConnectStandalone.cs | 2 +-
.../KNet/Specific/Consumer/KNetConsumer.cs | 2 +-
.../Specific/Consumer/KNetConsumerCallback.cs | 2 +-
.../KNet/Specific/Producer/KNetProducer.cs | 2 +-
.../Serialization/ByteBufferSupport.cs | 6 ++---
.../Streams/Kstream/PredicateEqualityTest.cs | 2 +-
33 files changed, 44 insertions(+), 71 deletions(-)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/clients/consumer/KNetConsumer.java (97%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/clients/consumer/KNetConsumerCallback.java (96%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/clients/producer/KNetProducer.java (98%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/common/serialization/ByteBufferDeserializer.java (95%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/common/serialization/ByteBufferSerializer.java (97%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/common/serialization/Serdes.java (95%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/connect/KNetConnectLogging.java (96%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/connect/KNetConnectProxy.java (98%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/connect/cli/ConnectDistributed.java (99%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/connect/cli/ConnectStandalone.java (99%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/connect/sink/KNetSinkConnector.java (97%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/connect/sink/KNetSinkTask.java (96%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/connect/source/KNetSourceConnector.java (98%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/connect/source/KNetSourceTask.java (96%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/streams/kstream/KNetPredicateEqualityTest.java (96%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/streams/kstream/TransformerSupplier.java (92%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/streams/kstream/ValueTransformerSupplier.java (96%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/streams/kstream/ValueTransformerWithKeySupplier.java (96%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/streams/processor/api/FixedKeyProcessorSupplier.java (96%)
rename src/jvm/knet/src/main/java/org/mases/knet/{ => developed}/streams/processor/api/ProcessorSupplier.java (96%)
diff --git a/src/jvm/knet/pom.xml b/src/jvm/knet/pom.xml
index 7fcd5d26af..aa56f2183c 100644
--- a/src/jvm/knet/pom.xml
+++ b/src/jvm/knet/pom.xml
@@ -164,33 +164,6 @@
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 3.6.0
-
-
- https://www.jcobridge.com/api-java
-
- true
-
-
-
- JCOBridge
- JCOBridge
- ${jcobridgeVersion}
-
-
-
-
-
- attach-javadocs
-
- jar
-
-
-
-
org.apache.maven.plugins
maven-gpg-plugin
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/clients/consumer/KNetConsumer.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/clients/consumer/KNetConsumer.java
similarity index 97%
rename from src/jvm/knet/src/main/java/org/mases/knet/clients/consumer/KNetConsumer.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/clients/consumer/KNetConsumer.java
index 80729c0283..43e262b5a0 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/clients/consumer/KNetConsumer.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/clients/consumer/KNetConsumer.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.clients.consumer;
+package org.mases.knet.developed.clients.consumer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.consumer.ConsumerRecords;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/clients/consumer/KNetConsumerCallback.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/clients/consumer/KNetConsumerCallback.java
similarity index 96%
rename from src/jvm/knet/src/main/java/org/mases/knet/clients/consumer/KNetConsumerCallback.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/clients/consumer/KNetConsumerCallback.java
index 02ce2c6b10..5cfe09a820 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/clients/consumer/KNetConsumerCallback.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/clients/consumer/KNetConsumerCallback.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.clients.consumer;
+package org.mases.knet.developed.clients.consumer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.annotation.InterfaceStability;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/clients/producer/KNetProducer.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/clients/producer/KNetProducer.java
similarity index 98%
rename from src/jvm/knet/src/main/java/org/mases/knet/clients/producer/KNetProducer.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/clients/producer/KNetProducer.java
index 42da734a64..cba06431f8 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/clients/producer/KNetProducer.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/clients/producer/KNetProducer.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.clients.producer;
+package org.mases.knet.developed.clients.producer;
import org.apache.kafka.clients.producer.Callback;
import org.apache.kafka.clients.producer.KafkaProducer;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/common/serialization/ByteBufferDeserializer.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/common/serialization/ByteBufferDeserializer.java
similarity index 95%
rename from src/jvm/knet/src/main/java/org/mases/knet/common/serialization/ByteBufferDeserializer.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/common/serialization/ByteBufferDeserializer.java
index 4b201a22cf..d7030ed2e1 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/common/serialization/ByteBufferDeserializer.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/common/serialization/ByteBufferDeserializer.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.common.serialization;
+package org.mases.knet.developed.common.serialization;
import org.apache.kafka.common.serialization.Deserializer;
import org.mases.jcobridge.JCSharedBuffer;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/common/serialization/ByteBufferSerializer.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/common/serialization/ByteBufferSerializer.java
similarity index 97%
rename from src/jvm/knet/src/main/java/org/mases/knet/common/serialization/ByteBufferSerializer.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/common/serialization/ByteBufferSerializer.java
index 345260e081..638717376c 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/common/serialization/ByteBufferSerializer.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/common/serialization/ByteBufferSerializer.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.common.serialization;
+package org.mases.knet.developed.common.serialization;
import org.apache.kafka.common.serialization.Serializer;
import org.mases.jcobridge.JCSharedBuffer;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/common/serialization/Serdes.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/common/serialization/Serdes.java
similarity index 95%
rename from src/jvm/knet/src/main/java/org/mases/knet/common/serialization/Serdes.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/common/serialization/Serdes.java
index 97bedf1aca..3a7a76a263 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/common/serialization/Serdes.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/common/serialization/Serdes.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.common.serialization;
+package org.mases.knet.developed.common.serialization;
import org.apache.kafka.common.serialization.Serde;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/connect/KNetConnectLogging.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/KNetConnectLogging.java
similarity index 96%
rename from src/jvm/knet/src/main/java/org/mases/knet/connect/KNetConnectLogging.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/connect/KNetConnectLogging.java
index 74b531019e..f801c38d56 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/connect/KNetConnectLogging.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/KNetConnectLogging.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.connect;
+package org.mases.knet.developed.connect;
// imported from org.slf4j.Logger
public interface KNetConnectLogging {
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/connect/KNetConnectProxy.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/KNetConnectProxy.java
similarity index 98%
rename from src/jvm/knet/src/main/java/org/mases/knet/connect/KNetConnectProxy.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/connect/KNetConnectProxy.java
index 9fbc8304ef..6303dbd3c9 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/connect/KNetConnectProxy.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/KNetConnectProxy.java
@@ -16,13 +16,13 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.connect;
+package org.mases.knet.developed.connect;
import org.apache.kafka.common.config.AbstractConfig;
import org.apache.kafka.common.config.ConfigDef;
import org.apache.kafka.common.config.ConfigException;
import org.mases.jcobridge.*;
-import org.mases.knet.connect.source.KNetSourceTask;
+import org.mases.knet.developed.connect.source.KNetSourceTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/connect/cli/ConnectDistributed.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/cli/ConnectDistributed.java
similarity index 99%
rename from src/jvm/knet/src/main/java/org/mases/knet/connect/cli/ConnectDistributed.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/connect/cli/ConnectDistributed.java
index e69489de8b..555bb6061c 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/connect/cli/ConnectDistributed.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/cli/ConnectDistributed.java
@@ -18,7 +18,7 @@
// Copied from original Apache Kafka source file ConnectDistributed.java
-package org.mases.knet.connect.cli;
+package org.mases.knet.developed.connect.cli;
import org.apache.kafka.common.utils.Exit;
import org.apache.kafka.common.utils.Time;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/connect/cli/ConnectStandalone.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/cli/ConnectStandalone.java
similarity index 99%
rename from src/jvm/knet/src/main/java/org/mases/knet/connect/cli/ConnectStandalone.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/connect/cli/ConnectStandalone.java
index 96c6f188de..9363b04ac8 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/connect/cli/ConnectStandalone.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/cli/ConnectStandalone.java
@@ -18,7 +18,7 @@
// Copied from original Apache Kafka source file ConnectStandalone.java
-package org.mases.knet.connect.cli;
+package org.mases.knet.developed.connect.cli;
import org.apache.kafka.common.utils.Exit;
import org.apache.kafka.common.utils.Time;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/connect/sink/KNetSinkConnector.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/sink/KNetSinkConnector.java
similarity index 97%
rename from src/jvm/knet/src/main/java/org/mases/knet/connect/sink/KNetSinkConnector.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/connect/sink/KNetSinkConnector.java
index 65c6cf68b3..ee0a07c9e3 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/connect/sink/KNetSinkConnector.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/sink/KNetSinkConnector.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.connect.sink;
+package org.mases.knet.developed.connect.sink;
import org.apache.kafka.common.config.ConfigDef;
import org.apache.kafka.connect.connector.Task;
@@ -24,8 +24,8 @@
import org.apache.kafka.connect.sink.SinkConnector;
import org.apache.kafka.connect.sink.SinkConnectorContext;
import org.mases.jcobridge.*;
-import org.mases.knet.connect.KNetConnectLogging;
-import org.mases.knet.connect.KNetConnectProxy;
+import org.mases.knet.developed.connect.KNetConnectLogging;
+import org.mases.knet.developed.connect.KNetConnectProxy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/connect/sink/KNetSinkTask.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/sink/KNetSinkTask.java
similarity index 96%
rename from src/jvm/knet/src/main/java/org/mases/knet/connect/sink/KNetSinkTask.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/connect/sink/KNetSinkTask.java
index 49e01cbeb2..7c2b82a758 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/connect/sink/KNetSinkTask.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/sink/KNetSinkTask.java
@@ -16,15 +16,15 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.connect.sink;
+package org.mases.knet.developed.connect.sink;
import org.apache.kafka.connect.errors.ConnectException;
import org.apache.kafka.connect.sink.SinkRecord;
import org.apache.kafka.connect.sink.SinkTask;
import org.apache.kafka.connect.sink.SinkTaskContext;
import org.mases.jcobridge.*;
-import org.mases.knet.connect.KNetConnectLogging;
-import org.mases.knet.connect.KNetConnectProxy;
+import org.mases.knet.developed.connect.KNetConnectLogging;
+import org.mases.knet.developed.connect.KNetConnectProxy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/connect/source/KNetSourceConnector.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/source/KNetSourceConnector.java
similarity index 98%
rename from src/jvm/knet/src/main/java/org/mases/knet/connect/source/KNetSourceConnector.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/connect/source/KNetSourceConnector.java
index 2fef5855e9..3b0ad007ab 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/connect/source/KNetSourceConnector.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/source/KNetSourceConnector.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.connect.source;
+package org.mases.knet.developed.connect.source;
import org.apache.kafka.common.config.AbstractConfig;
import org.apache.kafka.common.config.ConfigDef;
@@ -24,8 +24,8 @@
import org.apache.kafka.connect.errors.ConnectException;
import org.apache.kafka.connect.source.*;
import org.mases.jcobridge.*;
-import org.mases.knet.connect.KNetConnectLogging;
-import org.mases.knet.connect.KNetConnectProxy;
+import org.mases.knet.developed.connect.KNetConnectLogging;
+import org.mases.knet.developed.connect.KNetConnectProxy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/connect/source/KNetSourceTask.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/source/KNetSourceTask.java
similarity index 96%
rename from src/jvm/knet/src/main/java/org/mases/knet/connect/source/KNetSourceTask.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/connect/source/KNetSourceTask.java
index 93ed471f15..21cb0dc53e 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/connect/source/KNetSourceTask.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/connect/source/KNetSourceTask.java
@@ -16,15 +16,15 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.connect.source;
+package org.mases.knet.developed.connect.source;
import org.apache.kafka.connect.errors.ConnectException;
import org.apache.kafka.connect.source.SourceRecord;
import org.apache.kafka.connect.source.SourceTask;
import org.apache.kafka.connect.source.SourceTaskContext;
import org.mases.jcobridge.*;
-import org.mases.knet.connect.KNetConnectLogging;
-import org.mases.knet.connect.KNetConnectProxy;
+import org.mases.knet.developed.connect.KNetConnectLogging;
+import org.mases.knet.developed.connect.KNetConnectProxy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/KNetPredicateEqualityTest.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/KNetPredicateEqualityTest.java
similarity index 96%
rename from src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/KNetPredicateEqualityTest.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/KNetPredicateEqualityTest.java
index 2fabecce01..25233a7d14 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/KNetPredicateEqualityTest.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/KNetPredicateEqualityTest.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.streams.kstream;
+package org.mases.knet.developed.streams.kstream;
import org.apache.kafka.streams.kstream.Predicate;
import org.mases.jcobridge.*;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/TransformerSupplier.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/TransformerSupplier.java
similarity index 92%
rename from src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/TransformerSupplier.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/TransformerSupplier.java
index 427f9239b5..956fe21314 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/TransformerSupplier.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/TransformerSupplier.java
@@ -16,10 +16,10 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.streams.kstream;
+package org.mases.knet.developed.streams.kstream;
import org.apache.kafka.streams.state.StoreBuilder;
-import org.mases.knet.streams.processor.api.FixedKeyProcessorSupplier;
+import org.mases.knet.developed.streams.processor.api.FixedKeyProcessorSupplier;
import java.util.Set;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/ValueTransformerSupplier.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/ValueTransformerSupplier.java
similarity index 96%
rename from src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/ValueTransformerSupplier.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/ValueTransformerSupplier.java
index 8648ee781b..f69668a9b7 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/ValueTransformerSupplier.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/ValueTransformerSupplier.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.streams.kstream;
+package org.mases.knet.developed.streams.kstream;
import org.apache.kafka.streams.state.StoreBuilder;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/ValueTransformerWithKeySupplier.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/ValueTransformerWithKeySupplier.java
similarity index 96%
rename from src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/ValueTransformerWithKeySupplier.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/ValueTransformerWithKeySupplier.java
index 96570ddd95..f9ee14035f 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/streams/kstream/ValueTransformerWithKeySupplier.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/kstream/ValueTransformerWithKeySupplier.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.streams.kstream;
+package org.mases.knet.developed.streams.kstream;
import org.apache.kafka.streams.state.StoreBuilder;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/streams/processor/api/FixedKeyProcessorSupplier.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/processor/api/FixedKeyProcessorSupplier.java
similarity index 96%
rename from src/jvm/knet/src/main/java/org/mases/knet/streams/processor/api/FixedKeyProcessorSupplier.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/streams/processor/api/FixedKeyProcessorSupplier.java
index 9f9a622dad..d642385928 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/streams/processor/api/FixedKeyProcessorSupplier.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/processor/api/FixedKeyProcessorSupplier.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.streams.processor.api;
+package org.mases.knet.developed.streams.processor.api;
import org.apache.kafka.streams.state.StoreBuilder;
diff --git a/src/jvm/knet/src/main/java/org/mases/knet/streams/processor/api/ProcessorSupplier.java b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/processor/api/ProcessorSupplier.java
similarity index 96%
rename from src/jvm/knet/src/main/java/org/mases/knet/streams/processor/api/ProcessorSupplier.java
rename to src/jvm/knet/src/main/java/org/mases/knet/developed/streams/processor/api/ProcessorSupplier.java
index 2b5d8643ee..32df103edd 100644
--- a/src/jvm/knet/src/main/java/org/mases/knet/streams/processor/api/ProcessorSupplier.java
+++ b/src/jvm/knet/src/main/java/org/mases/knet/developed/streams/processor/api/ProcessorSupplier.java
@@ -16,7 +16,7 @@
* Refer to LICENSE for more information.
*/
-package org.mases.knet.streams.processor.api;
+package org.mases.knet.developed.streams.processor.api;
import org.apache.kafka.streams.state.StoreBuilder;
diff --git a/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/TransformerSupplier.cs b/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/TransformerSupplier.cs
index 00f1c746b2..7a3d2ff74a 100644
--- a/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/TransformerSupplier.cs
+++ b/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/TransformerSupplier.cs
@@ -58,7 +58,7 @@ public partial class TransformerSupplier : JVMBridgeListener, Org.Apach
///
///
///
- public override string BridgeClassName => "org.mases.knet.streams.kstream.TransformerSupplier";
+ public override string BridgeClassName => "org.mases.knet.developed.streams.kstream.TransformerSupplier";
#endregion
#region Instance methods
diff --git a/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/ValueTransformerSupplier.cs b/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/ValueTransformerSupplier.cs
index e5f12e60a7..435d98251e 100644
--- a/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/ValueTransformerSupplier.cs
+++ b/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/ValueTransformerSupplier.cs
@@ -58,7 +58,7 @@ public partial class ValueTransformerSupplier : JVMBridgeListener, Org.Ap
///
///
///
- public override string BridgeClassName => "org.mases.knet.streams.kstream.ValueTransformerSupplier";
+ public override string BridgeClassName => "org.mases.knet.developed.streams.kstream.ValueTransformerSupplier";
#endregion
#region Instance methods
diff --git a/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/ValueTransformerWithKeySupplier.cs b/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/ValueTransformerWithKeySupplier.cs
index aeac84c147..5639e01944 100644
--- a/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/ValueTransformerWithKeySupplier.cs
+++ b/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Kstream/ValueTransformerWithKeySupplier.cs
@@ -52,7 +52,7 @@ public partial class ValueTransformerWithKeySupplier : JVMBridgeListen
///
///
///
- public override string BridgeClassName => "org.mases.knet.streams.kstream.ValueTransformerWithKeySupplier";
+ public override string BridgeClassName => "org.mases.knet.developed.streams.kstream.ValueTransformerWithKeySupplier";
#endregion
#region Instance methods
diff --git a/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Processor/Api/FixedKeyProcessorSupplier.cs b/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Processor/Api/FixedKeyProcessorSupplier.cs
index 511faef016..04144667e2 100644
--- a/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Processor/Api/FixedKeyProcessorSupplier.cs
+++ b/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Processor/Api/FixedKeyProcessorSupplier.cs
@@ -63,7 +63,7 @@ public partial class FixedKeyProcessorSupplier : JVMBridgeListen
///
///
///
- public override string BridgeClassName => "org.mases.knet.streams.processor.api.FixedKeyProcessorSupplier";
+ public override string BridgeClassName => "org.mases.knet.developed.streams.processor.api.FixedKeyProcessorSupplier";
#endregion
#region Instance methods
diff --git a/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Processor/Api/ProcessorSupplier.cs b/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Processor/Api/ProcessorSupplier.cs
index 66fc272f76..a27ecfa644 100644
--- a/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Processor/Api/ProcessorSupplier.cs
+++ b/src/net/KNet/Developed/Org/Apache/Kafka/Streams/Processor/Api/ProcessorSupplier.cs
@@ -58,7 +58,7 @@ public partial class ProcessorSupplier : JVMBridgeListener
///
///
///
- public override string BridgeClassName => "org.mases.knet.streams.processor.api.ProcessorSupplier";
+ public override string BridgeClassName => "org.mases.knet.developed.streams.processor.api.ProcessorSupplier";
#endregion
#region Instance methods
diff --git a/src/net/KNet/Specific/Connect/KNetConnectDistributed.cs b/src/net/KNet/Specific/Connect/KNetConnectDistributed.cs
index e8d9e437d6..ff538a78a6 100644
--- a/src/net/KNet/Specific/Connect/KNetConnectDistributed.cs
+++ b/src/net/KNet/Specific/Connect/KNetConnectDistributed.cs
@@ -29,7 +29,7 @@ public class KNetConnectDistributed : MASES.JCOBridge.C2JBridge.JVMBridgeMain
///
public KNetConnectDistributed()
- : base("org.mases.knet.connect.cli.ConnectDistributed")
+ : base("org.mases.knet.developed.connect.cli.ConnectDistributed")
{
KNetConnectProxy.Register();
}
diff --git a/src/net/KNet/Specific/Connect/KNetConnectStandalone.cs b/src/net/KNet/Specific/Connect/KNetConnectStandalone.cs
index ac7e446712..c584437dc4 100644
--- a/src/net/KNet/Specific/Connect/KNetConnectStandalone.cs
+++ b/src/net/KNet/Specific/Connect/KNetConnectStandalone.cs
@@ -29,7 +29,7 @@ public class KNetConnectStandalone : MASES.JCOBridge.C2JBridge.JVMBridgeMain
///
public KNetConnectStandalone()
- : base("org.mases.knet.connect.cli.ConnectStandalone")
+ : base("org.mases.knet.developed.connect.cli.ConnectStandalone")
{
KNetConnectProxy.Register();
}
diff --git a/src/net/KNet/Specific/Consumer/KNetConsumer.cs b/src/net/KNet/Specific/Consumer/KNetConsumer.cs
index f0d58163a7..45d57262e1 100644
--- a/src/net/KNet/Specific/Consumer/KNetConsumer.cs
+++ b/src/net/KNet/Specific/Consumer/KNetConsumer.cs
@@ -124,7 +124,7 @@ public class KNetConsumer : Org.Apache.Kafka.Clients.Consume
///
///
///
- public override string BridgeClassName => "org.mases.knet.clients.consumer.KNetConsumer";
+ public override string BridgeClassName => "org.mases.knet.developed.clients.consumer.KNetConsumer";
internal KNetConsumer(Properties props) : base(props) { }
diff --git a/src/net/KNet/Specific/Consumer/KNetConsumerCallback.cs b/src/net/KNet/Specific/Consumer/KNetConsumerCallback.cs
index 360c6ebd68..44da72a793 100644
--- a/src/net/KNet/Specific/Consumer/KNetConsumerCallback.cs
+++ b/src/net/KNet/Specific/Consumer/KNetConsumerCallback.cs
@@ -35,7 +35,7 @@ class KNetConsumerCallback : JVMBridgeListener, IKNetConsume
///
///
///
- public sealed override string BridgeClassName => "org.mases.knet.clients.consumer.KNetConsumerCallback";
+ public sealed override string BridgeClassName => "org.mases.knet.developed.clients.consumer.KNetConsumerCallback";
readonly Action> recordReadyFunction = null;
public virtual Action> OnRecordReady { get { return recordReadyFunction; } }
diff --git a/src/net/KNet/Specific/Producer/KNetProducer.cs b/src/net/KNet/Specific/Producer/KNetProducer.cs
index b84b078101..eda88232a3 100644
--- a/src/net/KNet/Specific/Producer/KNetProducer.cs
+++ b/src/net/KNet/Specific/Producer/KNetProducer.cs
@@ -210,7 +210,7 @@ public class KNetProducer : KafkaProducer, IPr
///
///
///
- public override string BridgeClassName => "org.mases.knet.clients.producer.KNetProducer";
+ public override string BridgeClassName => "org.mases.knet.developed.clients.producer.KNetProducer";
readonly bool _autoCreateSerDes = false;
readonly ISerDes _keySerializer;
diff --git a/src/net/KNet/Specific/Serialization/ByteBufferSupport.cs b/src/net/KNet/Specific/Serialization/ByteBufferSupport.cs
index 360d982cc0..0f9b195d8e 100644
--- a/src/net/KNet/Specific/Serialization/ByteBufferSupport.cs
+++ b/src/net/KNet/Specific/Serialization/ByteBufferSupport.cs
@@ -27,7 +27,7 @@ namespace MASES.KNet.Serialization
public class ByteBufferDeserializer : JVMBridgeBase
{
///
- public override string BridgeClassName => "org.mases.knet.common.serialization.ByteBufferDeserializer";
+ public override string BridgeClassName => "org.mases.knet.developed.common.serialization.ByteBufferDeserializer";
}
///
@@ -36,7 +36,7 @@ public class ByteBufferDeserializer : JVMBridgeBase
public class ByteBufferSerializer : JVMBridgeBase
{
///
- public override string BridgeClassName => "org.mases.knet.common.serialization.ByteBufferSerializer";
+ public override string BridgeClassName => "org.mases.knet.developed.common.serialization.ByteBufferSerializer";
}
///
@@ -45,7 +45,7 @@ public class ByteBufferSerializer : JVMBridgeBase
public class Serdes : JVMBridgeBase
{
///
- public override string BridgeClassName => "org.mases.knet.common.serialization.Serdes";
+ public override string BridgeClassName => "org.mases.knet.developed.common.serialization.Serdes";
///
/// Returns of
///
diff --git a/src/net/KNet/Specific/Streams/Kstream/PredicateEqualityTest.cs b/src/net/KNet/Specific/Streams/Kstream/PredicateEqualityTest.cs
index 5e85c1e037..4cff7e7c7b 100644
--- a/src/net/KNet/Specific/Streams/Kstream/PredicateEqualityTest.cs
+++ b/src/net/KNet/Specific/Streams/Kstream/PredicateEqualityTest.cs
@@ -36,7 +36,7 @@ public class PredicateEqualityTest : Predicate, IGen
///
///
///
- public override string BridgeClassName => "org.mases.knet.streams.kstream.KNetPredicateEqualityTest";
+ public override string BridgeClassName => "org.mases.knet.developed.streams.kstream.KNetPredicateEqualityTest";
void updateRemote()
{
From 1b02db1494be2eef9153e785fbc7dce51d0fe498 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 05:06:18 +0200
Subject: [PATCH 2/7] Workflow review
---
.github/workflows/build.yaml | 12 -----
.github/workflows/codeql-analysis.yml | 11 +----
.github/workflows/docker.yaml | 8 ---
.github/workflows/documentation.yaml | 4 --
.github/workflows/generateclasses.yaml | 68 +++++++++++++++++++++-----
.github/workflows/pullrequest.yaml | 12 -----
.github/workflows/release.yaml | 4 --
7 files changed, 56 insertions(+), 63 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4dfd0e53d1..65633f0ce5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -9,10 +9,6 @@ on:
# only trigger on branches, not on tags
branches: '**'
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
# This workflow contains two jobs called "check_changes", "build_windows"
jobs:
# Verify if a build is needed
@@ -86,10 +82,6 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- - name: Install local file to be used within Javadoc plugin of generated POM
- run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/knet/pom.xml
- shell: bash
-
- name: Create Jars
run: mvn --file ./src/jvm/knet/pom.xml --no-transfer-progress package
env:
@@ -158,10 +150,6 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- - name: Install local file to be used within Javadoc plugin of generated POM
- run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/knet/pom.xml
- shell: bash
-
- name: Create Jars
run: mvn --file ./src/jvm/knet/pom.xml --no-transfer-progress package
env:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f8d403a6b0..49bef71043 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -21,10 +21,6 @@ on:
# schedule:
# - cron: '26 23 * * 3'
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
jobs:
# Verify if a check is needed
check_changes:
@@ -118,12 +114,7 @@ jobs:
- name: Maven preparation (step 1)
if: matrix.language == 'java'
- run: dotnet build --no-incremental --configuration Release --framework net8.0 /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" ./src/net/KNet.sln
-
- - name: Maven preparation (step 2)
- if: matrix.language == 'java'
- run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/knet/pom.xml
- shell: bash
+ run: dotnet build --no-incremental --configuration Release --framework net8.0 /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" ./src/net/KNet/KNet.csproj
- if: matrix.language == 'java'
run: mvn --file ./src/jvm/knet/pom.xml --no-transfer-progress package
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index dd277689d9..ae50618290 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -38,10 +38,6 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- - name: Install local file to be used within Javadoc plugin of generated POM
- run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/knet/pom.xml
- shell: bash
-
- name: Create Jars
run: mvn --file ./src/jvm/knet/pom.xml --no-transfer-progress package
env:
@@ -111,10 +107,6 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- - name: Install local file to be used within Javadoc plugin of generated POM
- run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/knet/pom.xml
- shell: bash
-
- name: Create Jars
run: mvn --file ./src/jvm/knet/pom.xml --no-transfer-progress package
env:
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
index 68b02713d9..31ecff499b 100644
--- a/.github/workflows/documentation.yaml
+++ b/.github/workflows/documentation.yaml
@@ -13,10 +13,6 @@ on:
default: false
type: boolean
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
# This workflow contains one job called "build_documentation"
jobs:
build_documentation:
diff --git a/.github/workflows/generateclasses.yaml b/.github/workflows/generateclasses.yaml
index 7a1868e337..84e2ffe742 100644
--- a/.github/workflows/generateclasses.yaml
+++ b/.github/workflows/generateclasses.yaml
@@ -12,10 +12,11 @@ on:
required: true
default: false
type: boolean
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
+ UseLatestJNetReflector:
+ description: 'Shall use latest unpublished version of JNetReflector'
+ required: true
+ default: false
+ type: boolean
# This workflow contains one job called "build_documentation"
jobs:
@@ -36,6 +37,12 @@ jobs:
fetch-depth: '1'
submodules: 'true'
+ - uses: actions/checkout@v4
+ if: ${{ inputs.UseLatestJNetReflector == true }}
+ with:
+ repository: masesgroup/JNet
+ path: JNet
+
- name: Pre compile
run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src\net\KNet\KNet.csproj
@@ -51,10 +58,6 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- - name: Install local file to be used within Javadoc plugin of generated POM
- run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/knet/pom.xml
- shell: bash
-
- name: Create Jars
run: mvn --file ./src/jvm/knet/pom.xml --no-transfer-progress package
env:
@@ -68,21 +71,60 @@ jobs:
- name: Clear Java generated files
run: Remove-Item .\src\jvm\knet\src\main\java\org\mases\knet\generated\* -Recurse -Force -Exclude README.md
- - run: dotnet tool update --version 2.5.1 -g MASES.JNetReflector
+ - name: Prebuild JNetReflector
+ if: ${{ inputs.UseLatestJNetReflector == true }}
+ run: dotnet build --no-incremental --configuration Release JNet\src\net\JNetReflector\JNetReflector.csproj
- - name: Build classes
+ - name: Create Jars of JNetReflector
+ if: ${{ inputs.UseLatestJNetReflector == true }}
+ run: mvn "-Djcobridgepath=../../../binReflector/net8.0/JCOBridge.jar" --file ./JNet/src/jvm/jnet/pom.xml --no-transfer-progress package
+ env:
+ MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+ MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+ MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+
+ - name: Download latest published version of JNetReflector
+ run: dotnet tool update --version 2.5.1 -g MASES.JNetReflector
+ if: ${{ inputs.UseLatestJNetReflector == false }}
+
+ - name: Build classes with unpublished JNetReflector
+ if: ${{ inputs.UseLatestJNetReflector == true }}
shell: cmd
- run: jnetreflector -TraceLevel 0 -OriginRootPath .\jars -DestinationRootPath .\src\ -ConfigurationFile .\src\configuration.json
+ run: |
+ cd JNet\binReflector\net8.0
+ MASES.JNetReflector.exe -TraceLevel 0 %GITHUB_WORKSPACE%\jars -DestinationRootPath %GITHUB_WORKSPACE%\src\ -ConfigurationFile %GITHUB_WORKSPACE%\src\configuration.json
env:
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
-
+
+ - name: Build classes with latest published version of JNetReflector
+ if: ${{ inputs.UseLatestJNetReflector == false }}
+ shell: cmd
+ run: jnetreflector -TraceLevel 0 -OriginRootPath %GITHUB_WORKSPACE%\jars -DestinationRootPath %GITHUB_WORKSPACE%\src\ -ConfigurationFile %GITHUB_WORKSPACE%\src\configuration.json
+ env:
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+
+ - name: Request a PR to commit changes
+ if: ${{ github.repository_owner == 'masesgroup' && inputs.GeneratePR == true && inputs.UseLatestJNetReflector == true }} #do not push any changes outside main repo or GeneratePR is false
+ uses: peter-evans/create-pull-request@v6
+ with:
+ branch-suffix: short-commit-hash
+ add-paths: src/*.*
+ commit-message: Update generated classes using last unpublished version of JNetReflector
+ title: Changes by GitHub action
+ body: |
+ Automated changes by GitHub action, fix #92
+ reviewers: masesdevelopers
+ assignees: masesdevelopers
+ labels: java, .NET, enhancement
+
- name: Extract commit SHA
+ if: ${{ github.repository_owner == 'masesgroup' && inputs.GeneratePR == true && inputs.UseLatestJNetReflector == false }}
run: |
echo "GITHUB_COMMIT_MESSAGE=$(echo $GITHUB_SHA | cut -c 1-7)" >> $GITHUB_ENV
shell: bash
- name: Request a PR to commit changes
- if: ${{ github.repository_owner == 'masesgroup' && inputs.GeneratePR == true }} #do not push any changes outside main repo or GeneratePR is false
+ if: ${{ github.repository_owner == 'masesgroup' && inputs.GeneratePR == true && inputs.UseLatestJNetReflector == false }} #do not push any changes outside main repo or GeneratePR is false
uses: peter-evans/create-pull-request@v6
with:
branch-suffix: short-commit-hash
diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml
index a22a21b32d..f656ea4727 100644
--- a/.github/workflows/pullrequest.yaml
+++ b/.github/workflows/pullrequest.yaml
@@ -8,10 +8,6 @@ on:
pull_request:
branches: [ master ]
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
jobs:
# Verify if a build is needed
check_changes:
@@ -84,10 +80,6 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- - name: Install local file to be used within Javadoc plugin of generated POM
- run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/knet/pom.xml
- shell: bash
-
- name: Create Jars
run: mvn --file ./src/jvm/knet/pom.xml --no-transfer-progress package
env:
@@ -138,10 +130,6 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- - name: Install local file to be used within Javadoc plugin of generated POM
- run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/knet/pom.xml
- shell: bash
-
- name: Create Jars
run: mvn --file ./src/jvm/knet/pom.xml --no-transfer-progress package
env:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 522797ca0a..0597c49477 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -44,10 +44,6 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- - name: Install local file to be used within Javadoc plugin of generated POM
- run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/knet/pom.xml
- shell: bash
-
- name: Create Jars
run: mvn --file ./src/jvm/knet/pom.xml --no-transfer-progress package
env:
From ab9b858b4ba2d9f905e0e9fffea5088a4d2d3790 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 05:30:54 +0200
Subject: [PATCH 3/7] Fix workflows/generateclasses.yaml
---
.github/workflows/generateclasses.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/generateclasses.yaml b/.github/workflows/generateclasses.yaml
index 84e2ffe742..964c9430a8 100644
--- a/.github/workflows/generateclasses.yaml
+++ b/.github/workflows/generateclasses.yaml
@@ -92,7 +92,7 @@ jobs:
shell: cmd
run: |
cd JNet\binReflector\net8.0
- MASES.JNetReflector.exe -TraceLevel 0 %GITHUB_WORKSPACE%\jars -DestinationRootPath %GITHUB_WORKSPACE%\src\ -ConfigurationFile %GITHUB_WORKSPACE%\src\configuration.json
+ MASES.JNetReflector.exe -TraceLevel 0 -OriginRootPath %GITHUB_WORKSPACE%\jars -DestinationRootPath %GITHUB_WORKSPACE%\src\ -ConfigurationFile %GITHUB_WORKSPACE%\src\configuration.json
env:
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
From d8091dc22e980bb11b901c55ab0ad40cee728ace Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 05:49:01 +0200
Subject: [PATCH 4/7] Text review
---
.github/workflows/generateclasses.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/generateclasses.yaml b/.github/workflows/generateclasses.yaml
index 964c9430a8..9a77e3b19a 100644
--- a/.github/workflows/generateclasses.yaml
+++ b/.github/workflows/generateclasses.yaml
@@ -103,7 +103,7 @@ jobs:
env:
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- - name: Request a PR to commit changes
+ - name: Request a PR to commit changes made with unpublished version of JNetReflector
if: ${{ github.repository_owner == 'masesgroup' && inputs.GeneratePR == true && inputs.UseLatestJNetReflector == true }} #do not push any changes outside main repo or GeneratePR is false
uses: peter-evans/create-pull-request@v6
with:
@@ -123,7 +123,7 @@ jobs:
echo "GITHUB_COMMIT_MESSAGE=$(echo $GITHUB_SHA | cut -c 1-7)" >> $GITHUB_ENV
shell: bash
- - name: Request a PR to commit changes
+ - name: Request a PR to commit changes made with latest published version of JNetReflector
if: ${{ github.repository_owner == 'masesgroup' && inputs.GeneratePR == true && inputs.UseLatestJNetReflector == false }} #do not push any changes outside main repo or GeneratePR is false
uses: peter-evans/create-pull-request@v6
with:
From 937cefc11f99b130680d77c34da34197f89e7e9b Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 16:26:29 +0200
Subject: [PATCH 5/7] Removed JCOBridge version
---
src/jvm/knet/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/jvm/knet/pom.xml b/src/jvm/knet/pom.xml
index aa56f2183c..10b7c87fe0 100644
--- a/src/jvm/knet/pom.xml
+++ b/src/jvm/knet/pom.xml
@@ -42,7 +42,6 @@
${basedir}/classpathfile.classpath
3.7.0
2.7.2.0
- 2.5.13
../../../bin/net8.0/JCOBridge.jar
From aab8e87a76d63df7797a40c815df9ca242306fa0 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 16:48:23 +0200
Subject: [PATCH 6/7] doc fix
---
src/documentation/api/index.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/documentation/api/index.md b/src/documentation/api/index.md
index 33203ef4b0..7b4110a8e8 100644
--- a/src/documentation/api/index.md
+++ b/src/documentation/api/index.md
@@ -3,6 +3,6 @@ title: APIs of .NET suite for Apache Kafka
_description: Describes the current available APIs of .NET suite for Apache Kafka
---
-# KNet: .NET gateway for Apache Kafka APIs
+# KNet: .NET suite for Apache Kafka
Open left menu to browse API
From e5c4022cd3543cc148e4b8d8ae279c0097fad199 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 16:50:55 +0200
Subject: [PATCH 7/7] Indentation fix
---
src/jvm/knet/pom.xml | 498 +++++++++++++++++++++----------------------
1 file changed, 249 insertions(+), 249 deletions(-)
diff --git a/src/jvm/knet/pom.xml b/src/jvm/knet/pom.xml
index 10b7c87fe0..7fc3330f43 100644
--- a/src/jvm/knet/pom.xml
+++ b/src/jvm/knet/pom.xml
@@ -2,261 +2,261 @@
- 4.0.0
+ 4.0.0
- com.masesgroup
- knet
- mases.knet
- Interface bridging implementation for Apache Kafka
- https://github.com/masesgroup/KNet
- ${knetVersion}
+ com.masesgroup
+ knet
+ mases.knet
+ Interface bridging implementation for Apache Kafka
+ https://github.com/masesgroup/KNet
+ ${knetVersion}
-
-
- Apache License, Version 2.0
- https://www.apache.org/licenses/LICENSE-2.0.txt
- repo
- A business-friendly OSS license
-
-
-
- https://github.com/masesgroup/KNet/issues
- GitHub Issues
-
-
- https://github.com/masesgroup/KNet
- scm:git:git://github.com/masesgroup/KNet.git
- scm:git:git@github.com:masesgroup/KNet.git
-
-
-
- info@masesgroup.com
- MASES Group
- https://github.com/masesgroup
- masesgroup
-
-
-
- 11
- 11
- ${basedir}/classpathfile.classpath
- 3.7.0
- 2.7.2.0
+
+
+ Apache License, Version 2.0
+ https://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+ A business-friendly OSS license
+
+
+
+ https://github.com/masesgroup/KNet/issues
+ GitHub Issues
+
+
+ https://github.com/masesgroup/KNet
+ scm:git:git://github.com/masesgroup/KNet.git
+ scm:git:git@github.com:masesgroup/KNet.git
+
+
+
+ info@masesgroup.com
+ MASES Group
+ https://github.com/masesgroup
+ masesgroup
+
+
+
+ 11
+ 11
+ ${basedir}/classpathfile.classpath
+ 3.7.0
+ 2.7.2.0
../../../bin/net8.0/JCOBridge.jar
-
-
-
- ossrh
- https://s01.oss.sonatype.org/content/repositories/snapshots
-
-
- ossrh
- Central Repository OSSRH
- https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.6.1
-
-
- build-classpath
- generate-sources
-
- build-classpath
-
-
- ${classpathfile}
-
-
-
- copy-dependencies
- package
-
- copy-dependencies
-
-
- ${basedir}/../../../jars/
- false
- false
- true
-
-
-
- copy-installed
- package
-
- copy
-
-
-
-
- ${project.groupId}
- ${project.artifactId}
- ${project.version}
- ${project.packaging}
-
-
- ${basedir}/../../../jars/
- true
-
-
-
-
-
- org.codehaus.gmaven
- gmaven-plugin
- 1.5
-
-
- generate-resources
-
- execute
-
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.11.0
-
-
- -cp
- ${originalClassPath}${path.separator}${basedir}/${jcobridgepath}
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.11.0
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 3.3.0
-
-
- attach-sources
-
- jar-no-fork
-
-
-
- **/target/
- **/*.xml
- **/*.zip
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 3.1.0
-
-
- --pinentry-mode
- loopback
-
-
-
-
- sign-artifacts
- verify
-
- sign
-
-
-
-
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.13
- true
-
- ossrh
- https://s01.oss.sonatype.org/
- true
-
-
-
-
-
-
- junit
- junit
- 4.13.2
- test
-
-
- org.slf4j
- slf4j-api
- 1.7.36
-
-
- org.apache.kafka
- kafka-clients
- ${kafkaVersion}
-
-
- org.apache.kafka
- kafka-streams
- ${kafkaVersion}
-
-
- org.apache.kafka
- kafka-tools
- ${kafkaVersion}
-
-
- org.apache.kafka
- kafka_2.13
- ${kafkaVersion}
-
+
+
+
+ ossrh
+ https://s01.oss.sonatype.org/content/repositories/snapshots
+
+
+ ossrh
+ Central Repository OSSRH
+ https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 3.6.1
+
+
+ build-classpath
+ generate-sources
+
+ build-classpath
+
+
+ ${classpathfile}
+
+
+
+ copy-dependencies
+ package
+
+ copy-dependencies
+
+
+ ${basedir}/../../../jars/
+ false
+ false
+ true
+
+
+
+ copy-installed
+ package
+
+ copy
+
+
+
+
+ ${project.groupId}
+ ${project.artifactId}
+ ${project.version}
+ ${project.packaging}
+
+
+ ${basedir}/../../../jars/
+ true
+
+
+
+
+
+ org.codehaus.gmaven
+ gmaven-plugin
+ 1.5
+
+
+ generate-resources
+
+ execute
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.11.0
+
+
+ -cp
+ ${originalClassPath}${path.separator}${basedir}/${jcobridgepath}
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.11.0
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 3.3.0
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+ **/target/
+ **/*.xml
+ **/*.zip
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 3.1.0
+
+
+ --pinentry-mode
+ loopback
+
+
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ 1.6.13
+ true
+
+ ossrh
+ https://s01.oss.sonatype.org/
+ true
+
+
+
+
+
+
+ junit
+ junit
+ 4.13.2
+ test
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.36
+
+
+ org.apache.kafka
+ kafka-clients
+ ${kafkaVersion}
+
+
+ org.apache.kafka
+ kafka-streams
+ ${kafkaVersion}
+
+
+ org.apache.kafka
+ kafka-tools
+ ${kafkaVersion}
+
+
+ org.apache.kafka
+ kafka_2.13
+ ${kafkaVersion}
+
org.apache.kafka
kafka-raft
${kafkaVersion}
-
- org.apache.kafka
- connect-runtime
- ${kafkaVersion}
-
-
- org.apache.kafka
- connect-mirror
- ${kafkaVersion}
-
-
- org.apache.kafka
- connect-file
- ${kafkaVersion}
-
-
- org.apache.kafka
- connect-basic-auth-extension
- ${kafkaVersion}
-
-
- io.opentelemetry
- opentelemetry-proto
- 1.0.0-alpha
-
-
+
+ org.apache.kafka
+ connect-runtime
+ ${kafkaVersion}
+
+
+ org.apache.kafka
+ connect-mirror
+ ${kafkaVersion}
+
+
+ org.apache.kafka
+ connect-file
+ ${kafkaVersion}
+
+
+ org.apache.kafka
+ connect-basic-auth-extension
+ ${kafkaVersion}
+
+
+ io.opentelemetry
+ opentelemetry-proto
+ 1.0.0-alpha
+
+