Skip to content

Commit 457f822

Browse files
committed
cosmetic: update code formatting to latest checkstyle ruleset
1 parent 3000159 commit 457f822

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/main/java/io/wcm/caconfig/extensions/persistence/impl/PagePersistenceStrategy.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
/**
5757
* AEM-specific persistence strategy that has higher precedence than the default strategy from Sling,
5858
* but lower precedence that the persistence strategy that is part of AEM since version 6.3.
59+
*
5960
* <p>
6061
* It supports reading configurations from cq:Page nodes in /conf, the configuration is read from the jcr:content child
6162
* node. Unlike the persistence strategy in AEM 6.3 this also supports writing configuration to /conf.

src/main/java/io/wcm/caconfig/extensions/references/impl/ConfigurationReferenceProvider.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@
5555
import com.day.cq.wcm.api.reference.ReferenceProvider;
5656

5757
/**
58-
* <p>
5958
* This implementation of {@link ReferenceProvider} allows to resolve references of a given {@link Resource} to
6059
* context-aware configurations.
61-
* </p>
60+
*
6261
* <p>
6362
* This is for example used by ActivationReferenceSearchServlet to resolve referenced content of pages during activation
6463
* of a page using AEM sites. Returning the configurations allows the editor to activate them along with the page
6564
* referring to them.
6665
* </p>
66+
*
6767
* <p>
6868
* This component can be disabled by configuration, but its enabled by default.
6969
* </p>
@@ -130,7 +130,8 @@ public List<com.day.cq.wcm.api.reference.Reference> findReferences(Resource reso
130130
Set<String> configurationBuckets = new LinkedHashSet<>(configurationResourceResolverConfig.configBucketNames());
131131

132132
for (String configurationName : configurationMetadatas.keySet()) {
133-
Iterator<Resource> configurationInheritanceChain = configurationResourceResolvingStrategy.getResourceInheritanceChain(resource, configurationBuckets, configurationName);
133+
Iterator<Resource> configurationInheritanceChain = configurationResourceResolvingStrategy.getResourceInheritanceChain(resource, configurationBuckets,
134+
configurationName);
134135
Map<String, Page> referencePages = new LinkedHashMap<>();
135136

136137
while (configurationInheritanceChain != null && configurationInheritanceChain.hasNext()) {

src/main/java/io/wcm/caconfig/extensions/references/impl/CoreCompReferenceProviderDisabler.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,18 @@
3838
* to the core components. It implements a much simplified logic compared to {@link ConfigurationReferenceProvider}
3939
* and does not properly detect the last modification date if one of the wcm.io persistence strategies
4040
* is used which stores the configuration in AEM pages that can be properly activated.
41+
*
4142
* <p>
4243
* To avoid conflicts with the two implementations trying to achieve the same, this services checks if
4344
* the Core Component reference provider is present, and deactivates it.
4445
* </p>
46+
*
4547
* <p>
4648
* Unfortunately there is no better way, as the Core Component reference provider does not support to be disabled via
4749
* OSGi configuration, and the AEM WCM Core implementation does not sort the reference providers by service ranking.
4850
* If both reference providers are active at the same time it's a matter of luck who "wins".
4951
* </p>
52+
*
5053
* <p>
5154
* The implementation of this service is heavily inspired by the "Component Disabler" of ACS AEM Commons.
5255
* </p>

0 commit comments

Comments
 (0)