javeme commented on code in PR #2612: URL: https://github.com/apache/incubator-hugegraph/pull/2612#discussion_r1712623383
########## hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/GraphSpaceFilter.java: ########## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hugegraph.api.filter; + +import java.io.IOException; +import java.net.URI; + +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import jakarta.inject.Singleton; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; + +/** TODO: Change the adaptor logic to keep compatibility with the non-gs version after we support gs function ↓ */ +@Provider +@Singleton +@PreMatching +public class GraphSpaceFilter implements ContainerRequestFilter { + + private static final Logger LOG = Log.logger(GraphSpaceFilter.class); + + @Override + public void filter(ContainerRequestContext context) throws IOException { + // Step 1: Get relativePath + URI baseUri = context.getUriInfo().getBaseUri(); + URI requestUri = context.getUriInfo().getRequestUri(); + URI relativePath = baseUri.relativize(requestUri); + + String relativePathStr = relativePath.getPath(); + // TODO: remember change the logic after we support "GraphSpace" + if (relativePathStr.startsWith("graphspaces/")) { + // Step 2: Extract the next substring after "graphspaces/" + String[] parts = relativePathStr.split("/"); + if (parts.length > 2) { + String ignoredPart = parts[1]; + String nextPathPart = parts[2]; + + // Step 3: Modify RequestUri and log the ignored part + URI newUri = UriBuilder.fromUri(baseUri) + .path(nextPathPart) + .build(); + + context.setRequestUri(newUri); + + // Log the ignored part + LOG.info("Ignored graphspaces segment: {}", ignoredPart); Review Comment: it may be too many log output, LOG.debug is ok? ########## hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/GraphSpaceFilter.java: ########## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hugegraph.api.filter; + +import java.io.IOException; +import java.net.URI; + +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import jakarta.inject.Singleton; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; + +/** TODO: Change the adaptor logic to keep compatibility with the non-gs version after we support gs function ↓ */ Review Comment: "gs" -- we advocate using as few abbreviations as possible, to convey information more accurately. ########## hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/GraphSpaceFilter.java: ########## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hugegraph.api.filter; + +import java.io.IOException; +import java.net.URI; + +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import jakarta.inject.Singleton; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; + +/** TODO: Change the adaptor logic to keep compatibility with the non-gs version after we support gs function ↓ */ +@Provider +@Singleton +@PreMatching +public class GraphSpaceFilter implements ContainerRequestFilter { + + private static final Logger LOG = Log.logger(GraphSpaceFilter.class); + + @Override + public void filter(ContainerRequestContext context) throws IOException { + // Step 1: Get relativePath + URI baseUri = context.getUriInfo().getBaseUri(); + URI requestUri = context.getUriInfo().getRequestUri(); + URI relativePath = baseUri.relativize(requestUri); + + String relativePathStr = relativePath.getPath(); + // TODO: remember change the logic after we support "GraphSpace" + if (relativePathStr.startsWith("graphspaces/")) { + // Step 2: Extract the next substring after "graphspaces/" + String[] parts = relativePathStr.split("/"); + if (parts.length > 2) { + String ignoredPart = parts[1]; + String nextPathPart = parts[2]; Review Comment: what if parts[3,4,5...], do we miss the rest parts? ########## hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/GraphSpaceFilter.java: ########## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hugegraph.api.filter; + +import java.io.IOException; +import java.net.URI; + +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import jakarta.inject.Singleton; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; + +/** TODO: Change the adaptor logic to keep compatibility with the non-gs version after we support gs function ↓ */ +@Provider +@Singleton +@PreMatching +public class GraphSpaceFilter implements ContainerRequestFilter { + + private static final Logger LOG = Log.logger(GraphSpaceFilter.class); + + @Override + public void filter(ContainerRequestContext context) throws IOException { Review Comment: can we give an example as a comment here? ########## hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/GraphSpaceFilter.java: ########## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hugegraph.api.filter; + +import java.io.IOException; +import java.net.URI; + +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import jakarta.inject.Singleton; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; + +/** TODO: Change the adaptor logic to keep compatibility with the non-gs version after we support gs function ↓ */ +@Provider +@Singleton +@PreMatching +public class GraphSpaceFilter implements ContainerRequestFilter { + + private static final Logger LOG = Log.logger(GraphSpaceFilter.class); + + @Override + public void filter(ContainerRequestContext context) throws IOException { + // Step 1: Get relativePath + URI baseUri = context.getUriInfo().getBaseUri(); + URI requestUri = context.getUriInfo().getRequestUri(); + URI relativePath = baseUri.relativize(requestUri); + + String relativePathStr = relativePath.getPath(); + // TODO: remember change the logic after we support "GraphSpace" + if (relativePathStr.startsWith("graphspaces/")) { Review Comment: prefer this style here: `return if (!relativePathStr.startsWith("graphspaces/"))` ########## hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/GraphSpaceFilter.java: ########## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hugegraph.api.filter; + +import java.io.IOException; +import java.net.URI; + +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import jakarta.inject.Singleton; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; + +/** TODO: Change the adaptor logic to keep compatibility with the non-gs version after we support gs function ↓ */ Review Comment: expect style like this: ```c /** * xx */ ``` ########## hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/GraphSpaceFilter.java: ########## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hugegraph.api.filter; + +import java.io.IOException; +import java.net.URI; + +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import jakarta.inject.Singleton; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; + +/** TODO: Change the adaptor logic to keep compatibility with the non-gs version after we support gs function ↓ */ +@Provider +@Singleton +@PreMatching +public class GraphSpaceFilter implements ContainerRequestFilter { + + private static final Logger LOG = Log.logger(GraphSpaceFilter.class); + + @Override + public void filter(ContainerRequestContext context) throws IOException { + // Step 1: Get relativePath + URI baseUri = context.getUriInfo().getBaseUri(); + URI requestUri = context.getUriInfo().getRequestUri(); + URI relativePath = baseUri.relativize(requestUri); + + String relativePathStr = relativePath.getPath(); + // TODO: remember change the logic after we support "GraphSpace" + if (relativePathStr.startsWith("graphspaces/")) { + // Step 2: Extract the next substring after "graphspaces/" Review Comment: can we add a api-test case for this code branch ########## hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/GraphSpaceFilter.java: ########## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hugegraph.api.filter; + +import java.io.IOException; +import java.net.URI; + +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import jakarta.inject.Singleton; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; + +/** TODO: Change the adaptor logic to keep compatibility with the non-gs version after we support gs function ↓ */ +@Provider +@Singleton +@PreMatching +public class GraphSpaceFilter implements ContainerRequestFilter { + + private static final Logger LOG = Log.logger(GraphSpaceFilter.class); + + @Override + public void filter(ContainerRequestContext context) throws IOException { + // Step 1: Get relativePath + URI baseUri = context.getUriInfo().getBaseUri(); + URI requestUri = context.getUriInfo().getRequestUri(); + URI relativePath = baseUri.relativize(requestUri); + + String relativePathStr = relativePath.getPath(); + // TODO: remember change the logic after we support "GraphSpace" Review Comment: "remember to remove the logic ..."? -- 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]
