Fixed retrieval of CertificateInfos

Signed-off-by: Alberto Codutti <alberto.codutti@eurotech.com>
eclipse · Jul 13, 2021 · b9fa30c · b9fa30c
1 parent 2fca7c0
commit b9fa30c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...rg/eclipse/kapua/app/console/module/certificate/server/GwtCertificateInfoServiceImpl.java b/...rg/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/...clipse/kapua/app/console/module/certificate/shared/service/GwtCertificateInfoService.java b/...clipse/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/...ole/module/device/client/device/keystore/dialog/KeystoreItemAddCertificateInfoDialog.java b/...ole/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!");