Project

General

Profile

« Previous | Next » 

Revision 27536

Added by Antonis Lempesis about 10 years ago

better handling of connections and datasource

View differences:

modules/uoa-openaire-connector/trunk/src/main/java/eu/dnetlib/openaire/thrift/ClaimConnector.java
53 53 

  		




  54
  54
  
    
        rs.close();


  		




  55
  55
  
    
        stmt.close();


  		




  
  56
  
    
	con.close();


  		




  56
  57
  
    

  		




  57
  58
  
    
		return res;


  		




  58
  59
  
    
	}


  		




  59
  60
  
    

  		




  60
  61
  
    
    public List<Claim> getClaimedPublications(Date from, Date to) throws SQLException {


  		




  
  62
  
    
	logger.info("Returning all claimed publications from " + from + " to " + to);


  		




  61
  63
  
    
        Connection con = DataSourceUtils.getConnection(datasource);


  		




  62
  64
  
    

  		




  63
  
  
    
        PreparedStatement stmt = con.prepareStatement("select \"resultid\", \"date\" , \"type\", \"xml\" from claims where \"agent\" != 'inference' and \"date \" >= ?::date and \"date\" <= ?::date ");


  		




  
  65
  
    
        PreparedStatement stmt = con.prepareStatement("select \"resultid\", \"date\" , \"type\", \"xml\" from claims where \"agent\" != 'inference' and \"date\" >= ?::date and \"date\" <= ?::date ");


  		




  64
  66
  
    

  		




  65
  67
  
    
        stmt.setDate(1, new java.sql.Date(from.getTime()));


  		




  66
  68
  
    
        stmt.setDate(2, new java.sql.Date(to.getTime()));


  		




  ......




  74
  76
  
    

  		




  75
  77
  
    
        rs.close();


  		




  76
  78
  
    
        stmt.close();


  		




  
  79
  
    
	con.close();


  		




  77
  80
  
    

  		




  
  81
  
    
	logger.debug("number of claims: " + res.size());


  		




  
  82
  
    

  		




  78
  83
  
    
        return res;


  		




  79
  84
  
    
    }


  		




  80
  85
  
    

  		




  ......




  88
  93
  
    

  		




  89
  94
  
    
        stmt.executeUpdate();


  		




  90
  95
  
    
        stmt.close();


  		




  
  96
  
    
	con.close();


  		




  91
  97
  
    
    }


  		




  92
  98
  
    

  		




  93
  99
  
    
    /**


  		












  

    
      modules/uoa-openaire-connector/trunk/src/main/resources/eu/dnetlib/openaire/thrift/springContext-openaire-thrift.xml
    
  





  8
  8
  
    
        http://www.springframework.org/schema/tx


  		




  9
  9
  
    
        http://www.springframework.org/schema/tx/spring-tx.xsd">


  		




  10
  10
  
    
		


  		




  11
  
  
    
	<!--<bean id="openaire.dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">-->


  		




  12
  
  
    
		<!--<property name="driverClassName" value="${openaire.connector.db.driverClassName}" />-->


  		




  13
  
  
    
		<!--<property name="url" value="${openaire.connector.db.url}" />-->


  		




  14
  
  
    
		<!--<property name="username" value="${openaire.connector.db.username}" />-->


  		




  15
  
  
    
		<!--<property name="password" value="${openaire.connector.db.password}" />-->


  		




  16
  
  
    
		<!--<property name="maxIdle" value="10" />-->


  		




  17
  
  
    
		<!--<property name="maxActive" value="100" />-->


  		




  18
  
  
    
		<!--<property name="maxWait" value="10000" />-->


  		




  19
  
  
    
		<!--<property name="validationQuery" value="SELECT 1;" />-->


  		




  20
  
  
    
		<!--<property name="testOnBorrow" value="true" />-->


  		




  21
  
  
    
		<!--<property name="testOnReturn" value="true" />-->


  		




  22
  
  
    
		<!--<property name="testWhileIdle" value="true" />-->


  		




  23
  
  
    
		<!--<property name="timeBetweenEvictionRunsMillis" value="1200000" />-->


  		




  24
  
  
    
		<!--<property name="minEvictableIdleTimeMillis" value="1800000" />-->


  		




  25
  
  
    
		<!--<property name="numTestsPerEvictionRun" value="5" />-->


  		




  26
  
  
    
		<!--<property name="poolPreparedStatements" value="true" />-->


  		




  27
  
  
    
		<!--<property name="defaultAutoCommit" value="true" />-->


  		




  28
  
  
    
	<!--</bean>-->


  		




  
  11
  
    
	<bean id="openaire.dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">


  		




  
  12
  
    
		<property name="driverClassName" value="${openaire.db.driverClassName}" />


  		




  
  13
  
    
		<property name="url" value="${openaire.db.url}" />


  		




  
  14
  
    
		<property name="username" value="${openaire.db.username}" />


  		




  
  15
  
    
		<property name="password" value="${openaire.db.password}" />


  		




  
  16
  
    
		<property name="maxIdle" value="10" />


  		




  
  17
  
    
		<property name="maxActive" value="100" />


  		




  
  18
  
    
		<property name="maxWait" value="10000" />


  		




  
  19
  
    
		<property name="validationQuery" value="SELECT 1;" />


  		




  
  20
  
    
		<property name="testOnBorrow" value="true" />


  		




  
  21
  
    
		<property name="testOnReturn" value="true" />


  		




  
  22
  
    
		<property name="testWhileIdle" value="true" />


  		




  
  23
  
    
		<property name="timeBetweenEvictionRunsMillis" value="1200000" />


  		




  
  24
  
    
		<property name="minEvictableIdleTimeMillis" value="1800000" />


  		




  
  25
  
    
		<property name="numTestsPerEvictionRun" value="5" />


  		




  
  26
  
    
		<property name="poolPreparedStatements" value="true" />


  		




  
  27
  
    
		<property name="defaultAutoCommit" value="true" />


  		




  
  28
  
    
	</bean>


  		




  29
  29
  
    

  		




  30
  30
  
    
	<bean id="claimConnector" class="eu.dnetlib.openaire.thrift.ClaimConnector">


  		




  31
  31
  
    
		<property name="actionManagerLocator" ref="actionManagerLocator" />


  		












Also available in:  Unified diff