You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by an...@apache.org on 2022/05/13 20:09:59 UTC
[solr-sandbox] branch crossdc-wip updated: Create a commons module for crossdc (#12)
This is an automated email from the ASF dual-hosted git repository.
anshum pushed a commit to branch crossdc-wip
in repository https://gitbox.apache.org/repos/asf/solr-sandbox.git
The following commit(s) were added to refs/heads/crossdc-wip by this push:
new 5f602af Create a commons module for crossdc (#12)
5f602af is described below
commit 5f602af7a9f5eb8eecbc373e79d8517ee3d39b3d
Author: Anshum Gupta <an...@apache.org>
AuthorDate: Fri May 13 13:09:55 2022 -0700
Create a commons module for crossdc (#12)
---
crossdc-commons/README.md | 5 ++++
.../build.gradle | 27 +++++++++++++++++++---
.../apache/solr/crossdc/common/CrossDcConf.java | 0
.../solr/crossdc/common/CrossDcConstants.java | 0
.../apache/solr/crossdc/common/IQueueHandler.java | 0
.../solr/crossdc/common/KafkaCrossDcConf.java | 0
.../solr/crossdc/common/MirroredSolrRequest.java | 0
.../common/MirroredSolrRequestSerializer.java | 0
.../solr/crossdc/common/SolrExceptionUtil.java | 0
crossdc-consumer/build.gradle | 1 +
.../org/apache/solr/crossdc/consumer/Consumer.java | 3 ---
.../solr/crossdc/SolrAndKafkaIntegrationTest.java | 1 -
crossdc-producer/build.gradle | 7 ++----
settings.gradle | 2 +-
14 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/crossdc-commons/README.md b/crossdc-commons/README.md
new file mode 100644
index 0000000..0a80190
--- /dev/null
+++ b/crossdc-commons/README.md
@@ -0,0 +1,5 @@
+Cross Data Center Replication Commons
+=====================================
+
+Commons module for Cross DC producer and consumer.
+This contains classes that are shared between the producer and consumer like configuration, constants, message processor, etc.
\ No newline at end of file
diff --git a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/CrossDcConf.java b/crossdc-commons/build.gradle
similarity index 63%
copy from crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/CrossDcConf.java
copy to crossdc-commons/build.gradle
index b1f3d24..b491b1b 100644
--- a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/CrossDcConf.java
+++ b/crossdc-commons/build.gradle
@@ -14,8 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.solr.crossdc.common;
+plugins {
+ id 'java'
+}
+
+description = 'Cross-DC Commons package'
+
+version '1.0-SNAPSHOT'
+
+repositories {
+ mavenCentral()
+ jcenter()
+}
+
+dependencies {
+ compile group: 'org.apache.solr', name: 'solr-solrj', version: '8.11.1'
+ compile 'org.apache.kafka:kafka-clients:2.8.0'
+ compile group: 'com.google.guava', name: 'guava', version: '14.0'
+}
+
+subprojects {
+ group "org.apache.solr"
+}
-public abstract class CrossDcConf {
- public abstract String getClusterName();
+test {
+ jvmArgs '-Djava.security.egd=file:/dev/./urandom'
}
diff --git a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/CrossDcConf.java b/crossdc-commons/src/main/java/org/apache/solr/crossdc/common/CrossDcConf.java
similarity index 100%
rename from crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/CrossDcConf.java
rename to crossdc-commons/src/main/java/org/apache/solr/crossdc/common/CrossDcConf.java
diff --git a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/CrossDcConstants.java b/crossdc-commons/src/main/java/org/apache/solr/crossdc/common/CrossDcConstants.java
similarity index 100%
rename from crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/CrossDcConstants.java
rename to crossdc-commons/src/main/java/org/apache/solr/crossdc/common/CrossDcConstants.java
diff --git a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/IQueueHandler.java b/crossdc-commons/src/main/java/org/apache/solr/crossdc/common/IQueueHandler.java
similarity index 100%
rename from crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/IQueueHandler.java
rename to crossdc-commons/src/main/java/org/apache/solr/crossdc/common/IQueueHandler.java
diff --git a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/KafkaCrossDcConf.java b/crossdc-commons/src/main/java/org/apache/solr/crossdc/common/KafkaCrossDcConf.java
similarity index 100%
rename from crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/KafkaCrossDcConf.java
rename to crossdc-commons/src/main/java/org/apache/solr/crossdc/common/KafkaCrossDcConf.java
diff --git a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/MirroredSolrRequest.java b/crossdc-commons/src/main/java/org/apache/solr/crossdc/common/MirroredSolrRequest.java
similarity index 100%
rename from crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/MirroredSolrRequest.java
rename to crossdc-commons/src/main/java/org/apache/solr/crossdc/common/MirroredSolrRequest.java
diff --git a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/MirroredSolrRequestSerializer.java b/crossdc-commons/src/main/java/org/apache/solr/crossdc/common/MirroredSolrRequestSerializer.java
similarity index 100%
rename from crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/MirroredSolrRequestSerializer.java
rename to crossdc-commons/src/main/java/org/apache/solr/crossdc/common/MirroredSolrRequestSerializer.java
diff --git a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/SolrExceptionUtil.java b/crossdc-commons/src/main/java/org/apache/solr/crossdc/common/SolrExceptionUtil.java
similarity index 100%
rename from crossdc-consumer/src/main/java/org/apache/solr/crossdc/common/SolrExceptionUtil.java
rename to crossdc-commons/src/main/java/org/apache/solr/crossdc/common/SolrExceptionUtil.java
diff --git a/crossdc-consumer/build.gradle b/crossdc-consumer/build.gradle
index ed9f70b..e173dd3 100644
--- a/crossdc-consumer/build.gradle
+++ b/crossdc-consumer/build.gradle
@@ -33,6 +33,7 @@ application {
dependencies {
compile group: 'org.apache.solr', name: 'solr-solrj', version: '8.11.1'
+ compile project(':crossdc-commons')
implementation 'org.slf4j:slf4j-api'
compile 'org.eclipse.jetty:jetty-http:9.4.41.v20210516'
compile 'org.eclipse.jetty:jetty-server:9.4.41.v20210516'
diff --git a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/consumer/Consumer.java b/crossdc-consumer/src/main/java/org/apache/solr/crossdc/consumer/Consumer.java
index 3373a96..e99b09e 100644
--- a/crossdc-consumer/src/main/java/org/apache/solr/crossdc/consumer/Consumer.java
+++ b/crossdc-consumer/src/main/java/org/apache/solr/crossdc/consumer/Consumer.java
@@ -19,9 +19,7 @@ package org.apache.solr.crossdc.consumer;
import org.apache.kafka.clients.consumer.*;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.errors.WakeupException;
-import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.serialization.StringSerializer;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.crossdc.KafkaMirroringSink;
import org.apache.solr.crossdc.MirroringException;
@@ -37,7 +35,6 @@ import org.eclipse.jetty.server.ServerConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.time.Duration;
import java.util.Collections;
diff --git a/crossdc-consumer/src/test/java/org/apache/solr/crossdc/SolrAndKafkaIntegrationTest.java b/crossdc-consumer/src/test/java/org/apache/solr/crossdc/SolrAndKafkaIntegrationTest.java
index b11a087..d2bbe7f 100644
--- a/crossdc-consumer/src/test/java/org/apache/solr/crossdc/SolrAndKafkaIntegrationTest.java
+++ b/crossdc-consumer/src/test/java/org/apache/solr/crossdc/SolrAndKafkaIntegrationTest.java
@@ -16,7 +16,6 @@ import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.crossdc.common.MirroredSolrRequest;
import org.apache.solr.crossdc.common.MirroredSolrRequestSerializer;
import org.apache.solr.crossdc.consumer.Consumer;
-import org.apache.solr.crossdc.messageprocessor.SolrMessageProcessor;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.slf4j.Logger;
diff --git a/crossdc-producer/build.gradle b/crossdc-producer/build.gradle
index 72e7eeb..f361cac 100644
--- a/crossdc-producer/build.gradle
+++ b/crossdc-producer/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
plugins {
- id 'application'
+ id 'java'
}
description = 'Cross-DC Producer package'
@@ -27,12 +27,9 @@ repositories {
jcenter()
}
-application {
- mainClass = 'org.apache.solr.crossdc.consumer.Consumer'
-}
-
dependencies {
compile project(':crossdc-consumer')
+ compile project(':crossdc-commons')
compile group: 'org.apache.solr', name: 'solr-solrj', version: '8.11.1'
compile group: 'org.apache.solr', name: 'solr-core', version: '8.11.1'
implementation 'org.slf4j:slf4j-api'
diff --git a/settings.gradle b/settings.gradle
index fa0b1e1..924bbaf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,4 +11,4 @@ rootProject.name = 'solr-sandbox'
include 'crossdc-consumer'
include 'crossdc-producer'
-
+include 'crossdc-commons'