Skip to content

Commit

Permalink
Use ExtensionsModelSubmitter over StandaloneModelSubmitter (#956)
Browse files Browse the repository at this point in the history
  • Loading branch information
dominikriemer authored and tenthe committed Dec 30, 2022
1 parent 9db245b commit 032ffba
Show file tree
Hide file tree
Showing 25 changed files with 48 additions and 53 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import org.apache.streampipes.service.extensions.base.WebSecurityConfig;
import org.apache.streampipes.svcdiscovery.api.model.SpServiceTag;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
Expand All @@ -42,9 +40,6 @@
@Import({PipelineElementContainerResourceConfig.class, WebSecurityConfig.class})
public abstract class StandaloneModelSubmitter extends StreamPipesExtensionsServiceBase {

private static final Logger LOG =
LoggerFactory.getLogger(StandaloneModelSubmitter.class.getCanonicalName());

@Deprecated
public void init(PeConfig peConfig) {
DeclarersSingleton.getInstance()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
*/
package org.apache.streampipes.pe.flink;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -37,7 +37,7 @@
import org.apache.streampipes.sinks.databases.flink.DatabasesFlinkInit;


public class AllFlinkPipelineElementsInit extends StandaloneModelSubmitter {
public class AllFlinkPipelineElementsInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new AllFlinkPipelineElementsInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
*/
package org.apache.streampipes.pe.jvm;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -40,7 +40,7 @@
import org.apache.streampipes.sinks.internal.jvm.SinksInternalJvmInit;
import org.apache.streampipes.sinks.notifications.jvm.SinksNotificationsJvmInit;

public class AllPipelineElementsInit extends StandaloneModelSubmitter {
public class AllPipelineElementsInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new AllPipelineElementsInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.aggregation.flink;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -34,7 +34,7 @@
import org.apache.streampipes.processors.aggregation.flink.processor.eventcount.EventCountController;
import org.apache.streampipes.processors.aggregation.flink.processor.rate.EventRateController;

public class AggregationFlinkInit extends StandaloneModelSubmitter {
public class AggregationFlinkInit extends ExtensionsModelSubmitter {

public static final String SERVICE_GROUP = "org.apache.streampipes.processors.aggregation.flink";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
package org.apache.streampipes.processors.changedetection.jvm;


import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -32,7 +32,7 @@
import org.apache.streampipes.processors.changedetection.jvm.cusum.CusumController;
import org.apache.streampipes.processors.changedetection.jvm.welford.WelfordChangeDetection;

public class ChangeDetectionJvmInit extends StandaloneModelSubmitter {
public class ChangeDetectionJvmInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new ChangeDetectionJvmInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.enricher.flink;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -32,7 +32,7 @@
import org.apache.streampipes.processors.enricher.flink.processor.timestamp.TimestampController;
import org.apache.streampipes.processors.enricher.flink.processor.urldereferencing.UrlDereferencingController;

public class EnricherFlinkInit extends StandaloneModelSubmitter {
public class EnricherFlinkInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new EnricherFlinkInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.enricher.jvm;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -35,7 +35,7 @@
import org.apache.streampipes.processors.enricher.jvm.processor.trigonometry.TrigonometryProcessor;
import org.apache.streampipes.processors.enricher.jvm.processor.valuechange.ValueChangeProcessor;

public class EnricherJvmInit extends StandaloneModelSubmitter {
public class EnricherJvmInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new EnricherJvmInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.filters.jvm;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -42,7 +42,7 @@
import org.apache.streampipes.processors.filters.jvm.processor.threshold.ThresholdDetectionProcessor;
import org.apache.streampipes.processors.filters.jvm.processor.throughputmon.ThroughputMonitorProcessor;

public class FiltersJvmInit extends StandaloneModelSubmitter {
public class FiltersJvmInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new FiltersJvmInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.siddhi;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -35,7 +35,7 @@
import org.apache.streampipes.processors.siddhi.topk.TopK;
import org.apache.streampipes.processors.siddhi.trend.TrendController;

public class FiltersSiddhiInit extends StandaloneModelSubmitter {
public class FiltersSiddhiInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new FiltersSiddhiInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processor.geo.flink;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -31,7 +31,7 @@
import org.apache.streampipes.processor.geo.flink.config.ConfigKeys;
import org.apache.streampipes.processor.geo.flink.processor.gridenricher.SpatialGridEnrichmentController;

public class GeoFlinkInit extends StandaloneModelSubmitter {
public class GeoFlinkInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new GeoFlinkInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.geo.jvm;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -39,7 +39,7 @@
import org.apache.streampipes.processors.geo.jvm.latlong.processor.revgeocoder.geocityname.GeoCityNameRevdecodeProcessor;
import org.apache.streampipes.processors.geo.jvm.latlong.processor.speedcalculator.SpeedCalculatorProcessor;

public class GeoJvmInit extends StandaloneModelSubmitter {
public class GeoJvmInit extends ExtensionsModelSubmitter {

@Override
public SpServiceDefinition provideServiceDefinition() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.imageprocessing.jvm;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -33,7 +33,7 @@
import org.apache.streampipes.processors.imageprocessing.jvm.processor.imageenrichment.ImageEnrichmentController;
import org.apache.streampipes.processors.imageprocessing.jvm.processor.qrreader.QrCodeReaderController;

public class ImageProcessingJvmInit extends StandaloneModelSubmitter {
public class ImageProcessingJvmInit extends ExtensionsModelSubmitter {

@Override
public SpServiceDefinition provideServiceDefinition() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.pattern.detection.flink;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -34,7 +34,7 @@
import org.apache.streampipes.processors.pattern.detection.flink.processor.peak.PeakDetectionController;
import org.apache.streampipes.processors.pattern.detection.flink.processor.sequence.SequenceController;

public class PatternDetectionFlinkInit extends StandaloneModelSubmitter {
public class PatternDetectionFlinkInit extends ExtensionsModelSubmitter {

public static final String SERVICE_GROUP = "org.apache.streampipes.processors.patterndetection.flink";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.statistics.flink;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -32,7 +32,7 @@
import org.apache.streampipes.processors.statistics.flink.processor.stat.summary.StatisticsSummaryController;
import org.apache.streampipes.processors.statistics.flink.processor.stat.window.StatisticsSummaryControllerWindow;

public class StatisticsFlinkInit extends StandaloneModelSubmitter {
public class StatisticsFlinkInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new StatisticsFlinkInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.textmining.flink;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -31,7 +31,7 @@
import org.apache.streampipes.processors.textmining.flink.config.ConfigKeys;
import org.apache.streampipes.processors.textmining.flink.processor.wordcount.WordCountController;

public class TextMiningFlinkInit extends StandaloneModelSubmitter {
public class TextMiningFlinkInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new TextMiningFlinkInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.textmining.jvm;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -35,7 +35,7 @@
import org.apache.streampipes.processors.textmining.jvm.processor.sentencedetection.SentenceDetectionController;
import org.apache.streampipes.processors.textmining.jvm.processor.tokenizer.TokenizerController;

public class TextMiningJvmInit extends StandaloneModelSubmitter {
public class TextMiningJvmInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new TextMiningJvmInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.transformation.flink;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -36,7 +36,7 @@
import org.apache.streampipes.processors.transformation.flink.processor.measurementunitonverter.MeasurementUnitConverterController;
import org.apache.streampipes.processors.transformation.flink.processor.rename.FieldRenamerController;

public class TransformationFlinkInit extends StandaloneModelSubmitter {
public class TransformationFlinkInit extends ExtensionsModelSubmitter {

public static final String SERVICE_GROUP = "org.apache.streampipes.processors.transformation.flink";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.processors.transformation.jvm;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand Down Expand Up @@ -52,7 +52,7 @@
import org.apache.streampipes.processors.transformation.jvm.processor.value.change.ChangedValueDetectionController;
import org.apache.streampipes.processors.transformation.jvm.processor.value.duration.CalculateDurationController;

public class TransformationJvmInit extends StandaloneModelSubmitter {
public class TransformationJvmInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new TransformationJvmInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.sinks.brokers.jvm;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -39,7 +39,7 @@
import org.apache.streampipes.sinks.brokers.jvm.rocketmq.RocketMQPublisherSink;
import org.apache.streampipes.sinks.brokers.jvm.websocket.WebsocketServerSink;

public class BrokersJvmInit extends StandaloneModelSubmitter {
public class BrokersJvmInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new BrokersJvmInit().init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

package org.apache.streampipes.sinks.databases.flink;

import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
Expand All @@ -31,7 +31,7 @@
import org.apache.streampipes.sinks.databases.flink.config.ConfigKeys;
import org.apache.streampipes.sinks.databases.flink.elasticsearch.ElasticSearchController;

public class DatabasesFlinkInit extends StandaloneModelSubmitter {
public class DatabasesFlinkInit extends ExtensionsModelSubmitter {

public static void main(String[] args) {
new DatabasesFlinkInit().init();
Expand Down

0 comments on commit 032ffba

Please sign in to comment.