Remove LegacyDataSource.

processing/src/main/java/org/apache/druid/query/DataSource.java

@@ -28,7 +28,7 @@
 /**
  * Represents a source... of data... for a query. Analogous to the "FROM" clause in SQL.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = LegacyDataSource.class)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = TableDataSource.class)
 @JsonSubTypes({
     @JsonSubTypes.Type(value = TableDataSource.class, name = "table"),
     @JsonSubTypes.Type(value = QueryDataSource.class, name = "query"),

processing/src/main/java/org/apache/druid/query/TableDataSource.java

@@ -40,6 +40,12 @@ public TableDataSource(@JsonProperty("name") String name)
     this.name = Preconditions.checkNotNull(name, "'name' must be nonnull");
   }
 
+  @JsonCreator
+  public static TableDataSource create(final String name)
+  {
+    return new TableDataSource(name);
+  }
+
   @JsonProperty
   public String getName()
   {

processing/src/test/java/org/apache/druid/query/TableDataSourceTest.java

@@ -36,6 +36,7 @@ public class TableDataSourceTest
   public ExpectedException expectedException = ExpectedException.none();
 
   private final TableDataSource fooDataSource = new TableDataSource("foo");
+  private final TableDataSource barDataSource = new TableDataSource("bar");
 
   @Test
   public void test_getTableNames()
@@ -89,27 +90,49 @@ public void test_equals()
   }
 
   @Test
-  public void test_equals_legacy()
+  public void test_serde_roundTrip() throws Exception
   {
-    final LegacyDataSource legacyFoo = new LegacyDataSource("foo");
-    final LegacyDataSource legacyBar = new LegacyDataSource("bar");
+    final ObjectMapper jsonMapper = TestHelper.makeJsonMapper();
+    final TableDataSource deserialized = (TableDataSource) jsonMapper.readValue(
+        jsonMapper.writeValueAsString(fooDataSource),
+        DataSource.class
+    );
 
-    Assert.assertEquals(legacyFoo, fooDataSource);
-    Assert.assertEquals(fooDataSource, legacyFoo);
+    Assert.assertEquals(fooDataSource, deserialized);
+    Assert.assertNotEquals(barDataSource, deserialized);
+  }
 
-    Assert.assertNotEquals(legacyBar, fooDataSource);
-    Assert.assertNotEquals(fooDataSource, legacyBar);
+  @Test
+  public void test_deserialize_fromObject() throws Exception
+  {
+    final ObjectMapper jsonMapper = TestHelper.makeJsonMapper();
+    final TableDataSource deserialized = (TableDataSource) jsonMapper.readValue(
+        "{\"type\":\"table\",\"name\":\"foo\"}",
+        DataSource.class
+    );
+
+    Assert.assertEquals(fooDataSource, deserialized);
+    Assert.assertNotEquals(barDataSource, deserialized);
   }
 
   @Test
-  public void test_serde() throws Exception
+  public void test_deserialize_fromString() throws Exception
   {
     final ObjectMapper jsonMapper = TestHelper.makeJsonMapper();
     final TableDataSource deserialized = (TableDataSource) jsonMapper.readValue(
-        jsonMapper.writeValueAsString(fooDataSource),
+        "\"foo\"",
         DataSource.class
     );
 
     Assert.assertEquals(fooDataSource, deserialized);
+    Assert.assertNotEquals(barDataSource, deserialized);
+  }
+
+  @Test
+  public void test_serialize() throws Exception
+  {
+    final ObjectMapper jsonMapper = TestHelper.makeJsonMapper();
+    final String s = jsonMapper.writeValueAsString(fooDataSource);
+    Assert.assertEquals("{\"type\":\"table\",\"name\":\"foo\"}", s);
   }
 }

processing/src/test/java/org/apache/druid/query/metadata/SegmentAnalyzerTest.java

@@ -20,11 +20,11 @@
 package org.apache.druid.query.metadata;
 
 import org.apache.druid.data.input.impl.DimensionSchema;
-import org.apache.druid.query.LegacyDataSource;
 import org.apache.druid.query.QueryPlus;
 import org.apache.druid.query.QueryRunner;
 import org.apache.druid.query.QueryRunnerFactory;
 import org.apache.druid.query.QueryRunnerTestHelper;
+import org.apache.druid.query.TableDataSource;
 import org.apache.druid.query.metadata.metadata.ColumnAnalysis;
 import org.apache.druid.query.metadata.metadata.SegmentAnalysis;
 import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery;
@@ -190,7 +190,7 @@ private List<SegmentAnalysis> getSegmentAnalysises(Segment index, EnumSet<Segmen
     );
 
     final SegmentMetadataQuery query = new SegmentMetadataQuery(
-        new LegacyDataSource("test"), new LegacySegmentSpec("2011/2012"), null, null, null, analyses, false, false
+        new TableDataSource("test"), new LegacySegmentSpec("2011/2012"), null, null, null, analyses, false, false
     );
     return runner.run(QueryPlus.wrap(query)).toList();
   }

server/src/test/java/org/apache/druid/server/log/FilteredRequestLoggerTest.java

@@ -26,8 +26,8 @@
 import com.google.inject.ProvisionException;
 import org.apache.druid.guice.JsonConfigurator;
 import org.apache.druid.jackson.DefaultObjectMapper;
-import org.apache.druid.query.LegacyDataSource;
 import org.apache.druid.query.Query;
+import org.apache.druid.query.TableDataSource;
 import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery;
 import org.apache.druid.server.QueryStats;
 import org.apache.druid.server.RequestLogLine;
@@ -47,7 +47,7 @@ public class FilteredRequestLoggerTest
   public final ExpectedException expectedException = ExpectedException.none();
   private final DefaultObjectMapper mapper = new DefaultObjectMapper();
   private final SegmentMetadataQuery testSegmentMetadataQuery = new SegmentMetadataQuery(
-      new LegacyDataSource("foo"),
+      new TableDataSource("foo"),
       null,
       null,
       null,

server/src/test/java/org/apache/druid/server/log/LoggingRequestLoggerTest.java

@@ -29,11 +29,11 @@
 import org.apache.druid.java.util.common.jackson.JacksonUtils;
 import org.apache.druid.query.BaseQuery;
 import org.apache.druid.query.DataSource;
-import org.apache.druid.query.LegacyDataSource;
 import org.apache.druid.query.Query;
 import org.apache.druid.query.QueryDataSource;
 import org.apache.druid.query.QueryRunner;
 import org.apache.druid.query.QuerySegmentWalker;
+import org.apache.druid.query.TableDataSource;
 import org.apache.druid.query.UnionDataSource;
 import org.apache.druid.query.filter.DimFilter;
 import org.apache.druid.query.spec.QuerySegmentSpec;
@@ -73,7 +73,7 @@ public class LoggingRequestLoggerTest
   final String remoteAddr = "some.host.tld";
   final Map<String, Object> queryContext = ImmutableMap.of("foo", "bar");
   final Query query = new FakeQuery(
-      new LegacyDataSource("datasource"),
+      new TableDataSource("datasource"),
       new QuerySegmentSpec()
       {
         @Override
@@ -127,7 +127,7 @@ public <T> QueryRunner<T> lookup(Query<T> query, QuerySegmentWalker walker)
   );
 
   final Query unionQuery = new FakeQuery(
-      new UnionDataSource(ImmutableList.of(new LegacyDataSource("A"), new LegacyDataSource("B"))),
+      new UnionDataSource(ImmutableList.of(new TableDataSource("A"), new TableDataSource("B"))),
       new QuerySegmentSpec()
       {
         @Override