SDC-9499. Fix DataGeneratorFormatConfig group name for all destinations

Change-Id: I612ac97f3275a4d6a2cc4e6c78c07f9acd55ec41
Reviewed-on: https://review.streamsets.net/15546
Tested-by: StreamSets CI <streamsets-ci-spam@streamsets.com>
Reviewed-by: Madhukar Devaraju <madhu@streamsets.com>

azure-lib/src/main/java/com/streamsets/pipeline/stage/destination/datalake/DataLakeConfigBean.java

@@ -252,7 +252,7 @@ public class DataLakeConfigBean {
   @ValueChooserModel(DataFormatChooserValues.class)
   public DataFormat dataFormat;
 
-  @ConfigDefBean(groups = {"DATALAKE"})
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataFormatConfig = new DataGeneratorFormatConfig();
 
   public void init(Stage.Context context, List<Stage.ConfigIssue> issues) {

azure-lib/src/main/java/com/streamsets/pipeline/stage/destination/datalake/DataLakeDTarget.java

@@ -34,7 +34,7 @@
 @ConfigGroups(value = Groups.class)
 @GenerateResourceBundle
 public class DataLakeDTarget extends DTarget {
-  @ConfigDefBean(groups = {"DATALAKE"})
+  @ConfigDefBean(groups = {"DATALAKE", "DATA_FORMAT"})
   public DataLakeConfigBean dataLakeConfig;
 
   @Override

azure-lib/src/main/java/com/streamsets/pipeline/stage/destination/eventhubs/EventHubProducerConfigBean.java

@@ -36,7 +36,7 @@ public class EventHubProducerConfigBean {
   @ValueChooserModel(DestinationDataFormatChooserValues.class)
   public DataFormat dataFormat = DataFormat.JSON;
 
-  @ConfigDefBean(groups = {"EVENT_HUB"})
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig;
 
 }

azure-lib/src/main/java/com/streamsets/pipeline/stage/destination/iothub/IotHubProducerConfigBean.java

@@ -36,7 +36,7 @@ public class IotHubProducerConfigBean {
   @ValueChooserModel(DestinationDataFormatChooserValues.class)
   public DataFormat dataFormat = DataFormat.JSON;
 
-  @ConfigDefBean(groups = {"IOT_HUB"})
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig;
 
   @ConfigDef(

basic-lib/src/main/java/com/streamsets/pipeline/stage/destination/coap/CoapClientTargetConfig.java

@@ -28,7 +28,7 @@
  * Bean specifying the configuration for an CoapClientTarget instance.
  */
 public class CoapClientTargetConfig {
-  @ConfigDefBean(groups = {"COAP"})
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig;
 
   @ConfigDef(

basic-lib/src/main/java/com/streamsets/pipeline/stage/destination/http/HttpClientTargetConfig.java

@@ -33,7 +33,7 @@
  * Bean specifying the configuration for an HttpClientTarget instance.
  */
 public class HttpClientTargetConfig {
-  @ConfigDefBean(groups = {"HTTP"})
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig;
 
   @ConfigDef(

basic-lib/src/main/java/com/streamsets/pipeline/stage/destination/mqtt/MqttClientTargetConfigBean.java

@@ -58,7 +58,7 @@ public class MqttClientTargetConfigBean {
   @ValueChooserModel(DataFormatChooserValues.class)
   public DataFormat dataFormat = DataFormat.JSON;
 
-  @ConfigDefBean(groups = {"MQTT"})
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig;
 
 }

basic-lib/src/main/java/com/streamsets/pipeline/stage/destination/websocket/WebSocketTargetConfig.java

@@ -32,7 +32,7 @@
  * Bean specifying the configuration for an WebSocket Client Target instance.
  */
 public class WebSocketTargetConfig {
-  @ConfigDefBean(groups = {"WEB_SOCKET"})
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig;
 
   @ConfigDef(

dataformats-lib/src/main/java/com/streamsets/service/generator/DataGeneratorServiceImpl.java

@@ -40,7 +40,6 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -73,7 +72,7 @@ public class DataGeneratorServiceImpl extends BaseService implements DataFormatG
   @ValueChooserModel(value = DataFormatChooserValues.class, filteringConfig = "displayFormats")
   public DataFormat dataFormat;
 
-  @ConfigDefBean()
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig;
 
   @Override

flume-protolib/src/main/java/com/streamsets/pipeline/stage/destination/flume/FlumeConfigBean.java

@@ -40,7 +40,7 @@ public class FlumeConfigBean {
   @ValueChooserModel(FlumeDestinationDataFormatChooserValues.class)
   public DataFormat dataFormat;
 
-  @ConfigDefBean(groups = {"FLUME"})
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig;
 
   public boolean init (Stage.Context context, List<Stage.ConfigIssue> issues) {

google-cloud-lib/src/main/java/com/streamsets/pipeline/stage/cloudstorage/destination/GCSTargetConfig.java

@@ -125,7 +125,7 @@ public class GCSTargetConfig {
   @ValueChooserModel(DataFormatChooserValues.class)
   public DataFormat dataFormat;
 
-  @ConfigDefBean()
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig;
 
   @ConfigDefBean(groups = "CREDENTIALS")

google-cloud-lib/src/main/java/com/streamsets/pipeline/stage/pubsub/destination/PubSubTargetConfig.java

@@ -35,7 +35,7 @@ public class PubSubTargetConfig {
   @ValueChooserModel(DataFormatChooserValues.class)
   public DataFormat dataFormat;
 
-  @ConfigDefBean
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataFormatConfig = new DataGeneratorFormatConfig();
 
   @ConfigDef(

hdfs-protolib/src/main/java/com/streamsets/pipeline/stage/destination/hdfs/HdfsTargetConfigBean.java

@@ -18,7 +18,6 @@
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Meter;
 import com.google.common.annotations.VisibleForTesting;
-import com.streamsets.datacollector.security.HadoopSecurityUtil;
 import com.streamsets.pipeline.api.ConfigDef;
 import com.streamsets.pipeline.api.ConfigDefBean;
 import com.streamsets.pipeline.api.Stage;
@@ -35,14 +34,13 @@
 import com.streamsets.pipeline.lib.el.RecordEL;
 import com.streamsets.pipeline.lib.el.TimeEL;
 import com.streamsets.pipeline.lib.el.TimeNowEL;
+import com.streamsets.pipeline.lib.hdfs.common.Errors;
+import com.streamsets.pipeline.lib.hdfs.common.HdfsBaseConfigBean;
 import com.streamsets.pipeline.stage.destination.hdfs.writer.ActiveRecordWriters;
 import com.streamsets.pipeline.stage.destination.hdfs.writer.RecordWriterManager;
 import com.streamsets.pipeline.stage.destination.lib.DataGeneratorFormatConfig;
-import com.streamsets.pipeline.lib.hdfs.common.Errors;
-import com.streamsets.pipeline.lib.hdfs.common.HdfsBaseConfigBean;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.SequenceFile;
@@ -380,7 +378,7 @@ protected String getConfigBeanPrefix() {
   )
   public boolean skipOldTempFileRecovery = false;
 
-  @ConfigDefBean()
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig;
 
   //private members

kafka_target-protolib/src/main/java/com/streamsets/pipeline/stage/destination/kafka/KafkaTargetConfig.java

@@ -78,7 +78,7 @@ public class KafkaTargetConfig {
   @ValueChooserModel(ProducerDataFormatChooserValues.class)
   public DataFormat dataFormat;
 
-  @ConfigDefBean
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig = new DataGeneratorFormatConfig();
 
   @ConfigDef(

kinesis-lib/src/main/java/com/streamsets/pipeline/stage/destination/kinesis/FirehoseConfigBean.java

@@ -46,7 +46,7 @@ public class FirehoseConfigBean extends KinesisConfigBean {
   @ValueChooserModel(FirehoseDestinationChooserValues.class)
   public FirehoseDestinationType destinationType;
 
-  @ConfigDefBean(groups = "KINESIS")
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataFormatConfig;
 
   @ConfigDef(

kinesis-lib/src/main/java/com/streamsets/pipeline/stage/destination/kinesis/FirehoseDTarget.java

@@ -34,7 +34,7 @@
 @GenerateResourceBundle
 public class FirehoseDTarget extends DTarget {
 
-  @ConfigDefBean(groups = "KINESIS")
+  @ConfigDefBean(groups = {"KINESIS", "DATA_FORMAT"})
   public FirehoseConfigBean kinesisConfig;
 
   @Override

kinesis-lib/src/main/java/com/streamsets/pipeline/stage/destination/kinesis/KinesisDTarget.java

@@ -36,7 +36,7 @@
 @GenerateResourceBundle
 public class KinesisDTarget extends DTarget {
 
-  @ConfigDefBean(groups = "KINESIS")
+  @ConfigDefBean(groups = {"KINESIS", "DATA_FORMAT"})
   public KinesisProducerConfigBean kinesisConfig;
 
   @Override

kinesis-lib/src/main/java/com/streamsets/pipeline/stage/destination/kinesis/KinesisProducerConfigBean.java

@@ -27,7 +27,7 @@
 
 public class KinesisProducerConfigBean extends KinesisConfigBean {
 
-  @ConfigDefBean(groups = "KINESIS")
+  @ConfigDefBean(groups = "DATA_FORMAT")
   public DataGeneratorFormatConfig dataFormatConfig;
 
   @ConfigDef(

kinesis-lib/src/main/java/com/streamsets/pipeline/stage/destination/kinesis/StatsKinesisDTarget.java

@@ -43,7 +43,7 @@
 @GenerateResourceBundle
 public class StatsKinesisDTarget extends DTarget {
 
-  @ConfigDefBean(groups = "KINESIS")
+  @ConfigDefBean(groups = {"KINESIS", "DATA_FORMAT"})
   public KinesisProducerConfigBean kinesisConfig;
 
   @Override

maprstreams-target-protolib/src/main/java/com/streamsets/pipeline/stage/destination/maprstreams/MapRStreamsTargetConfigBean.java

@@ -42,7 +42,7 @@ public class MapRStreamsTargetConfigBean {
   @ValueChooserModel(ProducerDataFormatChooserValues.class)
   public DataFormat dataFormat;
 
-  @ConfigDefBean(groups = {"MAPR_STREAMS"})
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataGeneratorFormatConfig;
 
   public void init(Stage.Context context, List<Stage.ConfigIssue> issues) {

rabbitmq-lib/src/main/java/com/streamsets/pipeline/stage/destination/rabbitmq/RabbitDTarget.java

@@ -37,7 +37,7 @@
 @ConfigGroups(value = Groups.class)
 @GenerateResourceBundle
 public class RabbitDTarget extends DTarget {
-  @ConfigDefBean(groups = {"RABBITMQ", "QUEUE", "EXCHANGE", "ADVANCED"})
+  @ConfigDefBean(groups = {"RABBITMQ", "QUEUE", "EXCHANGE", "ADVANCED", "DATA_FORMAT"})
   public RabbitTargetConfigBean conf;
 
   @Override

rabbitmq-lib/src/main/java/com/streamsets/pipeline/stage/destination/rabbitmq/RabbitTargetConfigBean.java

@@ -60,7 +60,7 @@ public class RabbitTargetConfigBean extends BaseRabbitConfigBean{
   @ValueChooserModel(ProducerDataFormatChooserValues.class)
   public DataFormat dataFormat = DataFormat.JSON;
 
-  @ConfigDefBean(groups = "RABBITMQ")
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataFormatConfig = new DataGeneratorFormatConfig();
 
 }

redis-lib/src/main/java/com/streamsets/pipeline/stage/destination/redis/RedisDTarget.java

@@ -35,7 +35,7 @@
 @GenerateResourceBundle
 public class RedisDTarget extends DTarget {
 
-  @ConfigDefBean(groups = {"REDIS"})
+  @ConfigDefBean
   public RedisTargetConfig conf;
 
   @Override

redis-lib/src/main/java/com/streamsets/pipeline/stage/destination/redis/RedisTargetConfig.java

@@ -125,7 +125,7 @@ public class RedisTargetConfig {
   )
   public List<String> channel;
 
-  @ConfigDefBean(groups = "REDIS")
+  @ConfigDefBean(groups = {"DATA_FORMAT"})
   public DataGeneratorFormatConfig dataFormatConfig = new DataGeneratorFormatConfig();
 
 }