You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by cg...@apache.org on 2020/05/20 00:14:46 UTC
[drill] 02/02: Revisions from review comments
This is an automated email from the ASF dual-hosted git repository.
cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
commit c32a9ebd0128bb9f5a979a1cec2ce53e1e274fe4
Author: Paul Rogers <pa...@yahoo.com>
AuthorDate: Thu May 7 15:16:07 2020 -0700
Revisions from review comments
---
.../org/apache/drill/exec/server/rest/LogsResources.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java
index e29050a..e4661d3 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java
@@ -28,6 +28,8 @@ import org.glassfish.jersey.server.mvc.Viewable;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.annotation.security.RolesAllowed;
import javax.inject.Inject;
@@ -56,7 +58,7 @@ import static org.apache.drill.exec.server.rest.auth.DrillUserPrincipal.ADMIN_RO
@Path("/")
@RolesAllowed(ADMIN_ROLE)
public class LogsResources {
- private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(LogsResources.class);
+ private static final Logger logger = LoggerFactory.getLogger(LogsResources.class);
@Inject DrillRestServer.UserAuthEnabled authEnabled;
@Inject SecurityContext sc;
@@ -155,7 +157,6 @@ public class LogsResources {
return files[0];
}
-
@XmlRootElement
public class Log implements Comparable<Log> {
@@ -164,7 +165,9 @@ public class LogsResources {
private final DateTime lastModified;
@JsonCreator
- public Log (@JsonProperty("name") String name, @JsonProperty("size") long size, @JsonProperty("lastModified") long lastModified) {
+ public Log (@JsonProperty("name") String name,
+ @JsonProperty("size") long size,
+ @JsonProperty("lastModified") long lastModified) {
this.name = name;
this.size = size;
this.lastModified = new DateTime(lastModified);
@@ -195,7 +198,9 @@ public class LogsResources {
private final int maxLines;
@JsonCreator
- public LogContent (@JsonProperty("name") String name, @JsonProperty("lines") Collection<String> lines, @JsonProperty("maxLines") int maxLines) {
+ public LogContent (@JsonProperty("name") String name,
+ @JsonProperty("lines") Collection<String> lines,
+ @JsonProperty("maxLines") int maxLines) {
this.name = name;
this.lines = lines;
this.maxLines = maxLines;