Changeset 1202

Timestamp:

12/04/11 23:04:48 (18 months ago)

Author:

philsmart

Message:

 

Location:

raptor-client/trunk

Files:

• src/main/java/uk/ac/cardiff/raptor/event/expansion/ResourceCategoryAttributeAssociationDefinition.java (modified) (1 diff)
• src/main/java/uk/ac/cardiff/raptor/event/expansion/connector/DataConnector.java (modified) (1 diff)
• src/main/java/uk/ac/cardiff/raptor/event/expansion/connector/RDBMSColumnDescriptor.java (modified) (1 diff)
• src/main/java/uk/ac/cardiff/raptor/event/expansion/connector/RDBMSDataConnector.java (modified) (11 diffs)
• src/main/java/uk/ac/cardiff/raptor/runtimeutils/ReflectionHelper.java (modified) (1 diff)
• src/main/java/uk/ac/cardiff/raptor/store/impl/PersistantEventHandler.java (modified) (1 diff)
• src/test/java/uk/ac/cardiff/raptor/event/expansion/RDBMSDataConnectorTest.java (modified) (2 diffs)
• test-output/Default suite/Default test.html (modified) (1 diff)
• test-output/Default suite/Default test.xml (modified) (1 diff)
• test-output/Default suite/methods-alphabetical.html (modified) (1 diff)
• test-output/Default suite/methods.html (modified) (1 diff)
• test-output/junitreports/TEST-uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.xml (modified) (1 diff)
• test-output/testng-results.xml (modified) (1 diff)

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/ResourceCategoryAttributeAssociationDefinition.java

@@ -51 +51 @@
 
         ResourceMetadata resourceMetadata = null;
-        Object result =
-                dataConnection.runQueryUnique("from ResourceMetadata where resourceId=?",
-                        new Object[] {event.getResourceId()});
+        Object result = null;
+        if (event.getResourceId() != null) {
+            result =
+                    dataConnection.runQueryUnique("from ResourceMetadata where resourceId=?",
+                            new Object[] {event.getResourceId()});
+        }
         if (result != null && result instanceof ResourceMetadata) {
             resourceMetadata = (ResourceMetadata) result;

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/connector/DataConnector.java

@@ -22 +22 @@
 import java.util.Map;
 
-/**
- * @author philsmart
- * 
- */
 public interface DataConnector {
 

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/connector/RDBMSColumnDescriptor.java

@@ +1 @@
+/**
+ * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk>
+ *
+ * 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 uk.ac.cardiff.raptor.event.expansion.connector;

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/connector/RDBMSDataConnector.java

@@ -1 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You 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
+/**
+ * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk>
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * 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
@@ -15 +14 @@
  * limitations under the License.
  */
-
 package uk.ac.cardiff.raptor.event.expansion.connector;
 
@@ -90 +88 @@
      * Constructor.
      * 
-     * @param source data source used to retrieve connections
-     */
-    public RDBMSDataConnector(DataSource source) {
+     */
+    public RDBMSDataConnector() {
         super();
-
-        dataSource = source;
-
-        readOnlyConnection = true;
-        usesStoredProcedure = false;
-        noResultIsError = false;
-
-        columnDescriptors = new HashMap<String, RDBMSColumnDescriptor>();
     }
 
@@ -123 +112 @@
             initialized = true;
             initializeCache();
+            readOnlyConnection = true;
+            usesStoredProcedure = false;
+            noResultIsError = false;
+            columnDescriptors = new HashMap<String, RDBMSColumnDescriptor>();
         }
     }
@@ -206 +199 @@
     public Map<String, RDBMSColumnDescriptor> getColumnDescriptor() {
         return columnDescriptors;
+    }
+
+    /**
+     * This removes all entries from the cache. {@link #initialize()} must be called first or this method does nothing.
+     */
+    protected void clearCache() {
+        if (cacheResults && initialized) {
+            cache.clear();
+            cacheResetTimeMs = System.currentTimeMillis();
+        }
+    }
+
+    private void checkCacheValidity() {
+        if (cacheTimeoutMs == 0 || !cacheResults) {
+            return;
+        }
+        long currentTimeMillis = System.currentTimeMillis();
+        boolean shouldReset = (currentTimeMillis - cacheResetTimeMs) > cacheTimeoutMs;
+        log.trace("Should reset cache?{} - time left {}", shouldReset, (currentTimeMillis - cacheResetTimeMs));
+        if (shouldReset) {
+            log.info("Ldap cache was cleared, timeout reached");
+            clearCache();
+        }
     }
 
@@ -258 +274 @@
         query = query.trim();
 
+        checkCacheValidity();
+
         Map<String, String> resolvedAttributes = null;
         if (cacheResults) {
@@ -292 +310 @@
                 Map<String, Map<String, String>> results = cache.get(principal);
                 attributes = results.get(query);
-                log.debug("RDBMS data connector - Fetched attributes from cache for principal {}", principal);
+                log.trace("RDBMS data connector - Fetched attributes from cache for principal {}", principal);
             }
         }
