This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git
commit de19fab14fbf05e06d6897047688439fb721b46e
Author: Stefan Seifert <stefanseif...@users.noreply.github.com>
AuthorDate: Mon Jun 24 14:26:30 2024 +0200
SLING-12361 apply spotless code formatting
---
pom.xml | 10 +++++-----
.../bndplugin/ConfigurationClassScannerPlugin.java | 7 ++-----
src/test/java/dummy/example/pkg1/Config1.java | 4 +---
src/test/java/dummy/example/pkg1/Config2.java | 4 +---
src/test/java/dummy/example/pkg1/sub1/Config3.java | 4 +---
.../AbstractConfigurationClassScannerPlugin.java | 23 +++++++++++-----------
.../caconfig/bndplugin/GenerateHeaderTest.java | 10 +++++-----
7 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index 98319b9..fdab314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,21 +28,21 @@
</parent>
<artifactId>org.apache.sling.caconfig.bnd-plugin</artifactId>
- <packaging>jar</packaging>
<version>1.0.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Apache Sling Context-Aware Configuration bnd Plugin</name>
<description>This bnd plugin detected all configuration annotation classes
and adds a bundle header 'Sling-ContextAware-Configuration-Classes' containing
their names.</description>
- <properties>
-
<project.build.outputTimestamp>2021-12-15T00:00:00Z</project.build.outputTimestamp>
- </properties>
-
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git</developerConnection>
<url>https://github.com/apache/sling-org-apache-sling-caconfig-bnd-plugin.git</url>
</scm>
+ <properties>
+
<project.build.outputTimestamp>2021-12-15T00:00:00Z</project.build.outputTimestamp>
+ </properties>
+
<dependencies>
<dependency>
<groupId>biz.aQute.bnd</groupId>
diff --git
a/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
b/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
index c71949f..7f1c461 100644
---
a/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
+++
b/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
@@ -23,8 +23,6 @@ import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.commons.lang3.StringUtils;
-
import aQute.bnd.osgi.Analyzer;
import aQute.bnd.osgi.Clazz;
import aQute.bnd.osgi.Clazz.QUERY;
@@ -32,6 +30,7 @@ import aQute.bnd.osgi.Instruction;
import aQute.bnd.service.AnalyzerPlugin;
import aQute.bnd.service.Plugin;
import aQute.service.reporter.Reporter;
+import org.apache.commons.lang3.StringUtils;
/**
* Scans the classpath of the bundle for annotation classes with the
"Configuration" annotation
@@ -87,11 +86,9 @@ public class ConfigurationClassScannerPlugin implements
AnalyzerPlugin, Plugin {
classNames.add(clazz.getClassName().getFQN());
}
}
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
reporter.exception(ex, "Error querying for classes with
annotation: " + annotationClassName);
}
return classNames;
}
-
}
diff --git a/src/test/java/dummy/example/pkg1/Config1.java
b/src/test/java/dummy/example/pkg1/Config1.java
index 9dd90b7..4c20d6d 100644
--- a/src/test/java/dummy/example/pkg1/Config1.java
+++ b/src/test/java/dummy/example/pkg1/Config1.java
@@ -21,6 +21,4 @@ package dummy.example.pkg1;
import org.apache.sling.caconfig.annotation.Configuration;
@Configuration
-public @interface Config1 {
-
-}
+public @interface Config1 {}
diff --git a/src/test/java/dummy/example/pkg1/Config2.java
b/src/test/java/dummy/example/pkg1/Config2.java
index 322a1df..796a145 100644
--- a/src/test/java/dummy/example/pkg1/Config2.java
+++ b/src/test/java/dummy/example/pkg1/Config2.java
@@ -21,6 +21,4 @@ package dummy.example.pkg1;
import org.apache.sling.caconfig.annotation.Configuration;
@Configuration
-public @interface Config2 {
-
-}
+public @interface Config2 {}
diff --git a/src/test/java/dummy/example/pkg1/sub1/Config3.java
b/src/test/java/dummy/example/pkg1/sub1/Config3.java
index 456413c..f521f12 100644
--- a/src/test/java/dummy/example/pkg1/sub1/Config3.java
+++ b/src/test/java/dummy/example/pkg1/sub1/Config3.java
@@ -21,6 +21,4 @@ package dummy.example.pkg1.sub1;
import org.apache.sling.caconfig.annotation.Configuration;
@Configuration
-public @interface Config3 {
-
-}
+public @interface Config3 {}
diff --git
a/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
b/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
index 4e3e158..b1c4123 100644
---
a/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
+++
b/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
@@ -18,10 +18,6 @@
*/
package org.apache.sling.caconfig.bndplugin;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-
import java.io.File;
import java.util.Arrays;
import java.util.HashMap;
@@ -29,16 +25,19 @@ import java.util.HashSet;
import java.util.Set;
import java.util.jar.Manifest;
+import aQute.bnd.osgi.Builder;
+import aQute.bnd.osgi.Jar;
+import aQute.bnd.service.Plugin;
+import aQute.service.reporter.Reporter;
import org.apache.commons.lang3.StringUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
-import aQute.bnd.osgi.Builder;
-import aQute.bnd.osgi.Jar;
-import aQute.bnd.service.Plugin;
-import aQute.service.reporter.Reporter;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
@RunWith(MockitoJUnitRunner.class)
public abstract class AbstractConfigurationClassScannerPlugin {
@@ -53,11 +52,11 @@ public abstract class
AbstractConfigurationClassScannerPlugin {
classesDirJar.setManifest(new Manifest());
builder.setJar(classesDirJar);
- builder.setSourcepath(new File[] { new File("src/test/java") } );
+ builder.setSourcepath(new File[] {new File("src/test/java")});
Plugin plugin = new ConfigurationClassScannerPlugin();
plugin.setReporter(mock(Reporter.class));
- plugin.setProperties(new HashMap<String,String>());
+ plugin.setProperties(new HashMap<String, String>());
builder.addBasicPlugin(plugin);
}
@@ -71,9 +70,9 @@ public abstract class AbstractConfigurationClassScannerPlugin
{
protected final void assertHeader(Jar jar, String headerName, String...
headerValues) throws Exception {
Set<String> expectedValues = new
HashSet<>(Arrays.asList(headerValues));
- String[] actual =
StringUtils.split(jar.getManifest().getMainAttributes().getValue(headerName),
",");
+ String[] actual =
+
StringUtils.split(jar.getManifest().getMainAttributes().getValue(headerName),
",");
Set<String> actualValues = new HashSet<>(Arrays.asList(actual));
assertEquals(expectedValues, actualValues);
}
-
}
diff --git
a/src/test/java/org/apache/sling/caconfig/bndplugin/GenerateHeaderTest.java
b/src/test/java/org/apache/sling/caconfig/bndplugin/GenerateHeaderTest.java
index 3ee5720..b093602 100644
--- a/src/test/java/org/apache/sling/caconfig/bndplugin/GenerateHeaderTest.java
+++ b/src/test/java/org/apache/sling/caconfig/bndplugin/GenerateHeaderTest.java
@@ -18,11 +18,10 @@
*/
package org.apache.sling.caconfig.bndplugin;
-import static
org.apache.sling.caconfig.bndplugin.ConfigurationClassScannerPlugin.CONFIGURATION_CLASSES_HEADER;
-
+import aQute.bnd.osgi.Jar;
import org.junit.Test;
-import aQute.bnd.osgi.Jar;
+import static
org.apache.sling.caconfig.bndplugin.ConfigurationClassScannerPlugin.CONFIGURATION_CLASSES_HEADER;
public class GenerateHeaderTest extends
AbstractConfigurationClassScannerPlugin {
@@ -30,10 +29,11 @@ public class GenerateHeaderTest extends
AbstractConfigurationClassScannerPlugin
public void testBuild() throws Exception {
Jar jar = builder.build();
- assertHeader(jar, CONFIGURATION_CLASSES_HEADER,
+ assertHeader(
+ jar,
+ CONFIGURATION_CLASSES_HEADER,
"dummy.example.pkg1.Config1",
"dummy.example.pkg1.Config2",
"dummy.example.pkg1.sub1.Config3");
}
-
}
