You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2024/03/22 15:41:33 UTC
(sling-org-apache-sling-models-api) branch master updated (3a2bfd7 -> f10c02a)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
from 3a2bfd7 SLING-12094 - Use GitHub for the Maven scm.url value
new fbfb295 SLING-12273 Update to sling-bundle-parent 60
new 2b015f5 Fix formatting with spotless-m-p
new f10c02a ignore formatting changes in git blame
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.git-blame-ignore-revs | 1 +
.sling-module.json | 8 +++
pom.xml | 70 +++++++++++-----------
.../apache/sling/models/annotations/Default.java | 29 ++++-----
.../annotations/DefaultInjectionStrategy.java | 31 +++++-----
.../apache/sling/models/annotations/Exporter.java | 27 +++++----
.../sling/models/annotations/ExporterOption.java | 26 ++++----
.../apache/sling/models/annotations/Exporters.java | 26 ++++----
.../apache/sling/models/annotations/Filter.java | 33 +++++-----
.../org/apache/sling/models/annotations/Model.java | 32 +++++-----
.../apache/sling/models/annotations/Optional.java | 32 +++++-----
.../org/apache/sling/models/annotations/Path.java | 34 ++++++-----
.../apache/sling/models/annotations/Required.java | 32 +++++-----
.../apache/sling/models/annotations/Source.java | 32 +++++-----
.../models/annotations/ValidationStrategy.java | 32 +++++-----
.../org/apache/sling/models/annotations/Via.java | 31 +++++-----
.../sling/models/annotations/ViaProviderType.java | 29 ++++-----
.../apt/ValidatingAnnotationProcessor.java | 67 ++++++++++++---------
.../injectorspecific/ChildResource.java | 39 ++++++------
.../injectorspecific/InjectionStrategy.java | 26 ++++----
.../annotations/injectorspecific/OSGiService.java | 38 ++++++------
.../injectorspecific/RequestAttribute.java | 38 ++++++------
.../annotations/injectorspecific/ResourcePath.java | 39 ++++++------
.../injectorspecific/ScriptVariable.java | 38 ++++++------
.../models/annotations/injectorspecific/Self.java | 39 ++++++------
.../annotations/injectorspecific/SlingObject.java | 39 ++++++------
.../injectorspecific/ValueMapValue.java | 38 ++++++------
.../sling/models/annotations/via/BeanProperty.java | 29 ++++-----
.../models/annotations/via/ChildResource.java | 29 ++++-----
.../models/annotations/via/ForcedResourceType.java | 29 ++++-----
.../annotations/via/OriginalResourceType.java | 29 ++++-----
.../models/annotations/via/ResourceSuperType.java | 29 ++++-----
.../sling/models/annotations/via/package-info.java | 2 +-
.../sling/models/export/spi/ModelExporter.java | 35 ++++++-----
.../sling/models/factory/ExportException.java | 26 ++++----
.../models/factory/InvalidAdaptableException.java | 2 +-
.../models/factory/InvalidModelException.java | 27 +++++----
.../models/factory/MissingElementException.java | 1 -
.../models/factory/MissingElementsException.java | 10 ++--
.../models/factory/MissingExporterException.java | 26 ++++----
.../sling/models/factory/ModelClassException.java | 6 +-
.../apache/sling/models/factory/ModelFactory.java | 53 +++++++++-------
.../models/factory/PostConstructException.java | 1 -
.../sling/models/factory/ValidationException.java | 27 +++++----
.../apache/sling/models/spi/AcceptsNullName.java | 3 +-
.../apache/sling/models/spi/DisposalCallback.java | 27 +++++----
.../sling/models/spi/DisposalCallbackRegistry.java | 31 +++++-----
.../sling/models/spi/ImplementationPicker.java | 18 +++---
.../java/org/apache/sling/models/spi/Injector.java | 37 +++++++-----
.../apache/sling/models/spi/ModelValidation.java | 31 +++++-----
.../org/apache/sling/models/spi/ValuePreparer.java | 29 +++++----
.../org/apache/sling/models/spi/ViaProvider.java | 26 ++++----
.../AbstractInjectAnnotationProcessor.java | 26 ++++----
.../AbstractInjectAnnotationProcessor2.java | 30 +++++-----
.../spi/injectorspecific/InjectAnnotation.java | 38 ++++++------
.../InjectAnnotationProcessor.java | 39 ++++++------
.../InjectAnnotationProcessor2.java | 44 +++++++-------
.../InjectAnnotationProcessorFactory.java | 31 +++++-----
.../InjectAnnotationProcessorFactory2.java | 30 +++++-----
.../StaticInjectAnnotationProcessorFactory.java | 29 ++++-----
.../factory/MissingElementsExceptionTest.java | 9 ++-
61 files changed, 924 insertions(+), 821 deletions(-)
create mode 100644 .git-blame-ignore-revs
create mode 100644 .sling-module.json
(sling-org-apache-sling-models-api) 01/03: SLING-12273 Update to sling-bundle-parent 60
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
commit fbfb295c90b08336e75cfb2d59ebbcd09a329da9
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Mar 21 13:35:33 2024 +0100
SLING-12273 Update to sling-bundle-parent 60
This allows building with Java 21
---
.sling-module.json | 8 ++++++++
pom.xml | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 0000000..d4268ec
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,8 @@
+{
+ "jenkins": {
+ "jdks": [
+ 17,
+ 21
+ ]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a6fda15..badc038 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>49</version>
+ <version>60</version>
<relativePath />
</parent>
(sling-org-apache-sling-models-api) 02/03: Fix formatting with spotless-m-p
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
commit 2b015f591fa7b52ddab506cdd1adc01ca5362075
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Mar 21 13:36:28 2024 +0100
Fix formatting with spotless-m-p
---
pom.xml | 68 +++++++++++-----------
.../apache/sling/models/annotations/Default.java | 29 ++++-----
.../annotations/DefaultInjectionStrategy.java | 31 +++++-----
.../apache/sling/models/annotations/Exporter.java | 27 ++++-----
.../sling/models/annotations/ExporterOption.java | 26 +++++----
.../apache/sling/models/annotations/Exporters.java | 26 +++++----
.../apache/sling/models/annotations/Filter.java | 33 ++++++-----
.../org/apache/sling/models/annotations/Model.java | 32 +++++-----
.../apache/sling/models/annotations/Optional.java | 32 +++++-----
.../org/apache/sling/models/annotations/Path.java | 34 ++++++-----
.../apache/sling/models/annotations/Required.java | 32 +++++-----
.../apache/sling/models/annotations/Source.java | 32 +++++-----
.../models/annotations/ValidationStrategy.java | 32 +++++-----
.../org/apache/sling/models/annotations/Via.java | 31 +++++-----
.../sling/models/annotations/ViaProviderType.java | 29 ++++-----
.../apt/ValidatingAnnotationProcessor.java | 67 ++++++++++++---------
.../injectorspecific/ChildResource.java | 39 +++++++------
.../injectorspecific/InjectionStrategy.java | 26 +++++----
.../annotations/injectorspecific/OSGiService.java | 38 ++++++------
.../injectorspecific/RequestAttribute.java | 38 ++++++------
.../annotations/injectorspecific/ResourcePath.java | 39 +++++++------
.../injectorspecific/ScriptVariable.java | 38 ++++++------
.../models/annotations/injectorspecific/Self.java | 39 +++++++------
.../annotations/injectorspecific/SlingObject.java | 39 +++++++------
.../injectorspecific/ValueMapValue.java | 38 ++++++------
.../sling/models/annotations/via/BeanProperty.java | 29 ++++-----
.../models/annotations/via/ChildResource.java | 29 ++++-----
.../models/annotations/via/ForcedResourceType.java | 29 ++++-----
.../annotations/via/OriginalResourceType.java | 29 ++++-----
.../models/annotations/via/ResourceSuperType.java | 29 ++++-----
.../sling/models/annotations/via/package-info.java | 2 +-
.../sling/models/export/spi/ModelExporter.java | 35 ++++++-----
.../sling/models/factory/ExportException.java | 26 +++++----
.../models/factory/InvalidAdaptableException.java | 2 +-
.../models/factory/InvalidModelException.java | 27 ++++-----
.../models/factory/MissingElementException.java | 1 -
.../models/factory/MissingElementsException.java | 10 ++--
.../models/factory/MissingExporterException.java | 26 +++++----
.../sling/models/factory/ModelClassException.java | 6 +-
.../apache/sling/models/factory/ModelFactory.java | 53 ++++++++++-------
.../models/factory/PostConstructException.java | 1 -
.../sling/models/factory/ValidationException.java | 27 ++++-----
.../apache/sling/models/spi/AcceptsNullName.java | 3 +-
.../apache/sling/models/spi/DisposalCallback.java | 27 ++++-----
.../sling/models/spi/DisposalCallbackRegistry.java | 31 +++++-----
.../sling/models/spi/ImplementationPicker.java | 18 +++---
.../java/org/apache/sling/models/spi/Injector.java | 37 +++++++-----
.../apache/sling/models/spi/ModelValidation.java | 31 +++++-----
.../org/apache/sling/models/spi/ValuePreparer.java | 29 ++++-----
.../org/apache/sling/models/spi/ViaProvider.java | 26 +++++----
.../AbstractInjectAnnotationProcessor.java | 26 +++++----
.../AbstractInjectAnnotationProcessor2.java | 30 +++++-----
.../spi/injectorspecific/InjectAnnotation.java | 38 ++++++------
.../InjectAnnotationProcessor.java | 39 +++++++------
.../InjectAnnotationProcessor2.java | 44 +++++++-------
.../InjectAnnotationProcessorFactory.java | 31 +++++-----
.../InjectAnnotationProcessorFactory2.java | 30 +++++-----
.../StaticInjectAnnotationProcessorFactory.java | 29 ++++-----
.../factory/MissingElementsExceptionTest.java | 9 ++-
59 files changed, 914 insertions(+), 820 deletions(-)
diff --git a/pom.xml b/pom.xml
index badc038..01761a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -25,7 +25,7 @@
<version>60</version>
<relativePath />
</parent>
-
+
<artifactId>org.apache.sling.models.api</artifactId>
<version>1.5.1-SNAPSHOT</version>
<name>Apache Sling Models API</name>
@@ -33,44 +33,14 @@
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git</developerConnection>
- <url>https://github.com/apache/sling-org-apache-sling-models-api.git</url>
<tag>HEAD</tag>
+ <url>https://github.com/apache/sling-org-apache-sling-models-api.git</url>
</scm>
-
+
<properties>
<sling.java.version>8</sling.java.version>
<project.build.outputTimestamp>2023-03-28T11:29:18Z</project.build.outputTimestamp>
</properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <!-- Disable annotation processing, otherwise Maven will try to use the ValidatingAnnotationProcessor,
- which is not available during compilation time -->
- <configuration>
- <proc>none</proc>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <settingsFile>src/it/settings.xml</settingsFile>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <postBuildHookScript>verify</postBuildHookScript>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -111,6 +81,36 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <!-- Disable annotation processing, otherwise Maven will try to use the ValidatingAnnotationProcessor,
+ which is not available during compilation time -->
+ <configuration>
+ <proc>none</proc>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <postBuildHookScript>verify</postBuildHookScript>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
diff --git a/src/main/java/org/apache/sling/models/annotations/Default.java b/src/main/java/org/apache/sling/models/annotations/Default.java
index 57c826b..34141ea 100644
--- a/src/main/java/org/apache/sling/models/annotations/Default.java
+++ b/src/main/java/org/apache/sling/models/annotations/Default.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
@@ -24,7 +26,7 @@ import java.lang.annotation.Target;
/**
* Default value for an injection.
*/
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
public @interface Default {
@@ -41,5 +43,4 @@ public @interface Default {
short[] shortValues() default {};
String[] values() default {};
-
}
diff --git a/src/main/java/org/apache/sling/models/annotations/DefaultInjectionStrategy.java b/src/main/java/org/apache/sling/models/annotations/DefaultInjectionStrategy.java
index 277d1f7..1d6bb2c 100644
--- a/src/main/java/org/apache/sling/models/annotations/DefaultInjectionStrategy.java
+++ b/src/main/java/org/apache/sling/models/annotations/DefaultInjectionStrategy.java
@@ -1,23 +1,24 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
public enum DefaultInjectionStrategy {
-
- REQUIRED, OPTIONAL
-
+ REQUIRED,
+ OPTIONAL
}
diff --git a/src/main/java/org/apache/sling/models/annotations/Exporter.java b/src/main/java/org/apache/sling/models/annotations/Exporter.java
index 169e3a6..cb49440 100644
--- a/src/main/java/org/apache/sling/models/annotations/Exporter.java
+++ b/src/main/java/org/apache/sling/models/annotations/Exporter.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
@@ -51,5 +53,4 @@ public @interface Exporter {
* @return Options
*/
ExporterOption[] options() default {};
-
}
diff --git a/src/main/java/org/apache/sling/models/annotations/ExporterOption.java b/src/main/java/org/apache/sling/models/annotations/ExporterOption.java
index 6932d2e..41c0c64 100644
--- a/src/main/java/org/apache/sling/models/annotations/ExporterOption.java
+++ b/src/main/java/org/apache/sling/models/annotations/ExporterOption.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
diff --git a/src/main/java/org/apache/sling/models/annotations/Exporters.java b/src/main/java/org/apache/sling/models/annotations/Exporters.java
index 4793cf8..3a33d14 100644
--- a/src/main/java/org/apache/sling/models/annotations/Exporters.java
+++ b/src/main/java/org/apache/sling/models/annotations/Exporters.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
diff --git a/src/main/java/org/apache/sling/models/annotations/Filter.java b/src/main/java/org/apache/sling/models/annotations/Filter.java
index c91f296..f737a0b 100644
--- a/src/main/java/org/apache/sling/models/annotations/Filter.java
+++ b/src/main/java/org/apache/sling/models/annotations/Filter.java
@@ -1,37 +1,38 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
+import javax.inject.Qualifier;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
/**
* Provide a filter on an @Inject.
*/
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
@Source("osgi-services")
@Qualifier
public @interface Filter {
public String value();
-
}
diff --git a/src/main/java/org/apache/sling/models/annotations/Model.java b/src/main/java/org/apache/sling/models/annotations/Model.java
index b30453a..fcd27c7 100644
--- a/src/main/java/org/apache/sling/models/annotations/Model.java
+++ b/src/main/java/org/apache/sling/models/annotations/Model.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
@@ -51,9 +53,9 @@ public @interface Model {
* @return Condition that is displayed in the felix console adapter plugin
*/
public String condition() default "";
-
+
/**
- *
+ *
* @return {@link ValidationStrategy#DISABLED} in case the model should not be validated through Sling Validation (default),
* {@link ValidationStrategy#REQUIRED} in case the model should be validated and if no appropriate Sling Validation Model exists it is considered invalid or
* {@link ValidationStrategy#OPTIONAL} in case the model should be validated only in case an appropriate Sling Validation Model is found.
@@ -72,6 +74,4 @@ public @interface Model {
* @return whether or not the model should be cached for the lifecycle of the adaptable
*/
public boolean cache() default false;
-
-
}
diff --git a/src/main/java/org/apache/sling/models/annotations/Optional.java b/src/main/java/org/apache/sling/models/annotations/Optional.java
index 39e068a..7e186c5 100644
--- a/src/main/java/org/apache/sling/models/annotations/Optional.java
+++ b/src/main/java/org/apache/sling/models/annotations/Optional.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
@@ -24,8 +26,6 @@ import java.lang.annotation.Target;
/**
* Marker annotation for optional injections.
*/
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
-public @interface Optional {
-
-}
+public @interface Optional {}
diff --git a/src/main/java/org/apache/sling/models/annotations/Path.java b/src/main/java/org/apache/sling/models/annotations/Path.java
index e730aa0..33e1cba 100644
--- a/src/main/java/org/apache/sling/models/annotations/Path.java
+++ b/src/main/java/org/apache/sling/models/annotations/Path.java
@@ -1,38 +1,40 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
+import javax.inject.Qualifier;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
/**
* Provide path(s) on an @Inject. Not necessarily tied to the Resource Path injector (thus no
* @Source annotation), may be reused for other injector types.
*/
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
@Qualifier
public @interface Path {
public String value() default "";
- public String[] paths() default {};
+ public String[] paths() default {};
}
diff --git a/src/main/java/org/apache/sling/models/annotations/Required.java b/src/main/java/org/apache/sling/models/annotations/Required.java
index 8992377..687d274 100644
--- a/src/main/java/org/apache/sling/models/annotations/Required.java
+++ b/src/main/java/org/apache/sling/models/annotations/Required.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
@@ -24,8 +26,6 @@ import java.lang.annotation.Target;
/**
* Marker annotation for required injections.
*/
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
-public @interface Required {
-
-}
+public @interface Required {}
diff --git a/src/main/java/org/apache/sling/models/annotations/Source.java b/src/main/java/org/apache/sling/models/annotations/Source.java
index 403b4ea..b819b7b 100644
--- a/src/main/java/org/apache/sling/models/annotations/Source.java
+++ b/src/main/java/org/apache/sling/models/annotations/Source.java
@@ -1,34 +1,36 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
+import javax.inject.Qualifier;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
/**
* Annotation which indicates the specific injector which will populate this injection.
* Can also be used as a meta-annotation to declare that some other annotation implies
* a source.
*/
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Qualifier
public @interface Source {
diff --git a/src/main/java/org/apache/sling/models/annotations/ValidationStrategy.java b/src/main/java/org/apache/sling/models/annotations/ValidationStrategy.java
index 6db5bbb..581964a 100644
--- a/src/main/java/org/apache/sling/models/annotations/ValidationStrategy.java
+++ b/src/main/java/org/apache/sling/models/annotations/ValidationStrategy.java
@@ -1,24 +1,28 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
-/**
+/**
* Used by the {@link Model} annotation.
*/
public enum ValidationStrategy {
- DISABLED, REQUIRED, OPTIONAL
+ DISABLED,
+ REQUIRED,
+ OPTIONAL
}
diff --git a/src/main/java/org/apache/sling/models/annotations/Via.java b/src/main/java/org/apache/sling/models/annotations/Via.java
index 6978ed4..4cebbea 100644
--- a/src/main/java/org/apache/sling/models/annotations/Via.java
+++ b/src/main/java/org/apache/sling/models/annotations/Via.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
@@ -27,7 +29,7 @@ import org.apache.sling.models.annotations.via.BeanProperty;
* Indicate that this injection point should be handled using some value
* derived from the adaptable.
*/
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
public @interface Via {
@@ -42,5 +44,4 @@ public @interface Via {
* @return Provider class
*/
public Class<? extends ViaProviderType> type() default BeanProperty.class;
-
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/models/annotations/ViaProviderType.java b/src/main/java/org/apache/sling/models/annotations/ViaProviderType.java
index 0abc629..f18f45d 100644
--- a/src/main/java/org/apache/sling/models/annotations/ViaProviderType.java
+++ b/src/main/java/org/apache/sling/models/annotations/ViaProviderType.java
@@ -1,23 +1,24 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations;
/**
* Marker interface for eligible @Via provider identifiers.
*/
-public interface ViaProviderType {
-}
+public interface ViaProviderType {}
diff --git a/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java b/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java
index 08ff759..f84563f 100644
--- a/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java
+++ b/src/main/java/org/apache/sling/models/annotations/apt/ValidatingAnnotationProcessor.java
@@ -1,23 +1,23 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.apt;
-import java.util.Set;
-
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
@@ -29,6 +29,8 @@ import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.tools.Diagnostic.Kind;
+import java.util.Set;
+
import org.apache.sling.models.annotations.Model;
/**
@@ -51,17 +53,21 @@ public class ValidatingAnnotationProcessor extends AbstractProcessor {
}
if (isStaticOrFinalField(annotatedElement)) {
- processingEnv.getMessager().printMessage(
- Kind.ERROR,
- "Annotation " + annotation + " may not be used on static or final fields: " + getSymbolName(annotatedElement),
- annotatedElement
- );
+ processingEnv
+ .getMessager()
+ .printMessage(
+ Kind.ERROR,
+ "Annotation " + annotation + " may not be used on static or final fields: "
+ + getSymbolName(annotatedElement),
+ annotatedElement);
} else if (isStaticMethod(annotatedElement)) {
- processingEnv.getMessager().printMessage(
- Kind.ERROR,
- "Annotation " + annotation + " may not be used on static methods: " + getSymbolName(annotatedElement),
- annotatedElement
- );
+ processingEnv
+ .getMessager()
+ .printMessage(
+ Kind.ERROR,
+ "Annotation " + annotation + " may not be used on static methods: "
+ + getSymbolName(annotatedElement),
+ annotatedElement);
}
}
}
@@ -70,7 +76,8 @@ public class ValidatingAnnotationProcessor extends AbstractProcessor {
}
private String getSymbolName(Element annotatedElement) {
- String name = annotatedElement.getEnclosingElement().getSimpleName().toString() + "#" + annotatedElement.getSimpleName().toString();
+ String name = annotatedElement.getEnclosingElement().getSimpleName().toString() + "#"
+ + annotatedElement.getSimpleName().toString();
if (annotatedElement.getKind() == ElementKind.METHOD) {
name += "()";
}
@@ -78,12 +85,14 @@ public class ValidatingAnnotationProcessor extends AbstractProcessor {
}
private boolean isStaticOrFinalField(Element annotatedElement) {
- return (annotatedElement.getModifiers().contains(Modifier.STATIC) || annotatedElement.getModifiers().contains(Modifier.FINAL))
- && annotatedElement.getKind() == ElementKind.FIELD;
+ return (annotatedElement.getModifiers().contains(Modifier.STATIC)
+ || annotatedElement.getModifiers().contains(Modifier.FINAL))
+ && annotatedElement.getKind() == ElementKind.FIELD;
}
private boolean isStaticMethod(Element annotatedElement) {
- return annotatedElement.getModifiers().contains(Modifier.STATIC) && annotatedElement.getKind() == ElementKind.METHOD;
+ return annotatedElement.getModifiers().contains(Modifier.STATIC)
+ && annotatedElement.getKind() == ElementKind.METHOD;
}
private boolean isSlingModel(Element annotatedElement) {
@@ -91,6 +100,6 @@ public class ValidatingAnnotationProcessor extends AbstractProcessor {
// skip any occurrence where the enclosing element is not a class or interface, should not happen
return (enclosingElement.getKind() == ElementKind.CLASS || enclosingElement.getKind() == ElementKind.INTERFACE)
- && enclosingElement.getAnnotation(Model.class) != null;
+ && enclosingElement.getAnnotation(Model.class) != null;
}
}
diff --git a/src/main/java/org/apache/sling/models/annotations/injectorspecific/ChildResource.java b/src/main/java/org/apache/sling/models/annotations/injectorspecific/ChildResource.java
index 87814dd..0c41a22 100644
--- a/src/main/java/org/apache/sling/models/annotations/injectorspecific/ChildResource.java
+++ b/src/main/java/org/apache/sling/models/annotations/injectorspecific/ChildResource.java
@@ -1,37 +1,39 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.injectorspecific;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.apache.sling.models.annotations.Source;
import org.apache.sling.models.spi.injectorspecific.InjectAnnotation;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
* Annotation to be used on either methods, fields or constructor parameters to let Sling Models inject a child resource
*
*/
-@Target({ METHOD, FIELD, PARAMETER })
+@Target({METHOD, FIELD, PARAMETER})
@Retention(RUNTIME)
@InjectAnnotation
@Source("child-resources")
@@ -74,5 +76,4 @@ public @interface ChildResource {
* @return Via name
*/
public String via() default "";
-
}
diff --git a/src/main/java/org/apache/sling/models/annotations/injectorspecific/InjectionStrategy.java b/src/main/java/org/apache/sling/models/annotations/injectorspecific/InjectionStrategy.java
index 1ffe717..f16a97f 100644
--- a/src/main/java/org/apache/sling/models/annotations/injectorspecific/InjectionStrategy.java
+++ b/src/main/java/org/apache/sling/models/annotations/injectorspecific/InjectionStrategy.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.injectorspecific;
diff --git a/src/main/java/org/apache/sling/models/annotations/injectorspecific/OSGiService.java b/src/main/java/org/apache/sling/models/annotations/injectorspecific/OSGiService.java
index 10c92b8..9f9a1fb 100644
--- a/src/main/java/org/apache/sling/models/annotations/injectorspecific/OSGiService.java
+++ b/src/main/java/org/apache/sling/models/annotations/injectorspecific/OSGiService.java
@@ -1,37 +1,39 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.injectorspecific;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.apache.sling.models.annotations.Source;
import org.apache.sling.models.spi.injectorspecific.InjectAnnotation;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
* Annotation to be used on either methods, fields or constructor parameters to let Sling Models inject an OSGi service
*
*/
-@Target({ METHOD, FIELD, PARAMETER })
+@Target({METHOD, FIELD, PARAMETER})
@Retention(RUNTIME)
@InjectAnnotation
@Source("osgi-services")
diff --git a/src/main/java/org/apache/sling/models/annotations/injectorspecific/RequestAttribute.java b/src/main/java/org/apache/sling/models/annotations/injectorspecific/RequestAttribute.java
index bc82188..057bb55 100644
--- a/src/main/java/org/apache/sling/models/annotations/injectorspecific/RequestAttribute.java
+++ b/src/main/java/org/apache/sling/models/annotations/injectorspecific/RequestAttribute.java
@@ -1,38 +1,40 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.injectorspecific;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.apache.sling.models.annotations.Source;
import org.apache.sling.models.spi.injectorspecific.InjectAnnotation;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
* Annotation to be used on either methods, fields or constructor parameters to let Sling Models inject a
* request attribute.
*
*/
-@Target({ METHOD, FIELD, PARAMETER })
+@Target({METHOD, FIELD, PARAMETER})
@Retention(RUNTIME)
@InjectAnnotation
@Source("request-attributes")
diff --git a/src/main/java/org/apache/sling/models/annotations/injectorspecific/ResourcePath.java b/src/main/java/org/apache/sling/models/annotations/injectorspecific/ResourcePath.java
index a2a33a7..e2487de 100644
--- a/src/main/java/org/apache/sling/models/annotations/injectorspecific/ResourcePath.java
+++ b/src/main/java/org/apache/sling/models/annotations/injectorspecific/ResourcePath.java
@@ -1,37 +1,39 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.injectorspecific;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.apache.sling.models.annotations.Source;
import org.apache.sling.models.spi.injectorspecific.InjectAnnotation;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
* Annotation to be used on either methods, fields or constructor parameters to let Sling Models inject a
* resource by path(s). The path may be either in the path/paths attribute or in a value map property with the given name.
*/
-@Target({ METHOD, FIELD, PARAMETER })
+@Target({METHOD, FIELD, PARAMETER})
@Retention(RUNTIME)
@InjectAnnotation
@Source("resource-path")
@@ -79,5 +81,4 @@ public @interface ResourcePath {
* @return Injection strategy
*/
public InjectionStrategy injectionStrategy() default InjectionStrategy.DEFAULT;
-
}
diff --git a/src/main/java/org/apache/sling/models/annotations/injectorspecific/ScriptVariable.java b/src/main/java/org/apache/sling/models/annotations/injectorspecific/ScriptVariable.java
index 980cec5..fed9bdb 100644
--- a/src/main/java/org/apache/sling/models/annotations/injectorspecific/ScriptVariable.java
+++ b/src/main/java/org/apache/sling/models/annotations/injectorspecific/ScriptVariable.java
@@ -1,38 +1,40 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.injectorspecific;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.apache.sling.models.annotations.Source;
import org.apache.sling.models.spi.injectorspecific.InjectAnnotation;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
* Annotation to be used on either methods, fields or constructor parameters to let Sling Models inject a
* script variable (from the org.apache.sling.api.scripting.SlingBindings)
*
*/
-@Target({ METHOD, FIELD, PARAMETER })
+@Target({METHOD, FIELD, PARAMETER})
@Retention(RUNTIME)
@InjectAnnotation
@Source("script-bindings")
diff --git a/src/main/java/org/apache/sling/models/annotations/injectorspecific/Self.java b/src/main/java/org/apache/sling/models/annotations/injectorspecific/Self.java
index 45aea56..ad6eaf5 100644
--- a/src/main/java/org/apache/sling/models/annotations/injectorspecific/Self.java
+++ b/src/main/java/org/apache/sling/models/annotations/injectorspecific/Self.java
@@ -1,37 +1,39 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.injectorspecific;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.apache.sling.models.annotations.Source;
import org.apache.sling.models.spi.injectorspecific.InjectAnnotation;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
* Annotation to be used on either methods, fields or constructor parameters to let Sling Models
* inject the adaptable itself, or an object that can be adapted from it.
*/
-@Target({ METHOD, FIELD, PARAMETER })
+@Target({METHOD, FIELD, PARAMETER})
@Retention(RUNTIME)
@InjectAnnotation
@Source("self")
@@ -59,5 +61,4 @@ public @interface Self {
* @return Injection strategy
*/
public InjectionStrategy injectionStrategy() default InjectionStrategy.DEFAULT;
-
}
diff --git a/src/main/java/org/apache/sling/models/annotations/injectorspecific/SlingObject.java b/src/main/java/org/apache/sling/models/annotations/injectorspecific/SlingObject.java
index 4350551..3f11cc6 100644
--- a/src/main/java/org/apache/sling/models/annotations/injectorspecific/SlingObject.java
+++ b/src/main/java/org/apache/sling/models/annotations/injectorspecific/SlingObject.java
@@ -1,32 +1,34 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.injectorspecific;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.apache.sling.models.annotations.Source;
import org.apache.sling.models.spi.injectorspecific.InjectAnnotation;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
* Injects common Sling objects that can be derived from either a SlingHttpServletRequest, a ResourceResolver or a
* Resource.
@@ -77,7 +79,7 @@ import org.apache.sling.models.spi.injectorspecific.InjectAnnotation;
* </tr>
* </table>
*/
-@Target({ METHOD, FIELD, PARAMETER })
+@Target({METHOD, FIELD, PARAMETER})
@Retention(RUNTIME)
@InjectAnnotation
@Source("sling-object")
@@ -106,5 +108,4 @@ public @interface SlingObject {
* @return Injection strategy
*/
public InjectionStrategy injectionStrategy() default InjectionStrategy.DEFAULT;
-
}
diff --git a/src/main/java/org/apache/sling/models/annotations/injectorspecific/ValueMapValue.java b/src/main/java/org/apache/sling/models/annotations/injectorspecific/ValueMapValue.java
index 5601327..91e9036 100644
--- a/src/main/java/org/apache/sling/models/annotations/injectorspecific/ValueMapValue.java
+++ b/src/main/java/org/apache/sling/models/annotations/injectorspecific/ValueMapValue.java
@@ -1,38 +1,40 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.injectorspecific;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.apache.sling.models.annotations.Source;
import org.apache.sling.models.spi.injectorspecific.InjectAnnotation;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
* Annotation to be used on either methods, fields or constructor parameter to let Sling Models
* inject a value from the ValueMap of the current resource.
*
*/
-@Target({ METHOD, FIELD, PARAMETER })
+@Target({METHOD, FIELD, PARAMETER})
@Retention(RUNTIME)
@InjectAnnotation
@Source("valuemap")
diff --git a/src/main/java/org/apache/sling/models/annotations/via/BeanProperty.java b/src/main/java/org/apache/sling/models/annotations/via/BeanProperty.java
index 11b3d02..321f871 100644
--- a/src/main/java/org/apache/sling/models/annotations/via/BeanProperty.java
+++ b/src/main/java/org/apache/sling/models/annotations/via/BeanProperty.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.via;
@@ -21,5 +23,4 @@ import org.apache.sling.models.annotations.ViaProviderType;
/**
* Marker class for using the JavaBean @Via provider.
*/
-public class BeanProperty implements ViaProviderType {
-}
+public class BeanProperty implements ViaProviderType {}
diff --git a/src/main/java/org/apache/sling/models/annotations/via/ChildResource.java b/src/main/java/org/apache/sling/models/annotations/via/ChildResource.java
index adeef76..7aa652f 100644
--- a/src/main/java/org/apache/sling/models/annotations/via/ChildResource.java
+++ b/src/main/java/org/apache/sling/models/annotations/via/ChildResource.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.via;
@@ -21,5 +23,4 @@ import org.apache.sling.models.annotations.ViaProviderType;
/**
* Marker class for using the ChildResource @Via provider.
*/
-public class ChildResource implements ViaProviderType {
-}
+public class ChildResource implements ViaProviderType {}
diff --git a/src/main/java/org/apache/sling/models/annotations/via/ForcedResourceType.java b/src/main/java/org/apache/sling/models/annotations/via/ForcedResourceType.java
index 5bf7847..bb2a847 100644
--- a/src/main/java/org/apache/sling/models/annotations/via/ForcedResourceType.java
+++ b/src/main/java/org/apache/sling/models/annotations/via/ForcedResourceType.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.via;
@@ -21,5 +23,4 @@ import org.apache.sling.models.annotations.ViaProviderType;
/**
* Marker class for using the ForcedResourceType @Via provider.
*/
-public class ForcedResourceType implements ViaProviderType {
-}
+public class ForcedResourceType implements ViaProviderType {}
diff --git a/src/main/java/org/apache/sling/models/annotations/via/OriginalResourceType.java b/src/main/java/org/apache/sling/models/annotations/via/OriginalResourceType.java
index 6427dbc..714236c 100644
--- a/src/main/java/org/apache/sling/models/annotations/via/OriginalResourceType.java
+++ b/src/main/java/org/apache/sling/models/annotations/via/OriginalResourceType.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.via;
@@ -23,5 +25,4 @@ import org.osgi.annotation.versioning.ProviderType;
* Marker class for using the OriginalResourceType @Via provider.
*/
@ProviderType
-public class OriginalResourceType implements ViaProviderType {
-}
+public class OriginalResourceType implements ViaProviderType {}
diff --git a/src/main/java/org/apache/sling/models/annotations/via/ResourceSuperType.java b/src/main/java/org/apache/sling/models/annotations/via/ResourceSuperType.java
index ab13228..560409c 100644
--- a/src/main/java/org/apache/sling/models/annotations/via/ResourceSuperType.java
+++ b/src/main/java/org/apache/sling/models/annotations/via/ResourceSuperType.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.annotations.via;
@@ -21,5 +23,4 @@ import org.apache.sling.models.annotations.ViaProviderType;
/**
* Marker class for using the ResourceSuperType @Via provider.
*/
-public class ResourceSuperType implements ViaProviderType {
-}
+public class ResourceSuperType implements ViaProviderType {}
diff --git a/src/main/java/org/apache/sling/models/annotations/via/package-info.java b/src/main/java/org/apache/sling/models/annotations/via/package-info.java
index 11bb4de..eb72f49 100644
--- a/src/main/java/org/apache/sling/models/annotations/via/package-info.java
+++ b/src/main/java/org/apache/sling/models/annotations/via/package-info.java
@@ -17,4 +17,4 @@
@Version("1.1.0")
package org.apache.sling.models.annotations.via;
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/models/export/spi/ModelExporter.java b/src/main/java/org/apache/sling/models/export/spi/ModelExporter.java
index 5654a82..49d165e 100644
--- a/src/main/java/org/apache/sling/models/export/spi/ModelExporter.java
+++ b/src/main/java/org/apache/sling/models/export/spi/ModelExporter.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.export.spi;
@@ -22,6 +24,7 @@ import org.apache.sling.models.factory.ExportException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
+
/**
* SPI interface for model exporters.
*/
@@ -46,12 +49,14 @@ public interface ModelExporter {
* @return an exported object
* @throws ExportException if the export is not successful
*/
- @Nullable <T> T export(@NotNull Object model, @NotNull Class<T> clazz, @NotNull Map<String, String> options) throws ExportException;
+ @Nullable
+ <T> T export(@NotNull Object model, @NotNull Class<T> clazz, @NotNull Map<String, String> options)
+ throws ExportException;
/**
* The name of the exporter.
* @return the name of the exporter
*/
- @NotNull String getName();
-
+ @NotNull
+ String getName();
}
diff --git a/src/main/java/org/apache/sling/models/factory/ExportException.java b/src/main/java/org/apache/sling/models/factory/ExportException.java
index 412d5d0..6605a65 100644
--- a/src/main/java/org/apache/sling/models/factory/ExportException.java
+++ b/src/main/java/org/apache/sling/models/factory/ExportException.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.factory;
diff --git a/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java b/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java
index 813f73c..3f9d3bc 100644
--- a/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java
+++ b/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java
@@ -23,7 +23,7 @@ import org.osgi.annotation.versioning.ProviderType;
/**
* Exception which is triggered whenever a Sling Model could not be
* instantiated because it could not be adapted from the given adaptable.
- *
+ *
* @see ModelFactory
*
*/
diff --git a/src/main/java/org/apache/sling/models/factory/InvalidModelException.java b/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
index 7cfc5fc..f1d10db 100644
--- a/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
+++ b/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.factory;
@@ -30,5 +32,4 @@ public class InvalidModelException extends RuntimeException {
public InvalidModelException(String message) {
super(message);
}
-
}
diff --git a/src/main/java/org/apache/sling/models/factory/MissingElementException.java b/src/main/java/org/apache/sling/models/factory/MissingElementException.java
index 1a38b70..a8149d7 100644
--- a/src/main/java/org/apache/sling/models/factory/MissingElementException.java
+++ b/src/main/java/org/apache/sling/models/factory/MissingElementException.java
@@ -40,5 +40,4 @@ public class MissingElementException extends RuntimeException {
public AnnotatedElement getElement() {
return element;
}
-
}
diff --git a/src/main/java/org/apache/sling/models/factory/MissingElementsException.java b/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
index 1dd875f..2680765 100644
--- a/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
+++ b/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
@@ -28,7 +28,7 @@ import org.osgi.annotation.versioning.ProviderType;
* due to some missing elements (i.e. required fields/methods/constructor parameters
* could not be injected).
* Contains a number of {@link MissingElementException}s.
- *
+ *
* @see ModelFactory
*
*/
@@ -38,22 +38,22 @@ public final class MissingElementsException extends RuntimeException {
private Collection<MissingElementException> missingElements;
-
public MissingElementsException(String message) {
super(message);
missingElements = new ArrayList<MissingElementException>();
}
public void addMissingElementExceptions(MissingElementException e) {
- // also add to suppressed list to make sure they appear as well with their full stack traces in the printStackTrace for this throwable
+ // also add to suppressed list to make sure they appear as well with their full stack traces in the
+ // printStackTrace for this throwable
addSuppressed(e);
missingElements.add(e);
}
-
+
public boolean isEmpty() {
return missingElements.isEmpty();
}
-
+
public Collection<MissingElementException> getMissingElements() {
return missingElements;
}
diff --git a/src/main/java/org/apache/sling/models/factory/MissingExporterException.java b/src/main/java/org/apache/sling/models/factory/MissingExporterException.java
index b58b6d3..2f0d919 100644
--- a/src/main/java/org/apache/sling/models/factory/MissingExporterException.java
+++ b/src/main/java/org/apache/sling/models/factory/MissingExporterException.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.factory;
diff --git a/src/main/java/org/apache/sling/models/factory/ModelClassException.java b/src/main/java/org/apache/sling/models/factory/ModelClassException.java
index d9d7172..9fa2e44 100644
--- a/src/main/java/org/apache/sling/models/factory/ModelClassException.java
+++ b/src/main/java/org/apache/sling/models/factory/ModelClassException.java
@@ -22,9 +22,9 @@ import org.osgi.annotation.versioning.ProviderType;
/**
* Exception which is triggered when the Model class could not be instantiated due to
- * not having a model annotation, some reflection error, invalid constructors or
+ * not having a model annotation, some reflection error, invalid constructors or
* because some exception within the post construct method was triggered.
- *
+ *
* @see ModelFactory
*/
@ProviderType
@@ -35,7 +35,7 @@ public class ModelClassException extends RuntimeException {
public ModelClassException(String message) {
super(message);
}
-
+
public ModelClassException(String message, Throwable e) {
super(message, e);
}
diff --git a/src/main/java/org/apache/sling/models/factory/ModelFactory.java b/src/main/java/org/apache/sling/models/factory/ModelFactory.java
index db66509..05a32f4 100644
--- a/src/main/java/org/apache/sling/models/factory/ModelFactory.java
+++ b/src/main/java/org/apache/sling/models/factory/ModelFactory.java
@@ -46,8 +46,9 @@ public interface ModelFactory {
* @throws ValidationException in case validation could not be performed for some reason (e.g. no validation information available)
* @throws InvalidModelException in case the given model type could not be validated through the model validation
*/
- public @NotNull <ModelType> ModelType createModel(@NotNull Object adaptable, @NotNull Class<ModelType> type) throws MissingElementsException,
- InvalidAdaptableException, ModelClassException, PostConstructException, ValidationException, InvalidModelException;
+ public @NotNull <ModelType> ModelType createModel(@NotNull Object adaptable, @NotNull Class<ModelType> type)
+ throws MissingElementsException, InvalidAdaptableException, ModelClassException, PostConstructException,
+ ValidationException, InvalidModelException;
/**
* Create a wrapped request object with the specified resource and instantiates the given Sling Model class from that wrapped request. The wrapped request
@@ -67,7 +68,8 @@ public interface ModelFactory {
* @since 1.5.0 (Models API Bundle 1.4.4)
* @see #getModelFromWrappedRequest(SlingHttpServletRequest, Resource, Class)
*/
- public @NotNull <T> T createModelFromWrappedRequest(@NotNull SlingHttpServletRequest request, @NotNull Resource resource, @NotNull Class<T> targetClass);
+ public @NotNull <T> T createModelFromWrappedRequest(
+ @NotNull SlingHttpServletRequest request, @NotNull Resource resource, @NotNull Class<T> targetClass);
/**
*
@@ -130,8 +132,9 @@ public interface ModelFactory {
* @throws ValidationException in case validation could not be performed for some reason (e.g. no validation information available)
* @throws InvalidModelException in case the given model type could not be validated through the model validation
*/
- public @NotNull Object getModelFromResource(@NotNull Resource resource) throws MissingElementsException,
- InvalidAdaptableException, ModelClassException, PostConstructException, ValidationException, InvalidModelException;
+ public @NotNull Object getModelFromResource(@NotNull Resource resource)
+ throws MissingElementsException, InvalidAdaptableException, ModelClassException, PostConstructException,
+ ValidationException, InvalidModelException;
/**
* Obtain an adapted model class based on the resource type of the request's resource.
@@ -145,8 +148,9 @@ public interface ModelFactory {
* @throws ValidationException in case validation could not be performed for some reason (e.g. no validation information available)
* @throws InvalidModelException in case the given model type could not be validated through the model validation
*/
- public @NotNull Object getModelFromRequest(@NotNull SlingHttpServletRequest request) throws MissingElementsException,
- InvalidAdaptableException, ModelClassException, PostConstructException, ValidationException, InvalidModelException;
+ public @NotNull Object getModelFromRequest(@NotNull SlingHttpServletRequest request)
+ throws MissingElementsException, InvalidAdaptableException, ModelClassException, PostConstructException,
+ ValidationException, InvalidModelException;
/**
* Export the model object using the defined target class using the named exporter.
@@ -160,8 +164,12 @@ public interface ModelFactory {
* @throws ExportException if the export fails
* @throws MissingExporterException if the named exporter can't be found
*/
- public @NotNull <T> T exportModel(@NotNull Object model, @NotNull String exporterName,
- @NotNull Class<T> targetClass, @NotNull Map<String, String> options) throws ExportException, MissingExporterException;
+ public @NotNull <T> T exportModel(
+ @NotNull Object model,
+ @NotNull String exporterName,
+ @NotNull Class<T> targetClass,
+ @NotNull Map<String, String> options)
+ throws ExportException, MissingExporterException;
/**
* Export the model object registered to the resource's type using the defined target class using the named exporter.
@@ -181,10 +189,13 @@ public interface ModelFactory {
* @throws ExportException if the export fails
* @throws MissingExporterException if the named exporter can't be found
*/
- public @NotNull <T> T exportModelForResource(@NotNull Resource resource, @NotNull String exporterName,
- @NotNull Class<T> targetClass, @NotNull Map<String, String> options) throws MissingElementsException,
- InvalidAdaptableException, ModelClassException, PostConstructException, ValidationException, InvalidModelException,
- ExportException, MissingExporterException;
+ public @NotNull <T> T exportModelForResource(
+ @NotNull Resource resource,
+ @NotNull String exporterName,
+ @NotNull Class<T> targetClass,
+ @NotNull Map<String, String> options)
+ throws MissingElementsException, InvalidAdaptableException, ModelClassException, PostConstructException,
+ ValidationException, InvalidModelException, ExportException, MissingExporterException;
/**
* Export the model object registered to the request's resource's type using the defined target class using the named exporter.
@@ -204,11 +215,13 @@ public interface ModelFactory {
* @throws ExportException if the export fails
* @throws MissingExporterException if the named exporter can't be found
*/
- public @NotNull <T> T exportModelForRequest(@NotNull SlingHttpServletRequest request, @NotNull String exporterName,
- @NotNull Class<T> targetClass, @NotNull Map<String, String> options) throws MissingElementsException,
- InvalidAdaptableException, ModelClassException, PostConstructException, ValidationException, InvalidModelException,
- ExportException, MissingExporterException;
-
+ public @NotNull <T> T exportModelForRequest(
+ @NotNull SlingHttpServletRequest request,
+ @NotNull String exporterName,
+ @NotNull Class<T> targetClass,
+ @NotNull Map<String, String> options)
+ throws MissingElementsException, InvalidAdaptableException, ModelClassException, PostConstructException,
+ ValidationException, InvalidModelException, ExportException, MissingExporterException;
/**
* Create a wrapped request object with the specified resource and (try to) adapt the request object into the specified class. The wrapped request
@@ -222,6 +235,6 @@ public interface ModelFactory {
* @return an instance of the target class or null if the adaptation could not be done
* @since 1.4.0 (Models API Bundle 1.3.6)
*/
- public @Nullable <T> T getModelFromWrappedRequest(@NotNull SlingHttpServletRequest request, @NotNull Resource resource, @NotNull Class<T> targetClass);
-
+ public @Nullable <T> T getModelFromWrappedRequest(
+ @NotNull SlingHttpServletRequest request, @NotNull Resource resource, @NotNull Class<T> targetClass);
}
diff --git a/src/main/java/org/apache/sling/models/factory/PostConstructException.java b/src/main/java/org/apache/sling/models/factory/PostConstructException.java
index f16ddec..c8b37de 100644
--- a/src/main/java/org/apache/sling/models/factory/PostConstructException.java
+++ b/src/main/java/org/apache/sling/models/factory/PostConstructException.java
@@ -35,5 +35,4 @@ public class PostConstructException extends ModelClassException {
public PostConstructException(String message, Throwable cause) {
super(message, cause);
}
-
}
diff --git a/src/main/java/org/apache/sling/models/factory/ValidationException.java b/src/main/java/org/apache/sling/models/factory/ValidationException.java
index 8a7f0fd..6342420 100644
--- a/src/main/java/org/apache/sling/models/factory/ValidationException.java
+++ b/src/main/java/org/apache/sling/models/factory/ValidationException.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.factory;
@@ -35,5 +37,4 @@ public class ValidationException extends RuntimeException {
public ValidationException(Throwable cause) {
super(cause);
}
-
}
diff --git a/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java b/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java
index 5ca2a2d..62d92b4 100644
--- a/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java
+++ b/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java
@@ -26,5 +26,4 @@ import org.osgi.annotation.versioning.ConsumerType;
*
*/
@ConsumerType
-public interface AcceptsNullName {
-}
+public interface AcceptsNullName {}
diff --git a/src/main/java/org/apache/sling/models/spi/DisposalCallback.java b/src/main/java/org/apache/sling/models/spi/DisposalCallback.java
index 42db8c9..aac20cf 100644
--- a/src/main/java/org/apache/sling/models/spi/DisposalCallback.java
+++ b/src/main/java/org/apache/sling/models/spi/DisposalCallback.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi;
@@ -29,5 +31,4 @@ public interface DisposalCallback {
* Callback method for when an object is destroyed.
*/
void onDisposed();
-
}
diff --git a/src/main/java/org/apache/sling/models/spi/DisposalCallbackRegistry.java b/src/main/java/org/apache/sling/models/spi/DisposalCallbackRegistry.java
index 84025d0..9c2d7cb 100644
--- a/src/main/java/org/apache/sling/models/spi/DisposalCallbackRegistry.java
+++ b/src/main/java/org/apache/sling/models/spi/DisposalCallbackRegistry.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi;
@@ -25,12 +27,11 @@ import org.osgi.annotation.versioning.ConsumerType;
*/
@ConsumerType
public interface DisposalCallbackRegistry {
-
+
/**
* Register a callback.
- *
+ *
* @param callback the callback to register
*/
void addDisposalCallback(@NotNull DisposalCallback callback);
-
}
diff --git a/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java b/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java
index 115d3b0..e1ff8a9 100644
--- a/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java
+++ b/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java
@@ -23,23 +23,23 @@ import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
/**
- * Defines a strategy to choose an implementation for a model if multiple are registered
+ * Defines a strategy to choose an implementation for a model if multiple are registered
* for the same interface or super class.
* <p>
- * With using the @Model.adapters attribute it is possible to define interfaces or super
- * classes to which the model implementation is an adaption target. It is possible that
+ * With using the @Model.adapters attribute it is possible to define interfaces or super
+ * classes to which the model implementation is an adaption target. It is possible that
* multiple models implement the same type.
* </p>
* <p>
- * In this case services implementing the {@link ImplementationPicker} interface are
- * queried to decide which implementation should be chosen. If multiple implementations
- * of this interface exists they are queried one after another by service ranking.
+ * In this case services implementing the {@link ImplementationPicker} interface are
+ * queried to decide which implementation should be chosen. If multiple implementations
+ * of this interface exists they are queried one after another by service ranking.
* The first that picks an implementation is the winner.
* </p>
*/
@ConsumerType
public interface ImplementationPicker {
-
+
/**
* Select an implementation for the adapter class to which the adaptable should be adapted to.
* @param adapterType Adapter type. Never null.
@@ -48,6 +48,6 @@ public interface ImplementationPicker {
* @param adaptable For reference: the adaptable. May be enquired to detect the context of the adaption. Never null.
* @return If an implementation is chosen the class is returned, otherwise null.
*/
- @Nullable Class<?> pick(@NotNull Class<?> adapterType, @NotNull Class<?>[] implementationsTypes, @NotNull Object adaptable);
-
+ @Nullable
+ Class<?> pick(@NotNull Class<?> adapterType, @NotNull Class<?>[] implementationsTypes, @NotNull Object adaptable);
}
diff --git a/src/main/java/org/apache/sling/models/spi/Injector.java b/src/main/java/org/apache/sling/models/spi/Injector.java
index 7483252..1e753ca 100644
--- a/src/main/java/org/apache/sling/models/spi/Injector.java
+++ b/src/main/java/org/apache/sling/models/spi/Injector.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi;
@@ -34,7 +36,8 @@ public interface Injector {
*
* @return the injector's name
*/
- @NotNull String getName();
+ @NotNull
+ String getName();
/**
* Produce a value for an injection point.
@@ -48,5 +51,11 @@ public interface Injector {
*
* @return the value to be injected or null if no value could be resolved
*/
- @Nullable Object getValue(@NotNull Object adaptable, String name, @NotNull Type declaredType, @NotNull AnnotatedElement element, @NotNull DisposalCallbackRegistry callbackRegistry);
+ @Nullable
+ Object getValue(
+ @NotNull Object adaptable,
+ String name,
+ @NotNull Type declaredType,
+ @NotNull AnnotatedElement element,
+ @NotNull DisposalCallbackRegistry callbackRegistry);
}
diff --git a/src/main/java/org/apache/sling/models/spi/ModelValidation.java b/src/main/java/org/apache/sling/models/spi/ModelValidation.java
index db84b4d..00edc0c 100644
--- a/src/main/java/org/apache/sling/models/spi/ModelValidation.java
+++ b/src/main/java/org/apache/sling/models/spi/ModelValidation.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi;
@@ -33,6 +35,7 @@ public interface ModelValidation {
* in case validation could not be performed for some reason (e.g. no validation information available)
* or {@link InvalidModelException} in case the given model type could not be validated through the {@link ModelValidation}.
*/
- public abstract <ModelType> RuntimeException validate(Object adaptable, Class<ModelType> modelClass, boolean required) throws ValidationException, InvalidModelException;
-
+ public abstract <ModelType> RuntimeException validate(
+ Object adaptable, Class<ModelType> modelClass, boolean required)
+ throws ValidationException, InvalidModelException;
}
diff --git a/src/main/java/org/apache/sling/models/spi/ValuePreparer.java b/src/main/java/org/apache/sling/models/spi/ValuePreparer.java
index e12a392..78a72e8 100644
--- a/src/main/java/org/apache/sling/models/spi/ValuePreparer.java
+++ b/src/main/java/org/apache/sling/models/spi/ValuePreparer.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi;
@@ -33,5 +35,6 @@ public interface ValuePreparer {
* @param adaptable the adaptable
* @return a prepared value or ObjectUtils.NULL if a value is not preparable
*/
- @NotNull Object prepareValue(@NotNull Object adaptable);
+ @NotNull
+ Object prepareValue(@NotNull Object adaptable);
}
diff --git a/src/main/java/org/apache/sling/models/spi/ViaProvider.java b/src/main/java/org/apache/sling/models/spi/ViaProvider.java
index daaf75e..91f83af 100644
--- a/src/main/java/org/apache/sling/models/spi/ViaProvider.java
+++ b/src/main/java/org/apache/sling/models/spi/ViaProvider.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi;
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java
index f1c3bc7..86c6063 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi.injectorspecific;
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java
index a96bfe7..c160777 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi.injectorspecific;
@@ -25,10 +27,10 @@ import org.osgi.annotation.versioning.ConsumerType;
*/
@SuppressWarnings("deprecation")
@ConsumerType
-public class AbstractInjectAnnotationProcessor2 extends AbstractInjectAnnotationProcessor implements InjectAnnotationProcessor2 {
+public class AbstractInjectAnnotationProcessor2 extends AbstractInjectAnnotationProcessor
+ implements InjectAnnotationProcessor2 {
public InjectionStrategy getInjectionStrategy() {
return InjectionStrategy.DEFAULT;
}
-
}
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotation.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotation.java
index 8f7564c..55f95c3 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotation.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotation.java
@@ -1,34 +1,34 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi.injectorspecific;
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
* Declares an annotation as a custom inject annotation.
*/
-@Target({ ANNOTATION_TYPE })
+@Target({ANNOTATION_TYPE})
@Retention(RUNTIME)
@Documented
-public @interface InjectAnnotation {
-
-}
+public @interface InjectAnnotation {}
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java
index 0fa4d88..d989d35 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi.injectorspecific;
@@ -28,8 +30,8 @@ public interface InjectAnnotationProcessor {
/**
* Tries to get the name value from the annotation.
- *
- * @return the value to be used for the name or null, in which case
+ *
+ * @return the value to be used for the name or null, in which case
* the standard annotation or name derived from method/field
* should be used
*/
@@ -37,32 +39,31 @@ public interface InjectAnnotationProcessor {
/**
* Tries to get the via value from the annotation.
- *
+ *
* @return the value to be used for the via or null, in
* which case the standard annotation should be used
*/
String getVia();
/**
- *
+ *
* @return true, if a default value is set
*/
boolean hasDefault();
/**
* Tries to get the default value from the annotation. Only used if {@link #hasDefault()} is set to true.
- *
+ *
* @return the value to be used if nothing can be injected
*/
Object getDefault();
/**
* Tries to get the information whether the injection is optional.
- *
+ *
* @return the value to be used for the default or null, in
* which case the standard annotation should be used.
* @deprecated use {@link InjectAnnotationProcessor2#getInjectionStrategy()} instead
*/
Boolean isOptional();
-
}
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java
index 886a8af..69d2869 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi.injectorspecific;
@@ -24,12 +26,12 @@ import org.osgi.annotation.versioning.ConsumerType;
*/
@SuppressWarnings("deprecation")
@ConsumerType
-public interface InjectAnnotationProcessor2 extends InjectAnnotationProcessor{
+public interface InjectAnnotationProcessor2 extends InjectAnnotationProcessor {
/**
* Tries to get the name value from the annotation.
- *
- * @return the value to be used for the name or null, in which case
+ *
+ * @return the value to be used for the name or null, in which case
* the standard annotation or name derived from method/field
* should be used
*/
@@ -37,32 +39,30 @@ public interface InjectAnnotationProcessor2 extends InjectAnnotationProcessor{
/**
* Tries to get the via value from the annotation.
- *
+ *
* @return the value to be used for the via or null, in
* which case the standard annotation should be used
*/
String getVia();
/**
- *
+ *
* @return true, if a default value is set
*/
boolean hasDefault();
/**
* Tries to get the default value from the annotation. Only used if {@link #hasDefault()} is set to true.
- *
+ *
* @return the value to be used if nothing can be injected
*/
Object getDefault();
-
-
+
/**
* Tries to get the information whether the injection is optional.
- *
+ *
* @return {@code REQUIRED} if injection is mandatory, {@code OPTIONAL} if injection is optional or {@code DEFAULT} in
* which case the standard annotation/injection strategy should be used.
*/
InjectionStrategy getInjectionStrategy();
-
}
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java
index b3cd3d8..e5af605 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi.injectorspecific;
@@ -22,7 +24,7 @@ import org.osgi.annotation.versioning.ConsumerType;
/**
* Factory for {@link InjectAnnotationProcessor} that is evaluated at runtime for each
- * sling model adaption and may depend on the adaptable.
+ * sling model adaption and may depend on the adaptable.
* @deprecated Use {@link StaticInjectAnnotationProcessorFactory} preferably or in case of a dependency to the adaptable {@link InjectAnnotationProcessorFactory2}
*/
@Deprecated
@@ -30,7 +32,7 @@ import org.osgi.annotation.versioning.ConsumerType;
public interface InjectAnnotationProcessorFactory {
/**
- *
+ *
* @param adaptable the object from which this model is adapted
* @param element the field or method which is annotated
* @return a ModelAnnotationProcessor in case there is a known
@@ -38,5 +40,4 @@ public interface InjectAnnotationProcessorFactory {
* null. This method should return a {@link InjectAnnotationProcessor2} preferably.
*/
InjectAnnotationProcessor createAnnotationProcessor(Object adaptable, AnnotatedElement element);
-
}
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java
index 772a2b6..2d8f8b9 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi.injectorspecific;
@@ -22,13 +24,13 @@ import org.osgi.annotation.versioning.ConsumerType;
/**
* Factory for {@link InjectAnnotationProcessor2} that is evaluated at runtime for each
- * sling model adaption and may depend on the adaptable.
+ * sling model adaption and may depend on the adaptable.
* Use {@link StaticInjectAnnotationProcessorFactory} preferably.
*/
@ConsumerType
public interface InjectAnnotationProcessorFactory2 {
/**
- *
+ *
* @param adaptable the object from which this model is adapted
* @param element the field or method which is annotated
* @return a ModelAnnotationProcessor in case there is a known
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java
index a78ba73..9d7038f 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.models.spi.injectorspecific;
@@ -29,12 +31,11 @@ import org.osgi.annotation.versioning.ConsumerType;
public interface StaticInjectAnnotationProcessorFactory {
/**
- *
+ *
* @param element the field or method which is annotated
* @return a ModelAnnotationProcessor in case there is a known
* injector-specific annotation on the given element found otherwise
* null
*/
InjectAnnotationProcessor2 createAnnotationProcessor(AnnotatedElement element);
-
}
diff --git a/src/test/java/org/apache/sling/models/factory/MissingElementsExceptionTest.java b/src/test/java/org/apache/sling/models/factory/MissingElementsExceptionTest.java
index ec6dd89..60e3778 100644
--- a/src/test/java/org/apache/sling/models/factory/MissingElementsExceptionTest.java
+++ b/src/test/java/org/apache/sling/models/factory/MissingElementsExceptionTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.sling.models.factory;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import java.io.PrintWriter;
import java.io.StringWriter;
import org.hamcrest.Matchers;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+
public class MissingElementsExceptionTest {
@Test
@@ -34,10 +34,10 @@ public class MissingElementsExceptionTest {
try {
try {
throw new IllegalStateException("Root exception");
- } catch(IllegalStateException rootException) {
+ } catch (IllegalStateException rootException) {
throw new MissingElementException(null, rootException);
}
- } catch(MissingElementException e) {
+ } catch (MissingElementException e) {
wrapperException.addMissingElementExceptions(e);
}
@@ -51,5 +51,4 @@ public class MissingElementsExceptionTest {
assertThat(stringWriter.toString(), Matchers.containsString("Root exception"));
assertThat(stringWriter.toString(), Matchers.containsString("Test wrapper"));
}
-
}
(sling-org-apache-sling-models-api) 03/03: ignore formatting changes in git blame
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
commit f10c02a20d915be0646dbb06f0bde44df55d575f
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Mar 21 13:37:31 2024 +0100
ignore formatting changes in git blame
---
.git-blame-ignore-revs | 1 +
1 file changed, 1 insertion(+)
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 0000000..6f72492
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1 @@
+b53121e51c7e985d9a09b94644849a3485af3807
\ No newline at end of file