Fix some broken tests POLYGENE-231
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/2118c3e3 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/2118c3e3 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/2118c3e3 Branch: refs/heads/develop Commit: 2118c3e347c56f0fa59e9e342a51f1a51a41fa61 Parents: baba8c0 Author: Paul Merlin <[email protected]> Authored: Mon Mar 13 16:20:45 2017 +0100 Committer: Paul Merlin <[email protected]> Committed: Sun Apr 2 19:16:24 2017 +0200 ---------------------------------------------------------------------- .../apache/polygene/spi/serialization/SerializationSettings.java | 2 +- .../java/org/apache/polygene/tools/model/VisitableDetailTest.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2118c3e3/core/spi/src/main/java/org/apache/polygene/spi/serialization/SerializationSettings.java ---------------------------------------------------------------------- diff --git a/core/spi/src/main/java/org/apache/polygene/spi/serialization/SerializationSettings.java b/core/spi/src/main/java/org/apache/polygene/spi/serialization/SerializationSettings.java index cba63a4..fd33629 100644 --- a/core/spi/src/main/java/org/apache/polygene/spi/serialization/SerializationSettings.java +++ b/core/spi/src/main/java/org/apache/polygene/spi/serialization/SerializationSettings.java @@ -41,7 +41,7 @@ public class SerializationSettings<SettingsType extends SerializationSettings> private final Map<ValueType, Converter<Object>> converters = new LinkedHashMap<>(); - public final Map<ValueType, Converter<Object>> getConverters() + public final Map<ValueType, Converter<?>> getConverters() { return Collections.unmodifiableMap( converters ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2118c3e3/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java ---------------------------------------------------------------------- diff --git a/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java b/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java index d06bc96..d6af619 100644 --- a/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java +++ b/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java @@ -22,7 +22,6 @@ package org.apache.polygene.tools.model; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.polygene.api.service.ServiceActivation; import org.apache.polygene.tools.model.descriptor.ServiceDetailDescriptor; import org.apache.polygene.tools.model.descriptor.TransientDetailDescriptor; import org.junit.Test; @@ -83,7 +82,6 @@ public class VisitableDetailTest // Module "visitEnter( ModuleName )", "visit( " + ModuleActivator.class.getName() + " )", - "visit( " + ServiceActivation.ServiceActivator.class.getName() + " )", // Leaving Structure "visitLeave( ModuleName )", "visitLeave( LayerName )",
