You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2020/11/05 16:30:51 UTC

[sling-org-apache-sling-adapter-annotations-it] 03/07: SLING-2938 - Add better error reporting to the adapter registration IT

This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-adapter-annotations-it.git

commit bd62f49877ead725d3ec84fa87dd5e2926d0e086
Author: Henry Kuijpers <He...@amplexor.com>
AuthorDate: Mon Nov 2 19:19:06 2020 +0100

    SLING-2938 - Add better error reporting to the adapter registration IT
---
 .../sling/adapter/annotations/AdapterRegistrationIT.java      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/apache/sling/adapter/annotations/AdapterRegistrationIT.java b/src/test/java/org/apache/sling/adapter/annotations/AdapterRegistrationIT.java
index 9f8a9fa..bd0666d 100644
--- a/src/test/java/org/apache/sling/adapter/annotations/AdapterRegistrationIT.java
+++ b/src/test/java/org/apache/sling/adapter/annotations/AdapterRegistrationIT.java
@@ -58,9 +58,14 @@ public class AdapterRegistrationIT implements AdapterAnnotationsIT {
             final ServicesInfo services = new ServicesInfo(JsonUtils.getJsonNodeFromString(
                     client.doGet("/system/console/services.json").getContent()));
             for (final ServiceInfo serviceInfo : services.forType(Adaption.class.getName())) {
-                final JsonNode serviceJson = JsonUtils.getJsonNodeFromString(
-                        client.doGet("/system/console/services/" + serviceInfo.getId() + ".json").getContent());
-                registeredAdaptions.add(Util.getNonDynamicPropertiesForService(serviceJson));
+                final String content = client.doGet("/system/console/services/" + serviceInfo.getId() + ".json").getContent();
+                try {
+                    final JsonNode serviceJson = JsonUtils.getJsonNodeFromString(content);
+                    registeredAdaptions.add(Util.getNonDynamicPropertiesForService(serviceJson));
+                } catch (final ClientException e) {
+                    System.err.println("Unable to find proper JSON content for " + content + " - skipping.");
+                    e.printStackTrace(System.err);
+                }
             }
         }
     }