Add RelationalPath extensions #631

querydsl-spatial/src/main/java/com/mysema/query/spatial/path/GeometryPaths.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014, Mysema Ltd
+ *
+ * Licensed 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 com.mysema.query.spatial.path;
+
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.GeometryCollection;
+import org.geolatte.geom.LineString;
+import org.geolatte.geom.LinearRing;
+import org.geolatte.geom.MultiLineString;
+import org.geolatte.geom.MultiPoint;
+import org.geolatte.geom.MultiPolygon;
+import org.geolatte.geom.Point;
+import org.geolatte.geom.PolyHedralSurface;
+import org.geolatte.geom.Polygon;
+
+/**
+ * @author tiwe
+ *
+ */
+public interface GeometryPaths {
+
+    <A extends GeometryCollection> GeometryCollectionPath<A> GeometryCollection(String property, Class<? extends A> type);
+
+    <A extends Geometry> GeometryPath<A> createGeometry(String property, Class<? extends A> type);
+
+    <A extends LinearRing> LinearRingPath<A> createLinearRing(String property, Class<? extends A> type);
+
+    <A extends LineString> LineStringPath<A> createLineString(String property, Class<? extends A> type);
+
+    <A extends MultiLineString> MultiLineStringPath<A> createMultiLineString(String property, Class<? extends A> type);
+
+    <A extends MultiPoint> MultiPointPath<A> createMultiPoint(String property, Class<? extends A> type);
+
+    <A extends MultiPolygon> MultiPolygonPath<A> createMultiPolygon(String property, Class<? extends A> type);
+
+    <A extends Point> PointPath<A> createPoint(String property, Class<? extends A> type);
+
+    <A extends Polygon> PolygonPath<A> createPolygon(String property, Class<? extends A> type);
+
+    <A extends PolyHedralSurface> PolyhedralSurfacePath<A> createPolyhedralSurface(String property, Class<? extends A> type);
+
+}

querydsl-spatial/src/main/java/com/mysema/query/spatial/path/MultiPointPath.java

@@ -15,16 +15,16 @@
 
 import java.lang.reflect.AnnotatedElement;
 
-import org.geolatte.geom.MultiPolygon;
+import org.geolatte.geom.MultiPoint;
 
-import com.mysema.query.spatial.MultiPolygonExpression;
+import com.mysema.query.spatial.MultiPointExpression;
 import com.mysema.query.types.Path;
 import com.mysema.query.types.PathImpl;
 import com.mysema.query.types.PathMetadata;
 import com.mysema.query.types.PathMetadataFactory;
 import com.mysema.query.types.Visitor;
 
-public class MultiPointPath<T extends MultiPolygon> extends MultiPolygonExpression<T> implements Path<T> {
+public class MultiPointPath<T extends MultiPoint> extends MultiPointExpression<T> implements Path<T> {
 
     private static final long serialVersionUID = 312776751843333543L;
 

querydsl-sql/src/main/java/com/mysema/query/sql/spatial/ExtendedRelationalPathBase.java

@@ -0,0 +1,116 @@
+/*
+ * Copyright 2014, Mysema Ltd
+ *
+ * Licensed 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 com.mysema.query.sql.spatial;
+
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.LineString;
+import org.geolatte.geom.LinearRing;
+import org.geolatte.geom.MultiLineString;
+import org.geolatte.geom.MultiPoint;
+import org.geolatte.geom.MultiPolygon;
+import org.geolatte.geom.Point;
+import org.geolatte.geom.PolyHedralSurface;
+import org.geolatte.geom.Polygon;
+
+import com.mysema.query.spatial.path.GeometryCollectionPath;
+import com.mysema.query.spatial.path.GeometryPath;
+import com.mysema.query.spatial.path.GeometryPaths;
+import com.mysema.query.spatial.path.LineStringPath;
+import com.mysema.query.spatial.path.LinearRingPath;
+import com.mysema.query.spatial.path.MultiLineStringPath;
+import com.mysema.query.spatial.path.MultiPointPath;
+import com.mysema.query.spatial.path.MultiPolygonPath;
+import com.mysema.query.spatial.path.PointPath;
+import com.mysema.query.spatial.path.PolygonPath;
+import com.mysema.query.spatial.path.PolyhedralSurfacePath;
+import com.mysema.query.sql.RelationalPathBase;
+import com.mysema.query.types.PathMetadata;
+import com.mysema.query.types.PathMetadataFactory;
+
+/**
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class ExtendedRelationalPathBase<T> extends RelationalPathBase<T> implements GeometryPaths {
+
+    private static final long serialVersionUID = -7176236689794620277L;
+
+    public ExtendedRelationalPathBase(Class<? extends T> type, String variable, String schema, String table) {
+        this(type, PathMetadataFactory.forVariable(variable), schema, table);
+    }
+
+    public ExtendedRelationalPathBase(Class<? extends T> type, PathMetadata<?> metadata, String schema, String table) {
+        super(type, metadata, schema, table);
+    }
+
+    @Override
+    public <A extends org.geolatte.geom.GeometryCollection> GeometryCollectionPath<A> GeometryCollection(
+            String property, Class<? extends A> type) {
+        return add(new GeometryCollectionPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends Geometry> GeometryPath<A> createGeometry(String property,
+            Class<? extends A> type) {
+        return add(new GeometryPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends LinearRing> LinearRingPath<A> createLinearRing(String property,
+            Class<? extends A> type) {
+        return add(new LinearRingPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends LineString> LineStringPath<A> createLineString(String property,
+            Class<? extends A> type) {
+        return add(new LineStringPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends MultiLineString> MultiLineStringPath<A> createMultiLineString(
+            String property, Class<? extends A> type) {
+        return add(new MultiLineStringPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends MultiPoint> MultiPointPath<A> createMultiPoint(String property,
+            Class<? extends A> type) {
+        return add(new MultiPointPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends MultiPolygon> MultiPolygonPath<A> createMultiPolygon(String property,
+            Class<? extends A> type) {
+        return add(new MultiPolygonPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends Point> PointPath<A> createPoint(String property, Class<? extends A> type) {
+        return add(new PointPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends Polygon> PolygonPath<A> createPolygon(String property, Class<? extends A> type) {
+        return add(new PolygonPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends PolyHedralSurface> PolyhedralSurfacePath<A> createPolyhedralSurface(
+            String property, Class<? extends A> type) {
+        return add(new PolyhedralSurfacePath<A>(type, forProperty(property)));
+    }
+
+}