Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some raw types in Configuration

This commit is contained in:
Gavin King 2022-01-29 01:23:19 +01:00
parent 9276ce4421
commit 2090df4a08
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
View File

@ -847,11 +847,11 @@ public class Configuration {
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// todo : decide about these
public Map getNamedSQLQueries() {
public Map<String, NamedNativeQueryDefinition> getNamedSQLQueries() {
return namedSqlQueries;
}
public Map getSqlResultSetMappings() {
public Map<String, NamedResultSetMappingDescriptor> getSqlResultSetMappings() {
return sqlResultSetMappings;
}
@ -881,10 +881,9 @@ public class Configuration {
*/
public Configuration mergeProperties(Properties properties) {
for ( Map.Entry<Object,Object> entry : properties.entrySet() ) {
if ( this.properties.containsKey( entry.getKey() ) ) {
continue;
if ( !properties.containsKey( entry.getKey() ) ) {
properties.setProperty( (String) entry.getKey(), (String) entry.getValue() );
}
this.properties.setProperty( (String) entry.getKey(), (String) entry.getValue() );
}
return this;
}