From e46bbcf8cfa390b90086e92046c48d290f3a4eb6 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Aug 2022 23:10:13 +1200
Subject: [PATCH] NaturalKeyQueryData use the matchSingleProperty + IntelliJ
 Inspect various improvements

The non-use of the matchSingleProperty meant it fell back to the multi-property match
---
 .../main/java/io/ebeaninternal/api/NaturalKeyQueryData.java   | 4 +++-
 ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java   | 2 +-
 .../java/io/ebeaninternal/server/deploy/DbMigrationInfo.java  | 1 -
 .../io/ebeaninternal/server/querydefn/DefaultOrmQuery.java    | 4 +---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
index a8b4d348d..e83bed445 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
@@ -142,7 +142,9 @@ public final class NaturalKeyQueryData<T> {
    */
   private boolean matchProperties() {
     if (naturalKey.isSingleProperty()) {
-      naturalKey.matchSingleProperty((inProperty != null) ? inProperty : eqList.get(0).property);
+      if (naturalKey.matchSingleProperty((inProperty != null) ? inProperty : eqList.get(0).property)) {
+        return true;
+      }
     }
 
     // multiple properties case
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
index c8a008351..76e7cad99 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -314,7 +314,7 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
    * Return true if select all properties was used to ensure the property
    * invoking a lazy load was included in the query.
    */
-  boolean selectAllForLazyLoadProperty();
+  void selectAllForLazyLoadProperty();
 
   /**
    * Set the select properties.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
index a356beb41..c9e90efb3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index a140a7fec..ceafabbb9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -442,14 +442,12 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    * included in the query.
    */
   @Override
-  public final boolean selectAllForLazyLoadProperty() {
+  public final void selectAllForLazyLoadProperty() {
     if (lazyLoadProperty != null) {
       if (!detail.containsProperty(lazyLoadProperty)) {
         detail.select("*");
-        return true;
       }
     }
-    return false;
   }
 
   private List<OrmQueryProperties> removeQueryJoins() {