This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
The following commit(s) were added to refs/heads/master by this push:
new 4bbe700 cosmetic: fix javadoc warnings, remove unused imports
4bbe700 is described below
commit 4bbe700c42008a6ce663395d1f771e6a1b11e722
Author: Stefan Seifert <[email protected]>
AuthorDate: Tue Mar 28 12:37:36 2023 +0200
cosmetic: fix javadoc warnings, remove unused imports
---
.../sling/models/impl/injectors/AbstractInjector.java | 6 +++---
.../sling/models/impl/injectors/OSGiServiceInjector.java | 15 +++++++--------
.../apache/sling/models/impl/model/InjectableElement.java | 1 +
.../java/org/apache/sling/models/impl/CachingTest.java | 3 ---
.../testmodels/classes/CachedModelWithAdapterTypes23.java | 2 --
5 files changed, 11 insertions(+), 16 deletions(-)
diff --git
a/src/main/java/org/apache/sling/models/impl/injectors/AbstractInjector.java
b/src/main/java/org/apache/sling/models/impl/injectors/AbstractInjector.java
index a2b8567..b1d37c3 100644
--- a/src/main/java/org/apache/sling/models/impl/injectors/AbstractInjector.java
+++ b/src/main/java/org/apache/sling/models/impl/injectors/AbstractInjector.java
@@ -45,7 +45,7 @@ abstract class AbstractInjector {
return resolver;
}
- /**
+ /**
* Retrieve the ValueMap from the given adaptable. This succeeds, if the
adaptable is either
* <ul>
* <li>a {@link ValueMap},</li>
@@ -53,7 +53,7 @@ abstract class AbstractInjector {
* <li>adaptable to a {@link ValueMap}.</li>
* </ul>
* Otherwise {@code null} is returned.
- * @param adaptable
+ * @param adaptable Adaptable
* @return a ValueMap or {@code null}.
*/
protected @Nullable ValueMap getValueMap(Object adaptable) {
@@ -73,7 +73,7 @@ abstract class AbstractInjector {
return null;
}
}
-
+
protected boolean isDeclaredTypeCollection(Type declaredType) {
boolean isCollection = false;
if (declaredType instanceof ParameterizedType) {
diff --git
a/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java
b/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java
index ce4d30d..086982c 100644
---
a/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java
+++
b/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java
@@ -72,14 +72,13 @@ public class OSGiServiceInjector implements Injector,
StaticInjectAnnotationProc
}
/**
- *
- * @param adaptable
- * @param name
- * @param type
- * @param element
- * @param callbackRegistry
- * @param modelContext
- * @return
+ * @param adaptable Adaptable
+ * @param name Name
+ * @param type Type
+ * @param element Element
+ * @param callbackRegistry Callback registry
+ * @param modelContext Model context
+ * @return Object
*/
@SuppressWarnings({ "null", "unused" })
public Object getValue(@NotNull Object adaptable, String name, @NotNull
Type type, @NotNull AnnotatedElement element,
diff --git
a/src/main/java/org/apache/sling/models/impl/model/InjectableElement.java
b/src/main/java/org/apache/sling/models/impl/model/InjectableElement.java
index 6c74b29..105b826 100644
--- a/src/main/java/org/apache/sling/models/impl/model/InjectableElement.java
+++ b/src/main/java/org/apache/sling/models/impl/model/InjectableElement.java
@@ -70,6 +70,7 @@ public interface InjectableElement {
Object getDefaultValue();
/**
+ * @param annotationProcessor Annotation processor
* @return {@code true} if the element is optional otherwise {@code false}
*/
boolean isOptional(InjectAnnotationProcessor annotationProcessor);
diff --git a/src/test/java/org/apache/sling/models/impl/CachingTest.java
b/src/test/java/org/apache/sling/models/impl/CachingTest.java
index e02eb44..553f16c 100644
--- a/src/test/java/org/apache/sling/models/impl/CachingTest.java
+++ b/src/test/java/org/apache/sling/models/impl/CachingTest.java
@@ -32,7 +32,6 @@ import
org.apache.sling.api.wrappers.SlingHttpServletRequestWrapper;
import org.apache.sling.api.wrappers.ValueMapDecorator;
import org.apache.sling.models.impl.injectors.RequestAttributeInjector;
import org.apache.sling.models.impl.injectors.ValueMapInjector;
-import org.apache.sling.models.spi.ImplementationPicker;
import org.apache.sling.models.testmodels.classes.CachedModel;
import
org.apache.sling.models.testmodels.classes.CachedModelWithAdapterTypes12;
import
org.apache.sling.models.testmodels.classes.CachedModelWithAdapterTypes23;
@@ -41,8 +40,6 @@ import
org.apache.sling.models.testmodels.interfaces.AdapterType1;
import org.apache.sling.models.testmodels.interfaces.AdapterType2;
import org.apache.sling.models.testmodels.interfaces.AdapterType3;
import org.apache.sling.servlethelpers.MockSlingHttpServletRequest;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git
a/src/test/java/org/apache/sling/models/testmodels/classes/CachedModelWithAdapterTypes23.java
b/src/test/java/org/apache/sling/models/testmodels/classes/CachedModelWithAdapterTypes23.java
index 3222b5c..365c73a 100644
---
a/src/test/java/org/apache/sling/models/testmodels/classes/CachedModelWithAdapterTypes23.java
+++
b/src/test/java/org/apache/sling/models/testmodels/classes/CachedModelWithAdapterTypes23.java
@@ -17,9 +17,7 @@
package org.apache.sling.models.testmodels.classes;
import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Model;
-import org.apache.sling.models.testmodels.interfaces.AdapterType1;
import org.apache.sling.models.testmodels.interfaces.AdapterType2;
import org.apache.sling.models.testmodels.interfaces.AdapterType3;
