Fix remaining review issues in #12346

Author: Kontinuation

api/src/main/java/org/apache/iceberg/types/Types.java

@@ -81,7 +81,6 @@ public static Type fromTypeName(String typeString) {
     Matcher geometry = GEOMETRY_PARAMETERS.matcher(typeString);
     if (geometry.matches()) {
       String crs = geometry.group(1);
-      Preconditions.checkArgument(!crs.contains(","), "Invalid CRS: %s", crs);
       return GeometryType.of(crs);
     }
 
@@ -599,7 +598,7 @@ public TypeID typeId() {
     }
 
     public String crs() {
-      return crs;
+      return crs != null ? crs : DEFAULT_CRS;
     }
 
     @Override
@@ -631,6 +630,7 @@ public String toString() {
 
   public static class GeographyType extends PrimitiveType {
     public static final String DEFAULT_CRS = "OGC:CRS84";
+    public static final EdgeAlgorithm DEFAULT_ALGORITHM = EdgeAlgorithm.SPHERICAL;
 
     public static GeographyType crs84() {
       return new GeographyType();
@@ -664,11 +664,11 @@ public TypeID typeId() {
     }
 
     public String crs() {
-      return crs;
+      return crs != null ? crs : DEFAULT_CRS;
     }
 
     public EdgeAlgorithm algorithm() {
-      return algorithm;
+      return algorithm != null ? algorithm : DEFAULT_ALGORITHM;
     }
 
     @Override

api/src/test/java/org/apache/iceberg/types/TestTypes.java

@@ -98,6 +98,8 @@ public void fromPrimitiveString() {
 
     assertThat(Types.fromPrimitiveString("geometry")).isEqualTo(Types.GeometryType.crs84());
     assertThat(Types.fromPrimitiveString("Geometry")).isEqualTo(Types.GeometryType.crs84());
+    assertThat(((Types.GeometryType) Types.fromPrimitiveString("geometry")).crs())
+        .isEqualTo(Types.GeometryType.DEFAULT_CRS);
     assertThat(Types.fromPrimitiveString("geometry(srid:3857)"))
         .isEqualTo(Types.GeometryType.of("srid:3857"));
     assertThat(Types.fromPrimitiveString("geometry( srid:3857 )"))
@@ -113,12 +115,13 @@ public void fromPrimitiveString() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> Types.fromPrimitiveString("geometry( )"))
         .withMessageContaining("Invalid CRS: (empty string)");
-    assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> Types.fromPrimitiveString("geometry(srid:123,456)"))
-        .withMessageContaining("Invalid CRS: srid:123,456");
 
     assertThat(Types.fromPrimitiveString("geography")).isEqualTo(Types.GeographyType.crs84());
     assertThat(Types.fromPrimitiveString("Geography")).isEqualTo(Types.GeographyType.crs84());
+    assertThat(((Types.GeographyType) Types.fromPrimitiveString("geography")).crs())
+        .isEqualTo(Types.GeographyType.DEFAULT_CRS);
+    assertThat(((Types.GeographyType) Types.fromPrimitiveString("geography")).algorithm())
+        .isEqualTo(Types.GeographyType.DEFAULT_ALGORITHM);
     assertThat(Types.fromPrimitiveString("geography(srid:4269)"))
         .isEqualTo(Types.GeographyType.of("srid:4269"));
     assertThat(Types.fromPrimitiveString("geography(srid: 4269)"))