X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=support%2Fspring%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Ftest%2Fspring%2FHibernateUtils.java;h=a07cc39ea422dea390e0ebef998c8e827aba4691;hb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;hp=0c6c8f54849b865ddaa2f2435db8afe01328f1e2;hpb=89c06d4d52b46c154128c97d6e758fa1f4fc7a6e;p=utils diff --git a/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java b/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java index 0c6c8f54..a07cc39e 100644 --- a/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java +++ b/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java @@ -30,40 +30,33 @@ import java.util.Map; import java.util.Properties; import java.util.TreeMap; - /** * Hibernate utilities. - * + * * @author Erik Brakkee */ public final class HibernateUtils { - /** - * DOCUMENT ME! - */ private static final String DATABASE_PROPS = "test.database.properties"; -/** + /** * Disabled. - * + * */ private HibernateUtils() { // Empty } /** - * DOCUMENT ME! - * + * * @param aDir - * + * * @return - * - * @throws IOException DOCUMENT ME! + * */ - public static Configuration getConfiguration(File aDir) - throws IOException { - Configuration conf = new Configuration(); - File[] files = aDir.listFiles((FileFilter) (new AwkFilenameFilter( - ".*\\.hbm\\.xml"))); + public static Configuration getConfiguration(File aDir) throws IOException { + Configuration conf = new Configuration(); + File[] files = aDir.listFiles((FileFilter) (new AwkFilenameFilter( + ".*\\.hbm\\.xml"))); for (File f : files) { System.out.println("Mapping file: " + f); @@ -73,37 +66,31 @@ public final class HibernateUtils { Map dbProps = getHibernateProperties(); for (Map.Entry entry : dbProps.entrySet()) { - System.out.println("Property: " + entry.getKey() + "=" - + entry.getValue()); + System.out.println("Property: " + entry.getKey() + "=" + + entry.getValue()); conf.setProperty(entry.getKey(), entry.getValue()); } return conf; } - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - * - * @throws IOException DOCUMENT ME! - */ private static Map getHibernateProperties() throws IOException { System.out.println("Reading properties file: " + DATABASE_PROPS); InputResource lPropFile = new ClassPathResource(DATABASE_PROPS); - Properties props = new Properties(); + Properties props = new Properties(); props.load(lPropFile.getInputStream()); Map result = new TreeMap(); - result.put("hibernate.connection.driver_class", - props.getProperty("database.driver")); - result.put("hibernate.connection.url", props.getProperty("database.url")); - result.put("hibernate.connection.username", - props.getProperty("database.username")); - result.put("hibernate.connection.password", - props.getProperty("database.password")); + result.put("hibernate.connection.driver_class", props + .getProperty("database.driver")); + result.put("hibernate.connection.url", props + .getProperty("database.url")); + result.put("hibernate.connection.username", props + .getProperty("database.username")); + result.put("hibernate.connection.password", props + .getProperty("database.password")); return result; }