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

HHH-10279 - Fix checkstyle errors

This commit is contained in:
Andrea Boriero 2015-11-12 22:45:12 +00:00
parent 9872358bed
commit 5ca5e90551
2 changed files with 71 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java
View File

@ -215,8 +215,9 @@ public class HQLQueryPlan implements Serializable {
final List combinedResults = new ArrayList( guessedResultSize ); final List combinedResults = new ArrayList( guessedResultSize );
final IdentitySet distinction; final IdentitySet distinction;
if ( needsLimit ) { if ( needsLimit ) {
distinction = new IdentitySet(guessedResultSize); distinction = new IdentitySet( guessedResultSize );
} else { }
else {
distinction = null; distinction = null;
} }
int includedCount = -1; int includedCount = -1;

87
hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
View File

@ -95,29 +95,77 @@ public class ActionQueue {
static { static {
EXECUTABLE_LISTS = new ListProvider[8]; EXECUTABLE_LISTS = new ListProvider[8];
EXECUTABLE_LISTS[0] = new ListProvider() { EXECUTABLE_LISTS[0] = new ListProvider() {
ExecutableList<?> get(ActionQueue instance) { return instance.orphanRemovals; } ExecutableList<?> get(ActionQueue instance) {
ExecutableList<?> init(ActionQueue instance) { return instance.orphanRemovals = new ExecutableList<OrphanRemovalAction>();} }; return instance.orphanRemovals;
}
ExecutableList<?> init(ActionQueue instance) {
return instance.orphanRemovals = new ExecutableList<OrphanRemovalAction>();
}
};
EXECUTABLE_LISTS[1] = new ListProvider() { EXECUTABLE_LISTS[1] = new ListProvider() {
ExecutableList<?> get(ActionQueue instance) { return instance.insertions; } ExecutableList<?> get(ActionQueue instance) {
ExecutableList<?> init(ActionQueue instance) { return instance.insertions = new ExecutableList<AbstractEntityInsertAction>( new InsertActionSorter() );} }; return instance.insertions;
}
ExecutableList<?> init(ActionQueue instance) {
return instance.insertions = new ExecutableList<AbstractEntityInsertAction>( new InsertActionSorter() );
}
};
EXECUTABLE_LISTS[2] = new ListProvider() { EXECUTABLE_LISTS[2] = new ListProvider() {
ExecutableList<?> get(ActionQueue instance) { return instance.updates; } ExecutableList<?> get(ActionQueue instance) {
ExecutableList<?> init(ActionQueue instance) { return instance.updates = new ExecutableList<EntityUpdateAction>();} }; return instance.updates;
}
ExecutableList<?> init(ActionQueue instance) {
return instance.updates = new ExecutableList<EntityUpdateAction>();
}
};
EXECUTABLE_LISTS[3] = new ListProvider() { EXECUTABLE_LISTS[3] = new ListProvider() {
ExecutableList<?> get(ActionQueue instance) { return instance.collectionQueuedOps; } ExecutableList<?> get(ActionQueue instance) {
ExecutableList<?> init(ActionQueue instance) { return instance.collectionQueuedOps = new ExecutableList<QueuedOperationCollectionAction>();} }; return instance.collectionQueuedOps;
}
ExecutableList<?> init(ActionQueue instance) {
return instance.collectionQueuedOps = new ExecutableList<QueuedOperationCollectionAction>();
}
};
EXECUTABLE_LISTS[4] = new ListProvider() { EXECUTABLE_LISTS[4] = new ListProvider() {
ExecutableList<?> get(ActionQueue instance) { return instance.collectionRemovals; } ExecutableList<?> get(ActionQueue instance) {
ExecutableList<?> init(ActionQueue instance) { return instance.collectionRemovals = new ExecutableList<CollectionRemoveAction>();} }; return instance.collectionRemovals;
}
ExecutableList<?> init(ActionQueue instance) {
return instance.collectionRemovals = new ExecutableList<CollectionRemoveAction>();
}
};
EXECUTABLE_LISTS[5] = new ListProvider() { EXECUTABLE_LISTS[5] = new ListProvider() {
ExecutableList<?> get(ActionQueue instance) { return instance.collectionUpdates; } ExecutableList<?> get(ActionQueue instance) {
ExecutableList<?> init(ActionQueue instance) { return instance.collectionUpdates = new ExecutableList<CollectionUpdateAction>();} }; return instance.collectionUpdates;
}
ExecutableList<?> init(ActionQueue instance) {
return instance.collectionUpdates = new ExecutableList<CollectionUpdateAction>();
}
};
EXECUTABLE_LISTS[6] = new ListProvider() { EXECUTABLE_LISTS[6] = new ListProvider() {
ExecutableList<?> get(ActionQueue instance) { return instance.collectionCreations; } ExecutableList<?> get(ActionQueue instance) {
ExecutableList<?> init(ActionQueue instance) { return instance.collectionCreations = new ExecutableList<CollectionRecreateAction>();} }; return instance.collectionCreations;
}
ExecutableList<?> init(ActionQueue instance) {
return instance.collectionCreations = new ExecutableList<CollectionRecreateAction>();
}
};
EXECUTABLE_LISTS[7] = new ListProvider() { EXECUTABLE_LISTS[7] = new ListProvider() {
ExecutableList<?> get(ActionQueue instance) { return instance.deletions; } ExecutableList<?> get(ActionQueue instance) {
ExecutableList<?> init(ActionQueue instance) { return instance.deletions = new ExecutableList<EntityDeleteAction>();} }; return instance.deletions;
}
ExecutableList<?> init(ActionQueue instance) {
return instance.deletions = new ExecutableList<EntityDeleteAction>();
}
};
} }
/** /**
@ -769,9 +817,10 @@ public class ActionQueue {
ExecutableList<?> l = p.get(this); ExecutableList<?> l = p.get(this);
if( l == null ) { if( l == null ) {
oos.writeBoolean(false); oos.writeBoolean(false);
} else { }
oos.writeBoolean(true); else {
l.writeExternal(oos); oos.writeBoolean( true );
l.writeExternal( oos );
} }
} }
} }