The Unified and Autonomous Development Platform
Fix the issue that web socket updating does not work
robin shende0c4a275bf7
diff --git a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex f225c0166f..4720c1482f 100644--- a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -177,7 +177,7 @@ public abstract class BasePage extends WebPage {if (message.getText().startsWith(WebSocketManager.OBSERVABLE_CHANGED)) {String observable = message.getText().substring(WebSocketManager.OBSERVABLE_CHANGED.length()+1);- for (WebSocketObserver observer: getWebSocketObservers()) {+ for (WebSocketObserver observer: findWebSocketObservers()) {if (observer.getObservables().contains(observable))observer.onObservableChanged(handler, observable);}@@ -192,7 +192,7 @@ public abstract class BasePage extends WebPage {* re-render the integration preview section after connecting will make it* displaying correctly*/- for (WebSocketObserver observer: getWebSocketObservers())+ for (WebSocketObserver observer: findWebSocketObservers())observer.onConnectionOpened(handler);}@@ -249,8 +249,9 @@ public abstract class BasePage extends WebPage {super.onAfterRender();}- private Collection<WebSocketObserver> getWebSocketObservers() {+ private Collection<WebSocketObserver> findWebSocketObservers() {Collection<WebSocketObserver> observers = new HashSet<>();+ observers.addAll(getBehaviors(io.onedev.server.web.behavior.WebSocketObserver.class));visitChildren(Component.class, new IVisitor<Component, Void>() {@Override@@ -262,13 +263,17 @@ public abstract class BasePage extends WebPage {return observers;}- public Collection<String> getWebSocketObservables() {+ public final Collection<String> findWebSocketObservables() {Collection<String> observables = new HashSet<>();- for (WebSocketObserver observer: getWebSocketObservers())+ for (WebSocketObserver observer: findWebSocketObservers())observables.addAll(observer.getObservables());return observables;}+ public Collection<String> getWebSocketObservables() {+ return new HashSet<>();+ }+private void checkReady() {if (!OneDev.getInstance().isReady() && getClass() != ServerInitPage.class)throw new RestartResponseAtInterceptPageException(ServerInitPage.class);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex eddafbc00e..199ca74376 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -70,6 +70,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.TextRange;import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.search.CommitIndexed;import io.onedev.server.search.IndexManager;import io.onedev.server.search.SearchManager;import io.onedev.server.search.hit.QueryHit;@@ -920,11 +921,11 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {@Overridepublic Collection<String> getWebSocketObservables() {Collection<String> observables = super.getWebSocketObservables();- observables.add("CommitIndexed:" + getProject().getRevCommit(resolvedRevision).name());+ observables.add(CommitIndexed.getWebSocketObservable(getProject().getRevCommit(resolvedRevision).name()));if (state.requestId != null)- observables.add(PullRequest.class.getName() + ":" + state.requestId);+ observables.add(PullRequest.getWebSocketObservable(state.requestId));if (state.commentId != null)- observables.add(CodeComment.class.getName() + ":" + state.commentId);+ observables.add(CodeComment.getWebSocketObservable(state.commentId));return observables;}diff --git a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.javaindex ea9aa41498..7f17266fb7 100644--- a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java+++ b/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java@@ -18,7 +18,7 @@ public class CommitIndexedBroadcaster {@Listenpublic void on(CommitIndexed event) {- webSocketManager.onObservableChanged(CommitIndexed.class.getName() + event.getCommitId().name(), null);+ webSocketManager.onObservableChanged(CommitIndexed.getWebSocketObservable(event.getCommitId().name()), null);}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java b/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.javaindex 4fdeb28edb..412d102cab 100644--- a/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java+++ b/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java@@ -50,7 +50,7 @@ public class DefaultWebSocketManager implements WebSocketManager {public void onObserverChanged(BasePage page) {String sessionId = page.getSession().getId();if (sessionId != null) {- observables.put(new PageKey(sessionId, new PageIdKey(page.getPageId())), page.getWebSocketObservables());+ observables.put(new PageKey(sessionId, new PageIdKey(page.getPageId())), page.findWebSocketObservables());}}