Segregate situp-plugins

.gitattributes

@@ -0,0 +1,5 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf

.gitignore

@@ -0,0 +1,7 @@
+# Ignore Gradle project-specific cache directory
+.DS_Store
+.idea
+.gradle
+
+# Ignore Gradle build output directory
+build

settings.gradle

@@ -2,4 +2,7 @@ rootProject.name = 'transformation-instance'
 
 include 'situp-api'
 include 'situp-plugins'
-include 'situp-core'
+include 'situp-core'
+include 'situp-plugins:common'
+include 'situp-plugins:apmtracesource'
+include 'situp-plugins:elasticsearch'

situp-core/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     compile project(':situp-api')
-    compile project(':situp-plugins')
+    compile project(':situp-plugins:common')
     implementation "com.fasterxml.jackson.core:jackson-databind:${versionMap.jackson_databind}"
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versionMap.jackson_dataformat_yaml}"
     implementation "javax.validation:validation-api:${versionMap.validation_api}"

situp-plugins/apmtracesource/build.gradle

@@ -0,0 +1,12 @@
+plugins {
+    id 'java'
+    id 'jacoco'
+}
+
+dependencies {
+    compile project(':situp-api')
+    compile project(':situp-plugins:common')
+    implementation 'io.netty:netty-all:4.1.51.Final'
+    implementation "com.fasterxml.jackson.core:jackson-databind:${versionMap.jackson_databind}"
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versionMap.jackson_dataformat_yaml}"
+}

situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceSource.java → situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceSource.java

@@ -1,11 +1,11 @@
 package com.amazon.situp.plugins.source.apmtracesource;
 
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.buffer.Buffer;
 import com.amazon.situp.model.configuration.PluginSetting;
 import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.source.Source;
-import com.amazon.situp.model.PluginType;
 import com.amazon.situp.plugins.source.apmtracesource.http.server.NettyHttpConfig;
 import com.amazon.situp.plugins.source.apmtracesource.http.server.NettyHttpServer;
 

situp-plugins/build.gradle

@@ -1,79 +0,0 @@
-buildscript {
-    ext {
-        es_version = System.getProperty("es.version", "7.8.0")
-        es_group = "org.elasticsearch"
-        distribution = 'oss-zip'
-    }
-
-    repositories {
-        maven { url "https://plugins.gradle.org/m2/" }
-    }
-
-    dependencies {
-        classpath "${es_group}.gradle:build-tools:${es_version}"
-        //Uncomment below dependency for publishing
-        //classpath 'com.amazonaws:aws-java-sdk-core:1.11.5'
-    }
-}
-
-plugins {
-    id 'java'
-    id 'jacoco'
-}
-apply plugin: 'elasticsearch.testclusters'
-apply plugin: 'elasticsearch.build'
-apply plugin: 'elasticsearch.rest-test'
-
-// To pass elasticsearch plugin check
-ext {
-    licenseFile = rootProject.file('LICENSE.TXT')
-    noticeFile = rootProject.file('NOTICE.TXT')
-}
-
-dependencies {
-    compile project(':situp-api')
-    implementation 'io.netty:netty-all:4.1.51.Final'
-    implementation "org.elasticsearch.client:elasticsearch-rest-client:${es_version}"
-    implementation "org.elasticsearch:elasticsearch:${es_version}"
-    implementation "com.fasterxml.jackson.core:jackson-databind:${versionMap.jackson_databind}"
-    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versionMap.jackson_dataformat_yaml}"
-    implementation "org.reflections:reflections:${versionMap.reflections}"
-    implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    testImplementation("junit:junit:${versionMap.junit}") {
-        exclude group:'org.hamcrest' // workaround for jarHell
-    }
-    testImplementation "org.elasticsearch.test:framework:${es_version}"
-}
-// Workaround for Werror
-compileJava.options.warnings = false
-
-// Resolve dependency conflict between ES sink and main project
-configurations.all {
-    resolutionStrategy {
-        force 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1'
-        force 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
-        force 'com.fasterxml.jackson.core:jackson-core:2.11.1'
-        force 'com.google.guava:guava:29.0-jre'
-        force 'org.apache.bval:bval-jsr:2.0.4'
-        force 'junit:junit:4.13'
-    }
-}
-
-integTest {}
-
-testClusters.integTest {
-    testDistribution = "OSS"
-}
-
-integTest.runner {
-    systemProperty 'tests.security.manager', 'false'
-}
-
-checkstyleMain.ignoreFailures = true
-checkstyleTest.ignoreFailures = true
-forbiddenApis.ignoreFailures = true
-testingConventions.enabled = false
-licenseHeaders.enabled = false
-dependencyLicenses.enabled = false
-thirdPartyAudit.enabled = false
-validateNebulaPom.enabled = false

