You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by pd...@apache.org on 2021/06/14 08:52:05 UTC
[zeppelin] branch master updated: [ZEPPELIN-5376] Polish server and
service package codes of zeppelin-server
This is an automated email from the ASF dual-hosted git repository.
pdallig 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 3b9cfbf [ZEPPELIN-5376] Polish server and service package codes of zeppelin-server
3b9cfbf is described below
commit 3b9cfbf64dff6f4fcd599be46fb48fcd8d8c2828
Author: cuspymd <cu...@gmail.com>
AuthorDate: Fri May 21 00:06:45 2021 +0900
[ZEPPELIN-5376] Polish server and service package codes of zeppelin-server
### What is this PR for?
Polish server and service package codes of zeppelin-server
- Delete unused import
- Delete and optimize redundant codes
- Add `final` keyword to some variables that have unchanged reference.
### What type of PR is it?
[Refactoring]
### What is the Jira issue?
* [ZEPPELIN-5376] Polish server and service package codes of zeppelin-server
### How should this be tested?
* CI
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: cuspymd <cu...@gmail.com>
Closes #4121 from cuspymd/polish-server and squashes the following commits:
53acee458 [cuspymd] Change variable name of Logger to upper case letters
625ac6d27 [cuspymd] Polish server and service package codes of zeppelin-server
---
.../apache/zeppelin/server/HtmlAddonResource.java | 9 ---------
.../zeppelin/server/ImmediateErrorHandlerImpl.java | 6 +++---
.../org/apache/zeppelin/server/ZeppelinServer.java | 2 +-
.../zeppelin/service/ConfigurationService.java | 2 +-
.../apache/zeppelin/service/InterpreterService.java | 7 +------
.../apache/zeppelin/service/JobManagerService.java | 13 +++++++------
.../zeppelin/service/NoAuthenticationService.java | 4 ++--
.../org/apache/zeppelin/service/NotebookService.java | 20 ++++++++------------
.../org/apache/zeppelin/service/ServiceContext.java | 4 ++--
.../zeppelin/service/SessionManagerService.java | 18 +++++++++---------
.../zeppelin/service/ShiroAuthenticationService.java | 4 ++--
.../zeppelin/service/SimpleServiceCallback.java | 2 +-
12 files changed, 37 insertions(+), 54 deletions(-)
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/HtmlAddonResource.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/HtmlAddonResource.java
index ec61945..6a5cda7 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/HtmlAddonResource.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/HtmlAddonResource.java
@@ -29,18 +29,9 @@ import java.net.URL;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import org.eclipse.jetty.util.resource.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
import com.google.common.io.CharStreams;
import com.google.common.io.Files;
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ImmediateErrorHandlerImpl.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ImmediateErrorHandlerImpl.java
index b21695f..5d0ec17 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ImmediateErrorHandlerImpl.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ImmediateErrorHandlerImpl.java
@@ -28,8 +28,8 @@ import java.util.List;
*/
@Singleton
public class ImmediateErrorHandlerImpl implements ImmediateErrorHandler {
- private final List<ErrorData> constructionErrors = new LinkedList<ErrorData>();
- private final List<ErrorData> destructionErrors = new LinkedList<ErrorData>();
+ private final List<ErrorData> constructionErrors = new LinkedList<>();
+ private final List<ErrorData> destructionErrors = new LinkedList<>();
@Override
public void postConstructFailed(ActiveDescriptor<?> immediateService, Throwable exception) {
@@ -55,7 +55,7 @@ public class ImmediateErrorHandlerImpl implements ImmediateErrorHandler {
long elapsedTime = System.currentTimeMillis() - currentTime;
waitTime -= elapsedTime;
}
- return new LinkedList<ErrorData>(constructionErrors);
+ return new LinkedList<>(constructionErrors);
}
}
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index 76d0f82..360c8ff 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -386,7 +386,7 @@ public class ZeppelinServer extends ResourceConfig {
String noteIdToRun = conf.getNotebookRunId();
if (!StringUtils.isEmpty(noteIdToRun)) {
LOG.info("Running note {} on start", noteIdToRun);
- NotebookService notebookService = (NotebookService) ServiceLocatorUtilities.getService(
+ NotebookService notebookService = ServiceLocatorUtilities.getService(
sharedServiceLocator, NotebookService.class.getName());
ServiceContext serviceContext;
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/service/ConfigurationService.java b/zeppelin-server/src/main/java/org/apache/zeppelin/service/ConfigurationService.java
index e194de1..b4c4bed 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/service/ConfigurationService.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/service/ConfigurationService.java
@@ -25,7 +25,7 @@ import java.util.Map;
public class ConfigurationService {
- private ZeppelinConfiguration zConf;
+ private final ZeppelinConfiguration zConf;
@Inject
public ConfigurationService(ZeppelinConfiguration zConf) {
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/service/InterpreterService.java b/zeppelin-server/src/main/java/org/apache/zeppelin/service/InterpreterService.java
index 7214815..d5c34a4 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/service/InterpreterService.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/service/InterpreterService.java
@@ -99,12 +99,7 @@ public class InterpreterService {
// It might take time to finish it
EXECUTOR_SERVICE.execute(
- new Runnable() {
- @Override
- public void run() {
- downloadInterpreter(request, dependencyResolver, interpreterDir, serviceCallback);
- }
- });
+ () -> downloadInterpreter(request, dependencyResolver, interpreterDir, serviceCallback));
}
void downloadInterpreter(
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/service/JobManagerService.java b/zeppelin-server/src/main/java/org/apache/zeppelin/service/JobManagerService.java
index 2521226..84d3594 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/service/JobManagerService.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/service/JobManagerService.java
@@ -41,9 +41,9 @@ public class JobManagerService {
private static final Logger LOGGER = LoggerFactory.getLogger(JobManagerService.class);
- private Notebook notebook;
- private AuthorizationService authorizationService;
- private ZeppelinConfiguration conf;
+ private final Notebook notebook;
+ private final AuthorizationService authorizationService;
+ private final ZeppelinConfiguration conf;
@Inject
public JobManagerService(Notebook notebook,
@@ -65,9 +65,10 @@ public class JobManagerService {
Note jobNote = notebook.getNote(noteId);
if (jobNote == null) {
callback.onFailure(new IOException("Note " + noteId + " not found"), context);
+ } else {
+ notesJobInfo.add(new NoteJobInfo(jobNote));
+ callback.onSuccess(notesJobInfo, context);
}
- notesJobInfo.add(new NoteJobInfo(jobNote));
- callback.onSuccess(notesJobInfo, context);
return notesJobInfo;
}
@@ -84,7 +85,7 @@ public class JobManagerService {
List<NoteJobInfo> notesJobInfo = notebook.getNoteStream()
.filter(note -> authorizationService.isOwner(context.getUserAndRoles(), note.getId()))
- .map(note -> new NoteJobInfo(note))
+ .map(NoteJobInfo::new)
.filter(noteJobInfo -> noteJobInfo.unixTimeLastRun > lastUpdateServerUnixTime)
.collect(Collectors.toList());
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/service/NoAuthenticationService.java b/zeppelin-server/src/main/java/org/apache/zeppelin/service/NoAuthenticationService.java
index 478d402..86ba100 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/service/NoAuthenticationService.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/service/NoAuthenticationService.java
@@ -30,12 +30,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class NoAuthenticationService implements AuthenticationService {
- private static Logger logger = LoggerFactory.getLogger(NoAuthenticationService.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(NoAuthenticationService.class);
private final String ANONYMOUS = "anonymous";
@Inject
public NoAuthenticationService() {
- logger.info("NoAuthenticationService is initialized");
+ LOGGER.info("NoAuthenticationService is initialized");
}
@Override
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java b/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java
index db324ac..946886c 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java
@@ -80,10 +80,10 @@ public class NotebookService {
private static final DateTimeFormatter TRASH_CONFLICT_TIMESTAMP_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- private ZeppelinConfiguration zConf;
- private Notebook notebook;
- private AuthorizationService authorizationService;
- private SchedulerService schedulerService;
+ private final ZeppelinConfiguration zConf;
+ private final Notebook notebook;
+ private final AuthorizationService authorizationService;
+ private final SchedulerService schedulerService;
@Inject
public NotebookService(
@@ -666,9 +666,7 @@ public class NotebookService {
throw new IOException("No such note");
}
synchronized (this) {
- if (note.getParagraphCount() < maxParagraph) {
- return note.addNewParagraph(context.getAutheInfo());
- } else {
+ if (note.getParagraphCount() >= maxParagraph) {
boolean removed = false;
for (int i = 1; i < note.getParagraphCount(); ++i) {
if (note.getParagraph(i).getStatus().isCompleted()) {
@@ -680,8 +678,8 @@ public class NotebookService {
if (!removed) {
throw new IOException("All the paragraphs are not completed, unable to find available paragraph");
}
- return note.addNewParagraph(context.getAutheInfo());
}
+ return note.addNewParagraph(context.getAutheInfo());
}
}
@@ -703,7 +701,7 @@ public class NotebookService {
callback.onFailure(new ParagraphNotFoundException(paragraphId), context);
return;
}
- Paragraph returnedParagraph = null;
+ Paragraph returnedParagraph;
if (note.isPersonalizedMode()) {
returnedParagraph = note.clearPersonalizedParagraphOutput(paragraphId,
context.getAutheInfo().getUser());
@@ -771,8 +769,6 @@ public class NotebookService {
if (configA.get("cron") != null && configB.get("cron") != null && configA.get("cron")
.equals(configB.get("cron"))) {
cronUpdated = true;
- } else if (configA.get("cron") == null && configB.get("cron") == null) {
- cronUpdated = false;
} else if (configA.get("cron") != null || configB.get("cron") != null) {
cronUpdated = true;
}
@@ -929,7 +925,7 @@ public class NotebookService {
callback)) {
return;
}
- Note revisionNote = null;
+ Note revisionNote;
if (revisionId.equals("Head")) {
revisionNote = note;
} else {
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/service/ServiceContext.java b/zeppelin-server/src/main/java/org/apache/zeppelin/service/ServiceContext.java
index 3db8bf8..7f75912 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/service/ServiceContext.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/service/ServiceContext.java
@@ -27,8 +27,8 @@ import java.util.Set;
*/
public class ServiceContext {
- private AuthenticationInfo autheInfo;
- private Set<String> userAndRoles;
+ private final AuthenticationInfo autheInfo;
+ private final Set<String> userAndRoles;
public ServiceContext(AuthenticationInfo authInfo, Set<String> userAndRoles) {
this.autheInfo = authInfo;
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/service/SessionManagerService.java b/zeppelin-server/src/main/java/org/apache/zeppelin/service/SessionManagerService.java
index 3c1adb4..71bc37c 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/service/SessionManagerService.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/service/SessionManagerService.java
@@ -49,10 +49,10 @@ public class SessionManagerService {
private static final Logger LOGGER = LoggerFactory.getLogger(SessionManagerService.class);
private static final int RETRY = 3;
- private Map<String, SessionInfo> sessions = new ConcurrentHashMap<>();
- private InterpreterSettingManager interpreterSettingManager;
- private Notebook notebook;
- private ScheduledExecutorService sessionCheckerExecutor;
+ private final Map<String, SessionInfo> sessions = new ConcurrentHashMap<>();
+ private final InterpreterSettingManager interpreterSettingManager;
+ private final Notebook notebook;
+ private final ScheduledExecutorService sessionCheckerExecutor;
public SessionManagerService(Notebook notebook, InterpreterSettingManager interpreterSettingManager) {
this.notebook = notebook;
@@ -134,12 +134,12 @@ public class SessionManagerService {
throw new Exception("No such session: " + sessionId);
}
// stop the associated interpreter process
- InterpreterGroup interpreterGroup = this.interpreterSettingManager.getInterpreterGroupById(sessionId);
+ ManagedInterpreterGroup interpreterGroup = this.interpreterSettingManager.getInterpreterGroupById(sessionId);
if (interpreterGroup == null) {
LOGGER.info("No interpreterGroup for session: {}", sessionId);
return;
}
- ((ManagedInterpreterGroup) interpreterGroup).getInterpreterSetting().closeInterpreters(sessionId);
+ interpreterGroup.getInterpreterSetting().closeInterpreters(sessionId);
// remove associated session note
notebook.removeNote(sessionInfo.getNoteId(), AuthenticationInfo.ANONYMOUS);
@@ -159,13 +159,13 @@ public class SessionManagerService {
LOGGER.warn("No such session: " + sessionId);
return null;
}
- InterpreterGroup interpreterGroup = this.interpreterSettingManager.getInterpreterGroupById(sessionId);
+ ManagedInterpreterGroup interpreterGroup = this.interpreterSettingManager.getInterpreterGroupById(sessionId);
if (interpreterGroup != null) {
RemoteInterpreterProcess remoteInterpreterProcess =
- ((ManagedInterpreterGroup) interpreterGroup).getRemoteInterpreterProcess();
+ interpreterGroup.getRemoteInterpreterProcess();
if (remoteInterpreterProcess == null) {
sessionInfo.setState(SessionState.READY.name());
- } else if (remoteInterpreterProcess != null) {
+ } else {
sessionInfo.setStartTime(remoteInterpreterProcess.getStartTime());
sessionInfo.setWeburl(interpreterGroup.getWebUrl());
if (remoteInterpreterProcess.isRunning()) {
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/service/ShiroAuthenticationService.java b/zeppelin-server/src/main/java/org/apache/zeppelin/service/ShiroAuthenticationService.java
index d15b81e..3276a1f 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/service/ShiroAuthenticationService.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/service/ShiroAuthenticationService.java
@@ -407,8 +407,8 @@ public class ShiroAuthenticationService implements AuthenticationService {
Connection con = null;
PreparedStatement ps = null;
ResultSet rs = null;
- DataSource dataSource = null;
- String authQuery = "";
+ DataSource dataSource;
+ String authQuery;
String[] retval;
String tablename = "";
String username = "";
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/service/SimpleServiceCallback.java b/zeppelin-server/src/main/java/org/apache/zeppelin/service/SimpleServiceCallback.java
index bf6616a..abd9222 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/service/SimpleServiceCallback.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/service/SimpleServiceCallback.java
@@ -29,7 +29,7 @@ import java.io.IOException;
*/
public class SimpleServiceCallback<T> implements ServiceCallback<T> {
- private static Logger LOGGER = LoggerFactory.getLogger(SimpleServiceCallback.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SimpleServiceCallback.class);
@Override
public void onStart(String message, ServiceContext context) throws IOException {