diff --git a/NOTICE b/NOTICE index 593241310c..a213852e77 100644 --- a/NOTICE +++ b/NOTICE @@ -43,3 +43,10 @@ modified copy of the PCollections library by Harold Cooper. * Copyright 2008 Harold Cooper * License: MIT License * Homepage: https://github.com/hrldcpr/pcollections + +This product contains a modified portion of the 'org.springframework.lang' +package in the Spring Framework library, distributed by Pivotal, Inc: + + * Copyright 2002-2019 the original author or authors. + * License: Apache License v2.0 + * Homepage: https://spring.io/projects/spring-framework diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNull.java b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNull.java index 697e59781e..2d8ada1cd7 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNull.java +++ b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNull.java @@ -28,7 +28,11 @@ *

Use {@code @NonNullApi} (scope = parameters + return values) and/or {@code @NonNullFields} * (scope = fields) to set the default behavior to non-nullable in order to avoid annotating * your whole codebase with {@code @NonNull}. + *

+ * NOTE: This file has been copied from {org.springframework.lang}. * + * @author Sebastien Deleuze + * @author Juergen Hoeller * @see NonNullApi * @see NonNullFields * @see Nullable diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java index f28a80be30..c15c5e4db4 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java +++ b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java @@ -26,7 +26,11 @@ * tools with JSR-305 support and used by Kotlin to infer nullability of the API. *

Should be used at package level in association with {@link Nullable} * annotations at parameter and return value level. + *

+ * NOTE: This file has been copied from {org.springframework.lang}. * + * @author Sebastien Deleuze + * @author Juergen Hoeller * @see NonNullFields * @see Nullable * @see NonNull diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java index 30bfc25411..9f8a820c12 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java +++ b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java @@ -26,7 +26,10 @@ * tools with JSR-305 support and used by Kotlin to infer nullability of the API. *

Should be used at package level in association with {@link Nullable} * annotations at field level. + *

+ * NOTE: This file has been copied from {org.springframework.lang}. * + * @author Sebastien Deleuze * @see NonNullFields * @see Nullable * @see NonNull diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java b/micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java index 44c8b112f4..eda1989f5e 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java +++ b/micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java @@ -28,7 +28,11 @@ * repeat parent {@code @Nullable} annotations unless they behave differently. *

Can be used in association with {@code NonNullApi} or {@code @NonNullFields} to * override the default non-nullable semantic to nullable. + *

+ * NOTE: This file has been copied from {org.springframework.lang}. * + * @author Sebastien Deleuze + * @author Juergen Hoeller * @see NonNullApi * @see NonNullFields * @see NonNull