situp-plugins/common/build.gradle

@@ -0,0 +1,11 @@
+plugins {
+    id 'java'
+    id 'jacoco'
+}
+dependencies {
+    compile project(':situp-api')
+    implementation "com.fasterxml.jackson.core:jackson-databind:${versionMap.jackson_databind}"
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versionMap.jackson_dataformat_yaml}"
+    implementation "org.reflections:reflections:${versionMap.reflections}"
+    testImplementation "junit:junit:${versionMap.junit}"
+}

situp-plugins/src/main/java/com/amazon/situp/plugins/PluginRepository.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/PluginRepository.java

@@ -19,7 +19,7 @@
  * TODO Add capability to discover custom new plugins
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
-public final class PluginRepository {
+public final class  PluginRepository {
     private static final String DEFAULT_PLUGINS_CLASSPATH = "com.amazon.situp.plugins";
     private static final Map<String, Class<Source>> SOURCES = new HashMap<>();
     private static final Map<String, Class<Buffer>> BUFFERS = new HashMap<>();

situp-plugins/src/main/java/com/amazon/situp/plugins/buffer/UnboundedInMemoryBuffer.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/buffer/UnboundedInMemoryBuffer.java

@@ -1,10 +1,10 @@
 package com.amazon.situp.plugins.buffer;
 
-import com.amazon.situp.model.record.Record;
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.buffer.Buffer;
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.record.Record;
 
 import java.util.ArrayList;
 import java.util.Collection;

situp-plugins/src/main/java/com/amazon/situp/plugins/processor/NoOpProcessor.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/NoOpProcessor.java

@@ -1,10 +1,10 @@
 package com.amazon.situp.plugins.processor;
 
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
-import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.processor.Processor;
+import com.amazon.situp.model.record.Record;
 
 import java.util.Collection;
 

situp-plugins/src/main/java/com/amazon/situp/plugins/processor/ProcessorFactory.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/ProcessorFactory.java

@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins.processor;
 
 import com.amazon.situp.model.configuration.PluginSetting;
+import com.amazon.situp.model.processor.Processor;
 import com.amazon.situp.plugins.PluginFactory;
 import com.amazon.situp.plugins.PluginRepository;
-import com.amazon.situp.model.processor.Processor;
 
 @SuppressWarnings({"rawtypes"})
 public class ProcessorFactory extends PluginFactory {

situp-plugins/src/main/java/com/amazon/situp/plugins/processor/StatelessServiceMapTraceProcessor.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/StatelessServiceMapTraceProcessor.java

@@ -1,11 +1,12 @@
 package com.amazon.situp.plugins.processor;
 
+import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.configuration.PluginSetting;
+import com.amazon.situp.model.processor.Processor;
 import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.record.RecordMetadata;
-import com.amazon.situp.model.annotations.SitupPlugin;
-import com.amazon.situp.model.PluginType;
-import com.amazon.situp.model.processor.Processor;
+
 import java.util.Collection;
 import java.util.stream.Collectors;
 

situp-plugins/src/main/java/com/amazon/situp/plugins/processor/StringProcessor.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/StringProcessor.java

@@ -1,10 +1,10 @@
 package com.amazon.situp.plugins.processor;
 
-import com.amazon.situp.model.record.Record;
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.processor.Processor;
+import com.amazon.situp.model.record.Record;
 
 import java.util.ArrayList;
 import java.util.Collection;

situp-plugins/src/main/java/com/amazon/situp/plugins/sink/FileSink.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/FileSink.java

@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins.sink;
 
-import com.amazon.situp.model.record.Record;
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.sink.Sink;
 
 import java.io.BufferedWriter;

situp-plugins/src/main/java/com/amazon/situp/plugins/sink/SinkFactory.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/SinkFactory.java

@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins.sink;
 
 import com.amazon.situp.model.configuration.PluginSetting;
+import com.amazon.situp.model.sink.Sink;
 import com.amazon.situp.plugins.PluginFactory;
 import com.amazon.situp.plugins.PluginRepository;
-import com.amazon.situp.model.sink.Sink;
 
 @SuppressWarnings({"rawtypes"})
 public class SinkFactory extends PluginFactory {

situp-plugins/src/main/java/com/amazon/situp/plugins/sink/StdOutSink.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/StdOutSink.java

@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins.sink;
 
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
-import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.sink.Sink;
 
 import java.util.Collection;

situp-plugins/src/main/java/com/amazon/situp/plugins/source/FileSource.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/FileSource.java

@@ -62,4 +62,4 @@ public void start(final Buffer<Record<String>> buffer) {
     public void stop() {
         isStopRequested = true;
     }
-}
+}

situp-plugins/src/main/java/com/amazon/situp/plugins/source/SourceFactory.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/SourceFactory.java

@@ -11,4 +11,4 @@ public class SourceFactory extends PluginFactory {
     public static Source newSource(final PluginSetting pluginSetting) {
         return (Source) newPlugin(pluginSetting, PluginRepository.getSourceClass(pluginSetting.getName()));
     }
-}
+}

situp-plugins/src/main/java/com/amazon/situp/plugins/source/StdInSource.java → situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/StdInSource.java

@@ -52,4 +52,4 @@ public void start(final Buffer<Record<String>> buffer) {
     public void stop() {
         isStopRequested = true;
     }
-}
+}

situp-plugins/src/test/java/com/amazon/situp/plugins/ConstructorLessComponent.java → situp-plugins/common/src/test/java/com/amazon/situp/plugins/ConstructorLessComponent.java

@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins;
 
 import com.amazon.situp.model.PluginType;
-import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.buffer.Buffer;
+import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.source.Source;
 
 @SitupPlugin(name = "junit-test", type = PluginType.SOURCE)

situp-plugins/src/test/java/com/amazon/situp/plugins/processor/ProcessorFactoryTests.java → situp-plugins/common/src/test/java/com/amazon/situp/plugins/processor/ProcessorFactoryTests.java

@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins.processor;
 
 import com.amazon.situp.model.configuration.PluginSetting;
+import com.amazon.situp.model.processor.Processor;
 import com.amazon.situp.plugins.PluginException;
 import com.amazon.situp.plugins.sink.SinkFactory;
-import com.amazon.situp.model.processor.Processor;
 import org.junit.Test;
 
 import java.util.HashMap;

situp-plugins/src/test/java/com/amazon/situp/plugins/sink/SinkFactoryTests.java → situp-plugins/common/src/test/java/com/amazon/situp/plugins/sink/SinkFactoryTests.java

@@ -1,8 +1,8 @@
 package com.amazon.situp.plugins.sink;
 
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.plugins.PluginException;
 import com.amazon.situp.model.sink.Sink;
+import com.amazon.situp.plugins.PluginException;
 import org.junit.Test;
 
 import java.util.HashMap;

situp-plugins/src/test/java/com/amazon/situp/plugins/sink/TestSink.java → situp-plugins/common/src/test/java/com/amazon/situp/plugins/sink/TestSink.java

@@ -1,10 +1,10 @@
 package com.amazon.situp.plugins.sink;
 
 
-import com.amazon.situp.model.record.Record;
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.configuration.Configuration;
-import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.sink.Sink;
 
 import java.util.ArrayList;

situp-plugins/src/test/java/com/amazon/situp/plugins/source/SourceFactoryTests.java → situp-plugins/common/src/test/java/com/amazon/situp/plugins/source/SourceFactoryTests.java

@@ -1,8 +1,8 @@
 package com.amazon.situp.plugins.source;
 
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.plugins.PluginException;
 import com.amazon.situp.model.source.Source;
+import com.amazon.situp.plugins.PluginException;
 import org.junit.Test;
 
 import java.util.HashMap;

situp-plugins/src/test/java/com/amazon/situp/plugins/source/TestSource.java → situp-plugins/common/src/test/java/com/amazon/situp/plugins/source/TestSource.java

@@ -1,10 +1,10 @@
 package com.amazon.situp.plugins.source;
 
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
-import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.buffer.Buffer;
 import com.amazon.situp.model.configuration.Configuration;
-import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.source.Source;
 
 import java.util.Iterator;