Merge pull request #321 from domaframework/refactor

Refactor CircleType and PointType into separate files

Author: nakamura-to

example-geometric-type/src/main/java/example/geometric/type/domain/CircleType.java

@@ -0,0 +1,50 @@
+package example.geometric.type.domain;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import org.postgresql.geometric.PGcircle;
+import org.postgresql.geometric.PGpoint;
+import org.seasar.doma.jdbc.type.AbstractJdbcType;
+
+class CircleType extends AbstractJdbcType<Circle> {
+
+  protected CircleType() {
+    super(Types.OTHER);
+  }
+
+  @Override
+  protected Circle doGetValue(ResultSet resultSet, int index) throws SQLException {
+    PGcircle c = resultSet.getObject(index, PGcircle.class);
+    return toCircle(c);
+  }
+
+  @Override
+  protected void doSetValue(PreparedStatement preparedStatement, int index, Circle value)
+      throws SQLException {
+    PGpoint p = new PGpoint(value.center().x(), value.center().y());
+    PGcircle c = new PGcircle(p, value.radius());
+    preparedStatement.setObject(index, c);
+  }
+
+  @Override
+  protected Circle doGetValue(CallableStatement callableStatement, int index) throws SQLException {
+    PGcircle c = callableStatement.getObject(index, PGcircle.class);
+    return toCircle(c);
+  }
+
+  @Override
+  protected String doConvertToLogFormat(Circle value) {
+    return value.toString();
+  }
+
+  static Circle toCircle(PGcircle c) {
+    if (c == null) {
+      return null;
+    }
+    Point center = PointType.toPoint(c.center);
+    return new Circle(center, c.radius);
+  }
+}

example-geometric-type/src/main/java/example/geometric/type/domain/CircleTypeProvider.java

@@ -1,15 +1,7 @@
 package example.geometric.type.domain;
 
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import org.postgresql.geometric.PGcircle;
-import org.postgresql.geometric.PGpoint;
 import org.seasar.doma.ExternalDomain;
 import org.seasar.doma.jdbc.domain.JdbcTypeProvider;
-import org.seasar.doma.jdbc.type.AbstractJdbcType;
 import org.seasar.doma.jdbc.type.JdbcType;
 
 @ExternalDomain
@@ -22,43 +14,3 @@ public JdbcType<Circle> getJdbcType() {
     return circleType;
   }
 }
-
-class CircleType extends AbstractJdbcType<Circle> {
-
-  protected CircleType() {
-    super(Types.OTHER);
-  }
-
-  @Override
-  protected Circle doGetValue(ResultSet resultSet, int index) throws SQLException {
-    PGcircle c = resultSet.getObject(index, PGcircle.class);
-    return toCircle(c);
-  }
-
-  @Override
-  protected void doSetValue(PreparedStatement preparedStatement, int index, Circle value)
-      throws SQLException {
-    PGpoint p = new PGpoint(value.center().x(), value.center().y());
-    PGcircle c = new PGcircle(p, value.radius());
-    preparedStatement.setObject(index, c);
-  }
-
-  @Override
-  protected Circle doGetValue(CallableStatement callableStatement, int index) throws SQLException {
-    PGcircle c = callableStatement.getObject(index, PGcircle.class);
-    return toCircle(c);
-  }
-
-  @Override
-  protected String doConvertToLogFormat(Circle value) {
-    return value.toString();
-  }
-
-  static Circle toCircle(PGcircle c) {
-    if (c == null) {
-      return null;
-    }
-    Point center = PointType.toPoint(c.center);
-    return new Circle(center, c.radius);
-  }
-}

example-geometric-type/src/main/java/example/geometric/type/domain/PointType.java

@@ -0,0 +1,47 @@
+package example.geometric.type.domain;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import org.postgresql.geometric.PGpoint;
+import org.seasar.doma.jdbc.type.AbstractJdbcType;
+
+class PointType extends AbstractJdbcType<Point> {
+
+  protected PointType() {
+    super(Types.OTHER);
+  }
+
+  @Override
+  protected Point doGetValue(ResultSet resultSet, int index) throws SQLException {
+    PGpoint p = resultSet.getObject(index, PGpoint.class);
+    return toPoint(p);
+  }
+
+  @Override
+  protected void doSetValue(PreparedStatement preparedStatement, int index, Point value)
+      throws SQLException {
+    PGpoint p = new PGpoint(value.x(), value.y());
+    preparedStatement.setObject(index, p);
+  }
+
+  @Override
+  protected Point doGetValue(CallableStatement callableStatement, int index) throws SQLException {
+    PGpoint p = callableStatement.getObject(index, PGpoint.class);
+    return toPoint(p);
+  }
+
+  @Override
+  protected String doConvertToLogFormat(Point value) {
+    return value.toString();
+  }
+
+  static Point toPoint(PGpoint p) {
+    if (p == null) {
+      return null;
+    }
+    return new Point(p.x, p.y);
+  }
+}

example-geometric-type/src/main/java/example/geometric/type/domain/PointTypeProvider.java

@@ -1,14 +1,7 @@
 package example.geometric.type.domain;
 
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import org.postgresql.geometric.PGpoint;
 import org.seasar.doma.ExternalDomain;
 import org.seasar.doma.jdbc.domain.JdbcTypeProvider;
-import org.seasar.doma.jdbc.type.AbstractJdbcType;
 import org.seasar.doma.jdbc.type.JdbcType;
 
 @ExternalDomain
@@ -21,41 +14,3 @@ public JdbcType<Point> getJdbcType() {
     return pointType;
   }
 }
-
-class PointType extends AbstractJdbcType<Point> {
-
-  protected PointType() {
-    super(Types.OTHER);
-  }
-
-  @Override
-  protected Point doGetValue(ResultSet resultSet, int index) throws SQLException {
-    PGpoint p = resultSet.getObject(index, PGpoint.class);
-    return toPoint(p);
-  }
-
-  @Override
-  protected void doSetValue(PreparedStatement preparedStatement, int index, Point value)
-      throws SQLException {
-    PGpoint p = new PGpoint(value.x(), value.y());
-    preparedStatement.setObject(index, p);
-  }
-
-  @Override
-  protected Point doGetValue(CallableStatement callableStatement, int index) throws SQLException {
-    PGpoint p = callableStatement.getObject(index, PGpoint.class);
-    return toPoint(p);
-  }
-
-  @Override
-  protected String doConvertToLogFormat(Point value) {
-    return value.toString();
-  }
-
-  static Point toPoint(PGpoint p) {
-    if (p == null) {
-      return null;
-    }
-    return new Point(p.x, p.y);
-  }
-}