forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Converted to v2 topic names test related to ProducerConsumerBase (apa…
…che#1562) * Converted to v2 topic names test related to ProducerConsumerBase * Added comment around v2 lookup API marker * Fixed proxy tests * Fixed BatchMessageTest * Fixed ProxyForwardAuthDataTest and ProxyRolesEnforcementTest
- Loading branch information
Showing
57 changed files
with
1,240 additions
and
630 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
141 changes: 60 additions & 81 deletions
141
...che/pulsar/broker/lookup/TopicLookup.java → ...pulsar/broker/lookup/TopicLookupBase.java
Large diffs are not rendered by default.
Oops, something went wrong.
76 changes: 76 additions & 0 deletions
76
pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/TopicLookup.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /** | ||
| * 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.pulsar.broker.lookup.v1; | ||
|
|
||
| import io.swagger.annotations.ApiResponse; | ||
| import io.swagger.annotations.ApiResponses; | ||
|
|
||
| import javax.ws.rs.DefaultValue; | ||
| import javax.ws.rs.Encoded; | ||
| import javax.ws.rs.GET; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.PathParam; | ||
| import javax.ws.rs.Produces; | ||
| import javax.ws.rs.QueryParam; | ||
| import javax.ws.rs.container.AsyncResponse; | ||
| import javax.ws.rs.container.Suspended; | ||
| import javax.ws.rs.core.MediaType; | ||
|
|
||
| import org.apache.pulsar.broker.lookup.TopicLookupBase; | ||
| import org.apache.pulsar.broker.web.NoSwaggerDocumentation; | ||
| import org.apache.pulsar.common.naming.TopicName; | ||
|
|
||
| /** | ||
| * The path for this handler is marked as "v2" even though it refers to Pulsar 1.x topic name format. | ||
| * | ||
| * The lookup API was already <code>/v2/</code> in Pulsar 1.x. This was internally versioned at Yahoo to not clash with | ||
| * an earlier API. | ||
| * | ||
| * Since we're adding now the "Pulsar v2" we cannot rename this topic lookup into <code>/v1</code>. Rather the | ||
| * difference here would be : <code>lookup/v2/destination/persistent/prop/cluster/ns/topic</code> vs | ||
| * <code>lookup/v2/topic/persistent/prop/ns/topic</code>. | ||
| */ | ||
| @Path("/v2/destination/") | ||
| @NoSwaggerDocumentation | ||
| public class TopicLookup extends TopicLookupBase { | ||
|
|
||
| @GET | ||
| @Path("{topic-domain}/{property}/{cluster}/{namespace}/{topic}") | ||
| @Produces(MediaType.APPLICATION_JSON) | ||
| public void lookupTopicAsync(@PathParam("topic-domain") String topicDomain, @PathParam("property") String property, | ||
| @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, | ||
| @PathParam("topic") @Encoded String encodedTopic, | ||
| @QueryParam("authoritative") @DefaultValue("false") boolean authoritative, | ||
| @Suspended AsyncResponse asyncResponse) { | ||
| TopicName topicName = getTopicName(topicDomain, property, cluster, namespace, encodedTopic); | ||
| internalLookupTopicAsync(topicName, authoritative, asyncResponse); | ||
| } | ||
|
|
||
| @GET | ||
| @Path("{topic-domain}/{property}/{cluster}/{namespace}/{topic}/bundle") | ||
| @Produces(MediaType.APPLICATION_JSON) | ||
| @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"), | ||
| @ApiResponse(code = 405, message = "Invalid topic domain type") }) | ||
| public String getNamespaceBundle(@PathParam("topic-domain") String topicDomain, | ||
| @PathParam("property") String property, @PathParam("cluster") String cluster, | ||
| @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic) { | ||
| TopicName topicName = getTopicName(topicDomain, property, cluster, namespace, encodedTopic); | ||
| return internalGetNamespaceBundle(topicName); | ||
| } | ||
| } |
65 changes: 65 additions & 0 deletions
65
pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/TopicLookup.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /** | ||
| * 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.pulsar.broker.lookup.v2; | ||
|
|
||
| import io.swagger.annotations.ApiResponse; | ||
| import io.swagger.annotations.ApiResponses; | ||
|
|
||
| import javax.ws.rs.DefaultValue; | ||
| import javax.ws.rs.Encoded; | ||
| import javax.ws.rs.GET; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.PathParam; | ||
| import javax.ws.rs.Produces; | ||
| import javax.ws.rs.QueryParam; | ||
| import javax.ws.rs.container.AsyncResponse; | ||
| import javax.ws.rs.container.Suspended; | ||
| import javax.ws.rs.core.MediaType; | ||
|
|
||
| import org.apache.pulsar.broker.lookup.TopicLookupBase; | ||
| import org.apache.pulsar.broker.web.NoSwaggerDocumentation; | ||
| import org.apache.pulsar.common.naming.TopicName; | ||
|
|
||
| @Path("/v2/topic") | ||
| @NoSwaggerDocumentation | ||
| public class TopicLookup extends TopicLookupBase { | ||
|
|
||
| @GET | ||
| @Path("{topic-domain}/{property}/{namespace}/{topic}") | ||
| @Produces(MediaType.APPLICATION_JSON) | ||
| public void lookupTopicAsync(@PathParam("topic-domain") String topicDomain, @PathParam("property") String property, | ||
| @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, | ||
| @QueryParam("authoritative") @DefaultValue("false") boolean authoritative, | ||
| @Suspended AsyncResponse asyncResponse) { | ||
| TopicName topicName = getTopicName(topicDomain, property, namespace, encodedTopic); | ||
| internalLookupTopicAsync(topicName, authoritative, asyncResponse); | ||
| } | ||
|
|
||
| @GET | ||
| @Path("{topic-domain}/{property}/{namespace}/{topic}/bundle") | ||
| @Produces(MediaType.APPLICATION_JSON) | ||
| @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"), | ||
| @ApiResponse(code = 405, message = "Invalid topic domain type") }) | ||
| public String getNamespaceBundle(@PathParam("topic-domain") String topicDomain, | ||
| @PathParam("property") String property, @PathParam("namespace") String namespace, | ||
| @PathParam("topic") @Encoded String encodedTopic) { | ||
| TopicName topicName = getTopicName(topicDomain, property, namespace, encodedTopic); | ||
| return internalGetNamespaceBundle(topicName); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.