fix(java): support skip optional sql serializers for java11+

java/fory-core/src/main/java/org/apache/fory/resolver/ClassResolver.java

@@ -35,7 +35,6 @@
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
-import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -127,6 +126,7 @@
 import org.apache.fory.serializer.SerializerFactory;
 import org.apache.fory.serializer.Serializers;
 import org.apache.fory.serializer.Shareable;
+import org.apache.fory.serializer.SqlTimeSerializers;
 import org.apache.fory.serializer.TimeSerializers;
 import org.apache.fory.serializer.UnknownClass;
 import org.apache.fory.serializer.UnknownClass.UnknownEmptyStruct;
@@ -329,6 +329,16 @@ private void addDefaultSerializers() {
     ArraySerializers.registerDefaultSerializers(this);
     PrimitiveListSerializers.registerDefaultSerializers(this);
     TimeSerializers.registerDefaultSerializers(this);
+    if (SqlTimeSerializers.isSqlModuleAvailable()) {
+      SqlTimeSerializers.registerDefaultSerializers(this);
+    } else {
+      Preconditions.checkArgument(
+          extRegistry.classIdGenerator + SqlTimeSerializers.getNumReservedTypeIds()
+              <= INTERNAL_NATIVE_ID_LIMIT,
+          "Internal type id overflow: %s",
+          extRegistry.classIdGenerator + SqlTimeSerializers.getNumReservedTypeIds());
+      extRegistry.classIdGenerator += SqlTimeSerializers.getNumReservedTypeIds();
+    }
     OptionalSerializers.registerDefaultSerializers(this);
     CollectionSerializers.registerDefaultSerializers(this);
     MapSerializers.registerDefaultSerializers(this);
@@ -374,7 +384,7 @@ private void addDefaultSerializer(Class type, Serializer serializer) {
   private void registerCommonUsedClasses() {
     registerInternal(LinkedList.class, TreeSet.class);
     registerInternal(LinkedHashMap.class, TreeMap.class);
-    registerInternal(Date.class, Timestamp.class, LocalDateTime.class, Instant.class);
+    registerInternal(Date.class, LocalDateTime.class, Instant.class);
     registerInternal(BigInteger.class, BigDecimal.class);
     registerInternal(Optional.class, OptionalInt.class);
     registerInternal(Boolean[].class, Byte[].class, Short[].class, Character[].class);

java/fory-core/src/main/java/org/apache/fory/resolver/XtypeResolver.java

@@ -29,7 +29,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -87,6 +86,7 @@
 import org.apache.fory.serializer.Serializer;
 import org.apache.fory.serializer.Serializers;
 import org.apache.fory.serializer.Shareable;
+import org.apache.fory.serializer.SqlTimeSerializers;
 import org.apache.fory.serializer.TimeSerializers;
 import org.apache.fory.serializer.UnionSerializer;
 import org.apache.fory.serializer.UnknownClass;
@@ -943,9 +943,16 @@ private void registerDefaultTypes() {
     registerType(Types.DURATION, Duration.class, new TimeSerializers.DurationSerializer(config));
     registerType(Types.TIMESTAMP, Instant.class, new TimeSerializers.InstantSerializer(config));
     registerType(Types.TIMESTAMP, Date.class, new TimeSerializers.DateSerializer(config));
-    registerType(
-        Types.TIMESTAMP, java.sql.Date.class, new TimeSerializers.SqlDateSerializer(config));
-    registerType(Types.TIMESTAMP, Timestamp.class, new TimeSerializers.TimestampSerializer(config));
+    if (SqlTimeSerializers.isSqlModuleAvailable()) {
+      registerType(
+          Types.TIMESTAMP,
+          TypeUtils.SQL_DATE_TYPE.getRawType(),
+          SqlTimeSerializers.newSqlDateSerializer(config));
+      registerType(
+          Types.TIMESTAMP,
+          TypeUtils.TIMESTAMP_TYPE.getRawType(),
+          SqlTimeSerializers.newTimestampSerializer(config));
+    }
     registerType(
         Types.TIMESTAMP, LocalDateTime.class, new TimeSerializers.LocalDateTimeSerializer(config));
     registerType(Types.DATE, LocalDate.class, new TimeSerializers.LocalDateSerializer(config));

java/fory-core/src/main/java/org/apache/fory/serializer/SqlTimeSerializers.java

@@ -0,0 +1,159 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.fory.serializer;
+
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.time.Instant;
+import org.apache.fory.config.Config;
+import org.apache.fory.context.CopyContext;
+import org.apache.fory.context.ReadContext;
+import org.apache.fory.context.WriteContext;
+import org.apache.fory.memory.MemoryBuffer;
+import org.apache.fory.resolver.TypeResolver;
+
+/** Optional SQL time serializers loaded only when {@code java.sql} types are actually used. */
+public final class SqlTimeSerializers {
+  private static final String SQL_DATE_CLASS_NAME = "java.sql.Date";
+  private static final String SQL_TIME_CLASS_NAME = "java.sql.Time";
+  private static final String SQL_TIMESTAMP_CLASS_NAME = "java.sql.Timestamp";
+  private static final int NUM_RESERVED_TYPE_IDS = 3;
+  private static final boolean SQL_MODULE_AVAILABLE =
+      isClassAvailable(SQL_DATE_CLASS_NAME)
+          && isClassAvailable(SQL_TIME_CLASS_NAME)
+          && isClassAvailable(SQL_TIMESTAMP_CLASS_NAME);
+
+  private SqlTimeSerializers() {}
+
+  public static boolean isSqlModuleAvailable() {
+    return SQL_MODULE_AVAILABLE;
+  }
+
+  public static int getNumReservedTypeIds() {
+    return NUM_RESERVED_TYPE_IDS;
+  }
+
+  public static Serializer<?> newSqlDateSerializer(Config config) {
+    return new SqlDateSerializer(config);
+  }
+
+  public static Serializer<?> newTimestampSerializer(Config config) {
+    return new TimestampSerializer(config);
+  }
+
+  public static void registerDefaultSerializers(TypeResolver resolver) {
+    Config config = resolver.getConfig();
+    resolver.registerInternalSerializer(java.sql.Date.class, newSqlDateSerializer(config));
+    resolver.registerInternalSerializer(Time.class, new SqlTimeSerializer(config));
+    resolver.registerInternalSerializer(Timestamp.class, newTimestampSerializer(config));
+  }
+
+  private static boolean isClassAvailable(String className) {
+    try {
+      Class.forName(className, false, SqlTimeSerializers.class.getClassLoader());
+      return true;
+    } catch (ClassNotFoundException e) {
+      return false;
+    }
+  }
+
+  public static final class SqlDateSerializer
+      extends TimeSerializers.BaseDateSerializer<java.sql.Date> {
+    public SqlDateSerializer(Config config) {
+      super(config, java.sql.Date.class);
+    }
+
+    public SqlDateSerializer(Config config, boolean needToWriteRef) {
+      super(config, java.sql.Date.class, needToWriteRef);
+    }
+
+    @Override
+    protected java.sql.Date newInstance(long time) {
+      return new java.sql.Date(time);
+    }
+
+    @Override
+    public java.sql.Date copy(CopyContext copyContext, java.sql.Date value) {
+      return newInstance(value.getTime());
+    }
+  }
+
+  public static final class SqlTimeSerializer extends TimeSerializers.BaseDateSerializer<Time> {
+    public SqlTimeSerializer(Config config) {
+      super(config, Time.class);
+    }
+
+    public SqlTimeSerializer(Config config, boolean needToWriteRef) {
+      super(config, Time.class, needToWriteRef);
+    }
+
+    @Override
+    protected Time newInstance(long time) {
+      return new Time(time);
+    }
+
+    @Override
+    public Time copy(CopyContext copyContext, Time value) {
+      return newInstance(value.getTime());
+    }
+  }
+
+  public static final class TimestampSerializer extends TimeSerializers.TimeSerializer<Timestamp> {
+    public TimestampSerializer(Config config) {
+      super(config, Timestamp.class);
+    }
+
+    public TimestampSerializer(Config config, boolean needToWriteRef) {
+      super(config, Timestamp.class, needToWriteRef);
+    }
+
+    @Override
+    public void write(WriteContext writeContext, Timestamp value) {
+      MemoryBuffer buffer = writeContext.getBuffer();
+      if (config.isXlang()) {
+        Instant instant = value.toInstant();
+        buffer.writeInt64(instant.getEpochSecond());
+        buffer.writeInt32(instant.getNano());
+      } else {
+        long time = value.getTime() - (value.getNanos() / 1_000_000);
+        buffer.writeInt64(time);
+        buffer.writeInt32(value.getNanos());
+      }
+    }
+
+    @Override
+    public Timestamp read(ReadContext readContext) {
+      MemoryBuffer buffer = readContext.getBuffer();
+      if (config.isXlang()) {
+        long seconds = buffer.readInt64();
+        int nanos = buffer.readInt32();
+        return Timestamp.from(Instant.ofEpochSecond(seconds, nanos));
+      }
+      Timestamp t = new Timestamp(buffer.readInt64());
+      t.setNanos(buffer.readInt32());
+      return t;
+    }
+
+    @Override
+    public Timestamp copy(CopyContext copyContext, Timestamp value) {
+      return new Timestamp(value.getTime());
+    }
+  }
+}

java/fory-core/src/main/java/org/apache/fory/serializer/TimeSerializers.java

@@ -19,8 +19,6 @@
 
 package org.apache.fory.serializer;
 
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -44,7 +42,7 @@
 import org.apache.fory.context.ReadContext;
 import org.apache.fory.context.WriteContext;
 import org.apache.fory.memory.MemoryBuffer;
-import org.apache.fory.resolver.TypeResolver;
+import org.apache.fory.resolver.ClassResolver;
 import org.apache.fory.util.DateTimeUtils;
 
 /** Serializers for all time related types. */
@@ -119,91 +117,6 @@ public Date copy(CopyContext copyContext, Date value) {
     }
   }
 
-  public static final class SqlDateSerializer extends BaseDateSerializer<java.sql.Date> {
-    public SqlDateSerializer(Config config) {
-      super(config, java.sql.Date.class);
-    }
-
-    public SqlDateSerializer(Config config, boolean needToWriteRef) {
-      super(config, java.sql.Date.class, needToWriteRef);
-    }
-
-    @Override
-    protected java.sql.Date newInstance(long time) {
-      return new java.sql.Date(time);
-    }
-
-    @Override
-    public java.sql.Date copy(CopyContext copyContext, java.sql.Date value) {
-      return newInstance(value.getTime());
-    }
-  }
-
-  public static final class SqlTimeSerializer extends BaseDateSerializer<Time> {
-
-    public SqlTimeSerializer(Config config) {
-      super(config, Time.class);
-    }
-
-    public SqlTimeSerializer(Config config, boolean needToWriteRef) {
-      super(config, Time.class, needToWriteRef);
-    }
-
-    @Override
-    protected Time newInstance(long time) {
-      return new Time(time);
-    }
-
-    @Override
-    public Time copy(CopyContext copyContext, Time value) {
-      return newInstance(value.getTime());
-    }
-  }
-
-  public static final class TimestampSerializer extends TimeSerializer<Timestamp> {
-
-    public TimestampSerializer(Config config) {
-      // conflict with instant
-      super(config, Timestamp.class);
-    }
-
-    public TimestampSerializer(Config config, boolean needToWriteRef) {
-      super(config, Timestamp.class, needToWriteRef);
-    }
-
-    @Override
-    public void write(WriteContext writeContext, Timestamp value) {
-      MemoryBuffer buffer = writeContext.getBuffer();
-      if (config.isXlang()) {
-        Instant instant = value.toInstant();
-        buffer.writeInt64(instant.getEpochSecond());
-        buffer.writeInt32(instant.getNano());
-      } else {
-        long time = value.getTime() - (value.getNanos() / 1_000_000);
-        buffer.writeInt64(time);
-        buffer.writeInt32(value.getNanos());
-      }
-    }
-
-    @Override
-    public Timestamp read(ReadContext readContext) {
-      MemoryBuffer buffer = readContext.getBuffer();
-      if (config.isXlang()) {
-        long seconds = buffer.readInt64();
-        int nanos = buffer.readInt32();
-        return Timestamp.from(Instant.ofEpochSecond(seconds, nanos));
-      }
-      Timestamp t = new Timestamp(buffer.readInt64());
-      t.setNanos(buffer.readInt32());
-      return t;
-    }
-
-    @Override
-    public Timestamp copy(CopyContext copyContext, Timestamp value) {
-      return new Timestamp(value.getTime());
-    }
-  }
-
   public static final class LocalDateSerializer extends ImmutableTimeSerializer<LocalDate>
       implements Shareable {
     public LocalDateSerializer(Config config) {
@@ -723,12 +636,9 @@ public OffsetDateTime read(ReadContext readContext) {
     }
   }
 
-  public static void registerDefaultSerializers(TypeResolver resolver) {
+  public static void registerDefaultSerializers(ClassResolver resolver) {
     Config config = resolver.getConfig();
     resolver.registerInternalSerializer(Date.class, new DateSerializer(config));
-    resolver.registerInternalSerializer(java.sql.Date.class, new SqlDateSerializer(config));
-    resolver.registerInternalSerializer(Time.class, new SqlTimeSerializer(config));
-    resolver.registerInternalSerializer(Timestamp.class, new TimestampSerializer(config));
     resolver.registerInternalSerializer(LocalDate.class, new LocalDateSerializer(config));
     resolver.registerInternalSerializer(LocalTime.class, new LocalTimeSerializer(config));
     resolver.registerInternalSerializer(LocalDateTime.class, new LocalDateTimeSerializer(config));