Merge pull request #119 from SawamiWataru/Issue-116-Enable-to-receive…

…-events-with-WebSocket Issue 116 enable to receive events with web socket
personium · Jan 31, 2018 · 5b3f55d · 5b3f55d
2 parents 11a87e5 + b46a24c
commit 5b3f55d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/io/personium/core/auth/AccessContext.java b/src/main/java/io/personium/core/auth/AccessContext.java
@@ -820,14 +820,15 @@ private static String getRealm(String baseUri, Cell cellobj) {
     }
 
     /**
-     * return an access context for WebSocket connection
+     * return an access context for WebSocket connection.
      * @param accessToken Authorization-token
      * @param cell Accessing cell
      * @param baseUri Accessing baseUri
      * @param host Accessing host
      * @return Created AccessContext Object
      */
-    public static AccessContext createForWebSocket(final String accessToken, final Cell cell, final String baseUri, final String host) {
+    public static AccessContext createForWebSocket(
+            final String accessToken, final Cell cell, final String baseUri, final String host) {
         String bearerAccessToken = OAuth2Helper.Scheme.BEARER_CREDENTIALS_PREFIX + accessToken;
         return createBearerAuthz(bearerAccessToken, cell, baseUri, host, null);
     }

diff --git a/src/main/java/io/personium/core/model/impl/es/CellEsImpl.java b/src/main/java/io/personium/core/model/impl/es/CellEsImpl.java
@@ -332,7 +332,7 @@ private static Cell findCell(String queryKey, String queryValue) {
             ret.id = (String) cache.get("_id");
         }
 
-        if(ret.url == null) {
+        if (ret.url == null) {
             ret.url = PersoniumUnitConfig.getBaseUrl() + ret.name + "/";
         }