Merge pull request #186 from kowshikn/master

Rename java package to data prepper

.github/workflows/gradle.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Gradle
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
-name: Java CI with Gradle
+name: Data Prepper Java CI with Gradle
 
 on: [push, pull_request]
 
@@ -31,6 +31,6 @@ jobs:
         sleep 90
     - name: Run ODFE tests
       run: |
-        ./gradlew :data-prepper-plugins:elasticsearch:test --tests "com.amazon.situp.plugins.sink.elasticsearch.ODFETests.testODFEConnection" -Dodfe.host=https://localhost:9200 -Dodfe.user=admin -Dodfe.password=admin
-        ./gradlew :data-prepper-plugins:elasticsearch:integTestRunner --tests "com.amazon.situp.plugins.sink.elasticsearch.ElasticsearchSinkIT" -Dodfe=true -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername=docker-cluster -Duser=admin -Dpassword=admin
+        ./gradlew :data-prepper-plugins:elasticsearch:test --tests "com.amazon.dataprepper.plugins.sink.elasticsearch.ODFETests.testODFEConnection" -Dodfe.host=https://localhost:9200 -Dodfe.user=admin -Dodfe.password=admin
+        ./gradlew :data-prepper-plugins:elasticsearch:integTestRunner --tests "com.amazon.dataprepper.plugins.sink.elasticsearch.ElasticsearchSinkIT" -Dodfe=true -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername=docker-cluster -Duser=admin -Dpassword=admin
 

data-prepper-api/src/main/java/com/amazon/situp/model/PluginType.java → data-prepper-api/src/main/java/com/amazon/dataprepper/model/PluginType.java

@@ -1,9 +1,9 @@
-package com.amazon.situp.model;
+package com.amazon.dataprepper.model;
 
