Changeset 289 for tools

Timestamp:

04/07/09 17:13:05 (11 months ago)

Author:

anton

Message:

Added proper resource handler instantiation and connection pools

Location:

tools/routingservice/branches/wrs-2.0

Files:

• data/resources.xml (modified) (1 diff)
• src/WRS.java (modified) (4 diffs)
• src/handler/HandlerFactory.java (added)
• src/handler/PgRoutingHandler.java (modified) (3 diffs)
• src/handler/ResourceHandler.java (modified) (1 diff)
• src/model/Resource.java (modified) (3 diffs)
• src/util/ObjectPool.java (added)
• src/util/db (added)
• src/util/db/JDBCConnectionPool.java (added)

tools/routingservice/branches/wrs-2.0/data/resources.xml

@@ -4 +4 @@
 xsi:noNamespaceSchemaLocation="http://wrs.postlbs.org/xsd/1.1.0/resource.xsd"
 >
-        <resource name="pgrouting" title="pgRouting instance on Dumbo server">
+        <resource type="database" name="pgrouting" title="pgRouting instance on Dumbo server">
                 <description>My test profile I use for testing</description>
                 <parameters>

tools/routingservice/branches/wrs-2.0/src/WRS.java

@@ +1 @@
+import handler.HandlerFactory;
+import handler.ResourceHandler;
+
 import java.io.IOException;
 import java.util.ArrayList;
@@ -101 +104 @@
                                 ServiceRequest serviceRequest = null;
                                 String result = "";
-                                
+
                                 try
                                 {
@@ -117 +120 @@
                                         else
                                         {
-                                                result = resource.processRequest(serviceRequest);
-                                        }
-                                        
+                                                try
+                                                {
+                                                        ResourceHandler handler = HandlerFactory.Handler
+                                                                        .valueOf(resource.getName().toUpperCase())
+                                                                        .getInstance();
+                                                        handler.setResource(resource);
+
+                                                        Vector<Parameter> output = handler
+                                                                        .handle(serviceRequest);
+                                                }
+                                                // TODO process the error more carefully
+                                                catch (InstantiationException e)
+                                                {
+                                                        log.logger.warning("Wrong resource "
+                                                                        + resource.getName());
+                                                }
+                                                catch (IllegalAccessException e)
+                                                {
+                                                        log.logger.warning("Wrong resource "
+                                                                        + resource.getName());
+                                                }
+                                        }
+
                                 }
                                 catch (InvalidVersionException e)
@@ -335 +358 @@
                         {
                                 util.resource.Resources.Resource res = li.next();
-                                Resource resource = new Resource(res.getName(), res.getType());
+                                Resource resource = new Resource(res.getName(), res.getType(),
+                                                res.getUrl(), res.getUser(), res.getPassword());
 
                                 ListIterator<Parameter> pi = res.getParameters().getParameter()

tools/routingservice/branches/wrs-2.0/src/handler/PgRoutingHandler.java

@@ -1 +1 @@
 package handler;
 
+import java.sql.Connection;
 import java.util.Hashtable;
 import java.util.Vector;
 
 import model.Resource;
+import util.ObjectPool;
 import util.Parameter;
 import util.ServiceRequest;
+import util.db.JDBCConnectionPool;
 
 import org.antlr.stringtemplate.StringTemplate;
@@ -14 +17 @@
         private Resource resource;
         private Hashtable<String, String> functions;
-        
+
         public static final String SRID = "srid";
         public static final String UNITS = "units";
-        
+
         public PgRoutingHandler()
         {
@@ -30 +33 @@
                 Vector<Parameter> out = new Vector<Parameter>();
 
-                StringTemplate queryTemplate = new StringTemplate(this.resource.getQuery());
+                if (this.resource != null)
+                {
 
+                        StringTemplate queryTemplate = new StringTemplate(this.resource
+                                        .getQuery());
+                        ObjectPool<Connection> pool = this.resource.getPool();
+                        Connection con = pool.checkOut();
+                        
+                        //TODO send query and get a result
+                        
+                        pool.checkIn(con);
+                }
                 return out;
         }

tools/routingservice/branches/wrs-2.0/src/handler/ResourceHandler.java

@@ -9 +9 @@
 public interface ResourceHandler
 {
+
         public void setResource(Resource resource);
         public Vector<Parameter> handle(ServiceRequest request);
+
 }

tools/routingservice/branches/wrs-2.0/src/model/Resource.java

@@ -1 +1 @@
 package model;
 
+import handler.HandlerFactory;
+import handler.PgRoutingHandler;
 import handler.ResourceHandler;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Hashtable;
 
+import org.restlet.Handler;
+
+import util.ObjectPool;
 import util.Parameter;
 import util.ServiceRequest;
+import util.db.JDBCConnectionPool;
 
 public class Resource
@@ -22 +29 @@
         private Hashtable<String, Parameter> parameters;
         private Hashtable<String, Service> services;
-        
-        private ResourceHandler handler;
 
-        public Resource(String name, String type)
+        private enum PoolTypes
+        {
+                DATABASE(JDBCConnectionPool.class);
+
+                private Class<? extends ObjectPool> poolType;
+
+                PoolTypes(Class<? extends ObjectPool> p)
+                {
+                        this.poolType = p;
+                }
+
+                public ObjectPool getInstance(String url, String user, String password)
+                                throws InstantiationException, IllegalAccessException,
+                                IllegalArgumentException, SecurityException,
+                                InvocationTargetException
+                {
+                        System.out.println(">>>>" + poolType.getConstructors()[0].toString());
+                        
+                        return (ObjectPool) poolType.getConstructors()[0]
+                                        .newInstance(new Object[] { url, user, password });
+                }
+        }
+
+        private ObjectPool pool;
+
+        public Resource(String name, String type, String url, String user, String password)
         {
                 super();
                 this.name = name;
                 this.type = type;
-                
+
+                try
+                {
+                        this.pool = PoolTypes.valueOf(type.toUpperCase()).getInstance(url, user, password);
+                }
+                // TODO process the error more carefully
+                catch (InstantiationException e)
+                {
+                        System.out.println("Wrong resource type " + this.type);
+                        e.printStackTrace();
+                }
+                catch (IllegalAccessException e)
+                {
+                        System.out.println("Wrong resource type " + this.type);
+                        e.printStackTrace();
+                }
+                catch (IllegalArgumentException e)
+                {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+                catch (SecurityException e)
+                {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+                catch (InvocationTargetException e)
+                {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+
                 parameters = new Hashtable<String, Parameter>();
                 services = new Hashtable<String, Service>();
         }
-        
+
         public String getName()
         {
                 return name;
-        }       
+        }
 
         public String getDescription()
@@ -120 +181 @@
         }
 
-        public String processRequest(ServiceRequest serviceRequest)
+        public String getType()
         {
-                // TODO Auto-generated method stub
-                return null;
+                return type;
+        }
+
+        public ObjectPool getPool()
+        {
+                return pool;
         }