mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '2.0.x' into 2.1.x
This commit is contained in:
commit
9d06d22b99
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
* 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.
|
||||
|
@ -22,6 +22,9 @@ import java.util.Map;
|
||||
/**
|
||||
* A base properties class with generics.
|
||||
*
|
||||
* @param <A> name type
|
||||
* @param <B> mapping key type
|
||||
* @param <C> mapping value type
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public class AbstractGenericProperties<A, B, C> {
|
||||
|
@ -19,6 +19,7 @@ package org.springframework.boot.configurationsample.generic;
|
||||
/**
|
||||
* An intermediate layer that resolves some of the generics from the parent but not all.
|
||||
*
|
||||
* @param <C> mapping value type
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public abstract class AbstractIntermediateGenericProperties<C>
|
||||
|
@ -21,6 +21,8 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
/**
|
||||
* Properties with unresolved generic information.
|
||||
*
|
||||
* @param <B> mapping key type
|
||||
* @param <C> mapping value type
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties("generic")
|
||||
|
Loading…
Reference in New Issue
Block a user