/ - Diff - D-Net - D-Net project tracking tool

     import eu.dnetlib.enabling.database.rmi.DatabaseException;
     import eu.dnetlib.miscutils.datetime.DateUtils;
     import eu.dnetlib.miscutils.functional.string.Sanitizer;
     import org.apache.commons.dbcp2.BasicDataSource;
     import org.apache.commons.lang.BooleanUtils;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
-...
     						final ResultSet rs = stm.executeQuery()) {
     					con.setAutoCommit(false);
     					rs.setFetchSize(getFetchSize());
     					boolean timeout = false;
     					while (rs.next()) {
     						ResultSetMetaData md = rs.getMetaData();
     						Map<String, Object> row = new HashMap<>();
-...
     							row.put(md.getColumnName(i), rs.getObject(i));
+    						}
     						if (!enqueue(queue, row)) {
     							timeout = true;
     							break;
+    						}
+    					}
     					if (timeout) {
     						throw new RuntimeException(String.format("queue full, consumer did not consume for %s seconds", BLOCKING_QUEUE_TIMEOUT));
+    					}
     					// An empty Map indicates the end of the resultset
     					enqueue(queue, new HashMap<>());
     				} catch (SQLException e) {
-...
     			return (T) queue;
+    		}
     		try(final BasicDataSource ds = (BasicDataSource) dataSourceFactory.createDataSource(dbName)) {
     			final JdbcTemplate jdbcTemplate = jdbcTemplateFactory.createJdbcTemplate(ds);
     			if (clazz == Integer.class) return (T) jdbcTemplate.queryForObject(query, Integer.class);
     			else if (clazz == List.class) return (T) jdbcTemplate.queryForList(query);
     			else if (clazz == Map.class) return (T) jdbcTemplate.queryForMap(query);
     			else if (clazz == SqlRowSet.class) return (T) jdbcTemplate.queryForRowSet(query);
     			else {
     				jdbcTemplate.update(query);
     				return null;
+    			}
     		} catch(SQLException e) {
     			throw new DatabaseException(e);
     		final JdbcTemplate jdbcTemplate = jdbcTemplateFactory.createJdbcTemplate(dbName);
     		if (clazz == Integer.class) return (T) jdbcTemplate.queryForObject(query, Integer.class);
     		else if (clazz == List.class) return (T) jdbcTemplate.queryForList(query);
     		else if (clazz == Map.class) return (T) jdbcTemplate.queryForMap(query);
     		else if (clazz == SqlRowSet.class) return (T) jdbcTemplate.queryForRowSet(query);
     		else {
     			jdbcTemplate.update(query);
     			return null;
+    		}
+    	}

     import javax.sql.DataSource;
     import org.apache.commons.dbcp2.BasicDataSource;
     import org.springframework.beans.factory.annotation.Required;
     import org.springframework.jdbc.datasource.DriverManagerDataSource;
     public class DataSourceFactoryImpl implements DataSourceFactory {
-...
     	@Override
     	public DataSource createDataSource(String db) {
     		// DriverManagerDataSource ds = new DriverManagerDataSource();
     		BasicDataSource ds = new BasicDataSource();
     		DriverManagerDataSource ds = new DriverManagerDataSource();
     		//BasicDataSource ds = new BasicDataSource();
     		ds.setDriverClassName(driverClassName);
     		ds.setUrl(baseUrl + "/" + db);
     		ds.setUsername(username);
     		ds.setPassword(password);
     		ds.setInitialSize(1);
     		//ds.setInitialSize(1);
     		return ds;
+    	}

     			<artifactId>postgresql</artifactId>
     			<version>${postgres.jdbc.version}</version>
     		</dependency>
     		<dependency>
     <!--		<dependency>
     			<groupId>org.apache.commons</groupId>
     			<artifactId>commons-dbcp2</artifactId>
     			<version>2.2.0</version>
     		</dependency>
     		</dependency>-->
     		<dependency>
     			<groupId>org.hibernate</groupId>
     			<artifactId>hibernate-core</artifactId>

Project

General

Profile

D-Net

Revision 50749

Added by Claudio Atzori about 6 years ago