Skip to content

Commit 3b41c87

Browse files
Fix compile error on Java 11 in TimedAspectTest
1 parent 9adf526 commit 3b41c87

File tree

1 file changed

+63
-63
lines changed

1 file changed

+63
-63
lines changed

micrometer-core/src/test/java/io/micrometer/core/aop/TimedAspectTest.java

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -475,100 +475,100 @@ void meterTagOnSuperClass() {
475475
assertThat(registry.get("method.timed").tag("superTag", "someValue").timer().count()).isEqualTo(1);
476476
}
477477

478-
enum AnnotatedTestClass {
478+
}
479479

480-
CLASS_WITHOUT_INTERFACE(MeterTagClass.class), CLASS_WITH_INTERFACE(MeterTagClassChild.class);
480+
enum AnnotatedTestClass {
481481

482-
private final Class<? extends MeterTagClassInterface> clazz;
482+
CLASS_WITHOUT_INTERFACE(MeterTagClass.class), CLASS_WITH_INTERFACE(MeterTagClassChild.class);
483483

484-
AnnotatedTestClass(Class<? extends MeterTagClassInterface> clazz) {
485-
this.clazz = clazz;
486-
}
484+
private final Class<? extends MeterTagClassInterface> clazz;
487485

488-
@SuppressWarnings("unchecked")
489-
<T extends MeterTagClassInterface> T newInstance() {
490-
try {
491-
return (T) clazz.getDeclaredConstructor().newInstance();
492-
}
493-
catch (Exception e) {
494-
throw new RuntimeException(e);
495-
}
496-
}
486+
AnnotatedTestClass(Class<? extends MeterTagClassInterface> clazz) {
487+
this.clazz = clazz;
488+
}
497489

490+
@SuppressWarnings("unchecked")
491+
<T extends MeterTagClassInterface> T newInstance() {
492+
try {
493+
return (T) clazz.getDeclaredConstructor().newInstance();
494+
}
495+
catch (Exception e) {
496+
throw new RuntimeException(e);
497+
}
498498
}
499499

500-
interface MeterTagClassInterface {
500+
}
501501

502-
@Timed
503-
void getAnnotationForTagValueResolver(@MeterTag(key = "test", resolver = ValueResolver.class) String test);
502+
interface MeterTagClassInterface {
504503

505-
@Timed
506-
void getAnnotationForTagValueExpression(
507-
@MeterTag(key = "test", expression = "'hello' + ' characters'") String test);
504+
@Timed
505+
void getAnnotationForTagValueResolver(@MeterTag(key = "test", resolver = ValueResolver.class) String test);
508506

509-
@Timed
510-
void getAnnotationForArgumentToString(@MeterTag("test") Long param);
507+
@Timed
508+
void getAnnotationForTagValueExpression(
509+
@MeterTag(key = "test", expression = "'hello' + ' characters'") String test);
511510

512-
}
511+
@Timed
512+
void getAnnotationForArgumentToString(@MeterTag("test") Long param);
513513

514-
static class MeterTagClass implements MeterTagClassInterface {
514+
}
515515

516-
@Timed
517-
@Override
518-
public void getAnnotationForTagValueResolver(
519-
@MeterTag(key = "test", resolver = ValueResolver.class) String test) {
520-
}
516+
static class MeterTagClass implements MeterTagClassInterface {
521517

522-
@Timed
523-
@Override
524-
public void getAnnotationForTagValueExpression(
525-
@MeterTag(key = "test", expression = "'hello' + ' characters'") String test) {
526-
}
518+
@Timed
519+
@Override
520+
public void getAnnotationForTagValueResolver(
521+
@MeterTag(key = "test", resolver = ValueResolver.class) String test) {
522+
}
527523

528-
@Timed
529-
@Override
530-
public void getAnnotationForArgumentToString(@MeterTag("test") Long param) {
531-
}
524+
@Timed
525+
@Override
526+
public void getAnnotationForTagValueExpression(
527+
@MeterTag(key = "test", expression = "'hello' + ' characters'") String test) {
528+
}
532529

533-
@Timed
534-
void getAnnotationForPackagePrivateMethod(@MeterTag("foo") String foo) {
535-
}
530+
@Timed
531+
@Override
532+
public void getAnnotationForArgumentToString(@MeterTag("test") Long param) {
533+
}
536534

535+
@Timed
536+
void getAnnotationForPackagePrivateMethod(@MeterTag("foo") String foo) {
537537
}
538538

539-
static class MeterTagClassChild implements MeterTagClassInterface {
539+
}
540540

541-
@Timed
542-
@Override
543-
public void getAnnotationForTagValueResolver(String test) {
544-
}
541+
static class MeterTagClassChild implements MeterTagClassInterface {
545542

546-
@Timed
547-
@Override
548-
public void getAnnotationForTagValueExpression(String test) {
549-
}
543+
@Timed
544+
@Override
545+
public void getAnnotationForTagValueResolver(String test) {
546+
}
550547

551-
@Timed
552-
@Override
553-
public void getAnnotationForArgumentToString(Long param) {
554-
}
548+
@Timed
549+
@Override
550+
public void getAnnotationForTagValueExpression(String test) {
551+
}
555552

553+
@Timed
554+
@Override
555+
public void getAnnotationForArgumentToString(Long param) {
556556
}
557557

558-
static class MeterTagSuper {
558+
}
559559

560-
@Timed
561-
public void superMethod(@MeterTag("superTag") String foo) {
562-
}
560+
static class MeterTagSuper {
563561

562+
@Timed
563+
public void superMethod(@MeterTag("superTag") String foo) {
564564
}
565565

566-
static class MeterTagSub extends MeterTagSuper {
566+
}
567567

568-
@Timed
569-
public void subMethod(@MeterTag("subTag") String foo) {
570-
}
568+
static class MeterTagSub extends MeterTagSuper {
571569

570+
@Timed
571+
public void subMethod(@MeterTag("subTag") String foo) {
572572
}
573573

574574
}

0 commit comments

Comments
 (0)