You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2019/06/12 21:58:00 UTC
[sling-org-apache-sling-app-cms] branch master updated: Fixing
SLING-8486: Fixing errors when using the FakeResponse and issues around the
binding of the Insight Providers
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new 6e31a94 Fixing SLING-8486: Fixing errors when using the FakeResponse and issues around the binding of the Insight Providers
6e31a94 is described below
commit 6e31a943d53eeb905c0a7f936fa7bcbf7d0c076a
Author: Dan Klco <dk...@apache.org>
AuthorDate: Wed Jun 12 16:57:48 2019 -0500
Fixing SLING-8486: Fixing errors when using the FakeResponse and issues
around the binding of the Insight Providers
---
.../java/org/apache/sling/cms/core/insights/impl/FakeResponse.java | 2 +-
.../org/apache/sling/cms/core/insights/impl/InsightFactoryImpl.java | 4 ++--
.../core/insights/impl/providers/HTMLValdiatorInsightProvider.java | 2 +-
.../cms/core/insights/impl/providers/PageSpeedInsightProvider.java | 2 +-
.../cms/core/insights/impl/providers/ReadabilityInsightProvider.java | 2 +-
.../cms/core/readability/impl/ReadabilityServiceFactoryImpl.java | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeResponse.java b/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeResponse.java
index 8757e63..2827c11 100644
--- a/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeResponse.java
+++ b/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeResponse.java
@@ -83,7 +83,7 @@ public class FakeResponse implements HttpServletResponse {
@Override
public void addHeader(String s, String s1) {
- throw new UnsupportedOperationException();
+ // NOOP since this is executed by the Sling Engine
}
@Override
diff --git a/core/src/main/java/org/apache/sling/cms/core/insights/impl/InsightFactoryImpl.java b/core/src/main/java/org/apache/sling/cms/core/insights/impl/InsightFactoryImpl.java
index d645259..37986d0 100644
--- a/core/src/main/java/org/apache/sling/cms/core/insights/impl/InsightFactoryImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/insights/impl/InsightFactoryImpl.java
@@ -44,7 +44,7 @@ public class InsightFactoryImpl implements InsightFactory {
@Reference
private SlingRequestProcessor requestProcessor;
-
+
@Override
public List<Insight> getInsights(File file) {
return getInsights(new FileInsightRequestImpl(file));
@@ -62,7 +62,7 @@ public class InsightFactoryImpl implements InsightFactory {
return getInsights(new PageInsightRequestImpl(page, requestProcessor));
}
- public List<InsightProvider> getProviders() {
+ public List<InsightProvider> getProviders() {
return providers;
}
diff --git a/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/HTMLValdiatorInsightProvider.java b/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/HTMLValdiatorInsightProvider.java
index 174f3f0..53c72ec 100644
--- a/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/HTMLValdiatorInsightProvider.java
+++ b/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/HTMLValdiatorInsightProvider.java
@@ -54,7 +54,7 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Component(service = InsightProvider.class)
+@Component(service = InsightProvider.class, immediate = true)
@Designate(ocd = Config.class)
public class HTMLValdiatorInsightProvider extends BaseInsightProvider {
diff --git a/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/PageSpeedInsightProvider.java b/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/PageSpeedInsightProvider.java
index c3141d6..916115c 100644
--- a/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/PageSpeedInsightProvider.java
+++ b/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/PageSpeedInsightProvider.java
@@ -49,7 +49,7 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Component(service = InsightProvider.class)
+@Component(service = InsightProvider.class, immediate = true)
@Designate(ocd = Config.class)
public class PageSpeedInsightProvider extends BaseInsightProvider {
diff --git a/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/ReadabilityInsightProvider.java b/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/ReadabilityInsightProvider.java
index 0a62b22..72e8b86 100644
--- a/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/ReadabilityInsightProvider.java
+++ b/core/src/main/java/org/apache/sling/cms/core/insights/impl/providers/ReadabilityInsightProvider.java
@@ -41,7 +41,7 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Component(service = InsightProvider.class)
+@Component(service = InsightProvider.class, immediate = true)
public class ReadabilityInsightProvider extends BaseInsightProvider {
public static final String I18N_KEY_READABILITY_DETAIL = "slingcms.readability.detail";
diff --git a/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceFactoryImpl.java b/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceFactoryImpl.java
index fd55f22..64a5166 100644
--- a/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceFactoryImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceFactoryImpl.java
@@ -23,7 +23,7 @@ import org.apache.sling.cms.readability.ReadabilityService;
import org.apache.sling.cms.readability.ReadabilityServiceFactory;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,7 +35,7 @@ public class ReadabilityServiceFactoryImpl implements ReadabilityServiceFactory
private static final Logger log = LoggerFactory.getLogger(ReadabilityServiceFactoryImpl.class);
- @Reference(cardinality = ReferenceCardinality.MULTIPLE)
+ @Reference(policyOption = ReferencePolicyOption.GREEDY)
private List<ReadabilityService> services;
@Override