This is an automated email from the ASF dual-hosted git repository.
tbonelee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 256f09664a [ZEPPELIN-6313] Drop configuration WS endpoint in backend
256f09664a is described below
commit 256f09664a4cd9c4fc574d8c64b30f0607e984c5
Author: SeungYoung Oh <[email protected]>
AuthorDate: Sun Sep 6 22:49:34 2026 +0900
[ZEPPELIN-6313] Drop configuration WS endpoint in backend
### What is this PR for?
Currently, configuration data is fetched through REST APIs introduced by
#5099. With the frontend no longer using the configuration WebSocket flow, this
PR removes the remaining backend WebSocket path for configuration data.
### What type of PR is it?
Improvement
### Todos
### What is the Jira issue?
[[ZEPPELIN-6313]](https://issues.apache.org/jira/browse/ZEPPELIN/6313)
### How should this be tested?
- Open /#/configuration and verify it loads configurations via GET
/api/configurations/all
- Import/export a note and verify it fetches GET /api/configurations/client
### Screenshots (if appropriate)
### Questions:
* Does the license files need to update? N
* Is there breaking changes for older versions? N
* Does this needs documentation? N
Closes #5457 from seung-00/ZEPPELIN-6313.
Signed-off-by: ChanHo Lee <[email protected]>
---
.../java/org/apache/zeppelin/common/Message.java | 4 ---
.../org/apache/zeppelin/socket/NotebookServer.java | 29 ----------------------
.../src/interfaces/message-operator.interface.ts | 12 ---------
3 files changed, 45 deletions(-)
diff --git
a/zeppelin-common/src/main/java/org/apache/zeppelin/common/Message.java
b/zeppelin-common/src/main/java/org/apache/zeppelin/common/Message.java
index fc8fd3a8eb..d1e1606007 100644
--- a/zeppelin-common/src/main/java/org/apache/zeppelin/common/Message.java
+++ b/zeppelin-common/src/main/java/org/apache/zeppelin/common/Message.java
@@ -152,10 +152,6 @@ public class Message implements JsonSerializable {
ANGULAR_OBJECT_CLIENT_UNBIND, // [c-s] angular object unbind from
AngularJS z object
- LIST_CONFIGURATIONS, // [c-s] ask all key/value pairs of
configurations
- CONFIGURATIONS_INFO, // [s-c] all key/value pairs of
configurations
- // @param settings serialized Map<String,
String> object
-
CHECKPOINT_NOTE, // [c-s] checkpoint note to storage
repository
// @param noteId
// @param checkpointName
diff --git
a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
index cf4c91e593..6ab2ef711e 100644
---
a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
+++
b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
@@ -88,7 +88,6 @@ import
org.apache.zeppelin.notebook.repo.NotebookRepoWithVersionControl.Revision
import org.apache.zeppelin.rest.exception.ForbiddenException;
import org.apache.zeppelin.scheduler.Job;
import org.apache.zeppelin.scheduler.Job.Status;
-import org.apache.zeppelin.service.ConfigurationService;
import org.apache.zeppelin.service.JobManagerService;
import org.apache.zeppelin.service.NotebookService;
import org.apache.zeppelin.service.ServiceContext;
@@ -162,7 +161,6 @@ public class NotebookServer implements
AngularObjectRegistryListener,
private Provider<NoteParser> noteParser;
private Provider<NotebookService> notebookServiceProvider;
private AuthorizationService authorizationService;
- private Provider<ConfigurationService> configurationServiceProvider;
private Provider<JobManagerService> jobManagerServiceProvider;
public NotebookServer() {
@@ -216,12 +214,6 @@ public class NotebookServer implements
AngularObjectRegistryListener,
}
- @Inject
- public void setConfigurationService(
- Provider<ConfigurationService> configurationServiceProvider) {
- this.configurationServiceProvider = configurationServiceProvider;
- }
-
@Inject
public void setJobManagerService(
Provider<JobManagerService> jobManagerServiceProvider) {
@@ -236,10 +228,6 @@ public class NotebookServer implements
AngularObjectRegistryListener,
return notebookServiceProvider.get();
}
- public ConfigurationService getConfigurationService() {
- return configurationServiceProvider.get();
- }
-
public synchronized JobManagerService getJobManagerService() {
return jobManagerServiceProvider.get();
}
@@ -511,9 +499,6 @@ public class NotebookServer implements
AngularObjectRegistryListener,
case ANGULAR_OBJECT_CLIENT_UNBIND:
angularObjectClientUnbind(conn, receivedMessage);
break;
- case LIST_CONFIGURATIONS:
- sendAllConfigurations(conn, context, receivedMessage);
- break;
case CHECKPOINT_NOTE:
checkpointNote(conn, context, receivedMessage);
break;
@@ -1668,20 +1653,6 @@ public class NotebookServer implements
AngularObjectRegistryListener,
}
- private void sendAllConfigurations(NotebookSocket conn,
- ServiceContext context,
- Message message) throws IOException {
-
- getConfigurationService().getAllProperties(context,
- new WebSocketServiceCallback<Map<String, String>>(conn) {
- @Override
- public void onSuccess(Map<String, String> properties, ServiceContext
context) throws IOException {
- super.onSuccess(properties, context);
- conn.send(serializeMessage(new
Message(OP.CONFIGURATIONS_INFO).put("configurations", properties)));
- }
- });
- }
-
private void checkpointNote(NotebookSocket conn,
ServiceContext context,
Message fromMessage) throws IOException {
diff --git
a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts
b/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts
index 3a98074219..e1812877da 100644
---
a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts
+++
b/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts
@@ -280,18 +280,6 @@ export enum OP {
*/
ANGULAR_OBJECT_CLIENT_UNBIND = 'ANGULAR_OBJECT_CLIENT_UNBIND',
- /**
- * [c-s]
- * @deprecated Retained for backend wire contract compatibility. Use
ConfigurationService REST APIs instead.
- */
- LIST_CONFIGURATIONS = 'LIST_CONFIGURATIONS',
-
- /**
- * [s-c]
- * @deprecated Retained for backend wire contract compatibility. Use
ConfigurationService REST APIs instead.
- */
- CONFIGURATIONS_INFO = 'CONFIGURATIONS_INFO',
-
/**
* [c-s]
* checkpoint note to storage repository
