[sling-org-apache-sling-resourcemerger] 18/23: SLING-3927 : Cleanup / deprecate ResourceMergerService

[ro...@apache.org]

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

rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit e6c5e1d61367aa613d1c6b2ced4bea4d6d8de96c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Sep 23 02:39:47 2014 +0000

    SLING-3927 : Cleanup / deprecate ResourceMergerService
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1626928 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resourcemerger/api/ResourceMergerService.java  |  2 ++
 .../{package-info.java => ResourceMergerUtil.java} | 24 ++++++++++++++++++----
 .../sling/resourcemerger/api/package-info.java     |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java b/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java
index 80d03ba..62e178d 100644
--- a/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java
+++ b/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java
@@ -24,7 +24,9 @@ import aQute.bnd.annotation.ProviderType;
 
 /**
  * Service to handle merged resources.
+ * @deprecated
  */
+@Deprecated
 @ProviderType
 public interface ResourceMergerService {
 
diff --git a/src/main/java/org/apache/sling/resourcemerger/api/package-info.java b/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerUtil.java
similarity index 52%
copy from src/main/java/org/apache/sling/resourcemerger/api/package-info.java
copy to src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerUtil.java
index 4d75dec..eddb471 100644
--- a/src/main/java/org/apache/sling/resourcemerger/api/package-info.java
+++ b/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerUtil.java
@@ -16,12 +16,28 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.sling.resourcemerger.api;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.resourcemerger.impl.MergedResourceConstants;
 
 /**
- * Provides a service to merge multiple physical resources into a single one
+ * Utility methods for merged resources.
+ * @since 1.2
  */
-@Version("1.1.0")
-package org.apache.sling.resourcemerger.api;
+public abstract class ResourceMergerUtil {
 
-import aQute.bnd.annotation.Version;
+    /**
+     * Returns <code>true</code> if the provided {@link Resource} is a merged resource.
+     * If the resource is <code>null</code>, <code>false</code> is returned.
+     * @param resource The resource
+     * @return Returns <code>true</code> if the provided {@link Resource} is a merged resource.
+     */
+    public static boolean isMergedResource(final Resource resource) {
+        if (resource == null) {
+            return false;
+        }
 
+        return Boolean.TRUE.equals(resource.getResourceMetadata().get(MergedResourceConstants.METADATA_FLAG));
+    }
+}
diff --git a/src/main/java/org/apache/sling/resourcemerger/api/package-info.java b/src/main/java/org/apache/sling/resourcemerger/api/package-info.java
index 4d75dec..4e09686 100644
--- a/src/main/java/org/apache/sling/resourcemerger/api/package-info.java
+++ b/src/main/java/org/apache/sling/resourcemerger/api/package-info.java
@@ -20,7 +20,7 @@
 /**
  * Provides a service to merge multiple physical resources into a single one
  */
-@Version("1.1.0")
+@Version("1.2.0")
 package org.apache.sling.resourcemerger.api;
 
 import aQute.bnd.annotation.Version;

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.