(no commit message)

[utils] / support / test / org / wamblee / test / HibernateUtils.java

diff --git a/support/test/org/wamblee/test/HibernateUtils.java b/support/test/org/wamblee/test/HibernateUtils.java
index 4630eb81690a2c90a054a52e64c84a9cb88ac361..41895b088861c94378a3e41fc8614b221d0cfcea 100644 (file)
--- 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<String,String> dbProps = getHibernateProperties(); 
-        
-        for (Map.Entry<String,String> entry : dbProps.entrySet()) {
-            System.out.println("Property: " + entry.getKey() + "=" + entry.getValue());
+
+        Map<String, String> dbProps = getHibernateProperties();
+
+        for (Map.Entry<String, String> entry : dbProps.entrySet()) {
+            System.out.println("Property: " + entry.getKey() + "="
+                    + entry.getValue());
             conf.setProperty(entry.getKey(), entry.getValue());
         }
-    
+
         return conf;
     }
-    
-    private static Map<String,String> 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<String,String> result = new TreeMap<String,String>(); 
-        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<String, String> 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<String, String> result = new TreeMap<String, String>();
+        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;
     }
 
 }