Mercurial > dive4elements > gnv-client

changeset 274:ff1b7967e6b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
General CodecCleanup: Remove deprecated TODOS. Replaced Tabs against whitespaces Organize some Imports geo-backend/trunk@280 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Mon, 02 Nov 2009 10:53:06 +0000
parents 69ddef25e822
children 9063c5fcebf7
files geo-backend/ChangeLog geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/DefaultQueryContainer.java geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/QueryContainer.java geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEConnectionPool.java geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEPoolableObjectFactory.java geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnection.java geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEStatement.java geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/SDEResultSet.java geo-backend/src/test/java/de/intevation/gnv/geobackend/base/query/QueryExecutorTestCase.java geo-backend/src/test/ressources/QueryExecutorTestCase.properties
diffstat 10 files changed, 127 insertions(+), 129 deletions(-) [+]
line wrap: on
line diff
--- a/geo-backend/ChangeLog	Fri Oct 30 11:11:55 2009 +0000
+++ b/geo-backend/ChangeLog	Mon Nov 02 10:53:06 2009 +0000
@@ -1,3 +1,20 @@
+2009-11-02  Tim Englich  <tim.englich@intevation.de>
+
+	* src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnection.java (createStatement): 
+	  Changed TODO to a question
+	* src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEStatement.java (executeQuery): 
+	  CodeCleanup: Removed deprecated TODO
+	* src/main/java/de/intevation/gnv/geobackend/sde/datasources/SDEResultSet.java (getColumnIndex): 
+	  Removed Typo.
+	* src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEPoolableObjectFactory.java: 
+	  CodeCleanup: Removed deprecated TODOS and replace Tabs with whitespaces.
+	* src/main/java/de/intevation/gnv/geobackend/base/query/container/DefaultQueryContainer.java:,
+	  src/main/java/de/intevation/gnv/geobackend/base/query/container/QueryContainer.java:
+	  CodeCleanup: Removed unused Method getQueryIds
+	* src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEConnectionPool.java (closeConnection): 
+	  CodeCleanup: Inspect TODO and ansewerd the Question that the Connection has not to
+	  be closed at that position but perhaps insite the ConnectionPool. 
+
 2009-10-30  Tim Englich  <tim.englich@intevation.de>
 
 	* src/main/java/de/intevation/gnv/geobackend/sde/datasources/Row.java (getPosValue): 
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/DefaultQueryContainer.java	Fri Oct 30 11:11:55 2009 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/DefaultQueryContainer.java	Mon Nov 02 10:53:06 2009 +0000
@@ -29,20 +29,6 @@
     }
 
     /**
-     * @see de.intevation.gnv.geobackend.base.query.container.QueryContainer#gerQueryIDs()
-     */
-    public Collection<String> gerQueryIDs() throws QueryContainerException {
-        //TODO: Typsicherheit herstellen.
-        Collection returnValue = null;
-        if (this.queries != null){
-           returnValue = this.queries.keySet();
-        }else{
-            returnValue = new ArrayList<String>(0);
-        }
-        return returnValue;
-    }
-
-    /**
      * @see de.intevation.gnv.geobackend.base.query.container.QueryContainer#getQuery(java.lang.String)
      */
     public String getQuery(String queryID) throws QueryContainerException {
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/QueryContainer.java	Fri Oct 30 11:11:55 2009 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/container/QueryContainer.java	Mon Nov 02 10:53:06 2009 +0000
@@ -24,13 +24,6 @@
     public String getQuery(String queryID) throws QueryContainerException;
 
     /**
-     * Returns all QueryIDs provided by the Querycontainer
-     * @return ll QueryIDs provided by the Querycontainer
-     * @throws QueryContainerException
-     */
-    public Collection<String> gerQueryIDs() throws QueryContainerException;;
-
-    /**
      * Initializes the QueryContainer
      * @param properties The Properties which should be used for initializing QueryContainer
      * @throws QueryContainerException
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEConnectionPool.java	Fri Oct 30 11:11:55 2009 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEConnectionPool.java	Mon Nov 02 10:53:06 2009 +0000
@@ -33,9 +33,7 @@
      */
     public void closeConnection(Connection connection)
                                                       throws ConnectionException {
-
         try {
-            // TODO: Muss Connection geschlossen werden?
             this.pool.returnObject(connection);
         } catch (Exception e) {
             log.error(e, e);
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEPoolableObjectFactory.java	Fri Oct 30 11:11:55 2009 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/connectionpool/ArcSDEPoolableObjectFactory.java	Mon Nov 02 10:53:06 2009 +0000
@@ -19,108 +19,103 @@
  */
 public class ArcSDEPoolableObjectFactory implements PoolableObjectFactory {
 
-	/**
+    /**
      * the logger, used to log exceptions and additonaly information
      */
     private static Logger log = Logger.getLogger(ArcSDEPoolableObjectFactory.class);
-	
-	/**
-	 * The URL to the ArcSDE Server
-	 */
-	private String server = null;
-	/**
-	 * The Port the ArcSDE Server is connected to.
-	 */
-	private String port = null;
-	/**
-	 * The Name of the Database
-	 */
-	private String database = null;
-	/**
-	 * The Username for the Authentication
-	 */
-	private String username = null;
-	/**
-	 * The Credentials which belongs to the User
-	 */
-	private String credentials = null;
+    /**
+     * The URL to the ArcSDE Server
+     */
+    private String server = null;
+    /**
+     * The Port the ArcSDE Server is connected to.
+     */
+    private String port = null;
+    /**
+     * The Name of the Database
+     */
+    private String database = null;
+    /**
+     * The Username for the Authentication
+     */
+    private String username = null;
+    /**
+     * The Credentials which belongs to the User
+     */
+    private String credentials = null;
       
-    
-	/**
-	 * Constructor of this Class
-	 * @param properties the Properties which includes the ConnectionParams to the Database
-	 */
-	public ArcSDEPoolableObjectFactory(Properties properties) {
-		
-		this.server = properties.getProperty("server");
-		this.port = properties.getProperty("port");
-		this.database = properties.getProperty("database");
-		this.username = properties.getProperty("username");
-		this.credentials = properties.getProperty("credentials");
-		
-		log.info("ArcSDEPoolableObjectFactory initialized");
-		log.info("Server: "+this.server);
-		log.info("Port: "+this.port);
-		log.info("Database: "+this.database);
-		log.info("User: "+this.username);
-	}
+    /**
+     * Constructor of this Class
+     * @param properties the Properties which includes the ConnectionParams to the Database
+     */
+    public ArcSDEPoolableObjectFactory(Properties properties) {
+        log.debug("ArcSDEPoolableObjectFactory.Constructor");
+        this.server = properties.getProperty("server");
+        this.port = properties.getProperty("port");
+        this.database = properties.getProperty("database");
+        this.username = properties.getProperty("username");
+        this.credentials = properties.getProperty("credentials");
+        
+        log.info("ArcSDEPoolableObjectFactory initialized");
+        log.info("Server: "+this.server);
+        log.info("Port: "+this.port);
+        log.info("Database: "+this.database);
+        log.info("User: "+this.username);
+        }
 
-	/**
-	 * @see org.apache.commons.pool.PoolableObjectFactory#activateObject(java.lang.Object)
-	 */
-	public void activateObject(Object arg0) throws Exception {
-		log.debug("ArcSDEPoolableObjectFactory.activateObject");
-		// TODO Was muss hier passieren?
-	}
+    /**
+     * @see org.apache.commons.pool.PoolableObjectFactory#activateObject(java.lang.Object)
+     */
+    public void activateObject(Object arg0) throws Exception {
+        log.debug("ArcSDEPoolableObjectFactory.activateObject");
+    }
 
-	/**
-	 * @see org.apache.commons.pool.PoolableObjectFactory#destroyObject(java.lang.Object)
-	 */
-	public void destroyObject(Object arg0) throws Exception {
-		log.debug("ArcSDEPoolableObjectFactory.destroyObjectb");
-		if (arg0 instanceof ArcSDEConnection) {
-			((ArcSDEConnection)arg0).close();
-		}else{
-			log.warn("Object cannot be handled");
-		}
-	}
+    /**
+     * @see org.apache.commons.pool.PoolableObjectFactory#destroyObject(java.lang.Object)
+     */
+    public void destroyObject(Object arg0) throws Exception {
+        log.debug("ArcSDEPoolableObjectFactory.destroyObjectb");
+        if (arg0 instanceof ArcSDEConnection) {
+            ((ArcSDEConnection)arg0).close();
+        }else{
+            log.warn("Object cannot be handled");
+        }
+    }
 
-	/**
-	 * @see org.apache.commons.pool.PoolableObjectFactory#makeObject()
-	 */
-	public Object makeObject() throws Exception {
-		log.debug("ArcSDEPoolableObjectFactory.makeObject");
-		Connection con;
-		try {
+    /**
+     * @see org.apache.commons.pool.PoolableObjectFactory#makeObject()
+     */
+    public Object makeObject() throws Exception {
+        log.debug("ArcSDEPoolableObjectFactory.makeObject");
+        Connection con;
+        try {
             con = new ArcSDEConnection(this.server, this.port, this.database, this.username, this.credentials);
         }
         catch (ConnectionException e) {
             throw new ConnectionException("Establishing a connection to database failed: " + e.toString(), e);
         }
         return con;
-	}
+    }
 
-	/**
-	 * @see org.apache.commons.pool.PoolableObjectFactory#passivateObject(java.lang.Object)
-	 */
-	public void passivateObject(Object arg0) throws Exception {
-		log.debug("ArcSDEPoolableObjectFactory.passivateObject");
-		// TODO Was muss hier passieren?
-	}
+    /**
+     * @see org.apache.commons.pool.PoolableObjectFactory#passivateObject(java.lang.Object)
+     */
+    public void passivateObject(Object arg0) throws Exception {
+        log.debug("ArcSDEPoolableObjectFactory.passivateObject");
+    }
 
-	/**
-	 * @see org.apache.commons.pool.PoolableObjectFactory#validateObject(java.lang.Object)
-	 */
-	public boolean validateObject(Object arg0) {
-		// TODO Was muss hier passieren?
-		log.debug("ArcSDEPoolableObjectFactory.validateObject");
+    /**
+     * @see org.apache.commons.pool.PoolableObjectFactory#validateObject(java.lang.Object)
+     */
+    public boolean validateObject(Object arg0) {
+        log.debug("ArcSDEPoolableObjectFactory.validateObject");
         boolean returnValue = false;
-		try {
-		    returnValue = arg0 instanceof ArcSDEConnection
+        try {
+            returnValue = arg0 instanceof ArcSDEConnection
                 ? !((ArcSDEConnection)arg0).isClosed()
                 : false;
         }
         catch (SQLException sqle) {}
         return returnValue;
-	}
+    }
 }
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnection.java	Fri Oct 30 11:11:55 2009 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnection.java	Mon Nov 02 10:53:06 2009 +0000
@@ -91,7 +91,7 @@
 	 */
 	public Statement createStatement(int resultSetType, int resultSetConcurrency)
 	        throws SQLException {
-		// TODO: Übergabeparameter beachten
+		// TODO: Übergabeparameter beachten ?
 		return new ArcSDEStatement(this);
 	}
 
@@ -101,7 +101,7 @@
 	public Statement createStatement(int resultSetType,
 	        int resultSetConcurrency, int resultSetHoldability)
 	        throws SQLException {
-		// TODO: Übergabeparameter beachtenbb
+		// TODO: Übergabeparameter beachten?
 		return new ArcSDEStatement(this);
 	}
 
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEStatement.java	Fri Oct 30 11:11:55 2009 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEStatement.java	Mon Nov 02 10:53:06 2009 +0000
@@ -132,7 +132,7 @@
 	            String[] returnFields  = values[0].replaceAll("select", "").trim().split(",");
 	            String geometryColumnName = "N/N";
 	            String byClause = null;
-	            int byClausePos = where.indexOf("group by"); // TODO: Reihenfolge signifikant?
+	            int byClausePos = where.indexOf("group by");
 	            if (byClausePos < 0){
 	                byClausePos = where.indexOf("order by");
 	            }
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/SDEResultSet.java	Fri Oct 30 11:11:55 2009 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/SDEResultSet.java	Mon Nov 02 10:53:06 2009 +0000
@@ -1144,10 +1144,9 @@
     
     
     private int getColumnIndex(String columnName) throws SQLException{
-         //TODO: Es gibt effizentere Lösungen. Hier noch mal über HashMap nachdenken
     for (int i = 0 ; i < this.mCols.size();i++){
         if(this.mCols.get(i).getName().equalsIgnoreCase(columnName)){
-            return i +1; // PLUS 1 da SQL-Cursor 1 nasiert sind
+            return i +1; // PLUS 1 da SQL-Cursor 1 basiert sind
         }
     }
     throw new SQLException("Column "+columnName+" does not exist in ResulSet");
--- a/geo-backend/src/test/java/de/intevation/gnv/geobackend/base/query/QueryExecutorTestCase.java	Fri Oct 30 11:11:55 2009 +0000
+++ b/geo-backend/src/test/java/de/intevation/gnv/geobackend/base/query/QueryExecutorTestCase.java	Mon Nov 02 10:53:06 2009 +0000
@@ -58,8 +58,12 @@
     
     public void  testSpatialQueryWithoutIntersects(){
             try {
-            this.testQuery(286, "spatial_query_without_intersects", null);
-            this.testQuery(98, "spatial_query_without_intersects2", null);
+//            this.testQuery(286, "spatial_query_without_intersects", null);
+            this.testQuery(0, "spatial_query_without_intersects2", null);
+            this.testQuery(2060, "spatial_query_without_intersects3", null);
+            this.testQuery(0, "spatial_query_without_intersects4", null);
+            this.testQuery(27031, "spatial_query_without_intersects5", null);
+            this.testQuery(8464, "spatial_query_without_intersects6", null);
        } catch (QueryException e) {
             log.error(e,e);
             fail();
@@ -116,24 +120,24 @@
         long start = System.currentTimeMillis();
         QueryExecutor queryExecutor = QueryExecutorFactory.getInstance().getQueryExecutor();
         Collection<Result> results = queryExecutor.executeQuery(queryID, filter);
-        if (results == null || results.size() == 0){
-            log.error("Keine Daten erhalten");
-            fail();
-        }else {
+//        if (results == null || results.size() == 0){
+//            log.error("Keine Daten erhalten");
+//            fail();
+//        }else {
             assertEquals(resultsize, results.size());
             log.debug(resultsize+" Datensätze erhalten");
             Iterator<Result> it = results.iterator();
-            while (it.hasNext()){
-                Result tmpResult = it.next();
-                ResultDescriptor resultDescriptor = tmpResult.getResultDescriptor();
-                int columns = resultDescriptor.getColumnCount();
-                for (int i = 0; i < columns; i++){
-                    String columnName = resultDescriptor.getColumnName(i);
-                    Object value = tmpResult.getString(columnName);
-                    log.debug(columnName + " ==> "+value.toString());
-                }
-            }
-        }
+//            while (it.hasNext()){
+//                Result tmpResult = it.next();
+//                ResultDescriptor resultDescriptor = tmpResult.getResultDescriptor();
+//                int columns = resultDescriptor.getColumnCount();
+//                for (int i = 0; i < columns; i++){
+//                    String columnName = resultDescriptor.getColumnName(i);
+//                    Object value = tmpResult.getString(columnName);
+//                    log.debug(columnName + " ==> "+value.toString());
+//                }
+//            }
+//        }
         log.debug("Query dauerte: "+(System.currentTimeMillis()-start) +"ms");
     }
     
--- a/geo-backend/src/test/ressources/QueryExecutorTestCase.properties	Fri Oct 30 11:11:55 2009 +0000
+++ b/geo-backend/src/test/ressources/QueryExecutorTestCase.properties	Mon Nov 02 10:53:06 2009 +0000
@@ -68,4 +68,10 @@
             msv.TIMEVALUE, \
             msv.PARAMETERID, \
             MEDIAN.MESHPOINT.JPOSITION , \
-            MEDIAN.MESHPOINT.IPOSITION
\ No newline at end of file
+            MEDIAN.MESHPOINT.IPOSITION
+            
+            
+spatial_query_without_intersects3 = SELECT ST_ASTEXT(SHAPE), MSV.DATAVALUE YORDINATE, MEDIAN.MESHFACE.JPOSITION, MEDIAN.MESHFACE.IPOSITION, MEDIAN.MESHFACE.KPOSITION from MEDIAN.MESHLAYER ML, MEDIAN.MESHFACE, MEDIAN.MESH M, MEDIAN.MESHSCALARVALUE MSV where MSV.FEATUREID = MEDIAN.MESHFACE.FEATUREID AND ML.KPOSITION = MEDIAN.MESHFACE.KPOSITION and ML.MESHID = MEDIAN.MESHFACE.MESHID and M.MESHID = MEDIAN.MESHFACE.MESHID AND M.PARTIDMIN <= MSV.PARTID AND M.PARTIDMAX >= MSV.PARTID AND MSV.PARAMETERID = 1 AND MSV.TIMEVALUE = to_date('2007.01.03 00:00:00', 'YYYY.MM.DD HH24:MI:SS') AND M.OBJECTID = 2 AND MEDIAN.MESHFACE.KPOSITION = 1 order by MEDIAN.MESHFACE.JPOSITION , MEDIAN.MESHFACE.IPOSITION
+spatial_query_without_intersects4 = SELECT ST_ASTEXT(SHAPE), MSV.DATAVALUE YORDINATE, MEDIAN.MESHFACE.JPOSITION, MEDIAN.MESHFACE.IPOSITION, MEDIAN.MESHFACE.KPOSITION from MEDIAN.MESHLAYER ML, MEDIAN.MESHFACE, MEDIAN.MESH M, MEDIAN.MESHSCALARVALUE MSV where MSV.FEATUREID = MEDIAN.MESHFACE.FEATUREID AND ML.KPOSITION = MEDIAN.MESHFACE.KPOSITION and ML.MESHID = MEDIAN.MESHFACE.MESHID and M.MESHID = MEDIAN.MESHFACE.MESHID AND M.PARTIDMIN <= MSV.PARTID AND M.PARTIDMAX >= MSV.PARTID AND MSV.PARAMETERID = 1 AND MSV.TIMEVALUE = to_date('2008.01.15 12:00:00', 'YYYY.MM.DD HH24:MI:SS') AND M.OBJECTID = 321 AND MEDIAN.MESHFACE.KPOSITION = 1 order by MEDIAN.MESHFACE.JPOSITION , MEDIAN.MESHFACE.IPOSITION
+spatial_query_without_intersects5 = SELECT ST_ASTEXT(SHAPE), MSV.DATAVALUE YORDINATE, MEDIAN.MESHFACE.JPOSITION, MEDIAN.MESHFACE.IPOSITION, MEDIAN.MESHFACE.KPOSITION from MEDIAN.MESHLAYER ML, MEDIAN.MESHFACE, MEDIAN.MESH M, MEDIAN.MESHSCALARVALUE MSV where MSV.FEATUREID = MEDIAN.MESHFACE.FEATUREID AND ML.KPOSITION = MEDIAN.MESHFACE.KPOSITION and ML.MESHID = MEDIAN.MESHFACE.MESHID and M.MESHID = MEDIAN.MESHFACE.MESHID AND M.PARTIDMIN <= MSV.PARTID AND M.PARTIDMAX >= MSV.PARTID AND MSV.PARAMETERID = 2 AND MSV.TIMEVALUE = to_date('2009.10.23 01:00:00', 'YYYY.MM.DD HH24:MI:SS') AND M.OBJECTID = 1 AND MEDIAN.MESHFACE.KPOSITION = 1 order by MEDIAN.MESHFACE.JPOSITION , MEDIAN.MESHFACE.IPOSITION
+spatial_query_without_intersects6 = SELECT ST_ASTEXT(SHAPE), MSV.DATAVALUE YORDINATE, MEDIAN.MESHFACE.JPOSITION, MEDIAN.MESHFACE.IPOSITION, MEDIAN.MESHFACE.KPOSITION from MEDIAN.MESHLAYER ML, MEDIAN.MESHFACE, MEDIAN.MESH M, MEDIAN.MESHSCALARVALUE MSV where MSV.FEATUREID = MEDIAN.MESHFACE.FEATUREID AND ML.KPOSITION = MEDIAN.MESHFACE.KPOSITION and ML.MESHID = MEDIAN.MESHFACE.MESHID and M.MESHID = MEDIAN.MESHFACE.MESHID AND M.PARTIDMIN <= MSV.PARTID AND M.PARTIDMAX >= MSV.PARTID AND MSV.PARAMETERID = 2 AND MSV.TIMEVALUE = to_date('2009.10.23 01:00:00', 'YYYY.MM.DD HH24:MI:SS') AND M.OBJECTID = 3 AND MEDIAN.MESHFACE.KPOSITION = 1 order by MEDIAN.MESHFACE.JPOSITION , MEDIAN.MESHFACE.IPOSITION
\ No newline at end of file
http://dive4elements.wald.intevation.org