From b9fa30c19ffd0166e63adec9359e792b5dd96b1c Mon Sep 17 00:00:00 2001
From: Alberto Codutti <alberto.codutti@eurotech.com>
Date: Tue, 13 Jul 2021 10:09:19 +0200
Subject: [PATCH] Fixed retrieval of CertificateInfos

Signed-off-by: Alberto Codutti <alberto.codutti@eurotech.com>
---
 .../certificate/server/GwtCertificateInfoServiceImpl.java     | 4 +++-
 .../certificate/shared/service/GwtCertificateInfoService.java | 2 +-
 .../keystore/dialog/KeystoreItemAddCertificateInfoDialog.java | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/console/module/certificate/src/main/java/org/eclipse/kapua/app/console/module/certificate/server/GwtCertificateInfoServiceImpl.java b/console/module/certificate/src/main/java/org/eclipse/kapua/app/console/module/certificate/server/GwtCertificateInfoServiceImpl.java
index 1bcc946b111..4b9b7410d52 100644
--- a/console/module/certificate/src/main/java/org/eclipse/kapua/app/console/module/certificate/server/GwtCertificateInfoServiceImpl.java
+++ b/console/module/certificate/src/main/java/org/eclipse/kapua/app/console/module/certificate/server/GwtCertificateInfoServiceImpl.java
@@ -42,13 +42,15 @@ public class GwtCertificateInfoServiceImpl extends KapuaRemoteServiceServlet imp
     private static final CertificateInfoFactory CERTIFICATE_INFO_FACTORY = LOCATOR.getFactory(CertificateInfoFactory.class);
 
     @Override
-    public List<GwtCertificateInfo> findAllCertificates(String scopeIdString) throws GwtKapuaException {
+    public List<GwtCertificateInfo> findAll(String scopeIdString) throws GwtKapuaException {
         try {
             KapuaId scopeId = KapuaEid.parseCompactId(scopeIdString);
 
             List<GwtCertificateInfo> gwtCertificateInfos = new ArrayList<GwtCertificateInfo>();
 
             CertificateInfoQuery query = CERTIFICATE_INFO_FACTORY.newQuery(scopeId);
+            query.setIncludeInherited(true);
+
             CertificateInfoListResult certificateInfos = CERTIFICATE_INFO_SERVICE.query(query);
 
             for (CertificateInfo certificateInfo : certificateInfos.getItems()) {
diff --git a/console/module/certificate/src/main/java/org/eclipse/kapua/app/console/module/certificate/shared/service/GwtCertificateInfoService.java b/console/module/certificate/src/main/java/org/eclipse/kapua/app/console/module/certificate/shared/service/GwtCertificateInfoService.java
index f82431311c9..39c055ba0fd 100644
--- a/console/module/certificate/src/main/java/org/eclipse/kapua/app/console/module/certificate/shared/service/GwtCertificateInfoService.java
+++ b/console/module/certificate/src/main/java/org/eclipse/kapua/app/console/module/certificate/shared/service/GwtCertificateInfoService.java
@@ -25,7 +25,7 @@
 @RemoteServiceRelativePath("certificateInfo")
 public interface GwtCertificateInfoService extends RemoteService {
 
-    List<GwtCertificateInfo> findAllCertificates(String scopeIdString) throws GwtKapuaException;
+    List<GwtCertificateInfo> findAll(String scopeIdString) throws GwtKapuaException;
 
     boolean isFindSupported();
 }
diff --git a/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/client/device/keystore/dialog/KeystoreItemAddCertificateInfoDialog.java b/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/client/device/keystore/dialog/KeystoreItemAddCertificateInfoDialog.java
index 2d91a2f8233..8546ad5634f 100644
--- a/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/client/device/keystore/dialog/KeystoreItemAddCertificateInfoDialog.java
+++ b/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/client/device/keystore/dialog/KeystoreItemAddCertificateInfoDialog.java
@@ -156,7 +156,7 @@ public void onSuccess(List<GwtDeviceKeystore> gwtKeystores) {
             }
         });
 
-        GWT_CERTIFICATE_INFO_SERVICE.findAllCertificates(gwtDevice.getScopeId(), new AsyncCallback<List<GwtCertificateInfo>>() {
+        GWT_CERTIFICATE_INFO_SERVICE.findAll(gwtDevice.getScopeId(), new AsyncCallback<List<GwtCertificateInfo>>() {
             @Override
             public void onFailure(Throwable t) {
                 certificateInfoCombo.setEmptyText("Error while loading certificate info!");