@@ -299 +317 @@
     }
 
+    /**
+     * Attributes returned from the database connector are defined by the SELECT statement in the SQL query, not through
+     * the <code>attributes</code> array. This is a no-op method.
+     */
     public void setReturnAttributes(String[] attributes) {
 
@@ -323 +345 @@
                 connection.setReadOnly(true);
             }
-            log.debug("RDBMS data connector - Querying database for attributes with query {}", query);
+            log.trace("RDBMS data connector - Querying database for attributes with query {}", query);
             Statement stmt = connection.createStatement();
             stmt.setQueryTimeout(queryTimeout);
@@ -502 +524 @@
         results.put(query, attributes);
 
-        log.debug("RDBMS data connector - Caching attributes for principal {}", principal);
+        log.trace("RDBMS data connector - Caching attributes for principal {}", principal);
 
     }
@@ -562 +584 @@
     }
 
+    /**
+     * @param dataSource the dataSource to set
+     */
+    public void setDataSource(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
 }

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/runtimeutils/ReflectionHelper.java

@@ -122 +122 @@
 
     /**
+     * Uses reflection to get all the classes that are in the <code>EVENT_PACKAGE_NAME</code package.
+     * 
+     * @return a list of simple names of found classes;
+     */
+    public static List<String> getAllEventClasses() {
+        List<String> allClasses = new ArrayList<String>();
+        String forPckgName = EVENT_PACKAGE_NAME;
+        String jarFile = getJARFilePath(forPckgName);
+        jarFile = jarFile.replace("file:", "");
+        log.debug("jar {}", jarFile);
+        List<String> classes = getClassNamesInJarOrFolder(jarFile, forPckgName);
+
+        for (String classname : classes) {
+            try {
+                Object o = Class.forName(classname.replace(".class", "")).newInstance();
+                if (o != null)
+                    if (o instanceof uk.ac.cardiff.model.event.Event) {
+                        allClasses.add(o.getClass().getSimpleName());
+                    }
+            } catch (ClassNotFoundException cnfex) {
+                log.error("error getting subclasses of Entry, {}", cnfex);
+            } catch (InstantiationException iex) {
+                // log.error("{}", iex);
+            } catch (IllegalAccessException iaex) {
+                // The class is not public
+            }
+        }
+        return allClasses;
+    }
+
+    /**
      * This is terrible code. Finds all fieldnames of all classes that are subclasses of the
-     * <code>uk.ac.cardiff.model.event.Event</code> class.
+     * {@link uk.ac.cardiff.model.event.Event} class.
      * 
      * @return

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/store/impl/PersistantEventHandler.java

@@ -93 +93 @@
 
     public List query(String query, Object[] parameters) {
-        log.trace("SQL query to entry handler [{}], with parameters [{}]", query, Arrays.asList(parameters));
+        if (parameters != null) {
+            log.trace("SQL query to entry handler [{}], with parameters [{}]", query, Arrays.asList(parameters));
+        } else {
+            log.trace("SQL query to entry handler [{}], with no parameters", query);
+        }
         return dataConnection.runQuery(query, parameters);
     }

raptor-client/trunk/src/test/java/uk/ac/cardiff/raptor/event/expansion/RDBMSDataConnectorTest.java

@@ +1 @@
+/**
+ * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk>
+ *
+ * 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 uk.ac.cardiff.raptor.event.expansion;
@@ -24 +39 @@
         bds.setPassword("");
 
-        dataConnector = new RDBMSDataConnector(bds);
+        dataConnector = new RDBMSDataConnector();
+        dataConnector.setDataSource(bds);
         dataConnector.setNoResultIsError(false);
         dataConnector.setCacheResults(true);
+        dataConnector.setCacheTimeoutMs(1000);
         dataConnector.initialise();
     }

raptor-client/trunk/test-output/Default suite/Default test.html

@@ -58 +58 @@
 <td>Tests passed/Failed/Skipped:</td><td>2/0/0</td>
 </tr><tr>
-<td>Started on:</td><td>Mon Nov 28 22:44:42 GMT 2011</td>
+<td>Started on:</td><td>Tue Nov 29 10:53:12 GMT 2011</td>
 </tr>
-<tr><td>Total time:</td><td>0 seconds (222 ms)</td>
+<tr><td>Total time:</td><td>0 seconds (227 ms)</td>
 </tr><tr>
 <td>Included groups:</td><td></td>

raptor-client/trunk/test-output/Default suite/Default test.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite hostname="testkwshibb1.nerc.ac.uk" name="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest" tests="2" failures="0" timestamp="28 Nov 2011 22:44:42 GMT" time="0.222" errors="0">
+<testsuite hostname="testkwshibb1.nerc.ac.uk" name="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest" tests="2" failures="0" timestamp="29 Nov 2011 10:53:12 GMT" time="0.227" errors="0">
   <testcase name="cacheTest" time="0.092" classname="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest"/>
   <testcase name="getAttributesTest" time="0.0050" classname="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest"/>

raptor-client/trunk/test-output/Default suite/methods-alphabetical.html

@@ -2 +2 @@
 <table border="1">
 <tr><th>Time</th><th>Delta (ms)</th><th>Suite<br>configuration</th><th>Test<br>configuration</th><th>Class<br>configuration</th><th>Groups<br>configuration</th><th>Method<br>configuration</th><th>Test<br>method</th><th>Thread</th><th>Instances</th></tr>
-<tr bgcolor="cd6888">  <td>11/11/28 22:44:42</td>   <td>0</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.cacheTest()">cacheTest</td> 
+<tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>0</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.cacheTest()">cacheTest</td> 
   <td>main@1211753909</td>   <td></td> </tr>
-<tr bgcolor="cd6888">  <td>11/11/28 22:44:42</td>   <td>93</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.getAttributesTest()">getAttributesTest</td> 
+<tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>94</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.getAttributesTest()">getAttributesTest</td> 
   <td>main@1211753909</td>   <td></td> </tr>
-<tr bgcolor="cd6888">  <td>11/11/28 22:44:42</td>   <td>-115</td> <td>&nbsp;</td><td>&nbsp;</td><td title="&gt;&gt;uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.setup()">&gt;&gt;setup</td> 
+<tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>-119</td> <td>&nbsp;</td><td>&nbsp;</td><td title="&gt;&gt;uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.setup()">&gt;&gt;setup</td> 
 <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>  <td>main@1211753909</td>   <td></td> </tr>
 </table>

raptor-client/trunk/test-output/Default suite/methods.html

@@ -2 +2 @@
 <table border="1">
 <tr><th>Time</th><th>Delta (ms)</th><th>Suite<br>configuration</th><th>Test<br>configuration</th><th>Class<br>configuration</th><th>Groups<br>configuration</th><th>Method<br>configuration</th><th>Test<br>method</th><th>Thread</th><th>Instances</th></tr>
-<tr bgcolor="cd6888">  <td>11/11/28 22:44:42</td>   <td>0</td> <td>&nbsp;</td><td>&nbsp;</td><td title="&gt;&gt;uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.setup()">&gt;&gt;setup</td> 
+<tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>0</td> <td>&nbsp;</td><td>&nbsp;</td><td title="&gt;&gt;uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.setup()">&gt;&gt;setup</td> 
 <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>  <td>main@1211753909</td>   <td></td> </tr>
-<tr bgcolor="cd6888">  <td>11/11/28 22:44:42</td>   <td>115</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.cacheTest()">cacheTest</td> 
+<tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>119</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.cacheTest()">cacheTest</td> 
   <td>main@1211753909</td>   <td></td> </tr>
-<tr bgcolor="cd6888">  <td>11/11/28 22:44:42</td>   <td>208</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.getAttributesTest()">getAttributesTest</td> 
+<tr bgcolor="cd6888">  <td>11/11/29 10:53:12</td>   <td>213</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td title="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.getAttributesTest()">getAttributesTest</td> 
   <td>main@1211753909</td>   <td></td> </tr>
 </table>

raptor-client/trunk/test-output/junitreports/TEST-uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated by org.testng.reporters.JUnitReportReporter -->
-<testsuite hostname="testkwshibb1.nerc.ac.uk" name="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest" tests="2" failures="0" timestamp="28 Nov 2011 22:44:42 GMT" time="0.097" errors="0">
+<testsuite hostname="testkwshibb1.nerc.ac.uk" name="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest" tests="2" failures="0" timestamp="29 Nov 2011 10:53:12 GMT" time="0.097" errors="0">
+  <testcase name="getAttributesTest" time="0.005" classname="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest"/>
   <testcase name="cacheTest" time="0.092" classname="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest"/>
-  <testcase name="getAttributesTest" time="0.005" classname="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest"/>
 </testsuite>

raptor-client/trunk/test-output/testng-results.xml

@@ -3 +3 @@
   <reporter-output>
   </reporter-output>
-  <suite name="Default suite" duration-ms="222" started-at="2011-11-28T22:44:42Z" finished-at="2011-11-28T22:44:42Z">
+  <suite name="Default suite" duration-ms="227" started-at="2011-11-29T10:53:12Z" finished-at="2011-11-29T10:53:12Z">
     <groups>
     </groups>
-    <test name="Default test" duration-ms="222" started-at="2011-11-28T22:44:42Z" finished-at="2011-11-28T22:44:42Z">
+    <test name="Default test" duration-ms="227" started-at="2011-11-29T10:53:12Z" finished-at="2011-11-29T10:53:12Z">
       <class name="uk.ac.cardiff.raptor.event.expansion.RDBMSDataConnectorTest">
-        <test-method status="PASS" signature="setup()" name="setup" is-config="true" duration-ms="116" started-at="2011-11-28T22:44:42Z" finished-at="2011-11-28T22:44:42Z">
+        <test-method status="PASS" signature="setup()" name="setup" is-config="true" duration-ms="119" started-at="2011-11-29T10:53:12Z" finished-at="2011-11-29T10:53:12Z">
         </test-method>
-        <test-method status="PASS" signature="cacheTest()" name="cacheTest" duration-ms="92" started-at="2011-11-28T22:44:42Z" finished-at="2011-11-28T22:44:42Z">
+        <test-method status="PASS" signature="cacheTest()" name="cacheTest" duration-ms="92" started-at="2011-11-29T10:53:12Z" finished-at="2011-11-29T10:53:12Z">
         </test-method>
-        <test-method status="PASS" signature="getAttributesTest()" name="getAttributesTest" duration-ms="5" started-at="2011-11-28T22:44:42Z" finished-at="2011-11-28T22:44:42Z">
+        <test-method status="PASS" signature="getAttributesTest()" name="getAttributesTest" duration-ms="5" started-at="2011-11-29T10:53:12Z" finished-at="2011-11-29T10:53:12Z">
         </test-method>
       </class>