This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6db340966420fa09c7cbb627f42c9d6bf0b2a20f
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Fri Apr 13 08:14:07 2018 +0200
ISIS-1841 further cleanup compiler warnings
---
.../apache/isis/applib/internal/discover/_Discover.java | 1 -
.../apache/isis/applib/util/ObjectContract_Parser.java | 6 ++++--
.../apache/isis/applib/events/InteractionEventTest.java | 16 ++++++----------
.../services/eventbus/AbstractDomainEvent_veto_Test.java | 5 ++---
.../applib/services/i18n/TranslatableStringTest.java | 12 ++++--------
.../java/org/apache/isis/schema/utils/Roundtrip.java | 3 ++-
.../IsisConfigurationBuilder_PeekConfigurationTest.java | 2 --
.../isis/core/commons/lang/ListUtilsTest_adjust.java | 7 +------
.../core/commons/lang/ListUtilsTest_mutableCopy.java | 5 -----
.../adapter/oid/OidMarshallerTest_roundtripping.java | 3 ++-
.../facets/Annotations_getAnnotations_on_Field_Test.java | 1 +
.../Annotations_getAnnotations_on_Parameter_Test.java | 1 +
.../isis/core/metamodel/facets/CollectionUtilsTest.java | 3 ++-
13 files changed, 25 insertions(+), 40 deletions(-)
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java
b/core/applib/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java
index ec2f816..48109b3 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java
@@ -21,7 +21,6 @@ package org.apache.isis.applib.internal.discover;
import java.util.List;
-import org.apache.isis.applib.internal.context._Context;
import org.apache.isis.applib.internal.context._Plugin;
import org.apache.isis.applib.plugins.classdiscovery.ClassDiscovery;
import org.apache.isis.applib.plugins.classdiscovery.ClassDiscoveryPlugin;
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
b/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
index 66e331e..cc33d95 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
@@ -51,6 +51,7 @@ class ObjectContract_Parser<T> {
* @param propertyNames
* @return
*/
+ @SuppressWarnings("unchecked")
public static <T> ObjectContract<T> parse(Class<T> cls, @Nullable final
String propertyNames) {
Objects.requireNonNull(cls);
@@ -68,6 +69,7 @@ class ObjectContract_Parser<T> {
}
for(Clause<T> clause : clauses) {
+ @SuppressWarnings("rawtypes")
final Function valueExtractor =
x->clause.extractValue((T)x);
contract = contract.thenUse(
@@ -86,14 +88,14 @@ class ObjectContract_Parser<T> {
private enum Direction {
ASC {
- @Override
+ @Override @SuppressWarnings({ "unchecked",
"rawtypes" })
public Comparator<Comparable<?>> getOrdering() {
// legacy of Ordering.natural().nullsFirst();
return
Comparator.nullsFirst(Comparator.<Comparable>naturalOrder());
}
},
ASC_NULLS_LAST {
- @Override
+ @Override @SuppressWarnings({ "unchecked", "rawtypes" })
public Comparator<Comparable<?>> getOrdering() {
// legacy of Ordering.natural().nullsLast();
return
Comparator.nullsLast(Comparator.<Comparable>naturalOrder());
diff --git
a/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
b/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
index dbcc1bf..e37afd3 100644
---
a/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
+++
b/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
@@ -24,21 +24,17 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
+import org.jmock.integration.junit4.JUnitRuleMockery;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
-@RunWith(JMock.class)
public class InteractionEventTest {
- @SuppressWarnings("unused")
- private final Mockery mockery = new JUnit4Mockery();
+ @Rule
+ public final JUnitRuleMockery context = new JUnitRuleMockery();
private InteractionEvent interactionEvent;
diff --git
a/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
b/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
index eba6338..2dec000 100644
---
a/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
+++
b/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
@@ -30,7 +30,7 @@ public class AbstractDomainEvent_veto_Test {
@Rule
public ExpectedException expectedException = ExpectedException.none();
- AbstractDomainEvent ev = new AbstractDomainEvent() { };
+ AbstractDomainEvent<?> ev = new AbstractDomainEvent<Object>() { private
static final long serialVersionUID = 1L; };
@Test
public void hidden_phase_and_veto_using_null() throws Exception {
@@ -86,8 +86,7 @@ public class AbstractDomainEvent_veto_Test {
public void disable_phase_and_attempt_to_veto_with_null() throws Exception
{
// given
- final AbstractDomainEvent ev = new AbstractDomainEvent() {
- };
+ final AbstractDomainEvent<?> ev = new AbstractDomainEvent<Object>() {
private static final long serialVersionUID = 1L; };
ev.setEventPhase(AbstractDomainEvent.Phase.DISABLE);
// expect
diff --git
a/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
b/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
index 096977a..bca7593 100644
---
a/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
+++
b/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
@@ -18,15 +18,14 @@
*/
package org.apache.isis.applib.services.i18n;
-import java.util.Locale;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class TranslatableStringTest {
@@ -89,7 +88,6 @@ public class TranslatableStringTest {
// given
final String simpleText = "text to translate";
final String someContext = "someContext";
- final Locale someLocale = Locale.CANADA; // any
final String translation = "the translation";
final TranslatableString ts = TranslatableString.tr(simpleText);
@@ -111,7 +109,6 @@ public class TranslatableStringTest {
final String singularText = "singular text to translate";
final String pluralText = "plural text to translate";
final String someContext = "someContext";
- final Locale someLocale = Locale.CANADA; // any
final String translation = "the translation";
final TranslatableString ts = TranslatableString.trn(singularText,
pluralText, 1);
@@ -133,7 +130,6 @@ public class TranslatableStringTest {
final String singularText = "singular text to translate";
final String pluralText = "plural text to translate";
final String someContext = "someContext";
- final Locale someLocale = Locale.CANADA; // any
final String translation = "the translation";
final int number = 2; // != 1
diff --git
a/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
b/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
index 32d8bf1..2cfde93 100644
--- a/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
+++ b/core/applib/src/test/java/org/apache/isis/schema/utils/Roundtrip.java
@@ -83,7 +83,8 @@ public class Roundtrip {
// given
final Timestamp startedAt = new Timestamp(new Date().getTime());
- final Timestamp completedAt = new Timestamp(startedAt.getTime() +
1000);
+ @SuppressWarnings("unused")
+ final Timestamp completedAt = new Timestamp(startedAt.getTime()
+ 1000);
final ValueWithTypeDto returnDto = new ValueWithTypeDto();
returnDto.setType(ValueType.BOOLEAN);
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder_PeekConfigurationTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder_PeekConfigurationTest.java
index f2c24b2..36739b8 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder_PeekConfigurationTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder_PeekConfigurationTest.java
@@ -19,8 +19,6 @@
package org.apache.isis.core.commons.configbuilder;
-import java.util.Properties;
-
import org.apache.isis.core.commons.config.IsisConfiguration;
import junit.framework.TestCase;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java
b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java
index d0a6d3b..8342792 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java
@@ -17,19 +17,14 @@
package org.apache.isis.core.commons.lang;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
-import com.google.common.collect.Lists;
-
import org.junit.Test;
-import org.apache.isis.core.commons.lang.ListExtensions;
+import com.google.common.collect.Lists;
public class ListUtilsTest_adjust {
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java
b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java
index 01df869..aaef729 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java
@@ -22,15 +22,10 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
-import com.google.common.collect.Lists;
-
import org.junit.Test;
-import org.apache.isis.core.commons.lang.ListExtensions;
-
public class ListUtilsTest_mutableCopy {
@Test
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
index e861353..c98bd98 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
@@ -28,7 +28,8 @@ import static org.junit.Assert.assertThat;
public class OidMarshallerTest_roundtripping {
- private OidMarshaller oidMarshaller = OidMarshaller.INSTANCE;
+ @SuppressWarnings("unused")
+ private OidMarshaller oidMarshaller = OidMarshaller.INSTANCE;
@Test
public void rootOid_withNoVersion() {
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
index cda729a..0f61767 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
@@ -16,6 +16,7 @@ import org.apache.isis.applib.annotation.Publishing;
import static org.hamcrest.CoreMatchers.is;
+@SuppressWarnings("unused")
public class Annotations_getAnnotations_on_Field_Test {
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java
index e2c1236..8f52dee 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java
@@ -13,6 +13,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
+@SuppressWarnings("unused")
public class Annotations_getAnnotations_on_Parameter_Test {
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/CollectionUtilsTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/CollectionUtilsTest.java
index f7c8067..c1f32c8 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/CollectionUtilsTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/CollectionUtilsTest.java
@@ -81,7 +81,8 @@ public class CollectionUtilsTest {
assertThat(o, is(not(nullValue())));
assertThat(collectionType.isAssignableFrom(o.getClass()),
is(true));
- Collection copy = (Collection)o;
+ @SuppressWarnings("rawtypes")
+ Collection copy = (Collection)o;
assertThat(copy.size(), is(3));
}
--
To stop receiving notification emails like this one, please contact
ahu...@apache.org.
