Skip to content

Commit 5ca5e90

Browse files
committed
HHH-10279 - Fix checkstyle errors
1 parent 9872358 commit 5ca5e90

File tree

2 files changed

+71
-21
lines changed

2 files changed

+71
-21
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,9 @@ public List performList(
215215
final List combinedResults = new ArrayList( guessedResultSize );
216216
final IdentitySet distinction;
217217
if ( needsLimit ) {
218-
distinction = new IdentitySet(guessedResultSize);
219-
} else {
218+
distinction = new IdentitySet( guessedResultSize );
219+
}
220+
else {
220221
distinction = null;
221222
}
222223
int includedCount = -1;

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

Lines changed: 68 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -95,29 +95,77 @@ public class ActionQueue {
9595
static {
9696
EXECUTABLE_LISTS = new ListProvider[8];
9797
EXECUTABLE_LISTS[0] = new ListProvider() {
98-
ExecutableList<?> get(ActionQueue instance) { return instance.orphanRemovals; }
99-
ExecutableList<?> init(ActionQueue instance) { return instance.orphanRemovals = new ExecutableList<OrphanRemovalAction>();} };
98+
ExecutableList<?> get(ActionQueue instance) {
99+
return instance.orphanRemovals;
100+
}
101+
102+
ExecutableList<?> init(ActionQueue instance) {
103+
return instance.orphanRemovals = new ExecutableList<OrphanRemovalAction>();
104+
}
105+
};
100106
EXECUTABLE_LISTS[1] = new ListProvider() {
101-
ExecutableList<?> get(ActionQueue instance) { return instance.insertions; }
102-
ExecutableList<?> init(ActionQueue instance) { return instance.insertions = new ExecutableList<AbstractEntityInsertAction>( new InsertActionSorter() );} };
107+
ExecutableList<?> get(ActionQueue instance) {
108+
return instance.insertions;
109+
}
110+
111+
ExecutableList<?> init(ActionQueue instance) {
112+
return instance.insertions = new ExecutableList<AbstractEntityInsertAction>( new InsertActionSorter() );
113+
}
114+
};
103115
EXECUTABLE_LISTS[2] = new ListProvider() {
104-
ExecutableList<?> get(ActionQueue instance) { return instance.updates; }
105-
ExecutableList<?> init(ActionQueue instance) { return instance.updates = new ExecutableList<EntityUpdateAction>();} };
116+
ExecutableList<?> get(ActionQueue instance) {
117+
return instance.updates;
118+
}
119+
120+
ExecutableList<?> init(ActionQueue instance) {
121+
return instance.updates = new ExecutableList<EntityUpdateAction>();
122+
}
123+
};
106124
EXECUTABLE_LISTS[3] = new ListProvider() {
107-
ExecutableList<?> get(ActionQueue instance) { return instance.collectionQueuedOps; }
108-
ExecutableList<?> init(ActionQueue instance) { return instance.collectionQueuedOps = new ExecutableList<QueuedOperationCollectionAction>();} };
125+
ExecutableList<?> get(ActionQueue instance) {
126+
return instance.collectionQueuedOps;
127+
}
128+
129+
ExecutableList<?> init(ActionQueue instance) {
130+
return instance.collectionQueuedOps = new ExecutableList<QueuedOperationCollectionAction>();
131+
}
132+
};
109133
EXECUTABLE_LISTS[4] = new ListProvider() {
110-
ExecutableList<?> get(ActionQueue instance) { return instance.collectionRemovals; }
111-
ExecutableList<?> init(ActionQueue instance) { return instance.collectionRemovals = new ExecutableList<CollectionRemoveAction>();} };
134+
ExecutableList<?> get(ActionQueue instance) {
135+
return instance.collectionRemovals;
136+
}
137+
138+
ExecutableList<?> init(ActionQueue instance) {
139+
return instance.collectionRemovals = new ExecutableList<CollectionRemoveAction>();
140+
}
141+
};
112142
EXECUTABLE_LISTS[5] = new ListProvider() {
113-
ExecutableList<?> get(ActionQueue instance) { return instance.collectionUpdates; }
114-
ExecutableList<?> init(ActionQueue instance) { return instance.collectionUpdates = new ExecutableList<CollectionUpdateAction>();} };
143+
ExecutableList<?> get(ActionQueue instance) {
144+
return instance.collectionUpdates;
145+
}
146+
147+
ExecutableList<?> init(ActionQueue instance) {
148+
return instance.collectionUpdates = new ExecutableList<CollectionUpdateAction>();
149+
}
150+
};
115151
EXECUTABLE_LISTS[6] = new ListProvider() {
116-
ExecutableList<?> get(ActionQueue instance) { return instance.collectionCreations; }
117-
ExecutableList<?> init(ActionQueue instance) { return instance.collectionCreations = new ExecutableList<CollectionRecreateAction>();} };
152+
ExecutableList<?> get(ActionQueue instance) {
153+
return instance.collectionCreations;
154+
}
155+
156+
ExecutableList<?> init(ActionQueue instance) {
157+
return instance.collectionCreations = new ExecutableList<CollectionRecreateAction>();
158+
}
159+
};
118160
EXECUTABLE_LISTS[7] = new ListProvider() {
119-
ExecutableList<?> get(ActionQueue instance) { return instance.deletions; }
120-
ExecutableList<?> init(ActionQueue instance) { return instance.deletions = new ExecutableList<EntityDeleteAction>();} };
161+
ExecutableList<?> get(ActionQueue instance) {
162+
return instance.deletions;
163+
}
164+
165+
ExecutableList<?> init(ActionQueue instance) {
166+
return instance.deletions = new ExecutableList<EntityDeleteAction>();
167+
}
168+
};
121169
}
122170

123171
/**
@@ -769,9 +817,10 @@ public void serialize(ObjectOutputStream oos) throws IOException {
769817
ExecutableList<?> l = p.get(this);
770818
if( l == null ) {
771819
oos.writeBoolean(false);
772-
} else {
773-
oos.writeBoolean(true);
774-
l.writeExternal(oos);
820+
}
821+
else {
822+
oos.writeBoolean( true );
823+
l.writeExternal( oos );
775824
}
776825
}
777826
}

0 commit comments

Comments
 (0)