NPE fix for governance panel for services

Evolveum · Mar 3, 2023 · c99de11 · c99de11
1 parent b493c45
commit c99de11
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/...n/java/com/evolveum/midpoint/gui/impl/component/data/provider/BaseSearchDataProvider.java b/...n/java/com/evolveum/midpoint/gui/impl/component/data/provider/BaseSearchDataProvider.java
@@ -46,7 +46,7 @@ public BaseSearchDataProvider(Component component, IModel<Search<C>> search, boo
     public BaseSearchDataProvider(Component component, IModel<Search<C>> search, boolean useCache, boolean useDefaultSortingField) {
         super(component, useCache, useDefaultSortingField);
         this.search = search;
-        this.oldType = search.getObject() == null ? null : search.getObject().getTypeClass();
+        this.oldType = search.getObject() == null ? null : search.getObject().getTypeClass();   // TODO not good, resolving model in constructor of provider. Can't this be avoided?
     }
 
     protected IModel<Search<C>> getSearchModel() {

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBuilder.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBuilder.java
@@ -293,6 +293,10 @@ public void createAbstractRoleSearchItemWrapperList(BasicQueryWrapper searchConf
     public BasicQueryWrapper createDefaultSearchBoxConfigurationWrapper(SearchBoxConfigurationType mergedConfig) {
         BasicQueryWrapper searchConfigWrapper = new BasicQueryWrapper();
         SearchItemsType searchItems = mergedConfig.getSearchItems();
+        if (searchItems == null) {
+            return searchConfigWrapper;
+        }
+
         for (SearchItemType searchItem : searchItems.getSearchItem()) {
             searchConfigWrapper.getItemsList().add(SearchConfigurationWrapperFactory.createPropertySearchItemWrapper(
                     type, allSearchableItems, searchItem, additionalSearchContext, modelServiceLocator));

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/GovernanceCardsPanel.java b/...om/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/GovernanceCardsPanel.java
@@ -96,9 +96,9 @@ protected void initLayout() {
 
     private void initSearchModel() {
         searchModel = new LoadableDetachableModel<>() {
+
             @Override
             protected Search load() {
-
                 SearchBuilder searchBuilder = new SearchBuilder(FocusType.class)
                         .collectionView(getObjectCollectionView())
                         .additionalSearchContext(createAdditionalSearchContext())