NPE in lib-app.get and lib-app.getDescriptor for missing app key #10280

enonic · Oct 4, 2023 · 89a345f · 89a345f
1 parent c9ce353
commit 89a345f
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 4 deletions.
diff --git a/modules/lib/lib-app/src/main/java/com/enonic/xp/lib/app/GetApplicationDescriptorHandler.java b/modules/lib/lib-app/src/main/java/com/enonic/xp/lib/app/GetApplicationDescriptorHandler.java
@@ -1,5 +1,6 @@
 package com.enonic.xp.lib.app;
 
+import java.util.Optional;
 import java.util.function.Supplier;
 
 import com.enonic.xp.app.ApplicationDescriptorService;
@@ -18,7 +19,9 @@ public final class GetApplicationDescriptorHandler
 
     public ApplicationDescriptorMapper execute()
     {
-        return new ApplicationDescriptorMapper( applicationDescriptorServiceSupplier.get().get( ApplicationKey.from( key ) ) );
+        return Optional.ofNullable( applicationDescriptorServiceSupplier.get().get( ApplicationKey.from( key ) ) )
+            .map( ApplicationDescriptorMapper::new )
+            .orElse( null );
     }
 
     public void setKey( final String key )

diff --git a/modules/lib/lib-app/src/main/java/com/enonic/xp/lib/app/GetApplicationHandler.java b/modules/lib/lib-app/src/main/java/com/enonic/xp/lib/app/GetApplicationHandler.java
@@ -1,5 +1,6 @@
 package com.enonic.xp.lib.app;
 
+import java.util.Optional;
 import java.util.function.Supplier;
 
 import com.enonic.xp.app.ApplicationKey;
@@ -18,7 +19,9 @@ public final class GetApplicationHandler
 
     public ApplicationMapper execute()
     {
-        return new ApplicationMapper( applicationServiceSupplier.get().get( ApplicationKey.from( key ) ) );
+        return Optional.ofNullable( applicationServiceSupplier.get().get( ApplicationKey.from( key ) ) )
+            .map( ApplicationMapper::new )
+            .orElse( null );
     }
 
     public void setKey( final String key )

diff --git a/.../lib/lib-app/src/test/java/com/enonic/xp/lib/app/GetApplicationDescriptorHandlerTest.java b/.../lib/lib-app/src/test/java/com/enonic/xp/lib/app/GetApplicationDescriptorHandlerTest.java
@@ -43,4 +43,13 @@ public void testWithoutIcon()
 
         runFunction( "/test/GetApplicationDescriptorHandlerTest.js", "getWithoutIcon" );
     }
+
+    @Test
+    public void testMissing()
+    {
+
+        when( applicationDescriptorService.get( isA( ApplicationKey.class ) ) ).thenAnswer( params -> null );
+
+        runFunction( "/test/GetApplicationDescriptorHandlerTest.js", "getMissing" );
+    }
 }
diff --git a/modules/lib/lib-app/src/test/java/com/enonic/xp/lib/app/GetApplicationHandlerTest.java b/modules/lib/lib-app/src/test/java/com/enonic/xp/lib/app/GetApplicationHandlerTest.java
@@ -44,4 +44,13 @@ public void testExample()
 
         runScript( "/lib/xp/examples/app/get.js" );
     }
+
+    @Test
+    public void testMissing()
+    {
+
+        when( applicationService.get( isA( ApplicationKey.class ) ) ).thenAnswer( params -> null );
+
+        runFunction( "/test/GetApplicationHandlerTest.js", "getMissing" );
+    }
 }
diff --git a/modules/lib/lib-app/src/test/resources/test/GetApplicationDescriptorHandlerTest.js b/modules/lib/lib-app/src/test/resources/test/GetApplicationDescriptorHandlerTest.js
@@ -3,10 +3,18 @@ var assert = require('/lib/xp/testing');
 
 exports.getWithoutIcon = function () {
     var result = appLib.getDescriptor({
-        key: '123456'
+        key: '123456',
     });
 
     assert.assertJsonEquals({
-        'key': '123456', 'description': 'my app description'
+        'key': '123456', 'description': 'my app description',
     }, result);
 };
+
+exports.getMissing = function () {
+    var result = appLib.getDescriptor({
+        key: 'missing',
+    });
+
+    assert.assertNull(result);
+}
diff --git a/modules/lib/lib-app/src/test/resources/test/GetApplicationHandlerTest.js b/modules/lib/lib-app/src/test/resources/test/GetApplicationHandlerTest.js
@@ -0,0 +1,10 @@
+var appLib = require('/lib/xp/app');
+var assert = require('/lib/xp/testing');
+
+exports.getMissing = function () {
+    var result = appLib.getDescriptor({
+        key: 'missing',
+    });
+
+    assert.assertNull(result);
+}