From b45a2bcfc0d19b7d70f73e1bdefca11f659ef7b9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 May 2015 19:43:57 +0100 Subject: [PATCH] Update javadoc following removal of deprecated APIs See gh-2697 --- .../springframework/boot/actuate/endpoint/PublicMetrics.java | 3 +-- .../main/java/org/springframework/boot/json/JsonParser.java | 4 ++-- .../java/org/springframework/boot/json/JsonParserFactory.java | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/PublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/PublicMetrics.java index 5b21667a35..18a3dadde3 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/PublicMetrics.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/PublicMetrics.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 the original author or authors. + * Copyright 2012-2015 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. @@ -24,7 +24,6 @@ import org.springframework.boot.actuate.metrics.Metric; * Interface to expose specific {@link Metric}s via a {@link MetricsEndpoint}. * * @author Dave Syer - * @see VanillaPublicMetrics * @see SystemPublicMetrics */ public interface PublicMetrics { diff --git a/spring-boot/src/main/java/org/springframework/boot/json/JsonParser.java b/spring-boot/src/main/java/org/springframework/boot/json/JsonParser.java index bf71ed8c35..27839fd889 100644 --- a/spring-boot/src/main/java/org/springframework/boot/json/JsonParser.java +++ b/spring-boot/src/main/java/org/springframework/boot/json/JsonParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 the original author or authors. + * Copyright 2012-2015 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. @@ -24,7 +24,7 @@ import java.util.Map; * * @author Dave Syer * @see JsonParserFactory - * @see SimpleJsonParser + * @see BasicJsonParser * @see JacksonJsonParser * @see GsonJsonParser * @see YamlJsonParser diff --git a/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java b/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java index 9d6a55cd32..a0de0c529b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 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. @@ -33,7 +33,7 @@ public abstract class JsonParserFactory { /** * Static factory for the "best" JSON parser available on the classpath. Tries Jackson * 2, then JSON (from eclipse), Simple JSON, Gson, Snake YAML, and then falls back to - * the {@link SimpleJsonParser}. + * the {@link BasicJsonParser}. * * @return a {@link JsonParser} */