Skip to content

Commit 419d3bf

Browse files
returnToInnocencereturnToInnocence
committed
Revert "fix: format and clean code in modules (#2439)"
This reverts commit 5cb9aad.
1 parent bd93508 commit 419d3bf

File tree

213 files changed

+2899
-3152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+2899
-3152
lines changed

‎hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/API.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,22 @@ public class API {
4848
public static final String TEXT_PLAIN = MediaType.TEXT_PLAIN;
4949
public static final String APPLICATION_JSON = MediaType.APPLICATION_JSON;
5050
public static final String APPLICATION_JSON_WITH_CHARSET =
51-
APPLICATION_JSON + ";charset=" + CHARSET;
52-
public static final String APPLICATION_TEXT_WITH_CHARSET =
53-
MediaType.TEXT_PLAIN + ";charset=" + CHARSET;
51+
APPLICATION_JSON + ";charset=" + CHARSET;
52+
public static final String APPLICATION_TEXT_WITH_CHARSET = MediaType.TEXT_PLAIN + ";charset=" + CHARSET;
5453
public static final String JSON = MediaType.APPLICATION_JSON_TYPE
55-
.getSubtype();
54+
.getSubtype();
5655
public static final String ACTION_APPEND = "append";
5756
public static final String ACTION_ELIMINATE = "eliminate";
5857
public static final String ACTION_CLEAR = "clear";
5958
protected static final Logger LOG = Log.logger(API.class);
6059
private static final Meter SUCCEED_METER =
61-
MetricsUtil.registerMeter(API.class, "commit-succeed");
60+
MetricsUtil.registerMeter(API.class, "commit-succeed");
6261
private static final Meter ILLEGAL_ARG_ERROR_METER =
63-
MetricsUtil.registerMeter(API.class, "illegal-arg");
62+
MetricsUtil.registerMeter(API.class, "illegal-arg");
6463
private static final Meter EXPECTED_ERROR_METER =
65-
MetricsUtil.registerMeter(API.class, "expected-error");
64+
MetricsUtil.registerMeter(API.class, "expected-error");
6665
private static final Meter UNKNOWN_ERROR_METER =
67-
MetricsUtil.registerMeter(API.class, "unknown-error");
66+
MetricsUtil.registerMeter(API.class, "unknown-error");
6867

6968
public static HugeGraph graph(GraphManager manager, String graph) {
7069
HugeGraph g = manager.graph(graph);

‎hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/arthas/ArthasAPI.java

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
import io.swagger.v3.oas.annotations.Operation;
3131
import io.swagger.v3.oas.annotations.tags.Tag;
32+
3233
import jakarta.inject.Singleton;
3334
import jakarta.ws.rs.PUT;
3435
import jakarta.ws.rs.Path;

‎hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/AccessAPI.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,37 @@
1919

2020
import java.util.List;
2121

22+
import io.swagger.v3.oas.annotations.tags.Tag;
23+
import jakarta.ws.rs.Consumes;
24+
import jakarta.ws.rs.DELETE;
25+
import jakarta.ws.rs.DefaultValue;
26+
import jakarta.ws.rs.GET;
27+
import jakarta.ws.rs.POST;
28+
import jakarta.ws.rs.PUT;
29+
import jakarta.ws.rs.PathParam;
30+
import jakarta.ws.rs.Produces;
31+
import jakarta.ws.rs.QueryParam;
32+
import jakarta.ws.rs.core.Context;
33+
34+
import jakarta.inject.Singleton;
35+
import jakarta.ws.rs.Path;
36+
import org.apache.hugegraph.core.GraphManager;
37+
import org.apache.hugegraph.define.Checkable;
38+
import org.slf4j.Logger;
39+
2240
import org.apache.hugegraph.HugeGraph;
2341
import org.apache.hugegraph.api.API;
2442
import org.apache.hugegraph.api.filter.StatusFilter.Status;
2543
import org.apache.hugegraph.auth.HugeAccess;
2644
import org.apache.hugegraph.auth.HugePermission;
2745
import org.apache.hugegraph.backend.id.Id;
28-
import org.apache.hugegraph.core.GraphManager;
29-
import org.apache.hugegraph.define.Checkable;
3046
import org.apache.hugegraph.exception.NotFoundException;
3147
import org.apache.hugegraph.util.E;
3248
import org.apache.hugegraph.util.Log;
33-
import org.slf4j.Logger;
34-
3549
import com.codahale.metrics.annotation.Timed;
3650
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
3751
import com.fasterxml.jackson.annotation.JsonProperty;
3852

39-
import io.swagger.v3.oas.annotations.tags.Tag;
40-
import jakarta.inject.Singleton;
41-
import jakarta.ws.rs.Consumes;
42-
import jakarta.ws.rs.DELETE;
43-
import jakarta.ws.rs.DefaultValue;
44-
import jakarta.ws.rs.GET;
45-
import jakarta.ws.rs.POST;
46-
import jakarta.ws.rs.PUT;
47-
import jakarta.ws.rs.Path;
48-
import jakarta.ws.rs.PathParam;
49-
import jakarta.ws.rs.Produces;
50-
import jakarta.ws.rs.QueryParam;
51-
import jakarta.ws.rs.core.Context;
52-
5353
@Path("graphs/{graph}/auth/accesses")
5454
@Singleton
5555
@Tag(name = "AccessAPI")

‎hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/BelongAPI.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,7 @@
1919

2020
import java.util.List;
2121

22-
import org.apache.hugegraph.HugeGraph;
23-
import org.apache.hugegraph.api.API;
24-
import org.apache.hugegraph.api.filter.StatusFilter.Status;
25-
import org.apache.hugegraph.auth.HugeBelong;
26-
import org.apache.hugegraph.backend.id.Id;
27-
import org.apache.hugegraph.core.GraphManager;
28-
import org.apache.hugegraph.define.Checkable;
29-
import org.apache.hugegraph.exception.NotFoundException;
30-
import org.apache.hugegraph.util.E;
31-
import org.apache.hugegraph.util.Log;
32-
import org.slf4j.Logger;
33-
34-
import com.codahale.metrics.annotation.Timed;
35-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
36-
import com.fasterxml.jackson.annotation.JsonProperty;
37-
3822
import io.swagger.v3.oas.annotations.tags.Tag;
39-
import jakarta.inject.Singleton;
4023
import jakarta.ws.rs.Consumes;
4124
import jakarta.ws.rs.DELETE;
4225
import jakarta.ws.rs.DefaultValue;
@@ -49,6 +32,23 @@
4932
import jakarta.ws.rs.QueryParam;
5033
import jakarta.ws.rs.core.Context;
5134

35+
import jakarta.inject.Singleton;
36+
import org.apache.hugegraph.core.GraphManager;
37+
import org.apache.hugegraph.define.Checkable;
38+
import org.slf4j.Logger;
39+
40+
import org.apache.hugegraph.HugeGraph;
41+
import org.apache.hugegraph.api.API;
42+
import org.apache.hugegraph.api.filter.StatusFilter.Status;
43+
import org.apache.hugegraph.auth.HugeBelong;
44+
import org.apache.hugegraph.backend.id.Id;
45+
import org.apache.hugegraph.exception.NotFoundException;
46+
import org.apache.hugegraph.util.E;
47+
import org.apache.hugegraph.util.Log;
48+
import com.codahale.metrics.annotation.Timed;
49+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
50+
import com.fasterxml.jackson.annotation.JsonProperty;
51+
5252
@Path("graphs/{graph}/auth/belongs")
5353
@Singleton
5454
@Tag(name = "BelongAPI")

‎hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/GroupAPI.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,7 @@
1919

2020
import java.util.List;
2121

22-
import org.apache.hugegraph.HugeGraph;
23-
import org.apache.hugegraph.api.API;
24-
import org.apache.hugegraph.api.filter.StatusFilter.Status;
25-
import org.apache.hugegraph.auth.HugeGroup;
26-
import org.apache.hugegraph.backend.id.IdGenerator;
27-
import org.apache.hugegraph.core.GraphManager;
28-
import org.apache.hugegraph.define.Checkable;
29-
import org.apache.hugegraph.exception.NotFoundException;
30-
import org.apache.hugegraph.util.E;
31-
import org.apache.hugegraph.util.Log;
32-
import org.slf4j.Logger;
33-
34-
import com.codahale.metrics.annotation.Timed;
35-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
36-
import com.fasterxml.jackson.annotation.JsonProperty;
37-
3822
import io.swagger.v3.oas.annotations.tags.Tag;
39-
import jakarta.inject.Singleton;
4023
import jakarta.ws.rs.Consumes;
4124
import jakarta.ws.rs.DELETE;
4225
import jakarta.ws.rs.DefaultValue;
@@ -49,6 +32,23 @@
4932
import jakarta.ws.rs.QueryParam;
5033
import jakarta.ws.rs.core.Context;
5134

35+
import jakarta.inject.Singleton;
36+
import org.apache.hugegraph.core.GraphManager;
37+
import org.apache.hugegraph.define.Checkable;
38+
import org.slf4j.Logger;
39+
40+
import org.apache.hugegraph.HugeGraph;
41+
import org.apache.hugegraph.api.API;
42+
import org.apache.hugegraph.api.filter.StatusFilter.Status;
43+
import org.apache.hugegraph.auth.HugeGroup;
44+
import org.apache.hugegraph.backend.id.IdGenerator;
45+
import org.apache.hugegraph.exception.NotFoundException;
46+
import org.apache.hugegraph.util.E;
47+
import org.apache.hugegraph.util.Log;
48+
import com.codahale.metrics.annotation.Timed;
49+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
50+
import com.fasterxml.jackson.annotation.JsonProperty;
51+
5252
@Path("graphs/{graph}/auth/groups")
5353
@Singleton
5454
@Tag(name = "GroupAPI")

‎hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/ProjectAPI.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,39 @@
2121
import java.util.List;
2222
import java.util.Set;
2323

24+
import io.swagger.v3.oas.annotations.tags.Tag;
25+
import jakarta.inject.Singleton;
26+
import jakarta.ws.rs.Consumes;
27+
import jakarta.ws.rs.DELETE;
28+
import jakarta.ws.rs.DefaultValue;
29+
import jakarta.ws.rs.GET;
30+
import jakarta.ws.rs.POST;
31+
import jakarta.ws.rs.PUT;
32+
import jakarta.ws.rs.Path;
33+
import jakarta.ws.rs.PathParam;
34+
import jakarta.ws.rs.Produces;
35+
import jakarta.ws.rs.QueryParam;
36+
import jakarta.ws.rs.core.Context;
37+
2438
import org.apache.commons.collections.CollectionUtils;
2539
import org.apache.commons.lang.StringUtils;
40+
import org.apache.hugegraph.core.GraphManager;
41+
import org.apache.hugegraph.define.Checkable;
42+
import org.slf4j.Logger;
43+
2644
import org.apache.hugegraph.HugeGraph;
2745
import org.apache.hugegraph.api.API;
2846
import org.apache.hugegraph.api.filter.StatusFilter.Status;
2947
import org.apache.hugegraph.auth.AuthManager;
3048
import org.apache.hugegraph.auth.HugeProject;
3149
import org.apache.hugegraph.backend.id.Id;
32-
import org.apache.hugegraph.core.GraphManager;
33-
import org.apache.hugegraph.define.Checkable;
3450
import org.apache.hugegraph.exception.NotFoundException;
3551
import org.apache.hugegraph.util.E;
3652
import org.apache.hugegraph.util.Log;
37-
import org.slf4j.Logger;
38-
3953
import com.codahale.metrics.annotation.Timed;
4054
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4155
import com.fasterxml.jackson.annotation.JsonProperty;
4256

43-
import io.swagger.v3.oas.annotations.tags.Tag;
44-
import jakarta.inject.Singleton;
45-
import jakarta.ws.rs.Consumes;
46-
import jakarta.ws.rs.DELETE;
47-
import jakarta.ws.rs.DefaultValue;
48-
import jakarta.ws.rs.GET;
49-
import jakarta.ws.rs.POST;
50-
import jakarta.ws.rs.PUT;
51-
import jakarta.ws.rs.Path;
52-
import jakarta.ws.rs.PathParam;
53-
import jakarta.ws.rs.Produces;
54-
import jakarta.ws.rs.QueryParam;
55-
import jakarta.ws.rs.core.Context;
56-
5757
@Path("graphs/{graph}/auth/projects")
5858
@Singleton
5959
@Tag(name = "ProjectAPI")

‎hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/TargetAPI.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,6 @@
2020
import java.util.List;
2121
import java.util.Map;
2222

23-
import org.apache.hugegraph.HugeGraph;
24-
import org.apache.hugegraph.api.API;
25-
import org.apache.hugegraph.api.filter.StatusFilter.Status;
26-
import org.apache.hugegraph.auth.HugeTarget;
27-
import org.apache.hugegraph.core.GraphManager;
28-
import org.apache.hugegraph.define.Checkable;
29-
import org.apache.hugegraph.exception.NotFoundException;
30-
import org.apache.hugegraph.util.E;
31-
import org.apache.hugegraph.util.JsonUtil;
32-
import org.apache.hugegraph.util.Log;
33-
import org.slf4j.Logger;
34-
35-
import com.codahale.metrics.annotation.Timed;
36-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
37-
import com.fasterxml.jackson.annotation.JsonProperty;
38-
3923
import io.swagger.v3.oas.annotations.tags.Tag;
4024
import jakarta.inject.Singleton;
4125
import jakarta.ws.rs.Consumes;
@@ -50,6 +34,22 @@
5034
import jakarta.ws.rs.QueryParam;
5135
import jakarta.ws.rs.core.Context;
5236

37+
import org.apache.hugegraph.core.GraphManager;
38+
import org.apache.hugegraph.define.Checkable;
39+
import org.slf4j.Logger;
40+
41+
import org.apache.hugegraph.HugeGraph;
42+
import org.apache.hugegraph.api.API;
43+
import org.apache.hugegraph.api.filter.StatusFilter.Status;
44+
import org.apache.hugegraph.auth.HugeTarget;
45+
import org.apache.hugegraph.exception.NotFoundException;
46+
import org.apache.hugegraph.util.E;
47+
import org.apache.hugegraph.util.JsonUtil;
48+
import org.apache.hugegraph.util.Log;
49+
import com.codahale.metrics.annotation.Timed;
50+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
51+
import com.fasterxml.jackson.annotation.JsonProperty;
52+
5353
@Path("graphs/{graph}/auth/targets")
5454
@Singleton
5555
@Tag(name = "TargetAPI")

‎hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/UserAPI.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,39 @@
1919

2020
import java.util.List;
2121

22+
import io.swagger.v3.oas.annotations.tags.Tag;
23+
import jakarta.inject.Singleton;
24+
import jakarta.ws.rs.Consumes;
25+
import jakarta.ws.rs.DELETE;
26+
import jakarta.ws.rs.DefaultValue;
27+
import jakarta.ws.rs.GET;
28+
import jakarta.ws.rs.POST;
29+
import jakarta.ws.rs.PUT;
30+
import jakarta.ws.rs.Path;
31+
import jakarta.ws.rs.PathParam;
32+
import jakarta.ws.rs.Produces;
33+
import jakarta.ws.rs.QueryParam;
34+
import jakarta.ws.rs.core.Context;
35+
2236
import org.apache.commons.lang3.StringUtils;
37+
import org.apache.hugegraph.core.GraphManager;
38+
import org.apache.hugegraph.define.Checkable;
39+
import org.slf4j.Logger;
40+
2341
import org.apache.hugegraph.HugeGraph;
2442
import org.apache.hugegraph.api.API;
2543
import org.apache.hugegraph.api.filter.StatusFilter.Status;
2644
import org.apache.hugegraph.auth.HugeUser;
2745
import org.apache.hugegraph.backend.id.Id;
2846
import org.apache.hugegraph.backend.id.IdGenerator;
29-
import org.apache.hugegraph.core.GraphManager;
30-
import org.apache.hugegraph.define.Checkable;
3147
import org.apache.hugegraph.exception.NotFoundException;
3248
import org.apache.hugegraph.util.E;
3349
import org.apache.hugegraph.util.Log;
3450
import org.apache.hugegraph.util.StringEncoding;
35-
import org.slf4j.Logger;
36-
3751
import com.codahale.metrics.annotation.Timed;
3852
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
3953
import com.fasterxml.jackson.annotation.JsonProperty;
4054

41-
import io.swagger.v3.oas.annotations.tags.Tag;
42-
import jakarta.inject.Singleton;
43-
import jakarta.ws.rs.Consumes;
44-
import jakarta.ws.rs.DELETE;
45-
import jakarta.ws.rs.DefaultValue;
46-
import jakarta.ws.rs.GET;
47-
import jakarta.ws.rs.POST;
48-
import jakarta.ws.rs.PUT;
49-
import jakarta.ws.rs.Path;
50-
import jakarta.ws.rs.PathParam;
51-
import jakarta.ws.rs.Produces;
52-
import jakarta.ws.rs.QueryParam;
53-
import jakarta.ws.rs.core.Context;
54-
5555
@Path("graphs/{graph}/auth/users")
5656
@Singleton
5757
@Tag(name = "UserAPI")

‎hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/cypher/CypherAPI.java

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import com.codahale.metrics.annotation.Timed;
3535

3636
import io.swagger.v3.oas.annotations.tags.Tag;
37+
3738
import jakarta.inject.Singleton;
3839
import jakarta.ws.rs.Consumes;
3940
import jakarta.ws.rs.GET;

0 commit comments

Comments
 (0)