This is an automated email from the ASF dual-hosted git repository. zehnder pushed a commit to branch hotfix-remove-debug-from-adapter in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit d6a7e94d990c52327175d3487933aaa8f761208a Author: Philipp Zehnder <[email protected]> AuthorDate: Tue Jan 17 10:25:19 2023 +0100 [hotfix] Remove isDebug from `IAdapter` --- .../extensions/api/connect/IAdapter.java | 3 +-- .../management/connect/adapter/Adapter.java | 22 ++-------------------- .../adapter/model/generic/GenericAdapter.java | 6 +----- .../model/generic/GenericDataSetAdapter.java | 12 ------------ .../model/generic/GenericDataStreamAdapter.java | 15 ++------------- .../adapter/model/specific/SpecificAdapter.java | 3 --- .../model/specific/SpecificDataSetAdapter.java | 3 --- .../model/specific/SpecificDataStreamAdapter.java | 4 ---- 8 files changed, 6 insertions(+), 62 deletions(-) diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/connect/IAdapter.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/connect/IAdapter.java index 5ad006b5c..e6e8f91c4 100644 --- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/connect/IAdapter.java +++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/connect/IAdapter.java @@ -32,11 +32,10 @@ public interface IAdapter<T extends AdapterDescription> extends Connector { void stopAdapter() throws AdapterException; - IAdapter getInstance(T adapterDescription); + IAdapter<T> getInstance(T adapterDescription); GuessSchema getSchema(T adapterDescription) throws AdapterException, ParseException; void changeEventGrounding(TransportProtocol transportProtocol); - boolean isDebug(); } diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/Adapter.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/Adapter.java index 3abf92830..4d87918d6 100644 --- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/Adapter.java +++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/Adapter.java @@ -35,29 +35,16 @@ import com.google.common.annotations.VisibleForTesting; public abstract class Adapter<T extends AdapterDescription> implements IAdapter<T> { - private boolean debug; - protected AdapterPipeline adapterPipeline; protected T adapterDescription; - public Adapter(T adapterDescription, boolean debug) { + public Adapter(T adapterDescription) { this.adapterDescription = adapterDescription; - this.debug = debug; this.adapterPipeline = getAdapterPipeline(adapterDescription); } - public Adapter(T adapterDescription) { - this(adapterDescription, false); - } - - public Adapter(boolean debug) { - this.debug = debug; - } - - public Adapter() { - this(false); - } + public Adapter() { } @Override public void changeEventGrounding(TransportProtocol transportProtocol) { @@ -96,11 +83,6 @@ public abstract class Adapter<T extends AdapterDescription> implements IAdapter< return new AdapterPipelineGenerator().generatePipeline(adapterDescription); } - @Override - public boolean isDebug() { - return debug; - } - @VisibleForTesting public AdapterPipeline getAdapterPipeline() { return adapterPipeline; diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericAdapter.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericAdapter.java index fa8f864f0..569cbcf7f 100644 --- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericAdapter.java +++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericAdapter.java @@ -42,10 +42,6 @@ public abstract class GenericAdapter<T extends AdapterDescription> extends Adapt super(adapterDescription); } - public GenericAdapter(T adapterDescription, boolean debug) { - super(adapterDescription, debug); - } - public GenericAdapter() { super(); } @@ -62,7 +58,7 @@ public abstract class GenericAdapter<T extends AdapterDescription> extends Adapt IParser parser = getParser(adapterDescription); IFormat format = getFormat(adapterDescription); - ProtocolDescription protocolDescription = ((GenericAdapterDescription) adapterDescription).getProtocolDescription(); + ProtocolDescription protocolDescription = (adapterDescription).getProtocolDescription(); IProtocol protocolInstance = this.protocol.getInstance(protocolDescription, parser, format); this.protocol = protocolInstance; diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericDataSetAdapter.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericDataSetAdapter.java index 5a2045323..990252497 100644 --- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericDataSetAdapter.java +++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericDataSetAdapter.java @@ -23,24 +23,14 @@ import org.apache.streampipes.extensions.management.connect.adapter.Adapter; import org.apache.streampipes.model.connect.adapter.GenericAdapterDescription; import org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class GenericDataSetAdapter extends GenericAdapter<GenericAdapterSetDescription> { public static final String ID = GenericAdapterSetDescription.ID; - Logger logger = LoggerFactory.getLogger(Adapter.class); - public GenericDataSetAdapter() { super(); } - - public GenericDataSetAdapter(GenericAdapterSetDescription adapterDescription, boolean debug) { - super(adapterDescription, debug); - } - public GenericDataSetAdapter(GenericAdapterSetDescription adapterDescription) { super(adapterDescription); } @@ -48,8 +38,6 @@ public class GenericDataSetAdapter extends GenericAdapter<GenericAdapterSetDescr @Override public GenericAdapterSetDescription declareModel() { GenericAdapterSetDescription adapterDescription = new GenericAdapterSetDescription(); -// adapterDescription.setAdapterId(GenericAdapterSetDescription.ID); -// adapterDescription.setUri(GenericAdapterSetDescription.ID); adapterDescription.setAppId(GenericAdapterSetDescription.ID); return adapterDescription; } diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericDataStreamAdapter.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericDataStreamAdapter.java index 6bf97463e..ce5e85643 100644 --- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericDataStreamAdapter.java +++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericDataStreamAdapter.java @@ -18,28 +18,19 @@ package org.apache.streampipes.extensions.management.connect.adapter.model.generic; +import org.apache.streampipes.extensions.api.connect.IAdapter; import org.apache.streampipes.extensions.api.connect.IProtocol; -import org.apache.streampipes.extensions.management.connect.adapter.Adapter; import org.apache.streampipes.model.connect.adapter.GenericAdapterDescription; import org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class GenericDataStreamAdapter extends GenericAdapter<GenericAdapterStreamDescription> { public static final String ID = GenericAdapterStreamDescription.ID; - Logger logger = LoggerFactory.getLogger(Adapter.class); - public GenericDataStreamAdapter() { super(); } - public GenericDataStreamAdapter(GenericAdapterStreamDescription adapterDescription, boolean debug) { - super(adapterDescription, debug); - } - public GenericDataStreamAdapter(GenericAdapterStreamDescription adapterDescription) { super(adapterDescription); } @@ -47,14 +38,12 @@ public class GenericDataStreamAdapter extends GenericAdapter<GenericAdapterStrea @Override public GenericAdapterStreamDescription declareModel() { GenericAdapterStreamDescription adapterDescription = new GenericAdapterStreamDescription(); -// adapterDescription.setAdapterId(GenericAdapterStreamDescription.ID); -// adapterDescription.setUri(GenericAdapterStreamDescription.ID); adapterDescription.setAppId(GenericAdapterStreamDescription.ID); return adapterDescription; } @Override - public Adapter getInstance(GenericAdapterStreamDescription adapterDescription) { + public IAdapter<GenericAdapterStreamDescription> getInstance(GenericAdapterStreamDescription adapterDescription) { return new GenericDataStreamAdapter(adapterDescription); } diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificAdapter.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificAdapter.java index bb4f667eb..4311045c7 100644 --- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificAdapter.java +++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificAdapter.java @@ -31,7 +31,4 @@ public abstract class SpecificAdapter<T extends AdapterDescription> extends Adap super(adapterDescription); } - public SpecificAdapter(T adapterDescription, boolean debug) { - super(adapterDescription, debug); - } } diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificDataSetAdapter.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificDataSetAdapter.java index 80b7f85c4..8ae5b69d0 100644 --- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificDataSetAdapter.java +++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificDataSetAdapter.java @@ -30,7 +30,4 @@ public abstract class SpecificDataSetAdapter extends SpecificAdapter<SpecificAda super(adapterDescription); } - public SpecificDataSetAdapter(SpecificAdapterSetDescription adapterDescription, boolean debug) { - super(adapterDescription, debug); - } } diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificDataStreamAdapter.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificDataStreamAdapter.java index 6019ba235..a55ed8c38 100644 --- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificDataStreamAdapter.java +++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificDataStreamAdapter.java @@ -30,8 +30,4 @@ public abstract class SpecificDataStreamAdapter extends SpecificAdapter<Specific super(adapterDescription); } - public SpecificDataStreamAdapter(SpecificAdapterStreamDescription adapterDescription, boolean debug) { - super(adapterDescription, debug); - } - }
