You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2015/12/04 21:35:52 UTC
svn commit: r1718026 - in /sling/trunk/bundles/extensions/models/impl/src:
main/java/org/apache/sling/models/impl/
test/java/org/apache/sling/models/impl/
Author: sseifert
Date: Fri Dec 4 20:35:52 2015
New Revision: 1718026
URL: http://svn.apache.org/viewvc?rev=1718026&view=rev
Log:
cosmetic: eliminate some warnings
Modified:
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/AdapterImplementations.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/AdapterFactoryTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ImplementsExtendsTest.java
Modified: sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/AdapterImplementations.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/AdapterImplementations.java?rev=1718026&r1=1718025&r2=1718026&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/AdapterImplementations.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/AdapterImplementations.java Fri Dec 4 20:35:52 2015
@@ -186,10 +186,10 @@ final class AdapterImplementations {
}
/**
- *
* @param adapterType the type to check
* @return {@code true} in case the given type is a model (may be with a different adapter class)
*/
+ @SuppressWarnings("unchecked")
public <ModelType> boolean isModelClass(Class<ModelType> adapterType) {
String key = adapterType.getName();
@@ -206,4 +206,5 @@ final class AdapterImplementations {
}
return true;
}
+
}
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/AdapterFactoryTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/AdapterFactoryTest.java?rev=1718026&r1=1718025&r2=1718026&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/AdapterFactoryTest.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/AdapterFactoryTest.java Fri Dec 4 20:35:52 2015
@@ -74,6 +74,7 @@ public class AdapterFactoryTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void testIsModelClass() {
Assert.assertTrue(factory.isModelClass(resource, DefaultStringModel.class));
Assert.assertFalse(factory.isModelClass(resource, InvalidModelWithMissingAnnotation.class));
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ImplementsExtendsTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ImplementsExtendsTest.java?rev=1718026&r1=1718025&r2=1718026&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ImplementsExtendsTest.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ImplementsExtendsTest.java Fri Dec 4 20:35:52 2015
@@ -176,6 +176,7 @@ public class ImplementsExtendsTest {
* class is the adapter still works.
*/
@Test
+ @SuppressWarnings("deprecation")
public void testImplementsNoPicker() {
factory.unbindImplementationPicker(firstImplementationPicker, firstImplementationPickerProps);
@@ -208,6 +209,7 @@ public class ImplementsExtendsTest {
* Test implementation class with a mapping that is not valid (an interface that is not implemented).
*/
@Test
+ @SuppressWarnings("deprecation")
public void testInvalidImplementsInterfaceModel() {
Resource res = getMockResourceWithProps();
InvalidSampleServiceInterface model = factory.getAdapter(res, InvalidSampleServiceInterface.class);