Merge branch '2.2.x' into 2.3.x

Closes gh-22059
This commit is contained in:
Phillip Webb 2020-06-22 12:14:35 -07:00
commit 9843888714
2 changed files with 27 additions and 1 deletions

View File

@ -109,7 +109,7 @@ public class FieldValues {
private Integer[] integerArray = new Integer[] { 42, 24 };
private FieldValues[] unknownArray = new FieldValues[] { new FieldValues() };
private UnknownElementType[] unknownArray = new UnknownElementType[] { new UnknownElementType() };
private Duration durationNone;

View File

@ -0,0 +1,26 @@
/*
* Copyright 2012-2020 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 org.springframework.boot.configurationsample.fieldvalues;
/**
* Type used to check unknown array element types.
*
* @author Phillip Webb
*/
public class UnknownElementType {
}