From 52872f9a72ec7ed1ef6e09214f714f9f6d97eda2 Mon Sep 17 00:00:00 2001 From: Toon Geens Date: Wed, 24 Jul 2019 14:44:08 +0200 Subject: [PATCH 1/2] Clean root resource path if necessary See gh-964 --- .../MultipleResourcesProjectContributor.java | 3 +- ...tipleResourcesProjectContributorTests.java | 59 +++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 initializr-generator/src/test/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributorTests.java diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributor.java b/initializr-generator/src/main/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributor.java index 34e41b2e..9a0fd780 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributor.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributor.java @@ -24,6 +24,7 @@ import java.util.function.Predicate; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.util.FileCopyUtils; +import org.springframework.util.StringUtils; /** * A {@link ProjectContributor} that contributes all of the resources found beneath a root @@ -45,7 +46,7 @@ public class MultipleResourcesProjectContributor implements ProjectContributor { } public MultipleResourcesProjectContributor(String rootResource, Predicate executable) { - this.rootResource = rootResource; + this.rootResource = StringUtils.trimTrailingCharacter(rootResource, '/'); this.executable = executable; } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributorTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributorTests.java new file mode 100644 index 00000000..7d74d665 --- /dev/null +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributorTests.java @@ -0,0 +1,59 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * 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 + * + * 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 io.spring.initializr.generator.project.contributor; + +import java.io.IOException; +import java.nio.file.Path; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link MultipleResourcesProjectContributor}. + * + * @author Toon Geens + */ +class MultipleResourcesProjectContributorTests { + + private static final String classLocation = MultipleResourcesProjectContributorTests.class.getPackage().getName() + .replace('.', '/'); + + private static final String classFile = MultipleResourcesProjectContributorTests.class.getSimpleName() + ".class"; + + @Test + void contribute(@TempDir Path directory) throws IOException { + String rootResource = "classpath:" + classLocation; + MultipleResourcesProjectContributor contributor = new MultipleResourcesProjectContributor(rootResource); + + contributor.contribute(directory); + + assertThat(directory.resolve(classFile)).exists(); + } + + @Test + void contributeWithTrailingSlash(@TempDir Path directory) throws IOException { + String rootResource = "classpath:" + classLocation + "/"; + MultipleResourcesProjectContributor contributor = new MultipleResourcesProjectContributor(rootResource); + + contributor.contribute(directory); + + assertThat(directory.resolve(classFile)).exists(); + } + +} From 7800d505512a0f0999d7676cc82c1a2873f01502 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 25 Jul 2019 13:41:33 +0200 Subject: [PATCH 2/2] Polish "Clean root resource path if necessary" See gh-964 --- ...tipleResourcesProjectContributorTests.java | 24 ++++++------------- .../test/resources/data/multi/one.properties | 1 + .../src/test/resources/data/multi/two.xml | 4 ++++ 3 files changed, 12 insertions(+), 17 deletions(-) create mode 100644 initializr-generator/src/test/resources/data/multi/one.properties create mode 100644 initializr-generator/src/test/resources/data/multi/two.xml diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributorTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributorTests.java index 7d74d665..a1049422 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributorTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/project/contributor/MultipleResourcesProjectContributorTests.java @@ -28,32 +28,22 @@ import static org.assertj.core.api.Assertions.assertThat; * Tests for {@link MultipleResourcesProjectContributor}. * * @author Toon Geens + * @author Stephane Nicoll */ class MultipleResourcesProjectContributorTests { - private static final String classLocation = MultipleResourcesProjectContributorTests.class.getPackage().getName() - .replace('.', '/'); - - private static final String classFile = MultipleResourcesProjectContributorTests.class.getSimpleName() + ".class"; - @Test void contribute(@TempDir Path directory) throws IOException { - String rootResource = "classpath:" + classLocation; - MultipleResourcesProjectContributor contributor = new MultipleResourcesProjectContributor(rootResource); - - contributor.contribute(directory); - - assertThat(directory.resolve(classFile)).exists(); + new MultipleResourcesProjectContributor("classpath:/data/multi").contribute(directory); + assertThat(directory.resolve("one.properties")).exists().isRegularFile(); + assertThat(directory.resolve("two.xml")).exists().isRegularFile(); } @Test void contributeWithTrailingSlash(@TempDir Path directory) throws IOException { - String rootResource = "classpath:" + classLocation + "/"; - MultipleResourcesProjectContributor contributor = new MultipleResourcesProjectContributor(rootResource); - - contributor.contribute(directory); - - assertThat(directory.resolve(classFile)).exists(); + new MultipleResourcesProjectContributor("classpath:/data/multi/").contribute(directory); + assertThat(directory.resolve("one.properties")).exists().isRegularFile(); + assertThat(directory.resolve("two.xml")).exists().isRegularFile(); } } diff --git a/initializr-generator/src/test/resources/data/multi/one.properties b/initializr-generator/src/test/resources/data/multi/one.properties new file mode 100644 index 00000000..4091b3db --- /dev/null +++ b/initializr-generator/src/test/resources/data/multi/one.properties @@ -0,0 +1 @@ +test=1 diff --git a/initializr-generator/src/test/resources/data/multi/two.xml b/initializr-generator/src/test/resources/data/multi/two.xml new file mode 100644 index 00000000..cb526584 --- /dev/null +++ b/initializr-generator/src/test/resources/data/multi/two.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file