Remove default content type, so config will return default content type

Author: ardian4

integration-test-remote/src/test/java/io/cdap/cdap/app/etl/gcp/GCSTest.java

@@ -24,6 +24,7 @@
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
 import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
 import com.google.gson.Gson;
@@ -120,7 +121,6 @@ public class GCSTest extends DataprocETLTestBase {
 
   private static Storage storage;
   private List<String> markedForDeleteBuckets;
-  private static final String DEFAULT_CONTENT_TYPE = "application/octet-stream";
   private static final String CSV_CONTENT_TYPE = "text/csv";
   private static final String MULTISINK_RUNTIME_ARG = "multisink.%s";
 
@@ -741,7 +741,7 @@ public void testGcsSourceFormats() throws Exception {
     ETLBatchConfig.Builder pipelineConfig = ETLBatchConfig.builder().addStage(source);
     for (String format : formats) {
       String path = String.format("%s/%s/%s", createPath(bucket, OUTPUT_BLOB_NAME), format, suffix);
-      ETLStage sink = new ETLStage(format, createSinkPlugin(format, path, schema, DEFAULT_CONTENT_TYPE));
+      ETLStage sink = new ETLStage(format, createSinkPlugin(format, path, schema));
       pipelineConfig.addStage(sink).addConnection(source.getName(), sink.getName());
     }
 
@@ -873,16 +873,21 @@ private ETLStage createSourceStage(String format, String path, String regex, Sch
                                               GOOGLE_CLOUD_ARTIFACT));
   }
 
+  private ETLPlugin createSinkPlugin(String format, String path, Schema schema) {
+    return createSinkPlugin(format, path, schema, null);
+  }
+
   private ETLPlugin createSinkPlugin(String format, String path, Schema schema, String contentType) {
-    return new ETLPlugin(SINK_PLUGIN_NAME, BatchSink.PLUGIN_TYPE,
-                         new ImmutableMap.Builder<String, String>()
-                           .put("path", path)
-                           .put("format", format)
-                           .put("project", getProjectId())
-                           .put("referenceName", format)
-                           .put("schema", schema.toString())
-                           .put("contentType", contentType).build(),
-                         GOOGLE_CLOUD_ARTIFACT);
+    ImmutableMap.Builder<String, String> propertyBuilder = new ImmutableMap.Builder<String, String>()
+      .put("path", path)
+      .put("format", format)
+      .put("project", getProjectId())
+      .put("referenceName", format)
+      .put("schema", schema.toString());
+    if (!Strings.isNullOrEmpty(contentType)) {
+      propertyBuilder.put("contentType", contentType);
+    }
+    return new ETLPlugin(SINK_PLUGIN_NAME, BatchSink.PLUGIN_TYPE, propertyBuilder.build(), GOOGLE_CLOUD_ARTIFACT);
   }
 
   private ETLPlugin createMultiSinkPlugin(String format, String path, Schema schema, String contentType,