Skip to content

Commit

Permalink
Unbundle MP CORS from MP bundle; bolster utility method (#1672)
Browse files Browse the repository at this point in the history
* Remove CORS MP support module from the MP bundle; developers will include it explicitly in their poms instead

* Make normalize() more defensive; add tests
  • Loading branch information
tjquinno committed Apr 22, 2020
1 parent c769d8e commit 13f4222
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 4 deletions.
4 changes: 0 additions & 4 deletions microprofile/bundles/helidon-microprofile/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@
<groupId>io.helidon.microprofile.tracing</groupId>
<artifactId>helidon-microprofile-tracing</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.microprofile</groupId>
<artifactId>helidon-microprofile-cors</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-binding</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ class CorsSupportHelper {
*/
public static String normalize(String path) {
int length = path.length();
if (length == 0) {
return path;
}
int beginIndex = path.charAt(0) == '/' ? 1 : 0;
int endIndex = path.charAt(length - 1) == '/' ? length - 1 : length;
return (endIndex <= beginIndex) ? "" : path.substring(beginIndex, endIndex);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Copyright (c) 2020 Oracle and/or its affiliates.
*
* 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 io.helidon.webserver.cors;

import org.junit.jupiter.api.Test;

import static io.helidon.webserver.cors.CorsSupportHelper.normalize;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.isEmptyString;

public class TestUtilityMethods {

@Test
public void testNormalize() {
assertThat(normalize("something"), is("something"));
assertThat(normalize("/something"), is("something"));
assertThat(normalize("something/"), is("something"));
assertThat(normalize("/something/"), is("something"));
assertThat(normalize("/"), isEmptyString());
assertThat(normalize(""), isEmptyString());
}
}

0 comments on commit 13f4222

Please sign in to comment.