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

Polishing

This commit is contained in:
Juergen Hoeller 2018-09-18 17:19:37 +02:00
parent 0204b082b1
commit 65ca7f4909
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@ -2567,7 +2567,7 @@ public class DefaultListableBeanFactoryTests {
@Test
public void testSingletonLookupByNameIsFastEnough() {
// Assume.group(TestGroup.PERFORMANCE);
Assume.group(TestGroup.PERFORMANCE);
Assume.notLogging(factoryLog);
DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
lbf.registerBeanDefinition("test", new RootBeanDefinition(TestBean.class));
@ -2584,7 +2584,7 @@ public class DefaultListableBeanFactoryTests {
@Test
public void testSingletonLookupByTypeIsFastEnough() {
// Assume.group(TestGroup.PERFORMANCE);
Assume.group(TestGroup.PERFORMANCE);
Assume.notLogging(factoryLog);
DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
lbf.registerBeanDefinition("test", new RootBeanDefinition(TestBean.class));

8
spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java
View File

@ -26,12 +26,12 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.lang.Nullable;
/**
* Default implementation of the {@link KeyHolder} interface, to be used for
* The standard implementation of the {@link KeyHolder} interface, to be used for
* holding auto-generated keys (as potentially returned by JDBC insert statements).
*
* <p>Create an instance of this class for each insert operation, and pass
* it to the corresponding {@link org.springframework.jdbc.core.JdbcTemplate}
* or {org.springframework.jdbc.object.SqlUpdate} methods.
* <p>Create an instance of this class for each insert operation, and pass it
* to the corresponding {@link org.springframework.jdbc.core.JdbcTemplate} or
* {@link org.springframework.jdbc.object.SqlUpdate} methods.
*
* @author Thomas Risberg
* @author Juergen Hoeller

20
spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 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.
@ -52,17 +52,17 @@ public interface KeyHolder {
* multiple entries as well. If this method encounters multiple entries in
* either the map or the list meaning that multiple keys were returned,
* then an InvalidDataAccessApiUsageException is thrown.
* @return the generated key
* @throws InvalidDataAccessApiUsageException if multiple keys are encountered.
* @return the generated key as a number
* @throws InvalidDataAccessApiUsageException if multiple keys are encountered
*/
@Nullable
Number getKey() throws InvalidDataAccessApiUsageException;
/**
* Retrieve the first map of keys. If there are multiple entries in the list
* (meaning that multiple rows had keys returned), then an
* InvalidDataAccessApiUsageException is thrown.
* @return the Map of generated keys
* Retrieve the first map of keys.
* <p>If there are multiple entries in the list (meaning that multiple rows
* had keys returned), then an InvalidDataAccessApiUsageException is thrown.
* @return the Map of generated keys for a single row
* @throws InvalidDataAccessApiUsageException if keys for multiple rows are encountered
*/
@Nullable
@ -70,10 +70,10 @@ public interface KeyHolder {
/**
* Return a reference to the List that contains the keys.
* Can be used for extracting keys for multiple rows (an unusual case),
* <p>Can be used for extracting keys for multiple rows (an unusual case),
* and also for adding new maps of keys.
* @return the List for the generated keys, with each entry being a Map
* of column names and key values
* @return the List for the generated keys, with each entry representing
* an individual row through a Map of column names and key values
*/
List<Map<String, Object>> getKeyList();