Catalog table should not need explicit segment granularity set

extensions-core/druid-catalog/src/test/java/org/apache/druid/server/http/catalog/EditorTest.java

@@ -327,24 +327,21 @@ public void testUpdateProperties() throws CatalogException
     // properties.
 
     // Remove a required property
-    Map<String, Object> updates1 = new HashMap<>();
-    updates1.put(DatasourceDefn.SEGMENT_GRANULARITY_PROPERTY, null);
-    assertThrows(
-        CatalogException.class,
-        () -> new TableEditor(
-                  catalog,
-                  table.id(),
-                  new UpdateProperties(updates1)
-              )
-             .go()
+    Map<String, Object> updates = new HashMap<>();
+    updates.put(DatasourceDefn.SEGMENT_GRANULARITY_PROPERTY, null);
+    cmd = new UpdateProperties(updates);
+    Map<String, Object> expected = ImmutableMap.of();
+    assertEquals(
+        expected,
+        doEdit(tableName, cmd).spec().properties()
     );
 
     // Add and update properties
-    Map<String, Object> updates = new HashMap<>();
+    updates = new HashMap<>();
     updates.put(DatasourceDefn.SEGMENT_GRANULARITY_PROPERTY, "PT1H");
     updates.put("foo", "bar");
     cmd = new UpdateProperties(updates);
-    Map<String, Object> expected = ImmutableMap.of(
+    expected = ImmutableMap.of(
         DatasourceDefn.SEGMENT_GRANULARITY_PROPERTY, "PT1H",
         "foo", "bar"
     );

server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java

@@ -21,7 +21,6 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Strings;
 import org.apache.druid.catalog.model.CatalogUtils;
 import org.apache.druid.catalog.model.ColumnSpec;
 import org.apache.druid.catalog.model.Columns;
@@ -83,9 +82,6 @@ public SegmentGranularityFieldDefn()
     public void validate(Object value, ObjectMapper jsonMapper)
     {
       String gran = decode(value, jsonMapper);
-      if (Strings.isNullOrEmpty(gran)) {
-        throw new IAE("Segment granularity is required.");
-      }
       CatalogUtils.validateGranularity(gran);
     }
   }

server/src/test/java/org/apache/druid/catalog/model/table/DatasourceTableTest.java

@@ -112,13 +112,7 @@ public void testEmptySpec()
 
     {
       TableSpec spec = new TableSpec(DatasourceDefn.TABLE_TYPE, ImmutableMap.of(), null);
-      ResolvedTable table = registry.resolve(spec);
-      expectValidationFails(table);
-    }
-
-    {
-      TableSpec spec = new TableSpec(DatasourceDefn.TABLE_TYPE, ImmutableMap.of(), null);
-      expectValidationFails(spec);
+      expectValidationSucceeds(spec);
     }
   }