X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Ftest%2Forg%2Fwamblee%2Ftest%2FHibernateUtils.java;h=41895b088861c94378a3e41fc8614b221d0cfcea;hb=8f2d78e446f48a1ed156b252998ae17cd6f0ba2b;hp=4630eb81690a2c90a054a52e64c84a9cb88ac361;hpb=caa126385642ffc57478e928ab871bc09c53e993;p=utils diff --git a/support/test/org/wamblee/test/HibernateUtils.java b/support/test/org/wamblee/test/HibernateUtils.java index 4630eb81..41895b08 100644 --- a/support/test/org/wamblee/test/HibernateUtils.java +++ b/support/test/org/wamblee/test/HibernateUtils.java @@ -12,7 +12,7 @@ * 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 org.wamblee.test; @@ -29,48 +29,63 @@ import org.wamblee.io.ClassPathResource; import org.wamblee.io.InputResource; /** - * Hibernate utilities. + * Hibernate utilities. */ -public class HibernateUtils { - +public final class HibernateUtils { + private static final String DATABASE_PROPS = "test.database.properties"; /** - * @param dir + * Disabled. + * + */ + private HibernateUtils() { + // Empty + } + + /** + * @param aDir * @return */ - public static Configuration getConfiguration(File dir) throws IOException { + public static Configuration getConfiguration(File aDir) throws IOException { Configuration conf = new Configuration(); - File[] files = dir.listFiles((FileFilter)(new AwkFilenameFilter(".*\\.hbm\\.xml"))); - for (File f: files) { + File[] files = aDir.listFiles((FileFilter) (new AwkFilenameFilter( + ".*\\.hbm\\.xml"))); + for (File f : files) { System.out.println("Mapping file: " + f); conf.addFile(f); } - - Map dbProps = getHibernateProperties(); - - for (Map.Entry entry : dbProps.entrySet()) { - System.out.println("Property: " + entry.getKey() + "=" + entry.getValue()); + + Map dbProps = getHibernateProperties(); + + for (Map.Entry entry : dbProps.entrySet()) { + System.out.println("Property: " + entry.getKey() + "=" + + entry.getValue()); conf.setProperty(entry.getKey(), entry.getValue()); } - + return conf; } - - private static Map getHibernateProperties() throws IOException { - - System.out.println( "Reading properties file: " + DATABASE_PROPS); - InputResource lPropFile = new ClassPathResource( DATABASE_PROPS ); - 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" ) ); - - return result; + + private static Map getHibernateProperties() + throws IOException { + + System.out.println("Reading properties file: " + DATABASE_PROPS); + InputResource lPropFile = new ClassPathResource(DATABASE_PROPS); + 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")); + + return result; } }