You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/11/11 17:43:36 UTC

svn commit: r1769320 - /sling/trunk/tooling/bnd/models-bnd-plugin/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java

Author: sseifert
Date: Fri Nov 11 17:43:36 2016
New Revision: 1769320

URL: http://svn.apache.org/viewvc?rev=1769320&view=rev
Log:
SLING-6048 generate header only when classes are present

Modified:
    sling/trunk/tooling/bnd/models-bnd-plugin/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java

Modified: sling/trunk/tooling/bnd/models-bnd-plugin/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/bnd/models-bnd-plugin/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java?rev=1769320&r1=1769319&r2=1769320&view=diff
==============================================================================
--- sling/trunk/tooling/bnd/models-bnd-plugin/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java (original)
+++ sling/trunk/tooling/bnd/models-bnd-plugin/src/main/java/org/apache/sling/bnd/models/ModelsScannerPlugin.java Fri Nov 11 17:43:36 2016
@@ -39,10 +39,10 @@ import aQute.service.reporter.Reporter;
  */
 public class ModelsScannerPlugin implements AnalyzerPlugin, Plugin {
     
-    private static final String MODELS_ANNOTATION_CLASS = "org.apache.sling.models.annotations.Model";
+    static final String MODELS_ANNOTATION_CLASS = "org.apache.sling.models.annotations.Model";
     
-    private static final String MODELS_PACKAGES_HEADER = "Sling-Model-Packages";
-    private static final String MODELS_CLASSES_HEADER = "Sling-Model-Classes";
+    static final String MODELS_PACKAGES_HEADER = "Sling-Model-Packages";
+    static final String MODELS_CLASSES_HEADER = "Sling-Model-Classes";
     
     private Reporter reporter;
 
@@ -66,7 +66,9 @@ public class ModelsScannerPlugin impleme
             Collection<String> classNames = getClassesWithAnnotation(MODELS_ANNOTATION_CLASS, analyzer);
 
             // set bundle header containing all class names found
-            analyzer.set(MODELS_CLASSES_HEADER, StringUtils.join(classNames, ","));
+            if (!classNames.isEmpty()) {
+                analyzer.set(MODELS_CLASSES_HEADER, StringUtils.join(classNames, ","));
+            }
 
         }