Merge branch '2.7.x'

Closes gh-33841
This commit is contained in:
Moritz Halbritter
2023-01-16 11:34:31 +01:00
7 changed files with 77 additions and 29 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2023 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.
@@ -16,6 +16,7 @@
package org.springframework.boot.actuate.autoconfigure.endpoint;
import java.lang.annotation.Annotation;
import java.util.Collections;
import java.util.Set;
@@ -200,6 +201,11 @@ class EndpointAutoConfigurationTests {
return false;
}
@Override
public <T extends Annotation> T getAnnotation(Class<T> annotation) {
return null;
}
}
}