FORGE-2028: Connection Profile Password is no longer required

HSQLDB does not require a password.
forge · Sep 22, 2014 · 541ac34 · 541ac34
1 parent 05f70d1
commit 541ac34
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.../src/main/java/org/jboss/forge/addon/database/tools/generate/GenerateEntitiesCommand.java b/.../src/main/java/org/jboss/forge/addon/database/tools/generate/GenerateEntitiesCommand.java
@@ -95,7 +95,7 @@ public void initializeUI(UIBuilder builder) throws Exception
       connectionProfile.setValueChoices(profileNames);
       connectionProfile.setValue("");
       // Enable password input only if profile does not store saved passwords
-      Callable<Boolean> enablePasswordInput = new Callable<Boolean>()
+      connectionProfilePassword.setEnabled(new Callable<Boolean>()
       {
          @Override
          public Boolean call() throws Exception
@@ -106,8 +106,7 @@ public Boolean call() throws Exception
             ConnectionProfile profile = profiles.get(connectionProfileName);
             return !profile.isSavePassword();
          }
-      };
-      connectionProfilePassword.setEnabled(enablePasswordInput).setRequired(enablePasswordInput);
+      });
       builder.add(targetPackage).add(connectionProfile).add(connectionProfilePassword);
    }
 
@@ -170,15 +169,18 @@ private Properties createConnectionProperties(ConnectionProfile profile)
       result.setProperty("hibernate.dialect",
                profile.getDialect() == null ? "" : profile.getDialect());
       String profilePassword;
-      // If password is not saved, user must supply it
+      // If password is not saved, user must provide it
       if (profile.isSavePassword())
       {
-         profilePassword = profile.getPassword() == null ? "" : profile.getPassword();
+         profilePassword = profile.getPassword();
       }
       else
       {
          profilePassword = connectionProfilePassword.getValue();
       }
+      if (profilePassword == null) 
+         profilePassword = "";
+
       result.setProperty("hibernate.connection.password", profilePassword);
       result.setProperty("hibernate.connection.url",
                profile.getUrl() == null ? "" : profile.getUrl());