-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds a path prefix routing object. (#412)
- Loading branch information
1 parent
a3b2345
commit cf0c326
Showing
18 changed files
with
866 additions
and
269 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
121 changes: 121 additions & 0 deletions
121
components/proxy/src/main/java/com/hotels/styx/routing/handlers/PathPrefixRouter.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,121 @@ | ||
| /* | ||
| Copyright (C) 2013-2019 Expedia Inc. | ||
| Licensed 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 com.hotels.styx.routing.handlers; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.hotels.styx.api.Eventual; | ||
| import com.hotels.styx.api.HttpHandler; | ||
| import com.hotels.styx.api.LiveHttpRequest; | ||
| import com.hotels.styx.common.Pair; | ||
| import com.hotels.styx.config.schema.Schema; | ||
| import com.hotels.styx.infrastructure.configuration.yaml.JsonNodeConfig; | ||
| import com.hotels.styx.routing.config.HttpHandlerFactory; | ||
| import com.hotels.styx.routing.config.RoutingObjectDefinition; | ||
| import com.hotels.styx.server.NoServiceConfiguredException; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import java.util.concurrent.ConcurrentSkipListMap; | ||
|
|
||
| import static com.hotels.styx.common.Pair.pair; | ||
| import static com.hotels.styx.config.schema.SchemaDsl.field; | ||
| import static com.hotels.styx.config.schema.SchemaDsl.list; | ||
| import static com.hotels.styx.config.schema.SchemaDsl.object; | ||
| import static com.hotels.styx.config.schema.SchemaDsl.routingObject; | ||
| import static com.hotels.styx.config.schema.SchemaDsl.string; | ||
| import static com.hotels.styx.routing.config.RoutingConfigParser.toRoutingConfigNode; | ||
| import static com.hotels.styx.routing.config.RoutingSupport.missingAttributeError; | ||
| import static java.lang.String.join; | ||
| import static java.util.Comparator.comparingInt; | ||
| import static java.util.Comparator.naturalOrder; | ||
| import static java.util.stream.Collectors.toList; | ||
|
|
||
| /** | ||
| * Makes a routing decision based on a request path prefix. | ||
| * | ||
| * Chooses a destination according to longest matching path prefix. | ||
| * The destination can be a routing object reference or an inline definition. | ||
| */ | ||
| public class PathPrefixRouter { | ||
| public static final Schema.FieldType SCHEMA = object( | ||
| field("routes", list(object( | ||
| field("prefix", string()), | ||
| field("destination", routingObject())) | ||
| )) | ||
| ); | ||
|
|
||
| private final ConcurrentSkipListMap<String, HttpHandler> routes = new ConcurrentSkipListMap<>( | ||
| comparingInt(String::length) | ||
| .reversed() | ||
| .thenComparing(naturalOrder()) | ||
| ); | ||
|
|
||
| PathPrefixRouter(List<Pair<String, HttpHandler>> routes) { | ||
| routes.forEach(entry -> this.routes.put(entry.key(), entry.value())); | ||
| } | ||
|
|
||
| public Optional<HttpHandler> route(LiveHttpRequest request) { | ||
| String path = request.path(); | ||
|
|
||
| return routes.entrySet().stream() | ||
| .filter(entry -> path.startsWith(entry.getKey())) | ||
| .findFirst() | ||
| .map(Map.Entry::getValue); | ||
| } | ||
|
|
||
| public static class Factory implements HttpHandlerFactory { | ||
|
|
||
| @Override | ||
| public HttpHandler build(List<String> parents, Context context, RoutingObjectDefinition configBlock) { | ||
| PathPrefixRouterConfig config = new JsonNodeConfig(configBlock.config()).as(PathPrefixRouterConfig.class); | ||
| if (config.routes == null) { | ||
| throw missingAttributeError(configBlock, join(".", parents), "routes"); | ||
| } | ||
|
|
||
| PathPrefixRouter pathPrefixRouter = new PathPrefixRouter( | ||
| config.routes.stream() | ||
| .map(route -> pair(route.prefix, context.factory().build(toRoutingConfigNode(route.destination)))) | ||
| .collect(toList()) | ||
| ); | ||
|
|
||
| return (request, ctx) -> pathPrefixRouter.route(request) | ||
| .orElse((x, y) -> Eventual.error(new NoServiceConfiguredException(request.path()))) | ||
| .handle(request, ctx); | ||
| } | ||
|
|
||
| private static class PathPrefixConfig { | ||
| private final String prefix; | ||
| private final JsonNode destination; | ||
|
|
||
| public PathPrefixConfig(@JsonProperty("prefix") String prefix, | ||
| @JsonProperty("destination") JsonNode destination) { | ||
| this.prefix = prefix; | ||
| this.destination = destination; | ||
| } | ||
| } | ||
|
|
||
| private static class PathPrefixRouterConfig { | ||
| private final List<PathPrefixConfig> routes; | ||
|
|
||
| public PathPrefixRouterConfig(@JsonProperty("routes") List<PathPrefixConfig> routes) { | ||
| this.routes = routes; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
60 changes: 60 additions & 0 deletions
60
components/proxy/src/main/java/com/hotels/styx/routing/handlers/RouteRefLookup.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,60 @@ | ||
| /* | ||
| Copyright (C) 2013-2019 Expedia Inc. | ||
| Licensed 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 com.hotels.styx.routing.handlers; | ||
|
|
||
| import com.hotels.styx.api.Eventual; | ||
| import com.hotels.styx.api.HttpHandler; | ||
| import com.hotels.styx.routing.RoutingObjectRecord; | ||
| import com.hotels.styx.routing.config.RoutingObjectReference; | ||
| import com.hotels.styx.routing.db.StyxObjectStore; | ||
|
|
||
| import static com.hotels.styx.api.HttpResponse.response; | ||
| import static com.hotels.styx.api.HttpResponseStatus.NOT_FOUND; | ||
| import static java.nio.charset.StandardCharsets.UTF_8; | ||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| /** | ||
| * Resolves a routing object reference from route database. | ||
| */ | ||
| public interface RouteRefLookup { | ||
| HttpHandler apply(RoutingObjectReference route); | ||
|
|
||
| /** | ||
| * A StyxObjectStore based route reference lookup function. | ||
| */ | ||
| class RouteDbRefLookup implements RouteRefLookup { | ||
| private final StyxObjectStore<RoutingObjectRecord> routeDatabase; | ||
|
|
||
| public RouteDbRefLookup(StyxObjectStore<RoutingObjectRecord> routeDatabase) { | ||
| this.routeDatabase = requireNonNull(routeDatabase); | ||
| } | ||
|
|
||
| @Override | ||
| public HttpHandler apply(RoutingObjectReference route) { | ||
| return this.routeDatabase.get(route.name()) | ||
| .map(RoutingObjectRecord::getHandler) | ||
| .orElse((liveRequest, na) -> { | ||
| liveRequest.consume(); | ||
|
|
||
| return Eventual.of(response(NOT_FOUND) | ||
| .body("Not found: " + route.name(), UTF_8) | ||
| .build() | ||
| .stream() | ||
| ); | ||
| }); | ||
| } | ||
| } | ||
| } |
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.