[Issue #33] Add property for hazelcast password (when Hazelcast storage is used)

Author: rossitsaborissova

README.md

@@ -42,6 +42,7 @@ oauth20.database=
 db_host=
 redis.sentinels=
 redis.master=
+hazelcast.password=
 apifest-oauth20.nodes=
 custom.classes.jar=
 user.authenticate.class=
@@ -82,6 +83,10 @@ You can define the name of Redis master in the following property in the apifest
 
 ***redis.master***
 
+If you use Hazelcast as a storage, you can set a password using the following property (otherwise the default Hazelcast password - dev-pass will be used):
+
+***hazelcast.password***
+
 In order to run ApiFest OAuth20 distributed storage, you need to setup all ApiFest OAuth20 nodes (as comma-separated list of IPs).
 
 ***apifest-oauth20.nodes***

apifest-oauth20/src/main/java/com/apifest/oauth20/OAuthServer.java

@@ -64,6 +64,7 @@ public final class OAuthServer {
     private static String redisMaster;
     private static String apifestOAuth20Nodes;
     private static URLClassLoader jarClassLoader;
+    private static String hazelcastPassword;
 
     // expires_in in sec for grant type password
     public static final int DEFAULT_PASSWORD_EXPIRES_IN = 900;
@@ -259,6 +260,8 @@ protected static void loadProperties(InputStream in) {
             }
             setHostAndPort((String) props.get("oauth20.host"), (String) props.get("oauth20.port"));
             apifestOAuth20Nodes = props.getProperty("apifest-oauth20.nodes");
+            // dev-pass is the default password used in Hazelcast
+            hazelcastPassword = props.getProperty("hazelcast.password", "dev-pass");
         } catch (IOException e) {
             log.error("Cannot load properties file", e);
         }
@@ -327,4 +330,7 @@ public static Class<ICustomGrantTypeHandler> getCustomGrantTypeHandler() {
         return customGrantTypeHandler;
     }
 
+    public static String getHazelcastPassword() {
+        return hazelcastPassword;
+    }
 }

apifest-oauth20/src/main/java/com/apifest/oauth20/persistence/hazelcast/HazelcastDBManager.java

@@ -76,7 +76,7 @@ public class HazelcastDBManager implements DBManager {
     static {
         // REVISIT: Hazelcast configuration
         Config config = createConfiguration();
-        GroupConfig groupConfig = new GroupConfig("apifest-oauth20", "apifest-oauth20-pass");
+        GroupConfig groupConfig = new GroupConfig("apifest-oauth20", OAuthServer.getHazelcastPassword());
         config.setGroupConfig(groupConfig);
         config.setMapConfigs(createMapConfigs());
         hazelcastClient = Hazelcast.newHazelcastInstance(config);

apifest-oauth20/src/main/resources/apifest-oauth.properties.template

@@ -8,4 +8,5 @@ apifest-oauth20.nodes=
 custom.classes.jar=
 user.authenticate.class=
 custom.grant_type=
-custom.grant_type.class=
+custom.grant_type.class=
+hazelcast.password=