From c9c014cde7978562f2e21399a7a31da2cde744df Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 15 May 2017 17:19:17 +0100 Subject: [PATCH] Drop IgnoreNestedPropertiesBindHandler and its tests This should have been done as part of abdc239. Closes gh-8657 --- .../IgnoreNestedPropertiesBindHandler.java | 51 --------- ...gnoreNestedPropertiesBindHandlerTests.java | 106 ------------------ 2 files changed, 157 deletions(-) delete mode 100644 spring-boot/src/main/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandler.java delete mode 100644 spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandlerTests.java diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandler.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandler.java deleted file mode 100644 index e5a26be0493..00000000000 --- a/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandler.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2012-2017 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 - * - * 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.springframework.boot.context.properties.bind.handler; - -import org.springframework.boot.context.properties.bind.AbstractBindHandler; -import org.springframework.boot.context.properties.bind.BindContext; -import org.springframework.boot.context.properties.bind.BindHandler; -import org.springframework.boot.context.properties.bind.Bindable; -import org.springframework.boot.context.properties.source.ConfigurationPropertyName; - -/** - * {@link BindHandler} to limit binding to only first level properties. - * - * @author Phillip Webb - * @author Madhura Bhave - * @since 2.0.0 - */ -public class IgnoreNestedPropertiesBindHandler extends AbstractBindHandler { - - public IgnoreNestedPropertiesBindHandler() { - super(); - } - - public IgnoreNestedPropertiesBindHandler(BindHandler parent) { - super(parent); - } - - @Override - public boolean onStart(ConfigurationPropertyName name, Bindable target, - BindContext context) { - if (context.getDepth() > 1) { - return false; - } - return super.onStart(name, target, context); - } - -} diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandlerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandlerTests.java deleted file mode 100644 index 1234dd1b7cf..00000000000 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandlerTests.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright 2012-2017 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 - * - * 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.springframework.boot.context.properties.bind.handler; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; - -import org.springframework.boot.context.properties.bind.Bindable; -import org.springframework.boot.context.properties.bind.Binder; -import org.springframework.boot.context.properties.source.ConfigurationPropertySource; -import org.springframework.boot.context.properties.source.MockConfigurationPropertySource; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Tests for {@link IgnoreNestedPropertiesBindHandler}. - * - * @author Phillip Webb - * @author Madhura Bhave - */ -public class IgnoreNestedPropertiesBindHandlerTests { - - private List sources = new ArrayList<>(); - - private Binder binder; - - @Before - public void setup() { - MockConfigurationPropertySource source = new MockConfigurationPropertySource(); - source.put("example.foo", "foovalue"); - source.put("example.nested.bar", "barvalue"); - this.sources.add(source); - this.binder = new Binder(this.sources); - } - - @Test - public void bindWhenNotIgnoringNestedShouldBindAll() throws Exception { - Example bound = this.binder.bind("example", Bindable.of(Example.class)).get(); - assertThat(bound.getFoo()).isEqualTo("foovalue"); - assertThat(bound.getNested().getBar()).isEqualTo("barvalue"); - } - - @Test - public void bindWhenIgnoringNestedShouldFilterNested() throws Exception { - Example bound = this.binder.bind("example", Bindable.of(Example.class), - new IgnoreNestedPropertiesBindHandler()).get(); - assertThat(bound.getFoo()).isEqualTo("foovalue"); - assertThat(bound.getNested()).isNull(); - } - - public static class Example { - - private String foo; - - private ExampleNested nested; - - public String getFoo() { - return this.foo; - } - - public void setFoo(String foo) { - this.foo = foo; - } - - public ExampleNested getNested() { - return this.nested; - } - - public void setNested(ExampleNested nested) { - this.nested = nested; - } - - } - - public static class ExampleNested { - - private String bar; - - public String getBar() { - return this.bar; - } - - public void setBar(String bar) { - this.bar = bar; - } - - } - -}