-import com.amazon.situp.model.buffer.Buffer;
-import com.amazon.situp.model.processor.Processor;
-import com.amazon.situp.model.sink.Sink;
-import com.amazon.situp.model.source.Source;
+import com.amazon.dataprepper.model.buffer.Buffer;
+import com.amazon.dataprepper.model.processor.Processor;
+import com.amazon.dataprepper.model.sink.Sink;
+import com.amazon.dataprepper.model.source.Source;
 
 public enum PluginType {
     SOURCE("source", Source.class),

data-prepper-api/src/main/java/com/amazon/situp/model/annotations/SitupPlugin.java → data-prepper-api/src/main/java/com/amazon/dataprepper/model/annotations/DataPrepperPlugin.java

@@ -1,6 +1,6 @@
-package com.amazon.situp.model.annotations;
+package com.amazon.dataprepper.model.annotations;
 
-import com.amazon.situp.model.PluginType;
+import com.amazon.dataprepper.model.PluginType;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -9,7 +9,7 @@
 import java.lang.annotation.RetentionPolicy;
 
 /**
- * Annotates a SITUP Java plugin that includes Source, Sink, Buffer and Processor.
+ * Annotates a Data Prepper Java plugin that includes Source, Sink, Buffer and Processor.
  * The value returned from {@link #name()} represents the name of the plugin and is used in the pipeline configuration
  * and the optional {@link #type()}
  *
@@ -22,7 +22,7 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
-public @interface SitupPlugin {
+public @interface DataPrepperPlugin {
     /**
      *
      * @return Name of the plugin which should be unique for the type

data-prepper-api/src/main/java/com/amazon/situp/model/buffer/Buffer.java → data-prepper-api/src/main/java/com/amazon/dataprepper/model/buffer/Buffer.java

@@ -1,6 +1,6 @@
-package com.amazon.situp.model.buffer;
+package com.amazon.dataprepper.model.buffer;
 
-import com.amazon.situp.model.record.Record;
+import com.amazon.dataprepper.model.record.Record;
 
 import java.util.Collection;
 import java.util.concurrent.TimeoutException;

data-prepper-api/src/main/java/com/amazon/situp/model/configuration/PluginSetting.java → data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PluginSetting.java

@@ -1,4 +1,4 @@
-package com.amazon.situp.model.configuration;
+package com.amazon.dataprepper.model.configuration;
 
 import java.util.Map;
 

data-prepper-api/src/main/java/com/amazon/situp/model/processor/Processor.java → data-prepper-api/src/main/java/com/amazon/dataprepper/model/processor/Processor.java

@@ -1,11 +1,11 @@
-package com.amazon.situp.model.processor;
+package com.amazon.dataprepper.model.processor;
 
-import com.amazon.situp.model.record.Record;
+import com.amazon.dataprepper.model.record.Record;
 
 import java.util.Collection;
 
 /**
- * SITUP Processor interface. These are intermediary processing units using which users can filter,
+ * Data Prepper Processor interface. These are intermediary processing units using which users can filter,
  * transform and enrich the records into desired format before publishing to the sink.
  */
 public interface Processor<InputRecord extends Record<?>, OutputRecord extends Record<?>> {

data-prepper-api/src/main/java/com/amazon/situp/model/record/Record.java → data-prepper-api/src/main/java/com/amazon/dataprepper/model/record/Record.java

@@ -1,7 +1,7 @@
-package com.amazon.situp.model.record;
+package com.amazon.dataprepper.model.record;
 
 /**
- * SITUP record - represents the fundamental data unit of TI, the idea is to encapsulate different
+ * Data Prepper record - represents the fundamental data unit of TI, the idea is to encapsulate different
  * types of data we will be supporting in TI.
  * <p>
  * TODO: The current implementation focuses on proving the bare bones for which this class only need to

data-prepper-api/src/main/java/com/amazon/situp/model/record/RecordMetadata.java → data-prepper-api/src/main/java/com/amazon/dataprepper/model/record/RecordMetadata.java

@@ -1,4 +1,4 @@
-package com.amazon.situp.model.record;
+package com.amazon.dataprepper.model.record;
 
 import com.google.common.collect.ImmutableMap;
 

data-prepper-api/src/main/java/com/amazon/situp/model/sink/Sink.java → data-prepper-api/src/main/java/com/amazon/dataprepper/model/sink/Sink.java

@@ -1,11 +1,11 @@
-package com.amazon.situp.model.sink;
+package com.amazon.dataprepper.model.sink;
 
-import com.amazon.situp.model.record.Record;
+import com.amazon.dataprepper.model.record.Record;
 
 import java.util.Collection;
 
 /**
- * SITUP sink interface. Sink may publish records to a disk or a file or
+ * Data Prepper sink interface. Sink may publish records to a disk or a file or
  * to elasticsearch or other pipelines or external systems
  */
 public interface Sink<T extends Record<?>> {

data-prepper-api/src/main/java/com/amazon/situp/model/source/Source.java → data-prepper-api/src/main/java/com/amazon/dataprepper/model/source/Source.java

@@ -1,10 +1,10 @@
-package com.amazon.situp.model.source;
+package com.amazon.dataprepper.model.source;
 
-import com.amazon.situp.model.buffer.Buffer;
-import com.amazon.situp.model.record.Record;
+import com.amazon.dataprepper.model.buffer.Buffer;
+import com.amazon.dataprepper.model.record.Record;
 
 /**
- * SITUP source interface. Source acts as receiver of the events that flow
+ * Data Prepper source interface. Source acts as receiver of the events that flow
  * through the transformation pipeline.
  */
 public interface Source<T extends Record<?>> {

data-prepper-api/src/main/java/com/amazon/situp/processor/state/ProcessorState.java → data-prepper-api/src/main/java/com/amazon/dataprepper/processor/state/ProcessorState.java

@@ -1,4 +1,4 @@
-package com.amazon.situp.processor.state;
+package com.amazon.dataprepper.processor.state;
 
 import java.util.List;
 import java.util.Map;

data-prepper-api/src/test/java/com/amazon/situp/model/PluginTypeTests.java → data-prepper-api/src/test/java/com/amazon/dataprepper/model/PluginTypeTests.java

@@ -1,9 +1,9 @@
-package com.amazon.situp.model;
+package com.amazon.dataprepper.model;
 
-import com.amazon.situp.model.buffer.Buffer;
-import com.amazon.situp.model.processor.Processor;
-import com.amazon.situp.model.sink.Sink;
-import com.amazon.situp.model.source.Source;
+import com.amazon.dataprepper.model.buffer.Buffer;
+import com.amazon.dataprepper.model.processor.Processor;
+import com.amazon.dataprepper.model.sink.Sink;
+import com.amazon.dataprepper.model.source.Source;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;

data-prepper-api/src/test/java/com/amazon/situp/model/configuration/PluginSettingsTests.java → data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PluginSettingsTests.java

@@ -1,7 +1,6 @@
-package com.amazon.situp.model.configuration;
+package com.amazon.dataprepper.model.configuration;
 
 import com.google.common.collect.ImmutableMap;
-import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Map;

data-prepper-api/src/test/java/com/amazon/situp/model/record/RecordTests.java → data-prepper-api/src/test/java/com/amazon/dataprepper/model/record/RecordTests.java

@@ -1,11 +1,11 @@
-package com.amazon.situp.model.record;
+package com.amazon.dataprepper.model.record;
 
 import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.amazon.situp.model.record.RecordMetadata.RECORD_TYPE;
+import static com.amazon.dataprepper.model.record.RecordMetadata.RECORD_TYPE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;

data-prepper-benchmarks/lmdb-benchmarks/src/jmh/java/com/amazon/situp/benchmarks/processor/state/LmdbProcessorStateBenchmarks.java → data-prepper-benchmarks/lmdb-benchmarks/src/jmh/java/com/amazon/dataprepper/benchmarks/processor/state/LmdbProcessorStateBenchmarks.java

@@ -1,6 +1,6 @@
-package com.amazon.situp.benchmarks.processor.state;
+package com.amazon.dataprepper.benchmarks.processor.state;
 
-import com.amazon.situp.plugins.processor.state.LmdbProcessorState;
+import com.amazon.dataprepper.plugins.processor.state.LmdbProcessorState;
 import com.google.common.primitives.SignedBytes;
 import org.openjdk.jmh.annotations.*;
 

data-prepper-benchmarks/mapdb-benchmarks/src/jmh/java/com/amazon/situp/benchmarks/processor/state/MapDbProcessorStateBenchmarks.java → data-prepper-benchmarks/mapdb-benchmarks/src/jmh/java/com/amazon/dataprepper/benchmarks/processor/state/MapDbProcessorStateBenchmarks.java

@@ -1,6 +1,6 @@
-package com.amazon.situp.benchmarks.processor.state;
+package com.amazon.dataprepper.benchmarks.processor.state;
 
-import com.amazon.situp.plugins.processor.state.MapDbProcessorState;
+import com.amazon.dataprepper.plugins.processor.state.MapDbProcessorState;
 import com.google.common.primitives.SignedBytes;
 import org.openjdk.jmh.annotations.*;
 

data-prepper-benchmarks/service-map-stateful-benchmarks/src/jmh/java/com/amazon/situp/benchmarks/processor/ServiceMapStatefulProcessorBenchmarks.java → data-prepper-benchmarks/service-map-stateful-benchmarks/src/jmh/java/com/amazon/dataprepper/benchmarks/processor/ServiceMapStatefulProcessorBenchmarks.java

@@ -1,16 +1,16 @@
-package com.amazon.situp.benchmarks.processor;
+package com.amazon.dataprepper.benchmarks.processor;
 
 import com.google.protobuf.ByteString;
-import com.amazon.situp.model.record.Record;
-import com.amazon.situp.plugins.processor.ServiceMapStatefulProcessor;
+import com.amazon.dataprepper.model.record.Record;
+import com.amazon.dataprepper.plugins.processor.ServiceMapStatefulProcessor;
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
-import java.util.concurrent.TimeUnit;
+
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
 import io.opentelemetry.proto.common.v1.AnyValue;
 import io.opentelemetry.proto.common.v1.KeyValue;
@@ -21,7 +21,6 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Level;
-import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;

data-prepper-core/build.gradle

@@ -29,7 +29,7 @@ jar {
     manifest {
         attributes('Implementation-Title': project.name,
                 'Implementation-Version': project.version,
-                'Main-Class': 'com.amazon.situp.SitupExecute')
+                'Main-Class': 'com.amazon.dataprepper.DataPrepperExecute')
     }
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }

data-prepper-core/integrationTest.gradle

@@ -135,7 +135,7 @@ task rawSpanEndToEndTest(type: Test) {
     classpath = sourceSets.integrationTest.runtimeClasspath
 
     filter {
-        includeTestsMatching "com.amazon.situp.integration.EndToEndRawSpanTest*"
+        includeTestsMatching "com.amazon.dataprepper.integration.EndToEndRawSpanTest*"
     }
 
     finalizedBy stopOdfeDockerContainer
@@ -155,7 +155,7 @@ task serviceMapEndToEndTest(type: Test) {
     classpath = sourceSets.integrationTest.runtimeClasspath
 
     filter {
-        includeTestsMatching "com.amazon.situp.integration.EndToEndServiceMapTest*"
+        includeTestsMatching "com.amazon.dataprepper.integration.EndToEndServiceMapTest*"
     }
 
     finalizedBy stopOdfeDockerContainer

data-prepper-core/src/integrationTest/java/com/amazon/situp/integration/EndToEndRawSpanTest.java → data-prepper-core/src/integrationTest/java/com/amazon/dataprepper/integration/EndToEndRawSpanTest.java

@@ -1,7 +1,7 @@
-package com.amazon.situp.integration;
+package com.amazon.dataprepper.integration;
 
 
-import com.amazon.situp.plugins.sink.elasticsearch.ConnectionConfiguration;
+import com.amazon.dataprepper.plugins.sink.elasticsearch.ConnectionConfiguration;
 import com.google.protobuf.ByteString;
 import com.linecorp.armeria.client.Clients;
 import com.linecorp.armeria.internal.shaded.bouncycastle.util.encoders.Hex;

data-prepper-core/src/integrationTest/java/com/amazon/situp/integration/EndToEndServiceMapTest.java → data-prepper-core/src/integrationTest/java/com/amazon/dataprepper/integration/EndToEndServiceMapTest.java

@@ -1,10 +1,9 @@
-package com.amazon.situp.integration;
+package com.amazon.dataprepper.integration;
 
 
 import com.google.protobuf.ByteString;
-import com.amazon.situp.plugins.sink.elasticsearch.ConnectionConfiguration;
+import com.amazon.dataprepper.plugins.sink.elasticsearch.ConnectionConfiguration;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;

data-prepper-core/src/integrationTest/java/com/amazon/situp/integration/ServiceMapTestData.java → data-prepper-core/src/integrationTest/java/com/amazon/dataprepper/integration/ServiceMapTestData.java

@@ -1,4 +1,4 @@
-package com.amazon.situp.integration;
+package com.amazon.dataprepper.integration;
 
 import io.opentelemetry.proto.trace.v1.Span;
 

data-prepper-core/src/main/java/com/amazon/situp/Situp.java → data-prepper-core/src/main/java/com/amazon/dataprepper/DataPrepper.java

@@ -1,46 +1,46 @@
-package com.amazon.situp;
+package com.amazon.dataprepper;
 
-import com.amazon.situp.parser.PipelineParser;
-import com.amazon.situp.pipeline.Pipeline;
+import com.amazon.dataprepper.parser.PipelineParser;
+import com.amazon.dataprepper.pipeline.Pipeline;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 
 /**
- * SITUP is the entry point into the execution engine. An instance of this class is provided by
+ * DataPrepper is the entry point into the execution engine. An instance of this class is provided by
  * {@link #getInstance()} method and the same can eb used to trigger execution via {@link #execute(String)} ()} of the
  * {@link Pipeline} with default configuration or {@link #execute(String)} to provide custom configuration file. Also,
  * the same instance reference can be further used to {@link #shutdown()} the execution.
  */
-public class Situp {
-    private static final Logger LOG = LoggerFactory.getLogger(Situp.class);
+public class DataPrepper {
+    private static final Logger LOG = LoggerFactory.getLogger(DataPrepper.class);
 
     private Map<String, Pipeline> transformationPipelines;
 
-    private static volatile Situp situp;
+    private static volatile DataPrepper dataPrepper;
 
-    public static Situp getInstance() {
-        if (situp == null) {
-            synchronized (Situp.class) {
-                if (situp == null)
-                    situp = new Situp();
+    public static DataPrepper getInstance() {
+        if (dataPrepper == null) {
+            synchronized (DataPrepper.class) {
+                if (dataPrepper == null)
+                    dataPrepper = new DataPrepper();
             }
         }
-        return situp;
+        return dataPrepper;
     }
 
-    private Situp() {
-        if (situp != null) {
-            throw new RuntimeException("Please use getInstance() for an instance of this SITUP");
+    private DataPrepper() {
+        if (dataPrepper != null) {
+            throw new RuntimeException("Please use getInstance() for an instance of this Data Prepper");
         }
     }
 
     /**
-     * Executes SITUP engine using the default configuration file/
+     * Executes Data Prepper engine using the default configuration file/
      *
      * @param configurationFileLocation the location of the configuration file
-     * @return true if the execute successfully initiates the SITUP
+     * @return true if the execute successfully initiates the Data Prepper
      */
     public boolean execute(final String configurationFileLocation) {
         LOG.info("Using {} configuration file", configurationFileLocation);

data-prepper-core/src/main/java/com/amazon/dataprepper/DataPrepperExecute.java

@@ -0,0 +1,21 @@
+package com.amazon.dataprepper;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Execute entry into Data Prepper.
+ */
+public class DataPrepperExecute {
+    private static final Logger LOG = LoggerFactory.getLogger(DataPrepperExecute.class);
+
+    public static void main(String[] args) {
+        final DataPrepper dataPrepper = DataPrepper.getInstance();
+        if (args.length > 0) {
+            dataPrepper.execute(args[0]);
+        } else {
+            LOG.error("Configuration file is required");
+            System.exit(1);
+        }
+    }
+}

data-prepper-core/src/main/java/com/amazon/situp/parser/ParseException.java → data-prepper-core/src/main/java/com/amazon/dataprepper/parser/ParseException.java

@@ -1,4 +1,4 @@
-package com.amazon.situp.parser;
+package com.amazon.dataprepper.parser;
 
 public class ParseException extends RuntimeException {
     public ParseException(final Throwable cause) {

data-prepper-core/src/main/java/com/amazon/situp/parser/PipelineConfigurationValidator.java → data-prepper-core/src/main/java/com/amazon/dataprepper/parser/PipelineConfigurationValidator.java

@@ -1,7 +1,7 @@
-package com.amazon.situp.parser;
+package com.amazon.dataprepper.parser;
 
-import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.parser.model.PipelineConfiguration;
+import com.amazon.dataprepper.model.configuration.PluginSetting;
+import com.amazon.dataprepper.parser.model.PipelineConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;