root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Revised deprecation markers

This commit is contained in:
Juergen Hoeller 2018-03-01 23:43:06 +01:00
parent cf1d162e1c
commit cd4f0935c5
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-core/src/main/java/org/springframework/lang/UsesJava7.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2018 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.
@ -28,6 +28,7 @@ import java.lang.annotation.Target;
*
* @author Stephane Nicoll
* @since 4.1
* @deprecated as of 5.0 since the framework is based on Java 8+ now
*/
@Retention(RetentionPolicy.CLASS)
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE})

3
spring-core/src/main/java/org/springframework/lang/UsesJava8.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2018 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.
@ -28,6 +28,7 @@ import java.lang.annotation.Target;
*
* @author Stephane Nicoll
* @since 4.1
* @deprecated as of 5.0 since the framework is based on Java 8+ now
*/
@Retention(RetentionPolicy.CLASS)
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE})

5
spring-jcl/src/main/java/org/apache/commons/logging/impl/SimpleLog.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@ -18,13 +18,14 @@ package org.apache.commons.logging.impl;
/**
* Originally a simple Commons Logging provider configured by system properties.
* Deprecated in {@code spring-jcl}, effectively equivalent to {@link NoOpLog} now.
* Deprecated in {@code spring-jcl}, effectively equivalent to {@link NoOpLog}.
*
* <p>Instead of instantiating this directly, call {@code LogFactory#getLog(Class/String)}
* which will fall back to {@code java.util.logging} if neither Log4j nor SLF4J are present.
*
* @author Juergen Hoeller (for the {@code spring-jcl} variant)
* @since 5.0
* @deprecated in {@code spring-jcl} (effectively equivalent to {@link NoOpLog})
*/
@Deprecated
@SuppressWarnings("serial")

3
spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java
View File

@ -1131,7 +1131,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
* @see #setCacheQueries
* @see #setQueryCacheRegion
*/
@Deprecated
@SuppressWarnings({"rawtypes", "deprecation"})
protected void prepareQuery(org.hibernate.Query queryObject) {
if (isCacheQueries()) {
@ -1232,7 +1231,7 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
if (retVal instanceof org.hibernate.Query) {
prepareQuery(((org.hibernate.Query) retVal));
}
if (retVal instanceof Criteria) {
else if (retVal instanceof Criteria) {
prepareCriteria(((Criteria) retVal));
}

3
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@ -79,6 +79,7 @@ public class HandlerMappingIntrospector
* Constructor that detects the configured {@code HandlerMapping}s in the
* given {@code ApplicationContext} or falls back on
* "DispatcherServlet.properties" like the {@code DispatcherServlet}.
* @deprecated as of 4.3.12, in favor of {@link #setApplicationContext}
*/
@Deprecated
public HandlerMappingIntrospector(ApplicationContext context) {