Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-681 - Removed some compiler warnings.

Browse Source 
Removed unused constants. Removed usage of deprecated method in RepositoryBeanDefinitionParser.
This commit is contained in:
Oliver Gierke
2015-04-13 13:04:59 +02:00
parent 74b452433e
commit d48fddf9e6
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/auditing/AnnotationAuditingMetadata.java
View File

@@ -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.
@@ -51,7 +51,6 @@ final class AnnotationAuditingMetadata {
private static final Map<Class<?>, AnnotationAuditingMetadata> METADATA_CACHE = new ConcurrentHashMap<Class<?>, AnnotationAuditingMetadata>();
private static final String JDK8_TIME_PACKAGE_PREFIX = "java.time";
public static final boolean IS_JDK_8 = org.springframework.util.ClassUtils.isPresent("java.time.Clock",
AnnotationAuditingMetadata.class.getClassLoader());

13
src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2014 the original author or authors.
* Copyright 2008-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.
@@ -23,6 +23,7 @@ import org.springframework.beans.factory.parsing.ReaderContext;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.beans.factory.xml.XmlReaderContext;
import org.springframework.core.env.Environment;
import org.springframework.core.io.ResourceLoader;
import org.springframework.util.Assert;
@@ -56,10 +57,12 @@ public class RepositoryBeanDefinitionParser implements BeanDefinitionParser {
*/
public BeanDefinition parse(Element element, ParserContext parser) {
XmlReaderContext readerContext = parser.getReaderContext();
try {
Environment environment = parser.getDelegate().getEnvironment();
ResourceLoader resourceLoader = parser.getReaderContext().getResourceLoader();
Environment environment = readerContext.getEnvironment();
ResourceLoader resourceLoader = readerContext.getResourceLoader();
BeanDefinitionRegistry registry = parser.getRegistry();
XmlRepositoryConfigurationSource configSource = new XmlRepositoryConfigurationSource(element, parser, environment);
@@ -69,11 +72,11 @@ public class RepositoryBeanDefinitionParser implements BeanDefinitionParser {
RepositoryConfigurationUtils.exposeRegistration(extension, registry, configSource);
for (BeanComponentDefinition definition : delegate.registerRepositoriesIn(registry, extension)) {
parser.getReaderContext().fireComponentRegistered(definition);
readerContext.fireComponentRegistered(definition);
}
} catch (RuntimeException e) {
handleError(e, element, parser.getReaderContext());
handleError(e, element, readerContext);
}
return null;

3
src/main/java/org/springframework/data/repository/query/Parameters.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2014 the original author or authors.
* Copyright 2008-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.
@@ -37,6 +37,7 @@ import org.springframework.util.Assert;
*/
public abstract class Parameters<S extends Parameters<S, T>, T extends Parameter> implements Iterable<T> {
@SuppressWarnings("unchecked")//
public static final List<Class<?>> TYPES = Arrays.asList(Pageable.class, Sort.class);
private static final String PARAM_ON_SPECIAL = format("You must not user @%s on a parameter typed %s or %s",