Repository: james-project Updated Branches: refs/heads/master 2dbdc83a2 -> 3db272aa9
Fix Eclipse warnings Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/73a762dc Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/73a762dc Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/73a762dc Branch: refs/heads/master Commit: 73a762dc62d5ba06201007992a99b79837a139c5 Parents: 1a5f21a Author: Raphael Ouazana <[email protected]> Authored: Tue Aug 28 10:44:44 2018 +0200 Committer: Raphael Ouazana <[email protected]> Committed: Tue Aug 28 10:44:44 2018 +0200 ---------------------------------------------------------------------- .../eventstore/cassandra/JsonEventSerializer.java | 10 +++++++--- .../cassandra/CassandraGenericEventStoreExtension.java | 3 ++- .../data/CassandraDLPConfigurationStoreModule.java | 1 + .../apache/james/jmap/cassandra/filtering/DTOTest.java | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/73a762dc/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.java ---------------------------------------------------------------------- diff --git a/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.java b/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.java index 189eeec..cdf3730 100644 --- a/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.java +++ b/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.java @@ -47,12 +47,14 @@ public class JsonEventSerializer { } } + @SuppressWarnings("rawtypes") private final Map<Class<? extends Event>, EventDTOModule> eventClassToModule; + @SuppressWarnings("rawtypes") private final Map<String, EventDTOModule> typeToModule; private final ObjectMapper objectMapper; @Inject - public JsonEventSerializer(Set<EventDTOModule> modules) { + public JsonEventSerializer(@SuppressWarnings("rawtypes") Set<EventDTOModule> modules) { objectMapper = new ObjectMapper(); objectMapper.registerModule(new Jdk8Module()); objectMapper.registerModule(new GuavaModule()); @@ -69,12 +71,13 @@ public class JsonEventSerializer { Function.identity())); } - public JsonEventSerializer(EventDTOModule... modules) { + public JsonEventSerializer(@SuppressWarnings("rawtypes") EventDTOModule... modules) { this(ImmutableSet.copyOf(modules)); } public String serialize(Event event) throws JsonProcessingException { - Object dto = Optional.ofNullable(eventClassToModule.get(event.getClass())) + @SuppressWarnings("unchecked") + EventDTO dto = Optional.ofNullable(eventClassToModule.get(event.getClass())) .orElseThrow(() -> new UnknownEventException("unknown event class " + event.getClass())) .toDTO(event); return objectMapper.writeValueAsString(dto); @@ -91,6 +94,7 @@ public class JsonEventSerializer { return dto.toEvent(); } + @SuppressWarnings("unchecked") public Class<? extends EventDTO> retrieveDTOClass(String type) { return Optional.ofNullable(typeToModule.get(type)) .map(EventDTOModule::getDTOClass) http://git-wip-us.apache.org/repos/asf/james-project/blob/73a762dc/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java ---------------------------------------------------------------------- diff --git a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java index 94d4e10..2f2650b 100644 --- a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java +++ b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java @@ -38,12 +38,13 @@ import org.junit.jupiter.api.extension.ParameterResolver; public class CassandraGenericEventStoreExtension implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback, ParameterResolver { private final DockerCassandraExtension dockerCassandraExtension; + @SuppressWarnings("rawtypes") private final Set<EventDTOModule> modules; private CassandraCluster cassandra; private DockerCassandra dockerCassandra; private EventStoreDao eventStoreDao; - public CassandraGenericEventStoreExtension(Set<EventDTOModule> modules) { + public CassandraGenericEventStoreExtension(@SuppressWarnings("rawtypes") Set<EventDTOModule> modules) { this.modules = modules; dockerCassandraExtension = new DockerCassandraExtension(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/73a762dc/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDLPConfigurationStoreModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDLPConfigurationStoreModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDLPConfigurationStoreModule.java index 1ee1595..f82a9e1 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDLPConfigurationStoreModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDLPConfigurationStoreModule.java @@ -35,6 +35,7 @@ public class CassandraDLPConfigurationStoreModule extends AbstractModule { bind(EventSourcingDLPConfigurationStore.class).in(Scopes.SINGLETON); bind(DLPConfigurationStore.class).to(EventSourcingDLPConfigurationStore.class); + @SuppressWarnings("rawtypes") Multibinder<EventDTOModule> eventDTOModuleBinder = Multibinder.newSetBinder(binder(), EventDTOModule.class); eventDTOModuleBinder.addBinding().toInstance(DLPConfigurationModules.DLP_CONFIGURATION_STORE); http://git-wip-us.apache.org/repos/asf/james-project/blob/73a762dc/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/DTOTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/DTOTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/DTOTest.java index 08f5685..17c2092 100644 --- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/DTOTest.java +++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/DTOTest.java @@ -19,6 +19,7 @@ package org.apache.james.jmap.cassandra.filtering; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.apache.james.jmap.api.filtering.RuleFixture.RULE_1; import static org.apache.james.jmap.api.filtering.RuleFixture.RULE_2; import static org.apache.james.jmap.api.filtering.RuleFixture.RULE_FROM; @@ -26,7 +27,6 @@ import static org.apache.james.jmap.api.filtering.RuleFixture.RULE_RECIPIENT; import static org.apache.james.jmap.api.filtering.RuleFixture.RULE_SUBJECT; import static org.apache.james.jmap.api.filtering.RuleFixture.RULE_TO; import static org.assertj.core.api.Assertions.assertThat; -import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import org.apache.james.core.User; import org.apache.james.eventsourcing.EventId; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
