JackyYangPassion commented on code in PR #2286:
URL:
https://github.com/apache/incubator-hugegraph/pull/2286#discussion_r1296025451
##########
hugegraph-api/src/main/java/org/apache/hugegraph/api/API.java:
##########
@@ -22,55 +22,53 @@
import java.util.concurrent.Callable;
import java.util.function.Consumer;
-import jakarta.ws.rs.ForbiddenException;
-import jakarta.ws.rs.NotFoundException;
-import jakarta.ws.rs.NotSupportedException;
-import jakarta.ws.rs.core.MediaType;
-
+import org.apache.hugegraph.HugeException;
+import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.core.GraphManager;
import org.apache.hugegraph.define.Checkable;
import org.apache.hugegraph.metrics.MetricsUtil;
-import org.slf4j.Logger;
-
-import org.apache.hugegraph.HugeException;
-import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.util.E;
import org.apache.hugegraph.util.JsonUtil;
import org.apache.hugegraph.util.Log;
+import org.slf4j.Logger;
+
import com.codahale.metrics.Meter;
import com.google.common.collect.ImmutableMap;
-public class API {
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MediaType;
- protected static final Logger LOG = Log.logger(API.class);
+public class API {
public static final String CHARSET = "UTF-8";
-
public static final String TEXT_PLAIN = MediaType.TEXT_PLAIN;
public static final String APPLICATION_JSON = MediaType.APPLICATION_JSON;
public static final String APPLICATION_JSON_WITH_CHARSET =
- APPLICATION_JSON + ";charset=" + CHARSET;
+ APPLICATION_JSON + ";charset=" + CHARSET;
+ public static final String APPLICATION_TEXT_WITH_CHARSET =
+ MediaType.TEXT_PLAIN + ";charset=" + CHARSET;
public static final String JSON = MediaType.APPLICATION_JSON_TYPE
- .getSubtype();
-
+ .getSubtype();
public static final String ACTION_APPEND = "append";
public static final String ACTION_ELIMINATE = "eliminate";
public static final String ACTION_CLEAR = "clear";
-
+ protected static final Logger LOG = Log.logger(API.class);
private static final Meter SUCCEED_METER =
- MetricsUtil.registerMeter(API.class,
"commit-succeed");
+ MetricsUtil.registerMeter(API.class, "commit-succeed");
Review Comment:
can keep the params alignment style
##########
hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/AccessLogFilter.java:
##########
@@ -0,0 +1,69 @@
+package org.apache.hugegraph.api.filter;
Review Comment:
need add apache license
##########
hugegraph-test/src/main/java/org/apache/hugegraph/api/MetricsApiTest.java:
##########
@@ -165,8 +190,8 @@ public void testMetricsBackend() {
String key = (String) e.getKey();
value = e.getValue();
Assert.assertTrue(String.format(
- "Expect map value for key %s but got %s",
- key, value),
+ "Expect map value for key %s but
got %s",
Review Comment:
prefer to keep the origin alignment
##########
hugegraph-api/src/main/java/org/apache/hugegraph/api/API.java:
##########
@@ -22,55 +22,53 @@
import java.util.concurrent.Callable;
import java.util.function.Consumer;
-import jakarta.ws.rs.ForbiddenException;
-import jakarta.ws.rs.NotFoundException;
-import jakarta.ws.rs.NotSupportedException;
-import jakarta.ws.rs.core.MediaType;
-
+import org.apache.hugegraph.HugeException;
+import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.core.GraphManager;
import org.apache.hugegraph.define.Checkable;
import org.apache.hugegraph.metrics.MetricsUtil;
-import org.slf4j.Logger;
-
-import org.apache.hugegraph.HugeException;
-import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.util.E;
import org.apache.hugegraph.util.JsonUtil;
import org.apache.hugegraph.util.Log;
+import org.slf4j.Logger;
+
import com.codahale.metrics.Meter;
import com.google.common.collect.ImmutableMap;
-public class API {
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MediaType;
- protected static final Logger LOG = Log.logger(API.class);
+public class API {
public static final String CHARSET = "UTF-8";
-
public static final String TEXT_PLAIN = MediaType.TEXT_PLAIN;
public static final String APPLICATION_JSON = MediaType.APPLICATION_JSON;
public static final String APPLICATION_JSON_WITH_CHARSET =
- APPLICATION_JSON + ";charset=" + CHARSET;
+ APPLICATION_JSON + ";charset=" + CHARSET;
+ public static final String APPLICATION_TEXT_WITH_CHARSET =
+ MediaType.TEXT_PLAIN + ";charset=" + CHARSET;
public static final String JSON = MediaType.APPLICATION_JSON_TYPE
- .getSubtype();
-
+ .getSubtype();
public static final String ACTION_APPEND = "append";
public static final String ACTION_ELIMINATE = "eliminate";
public static final String ACTION_CLEAR = "clear";
-
+ protected static final Logger LOG = Log.logger(API.class);
private static final Meter SUCCEED_METER =
- MetricsUtil.registerMeter(API.class,
"commit-succeed");
+ MetricsUtil.registerMeter(API.class, "commit-succeed");
private static final Meter ILLEGAL_ARG_ERROR_METER =
- MetricsUtil.registerMeter(API.class, "illegal-arg");
+ MetricsUtil.registerMeter(API.class, "illegal-arg");
Review Comment:
ditto
##########
hugegraph-api/src/main/java/org/apache/hugegraph/api/API.java:
##########
@@ -22,55 +22,53 @@
import java.util.concurrent.Callable;
import java.util.function.Consumer;
-import jakarta.ws.rs.ForbiddenException;
-import jakarta.ws.rs.NotFoundException;
-import jakarta.ws.rs.NotSupportedException;
-import jakarta.ws.rs.core.MediaType;
-
+import org.apache.hugegraph.HugeException;
+import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.core.GraphManager;
import org.apache.hugegraph.define.Checkable;
import org.apache.hugegraph.metrics.MetricsUtil;
-import org.slf4j.Logger;
-
-import org.apache.hugegraph.HugeException;
-import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.util.E;
import org.apache.hugegraph.util.JsonUtil;
import org.apache.hugegraph.util.Log;
+import org.slf4j.Logger;
+
import com.codahale.metrics.Meter;
import com.google.common.collect.ImmutableMap;
-public class API {
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MediaType;
- protected static final Logger LOG = Log.logger(API.class);
+public class API {
public static final String CHARSET = "UTF-8";
-
public static final String TEXT_PLAIN = MediaType.TEXT_PLAIN;
public static final String APPLICATION_JSON = MediaType.APPLICATION_JSON;
public static final String APPLICATION_JSON_WITH_CHARSET =
- APPLICATION_JSON + ";charset=" + CHARSET;
+ APPLICATION_JSON + ";charset=" + CHARSET;
+ public static final String APPLICATION_TEXT_WITH_CHARSET =
+ MediaType.TEXT_PLAIN + ";charset=" + CHARSET;
public static final String JSON = MediaType.APPLICATION_JSON_TYPE
- .getSubtype();
-
+ .getSubtype();
public static final String ACTION_APPEND = "append";
public static final String ACTION_ELIMINATE = "eliminate";
public static final String ACTION_CLEAR = "clear";
-
+ protected static final Logger LOG = Log.logger(API.class);
private static final Meter SUCCEED_METER =
- MetricsUtil.registerMeter(API.class,
"commit-succeed");
+ MetricsUtil.registerMeter(API.class, "commit-succeed");
private static final Meter ILLEGAL_ARG_ERROR_METER =
- MetricsUtil.registerMeter(API.class, "illegal-arg");
+ MetricsUtil.registerMeter(API.class, "illegal-arg");
private static final Meter EXPECTED_ERROR_METER =
- MetricsUtil.registerMeter(API.class,
"expected-error");
+ MetricsUtil.registerMeter(API.class, "expected-error");
private static final Meter UNKNOWN_ERROR_METER =
- MetricsUtil.registerMeter(API.class, "unknown-error");
+ MetricsUtil.registerMeter(API.class, "unknown-error");
public static HugeGraph graph(GraphManager manager, String graph) {
HugeGraph g = manager.graph(graph);
if (g == null) {
throw new NotFoundException(String.format(
- "Graph '%s' does not exist", graph));
+ "Graph '%s' does not exist", graph));
Review Comment:
prefer to keep the origin alignment
##########
hugegraph-api/src/main/java/org/apache/hugegraph/api/API.java:
##########
@@ -22,55 +22,53 @@
import java.util.concurrent.Callable;
import java.util.function.Consumer;
-import jakarta.ws.rs.ForbiddenException;
-import jakarta.ws.rs.NotFoundException;
-import jakarta.ws.rs.NotSupportedException;
-import jakarta.ws.rs.core.MediaType;
-
+import org.apache.hugegraph.HugeException;
+import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.core.GraphManager;
import org.apache.hugegraph.define.Checkable;
import org.apache.hugegraph.metrics.MetricsUtil;
-import org.slf4j.Logger;
-
-import org.apache.hugegraph.HugeException;
-import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.util.E;
import org.apache.hugegraph.util.JsonUtil;
import org.apache.hugegraph.util.Log;
+import org.slf4j.Logger;
+
import com.codahale.metrics.Meter;
import com.google.common.collect.ImmutableMap;
-public class API {
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MediaType;
- protected static final Logger LOG = Log.logger(API.class);
+public class API {
public static final String CHARSET = "UTF-8";
-
public static final String TEXT_PLAIN = MediaType.TEXT_PLAIN;
public static final String APPLICATION_JSON = MediaType.APPLICATION_JSON;
public static final String APPLICATION_JSON_WITH_CHARSET =
- APPLICATION_JSON + ";charset=" + CHARSET;
+ APPLICATION_JSON + ";charset=" + CHARSET;
+ public static final String APPLICATION_TEXT_WITH_CHARSET =
+ MediaType.TEXT_PLAIN + ";charset=" + CHARSET;
public static final String JSON = MediaType.APPLICATION_JSON_TYPE
- .getSubtype();
-
+ .getSubtype();
public static final String ACTION_APPEND = "append";
public static final String ACTION_ELIMINATE = "eliminate";
public static final String ACTION_CLEAR = "clear";
-
+ protected static final Logger LOG = Log.logger(API.class);
private static final Meter SUCCEED_METER =
- MetricsUtil.registerMeter(API.class,
"commit-succeed");
+ MetricsUtil.registerMeter(API.class, "commit-succeed");
private static final Meter ILLEGAL_ARG_ERROR_METER =
- MetricsUtil.registerMeter(API.class, "illegal-arg");
+ MetricsUtil.registerMeter(API.class, "illegal-arg");
private static final Meter EXPECTED_ERROR_METER =
- MetricsUtil.registerMeter(API.class,
"expected-error");
+ MetricsUtil.registerMeter(API.class, "expected-error");
Review Comment:
ditto
##########
hugegraph-api/src/main/java/org/apache/hugegraph/api/API.java:
##########
@@ -22,55 +22,53 @@
import java.util.concurrent.Callable;
import java.util.function.Consumer;
-import jakarta.ws.rs.ForbiddenException;
-import jakarta.ws.rs.NotFoundException;
-import jakarta.ws.rs.NotSupportedException;
-import jakarta.ws.rs.core.MediaType;
-
+import org.apache.hugegraph.HugeException;
+import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.core.GraphManager;
import org.apache.hugegraph.define.Checkable;
import org.apache.hugegraph.metrics.MetricsUtil;
-import org.slf4j.Logger;
-
-import org.apache.hugegraph.HugeException;
-import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.util.E;
import org.apache.hugegraph.util.JsonUtil;
import org.apache.hugegraph.util.Log;
+import org.slf4j.Logger;
+
import com.codahale.metrics.Meter;
import com.google.common.collect.ImmutableMap;
-public class API {
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MediaType;
- protected static final Logger LOG = Log.logger(API.class);
+public class API {
public static final String CHARSET = "UTF-8";
-
public static final String TEXT_PLAIN = MediaType.TEXT_PLAIN;
public static final String APPLICATION_JSON = MediaType.APPLICATION_JSON;
public static final String APPLICATION_JSON_WITH_CHARSET =
- APPLICATION_JSON + ";charset=" + CHARSET;
+ APPLICATION_JSON + ";charset=" + CHARSET;
+ public static final String APPLICATION_TEXT_WITH_CHARSET =
+ MediaType.TEXT_PLAIN + ";charset=" + CHARSET;
public static final String JSON = MediaType.APPLICATION_JSON_TYPE
- .getSubtype();
-
+ .getSubtype();
public static final String ACTION_APPEND = "append";
public static final String ACTION_ELIMINATE = "eliminate";
public static final String ACTION_CLEAR = "clear";
-
+ protected static final Logger LOG = Log.logger(API.class);
private static final Meter SUCCEED_METER =
- MetricsUtil.registerMeter(API.class,
"commit-succeed");
+ MetricsUtil.registerMeter(API.class, "commit-succeed");
private static final Meter ILLEGAL_ARG_ERROR_METER =
- MetricsUtil.registerMeter(API.class, "illegal-arg");
+ MetricsUtil.registerMeter(API.class, "illegal-arg");
private static final Meter EXPECTED_ERROR_METER =
- MetricsUtil.registerMeter(API.class,
"expected-error");
+ MetricsUtil.registerMeter(API.class, "expected-error");
private static final Meter UNKNOWN_ERROR_METER =
- MetricsUtil.registerMeter(API.class, "unknown-error");
+ MetricsUtil.registerMeter(API.class, "unknown-error");
Review Comment:
ditto
##########
hugegraph-api/src/main/java/org/apache/hugegraph/api/API.java:
##########
@@ -141,7 +139,7 @@ protected static void checkUpdatingBody(Checkable body) {
}
protected static void checkCreatingBody(
- Collection<? extends Checkable> bodies) {
+ Collection<? extends Checkable> bodies) {
Review Comment:
ditto
##########
hugegraph-api/src/main/java/org/apache/hugegraph/api/API.java:
##########
@@ -97,7 +95,7 @@ public static <R> R commit(HugeGraph g, Callable<R> callable)
{
SUCCEED_METER.mark();
return result;
} catch (IllegalArgumentException | NotFoundException |
- ForbiddenException e) {
+ ForbiddenException e) {
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
