From 8b4033fc8d982f8cddbc198c3694f96ce8e16420 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Sat, 4 Nov 2017 13:06:56 +0100 Subject: [PATCH] #414 - Java 7 Compiler error fixes --- .../persistence/view/impl/update/EntityViewUpdaterImpl.java | 2 +- .../impl/update/flush/AbstractPluralAttributeFlusher.java | 4 ++-- .../view/impl/update/flush/CollectionAttributeFlusher.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/EntityViewUpdaterImpl.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/EntityViewUpdaterImpl.java index 27b3f39a15..2710657c7b 100644 --- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/EntityViewUpdaterImpl.java +++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/EntityViewUpdaterImpl.java @@ -425,7 +425,7 @@ private void update(UpdateContext context, Object entity, MutableStateTrackable } @SuppressWarnings("unchecked") - DirtyAttributeFlusher flusher = getNestedDirtyFlusher(context, updatableProxy, null); + DirtyAttributeFlusher flusher = (DirtyAttributeFlusher) (DirtyAttributeFlusher) getNestedDirtyFlusher(context, updatableProxy, null); // If nothing is dirty, we don't have to do anything if (flusher == null) { diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/AbstractPluralAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/AbstractPluralAttributeFlusher.java index 94fab3040b..1f981cec35 100644 --- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/AbstractPluralAttributeFlusher.java +++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/AbstractPluralAttributeFlusher.java @@ -308,7 +308,7 @@ protected final boolean determineElementFlushers(UpdateContext context, TypeDesc if (o instanceof MutableStateTrackable) { MutableStateTrackable element = (MutableStateTrackable) o; @SuppressWarnings("unchecked") - DirtyAttributeFlusher flusher = (DirtyAttributeFlusher) mapper.getNestedDirtyFlusher(context, element, null); + DirtyAttributeFlusher flusher = (DirtyAttributeFlusher) (DirtyAttributeFlusher) mapper.getNestedDirtyFlusher(context, element, null); if (flusher != null) { elementFlushers.add(new UpdateCollectionElementAttributeFlusher(flusher, element, optimisticLockProtected, mapper)); } @@ -319,7 +319,7 @@ protected final boolean determineElementFlushers(UpdateContext context, TypeDesc if (o instanceof MutableStateTrackable) { MutableStateTrackable element = (MutableStateTrackable) o; @SuppressWarnings("unchecked") - DirtyAttributeFlusher flusher = (DirtyAttributeFlusher) mapper.getNestedDirtyFlusher(context, element, null); + DirtyAttributeFlusher flusher = (DirtyAttributeFlusher) (DirtyAttributeFlusher) mapper.getNestedDirtyFlusher(context, element, null); if (flusher != null) { // We can't merge flat view elements separately so we need to replace the element in the collection // This is signalled by returning null diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionAttributeFlusher.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionAttributeFlusher.java index fd9db1cf20..a2453e8987 100644 --- a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionAttributeFlusher.java +++ b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/update/flush/CollectionAttributeFlusher.java @@ -1021,7 +1021,7 @@ private void visitInverseElementFlushersForActions(UpdateContext context, Iterab if (o instanceof MutableStateTrackable) { MutableStateTrackable element = (MutableStateTrackable) o; @SuppressWarnings("unchecked") - DirtyAttributeFlusher flusher = (DirtyAttributeFlusher) mapper.getNestedDirtyFlusher(context, element, null); + DirtyAttributeFlusher flusher = (DirtyAttributeFlusher) (DirtyAttributeFlusher) mapper.getNestedDirtyFlusher(context, element, null); if (flusher != null) { Object addedElement = added.remove(element); if (addedElement != null) {