DataPropertyStatement optimizations

webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java

@@ -12,6 +12,10 @@ import com.hp.hpl.jena.rdf.model.Property;
  */
 public interface DataPropertyStatement {
     
+    public Individual getIndividual();
+    
+    public void setIndividual(Individual individual);
+    
     public String getIndividualURI();
 
     public void setIndividualURI(String individualURI);

webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java

@@ -10,6 +10,7 @@ import java.util.Date;
  */
 public class DataPropertyStatementImpl implements VitroTimeWindowedResource, DataPropertyStatement
 {
+    private Individual individual = null;
     private String individualURI = null;
     private String data = null;
     private String datapropURI = null;
@@ -35,6 +36,14 @@ public class DataPropertyStatementImpl implements VitroTimeWindowedResource, Dat
         this.data = data;
     }
 
+    public Individual getIndividual() {
+        return this.individual;
+    }
+    
+    public void setIndividual(Individual individual) {
+        this.individual = individual;
+    }
+    
     public String getIndividualURI() {
         return individualURI;
     }

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java

@@ -30,6 +30,10 @@ public class DataPropertyStatementFiltering implements DataPropertyStatement {
         return innerStmt.toString();
     }
 
+    public Individual getIndividual() {
+        return innerStmt.getIndividual();
+    }
+    
     public String getIndividualURI() {
         return innerStmt.getIndividualURI();
     }
@@ -62,6 +66,10 @@ public class DataPropertyStatementFiltering implements DataPropertyStatement {
         return innerStmt.getString();
     }
     
+    public void setIndividual(Individual individual) {
+        innerStmt.setIndividual(individual);
+    }
+    
     public void setIndividualURI(String individualURI) {
         innerStmt.setIndividualURI(individualURI);
     }

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HiddenFromDisplayBelowRoleLevelFilter.java

@@ -154,7 +154,7 @@ public class HiddenFromDisplayBelowRoleLevelFilter extends VitroFiltersImpl {
                         return false;
                 }
 
-                Individual subject = wdf.getIndividualDao().getIndividualByURI( dPropStmt.getIndividualURI() );
+                Individual subject = dPropStmt.getIndividual();
                 if( subject == null ) {
                     if( ! canViewOddItems() ){  return false; }
                 }else{

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/ProhibitedFromUpdateBelowRoleLevelFilter.java

@@ -126,7 +126,7 @@ public class ProhibitedFromUpdateBelowRoleLevelFilter extends VitroFiltersImpl {
                         return false;
                 }
                 
-                Individual subject = wdf.getIndividualDao().getIndividualByURI( dPropStmt.getIndividualURI() );                        
+                Individual subject = dPropStmt.getIndividual();                        
                 if( subject == null ) {
                     if( ! canViewOddItems() ){  return false; }
                 }else{

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java

@@ -121,6 +121,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
                         fillDataPropertyStatementWithJenaLiteral(ed,lit);
                         ed.setDatapropURI(st.getPredicate().getURI());
                         ed.setIndividualURI(ind.getURI());
+                        ed.setIndividual(entity);
                         edList.add(ed);
                      /* } */
                     }
@@ -180,6 +181,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
 	                    Literal lit = (Literal)st.getObject();
 	                    fillDataPropertyStatementWithJenaLiteral(ed, lit);
 	                    ed.setIndividualURI(entity.getURI());
+	                    ed.setIndividual(entity);
 	                    ed.setDatapropURI(st.getPredicate().getURI());
 	                    edList.add(ed);
 	                }

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java

@@ -99,6 +99,7 @@ public class DataPropertyStatementDaoSDB extends DataPropertyStatementDaoJena
                         fillDataPropertyStatementWithJenaLiteral(ed,lit);
                         ed.setDatapropURI(st.getPredicate().getURI());
                         ed.setIndividualURI(ind.getURI());
+                        ed.setIndividual(entity);
                         edList.add(ed);
                      /* } */
                     }

webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java

@@ -38,8 +38,10 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
     private static final Log log = LogFactory.getLog(JenaDataSourceSetupBase.class);
 
     protected final static int DEFAULT_MAXWAIT = 10000, // ms
+            DEFAULT_INITIALSIZE = 8,
             DEFAULT_MAXACTIVE = 300,
             DEFAULT_MAXIDLE = 30,
+            DEFAULT_MINIDLE = 8,
             DEFAULT_TIMEBETWEENEVICTIONS = 30 * 60 * 1000, // ms
             DEFAULT_TESTSPEREVICTION = 3,
             DEFAULT_MINEVICTIONIDLETIME = 1000 * 60 * 30; // ms
@@ -167,6 +169,8 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
            }
        }
        ds.setMaxActive(maxActiveInt);
+       ds.setInitialSize(DEFAULT_INITIALSIZE);
+       ds.setMinIdle(DEFAULT_MINIDLE);
        ds.setMaxIdle(DEFAULT_MAXIDLE);
        ds.setMaxWait(DEFAULT_MAXWAIT);
        ds.setValidationQuery(DEFAULT_VALIDATIONQUERY);