Fix review findings

Signed-off-by: Avgustin Marinov <[email protected]>
eclipse-hawkbit · Dec 16, 2024 · 6df13d5 · 6df13d5
1 parent c66c054
commit 6df13d5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/...ry-jpa-api/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractBaseEntity.java b/...ry-jpa-api/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractBaseEntity.java
@@ -10,15 +10,13 @@
 package org.eclipse.hawkbit.repository.jpa.model;
 
 import java.io.Serializable;
-import java.util.concurrent.TimeUnit;
 
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.PostPersist;
 import jakarta.persistence.PostRemove;
 import jakarta.persistence.PostUpdate;
 
-import org.eclipse.hawkbit.repository.Identifiable;
 import org.eclipse.hawkbit.repository.jpa.model.helper.AfterTransactionCommitExecutorHolder;
 import org.eclipse.hawkbit.repository.model.BaseEntity;
 import org.eclipse.hawkbit.tenancy.TenantAwareAuthenticationDetails;

diff --git a/.../src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java b/.../src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java
@@ -31,7 +31,7 @@ public void postUpdate(final DescriptorEvent event) {
         final Object object = event.getObject();
         if (((UpdateObjectQuery) event.getQuery()).getObjectChangeSet().getChangedAttributeNames().stream()
                 .anyMatch(field -> !TARGET_UPDATE_EVENT_IGNORE_FIELDS.contains(field))) {
-            ((AbstractJpaBaseEntity)object).doNotify(() -> ((EventAwareEntity) object).fireUpdateEvent());
+            AbstractJpaBaseEntity.doNotify(() -> ((EventAwareEntity) object).fireUpdateEvent());
         }
     }
 }
diff --git a/.../src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java b/.../src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java
@@ -57,7 +57,7 @@ public void onPostUpdate(final PostUpdateEvent event) {
         }
 
         if (hasNonIgnoredChanges || !lastTargetQueryChanged) {
-            ((AbstractJpaBaseEntity)event.getEntity()).doNotify(() -> ((EventAwareEntity) event.getEntity()).fireUpdateEvent());
+            AbstractJpaBaseEntity.doNotify(() -> ((EventAwareEntity) event.getEntity()).fireUpdateEvent());
         }
     }
 

diff --git a/...jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracle.java b/...jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracle.java
@@ -77,9 +77,7 @@ public ValidationOracleContext suggest(final String rsqlQuery, final int cursorP
         } catch (final JpaSystemException e) {
             // noop
         } catch (final RuntimeException e) {
-            if ("org.eclipse.persistence.exceptions.ConversionException".equals(e.getClass().getName())) {
-                // noop
-            } else {
+            if (!"org.eclipse.persistence.exceptions.ConversionException".equals(e.getClass().getName())) {
                 throw e;
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,7 +57,7 @@ public void onPostUpdate(final PostUpdateEvent event) { @@
             }
             if (hasNonIgnoredChanges || !lastTargetQueryChanged) {
-                ((AbstractJpaBaseEntity)event.getEntity()).doNotify(() -> ((EventAwareEntity) event.getEntity()).fireUpdateEvent());
+                AbstractJpaBaseEntity.doNotify(() -> ((EventAwareEntity) event.getEntity()).fireUpdateEvent());
             }
         }
@@ Expand Down @@