From 3e9f2bc0b41481de17af61bc800e4843bb4fb6c5 Mon Sep 17 00:00:00 2001 From: eblondel Date: Tue, 25 Jun 2013 12:27:39 +0200 Subject: [PATCH] #81 - master - fix PostGIS / OracleNG Estimated extends param --- .../rest/encoder/datastore/GSOracleNGDatastoreEncoder.java | 6 ++++++ .../rest/encoder/datastore/GSPostGISDatastoreEncoder.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/datastore/GSOracleNGDatastoreEncoder.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/datastore/GSOracleNGDatastoreEncoder.java index 5c21a4b..f0b4eed 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/encoder/datastore/GSOracleNGDatastoreEncoder.java +++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/datastore/GSOracleNGDatastoreEncoder.java @@ -44,6 +44,7 @@ public class GSOracleNGDatastoreEncoder extends GSAbstractDatastoreEncoder { static final boolean DEFAULT_LOOSE_BBOX = true; static final boolean DEFAULT_PREPARED_STATEMENTS = true; static final int DEFAULT_MAX_OPEN_PREPARED_STATEMENTS = 50; + static final boolean DEFAULT_ESTIMATED_EXTENDS = false; /** * Create an {@value #TYPE} datastore with default connection parameters, @@ -80,6 +81,7 @@ public class GSOracleNGDatastoreEncoder extends GSAbstractDatastoreEncoder { setLooseBBox(DEFAULT_LOOSE_BBOX); setPreparedStatements(DEFAULT_PREPARED_STATEMENTS); setMaxOpenPreparedStatements(DEFAULT_MAX_OPEN_PREPARED_STATEMENTS); + setEstimatedExtends(DEFAULT_ESTIMATED_EXTENDS); } /** @@ -171,6 +173,10 @@ public class GSOracleNGDatastoreEncoder extends GSAbstractDatastoreEncoder { connectionParameters.set("Max open prepared statements", Integer.toString(maxOpenPreparedStatements)); } + public void setEstimatedExtends(boolean estimatedExtends){ + connectionParameters.set("Estimated extends", Boolean.toString(estimatedExtends)); + } + /** * Check database validity. * diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/datastore/GSPostGISDatastoreEncoder.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/datastore/GSPostGISDatastoreEncoder.java index f4fd813..621a983 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/encoder/datastore/GSPostGISDatastoreEncoder.java +++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/datastore/GSPostGISDatastoreEncoder.java @@ -43,6 +43,7 @@ public class GSPostGISDatastoreEncoder extends GSAbstractDatastoreEncoder { static final boolean DEFAULT_LOOSE_BBOX = true; static final boolean DEFAULT_PREPARED_STATEMENTS = false; static final int DEFAULT_MAX_OPEN_PREPARED_STATEMENTS = 50; + static final boolean DEFAULT_ESTIMATED_EXTENDS = false; /** * @@ -63,6 +64,7 @@ public class GSPostGISDatastoreEncoder extends GSAbstractDatastoreEncoder { setLooseBBox(DEFAULT_LOOSE_BBOX); setPreparedStatements(DEFAULT_PREPARED_STATEMENTS); setMaxOpenPreparedStatements(DEFAULT_MAX_OPEN_PREPARED_STATEMENTS); + setEstimatedExtends(DEFAULT_ESTIMATED_EXTENDS); } @@ -142,6 +144,10 @@ public class GSPostGISDatastoreEncoder extends GSAbstractDatastoreEncoder { connectionParameters.set("Max open prepared statements", Integer.toString(maxOpenPreparedStatements)); } + public void setEstimatedExtends(boolean estimatedExtends){ + connectionParameters.set("Estimated extends", Boolean.toString(estimatedExtends)); + } + /** * @return {@value #TYPE} */