Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

token container instance -> getInstance

Browse source
This commit is contained in:
Khalid Huseynov 2017-03-21 11:44:46 +09:00
parent b465b6e962
commit 4e36ce6d96
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/model/UserTokenContainer.java
View file

@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
public class UserTokenContainer {
private static final Logger LOG = LoggerFactory.getLogger(UserTokenContainer.class);
public static UserTokenContainer instance = null;
private static UserTokenContainer instance = null;
private ConcurrentMap<String, String> userTokens = new ConcurrentHashMap<String, String>();
private final ZeppelinhubRestApiHandler restApiClient;
private String defaultToken;
@ -55,6 +55,10 @@ public class UserTokenContainer {
this.defaultToken = defaultToken;
}
public static UserTokenContainer getInstance() {
return instance;
}
public void setUserToken(String username, String token) {
if (StringUtils.isBlank(username) || StringUtils.isBlank(token)) {
LOG.warn("Can't set empty user token");

4
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java
View file

@ -282,7 +282,7 @@ public class ZeppelinClient {
return;
}
token = UserTokenContainer.instance.getUserToken(zeppelinMsg.principal);
token = UserTokenContainer.getInstance().getUserToken(zeppelinMsg.principal);
Client client = Client.getInstance();
if (client == null) {
LOG.warn("Client isn't initialized yet");
@ -302,7 +302,7 @@ public class ZeppelinClient {
return;
}
NotebookAuthorization noteAuth = NotebookAuthorization.getInstance();
Map<String, String> userTokens = UserTokenContainer.instance.getAllUserTokens();
Map<String, String> userTokens = UserTokenContainer.getInstance().getAllUserTokens();
Client client = Client.getInstance();
Set<String> userAndRoles;
String token;

2
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/scheduler/ZeppelinHubHeartbeat.java
View file

@ -41,7 +41,7 @@ public class ZeppelinHubHeartbeat implements Runnable {
@Override
public void run() {
LOG.debug("Sending PING to zeppelinhub token");
for (String token: UserTokenContainer.instance.getAllTokens()) {
for (String token: UserTokenContainer.getInstance().getAllTokens()) {
client.send(ZeppelinhubUtils.pingMessage(token), token);
}
}

6
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/utils/ZeppelinhubUtils.java
View file

@ -100,8 +100,8 @@ public class ZeppelinhubUtils {
public static void userLoginRoutine(String username) {
LOG.debug("Executing user login routine");
String token = UserTokenContainer.instance.getUserToken(username);
UserTokenContainer.instance.setUserToken(username, token);
String token = UserTokenContainer.getInstance().getUserToken(username);
UserTokenContainer.getInstance().setUserToken(username, token);
String msg = ZeppelinhubUtils.liveMessage(token);
ZeppelinhubClient.getInstance()
.send(msg, token);
@ -109,7 +109,7 @@ public class ZeppelinhubUtils {
public static void userLogoutRoutine(String username) {
LOG.debug("Executing user logout routine");
String token = UserTokenContainer.instance.removeUserToken(username);
String token = UserTokenContainer.getInstance().removeUserToken(username);
String msg = ZeppelinhubUtils.deadMessage(token);
ZeppelinhubClient.getInstance()
.send(msg, token);