-
Notifications
You must be signed in to change notification settings - Fork 896
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reuse VirtualHostBuilder on the same hostnamePattern (#5418)
Motivation: I registered each virtual host with the same hostname, the registered routes cannot be not found. Because `VirtualHostBuilder` creates new builder even if hostname is the same. However, it does reuse them on the same port. So, I think it's better to reuse them on the same hostname. Modifications: - `ServerBuilder.virtualHost(hostnamePattern)` and `ServerBuilder.virtualHost(defaultHostname, hostnamePattern)` checks whether there is `builders` with the same hostname. If there is, returns this builder. Result: - Reuse `VirtualHostBuilder` on the same hostname. - Even if you register each one on a virtual host with the same hostname, they will be merged. <!-- Visit this URL to learn more about how to write a pull request description: https://armeria.dev/community/developer-guide#how-to-write-pull-request-description --> --------- Co-authored-by: jrhee17 <guins_j@guins.org> Co-authored-by: Ikhun Um <ih.pert@gmail.com> Co-authored-by: minwoox <songmw725@gmail.com>
- Loading branch information
4 people
committed
Apr 4, 2024
1 parent
66cfaa4
commit dad02d6
Showing
7 changed files
with
214 additions
and
42 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
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
99 changes: 99 additions & 0 deletions
99
core/src/test/java/com/linecorp/armeria/server/HostnameBasedVirtualHostTest.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,99 @@ | ||
| /* | ||
| * Copyright 2024 LINE Corporation | ||
| * | ||
| * LINE Corporation 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: | ||
| * | ||
| * https://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 com.linecorp.armeria.server; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import java.net.ServerSocket; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
|
||
| import com.linecorp.armeria.client.ClientFactory; | ||
| import com.linecorp.armeria.client.WebClient; | ||
| import com.linecorp.armeria.common.AggregatedHttpResponse; | ||
| import com.linecorp.armeria.common.HttpResponse; | ||
| import com.linecorp.armeria.internal.testing.MockAddressResolverGroup; | ||
| import com.linecorp.armeria.testing.junit5.server.ServerExtension; | ||
|
|
||
| class HostnameBasedVirtualHostTest { | ||
|
|
||
| private static int fooHostPort; | ||
|
|
||
| @RegisterExtension | ||
| static ServerExtension serverWithPortMapping = new ServerExtension() { | ||
| @Override | ||
| protected void configure(ServerBuilder sb) throws Exception { | ||
|
|
||
| try (ServerSocket ss = new ServerSocket(0)) { | ||
| fooHostPort = ss.getLocalPort(); | ||
| } | ||
|
|
||
| sb.http(fooHostPort) | ||
| .virtualHost("foo.com:" + fooHostPort) | ||
| .service("/foo", (ctx, req) -> HttpResponse.of("foo with port")) | ||
| .and() | ||
| .virtualHost("foo.com:" + fooHostPort) | ||
| .service("/bar", (ctx, req) -> HttpResponse.of("bar with port")) | ||
| .and() | ||
| .virtualHost("foo.bar.com") | ||
| .service("/foo-bar", (ctx, req) -> HttpResponse.of("foo bar")) | ||
| .and() | ||
| .build(); | ||
| } | ||
| }; | ||
|
|
||
| @Test | ||
| void testHostnamePattern() { | ||
| try (ClientFactory factory = ClientFactory.builder() | ||
| .addressResolverGroupFactory( | ||
| unused -> MockAddressResolverGroup.localhost()) | ||
| .build()) { | ||
|
|
||
| final WebClient client = WebClient.builder("http://foo.com:" + fooHostPort) | ||
| .factory(factory) | ||
| .build(); | ||
| AggregatedHttpResponse response = client.get("/foo").aggregate().join(); | ||
| assertThat(response.contentUtf8()).isEqualTo("foo with port"); | ||
|
|
||
| response = client.get("/bar").aggregate().join(); | ||
| assertThat(response.contentUtf8()).isEqualTo("bar with port"); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void shouldReturnSameInstanceForHostnameBasedVirtualHost() { | ||
| final ServerBuilder serverBuilder = Server.builder(); | ||
| final VirtualHostBuilder virtualHost1 = serverBuilder.virtualHost("foo.com"); | ||
| final VirtualHostBuilder virtualHost2 = serverBuilder.virtualHost("foo.com"); | ||
| assertThat(virtualHost1).isSameAs(virtualHost2); | ||
| final VirtualHostBuilder virtualHost3 = serverBuilder.virtualHost("foo.com:18080"); | ||
| assertThat(virtualHost2).isNotSameAs(virtualHost3); | ||
| final VirtualHostBuilder virtualHost4 = serverBuilder.virtualHost("bar.com"); | ||
| assertThat(virtualHost2).isNotSameAs(virtualHost4); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldReturnSameInstanceForHostnameBasedVirtualHostWithPort() { | ||
| final ServerBuilder serverBuilder = Server.builder(); | ||
| final VirtualHostBuilder virtualHost1 = serverBuilder.virtualHost("foo.com:18080"); | ||
| final VirtualHostBuilder virtualHost2 = serverBuilder.virtualHost("foo.com:18080"); | ||
| assertThat(virtualHost1).isSameAs(virtualHost2); | ||
| final VirtualHostBuilder virtualHost3 = serverBuilder.virtualHost("foo.com:18081"); | ||
| assertThat(virtualHost2).isNotSameAs(virtualHost3); | ||
| } | ||
| } |
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.