From 03a067b9df2c7b5a774dd3d8e1616c6f0eca9104 Mon Sep 17 00:00:00 2001 From: Radim Vansa Date: Tue, 13 Jun 2017 13:34:13 +0200 Subject: [PATCH] ISPN-7918 Drop functional EntryVersion --- .../org/infinispan/commons/marshall/Ids.java | 2 - .../FunctionalEntryVersionAdapter.java | 66 --------------- .../infinispan/functional/EntryVersion.java | 84 ------------------- .../org/infinispan/functional/MetaParam.java | 16 ++-- .../functional/impl/EntryViews.java | 3 +- .../impl/MetaParamsInternalMetadata.java | 10 +-- .../marshall/core/InternalExternalizers.java | 3 - .../marshall/exts/MetaParamExternalizers.java | 26 +----- .../functional/FunctionalMapTest.java | 17 ++-- ...TxBackupOwnerBecomingPrimaryOwnerTest.java | 13 ++- .../functional/impl/MetaParamsTest.java | 35 ++++---- 11 files changed, 41 insertions(+), 234 deletions(-) delete mode 100644 core/src/main/java/org/infinispan/container/versioning/FunctionalEntryVersionAdapter.java delete mode 100644 core/src/main/java/org/infinispan/functional/EntryVersion.java diff --git a/commons/src/main/java/org/infinispan/commons/marshall/Ids.java b/commons/src/main/java/org/infinispan/commons/marshall/Ids.java index 5cf30af7cfd3..0620734fcb0c 100644 --- a/commons/src/main/java/org/infinispan/commons/marshall/Ids.java +++ b/commons/src/main/java/org/infinispan/commons/marshall/Ids.java @@ -128,7 +128,6 @@ public interface Ids { // TODO: Add other meta params int META_LIFESPAN = 91; int META_ENTRY_VERSION = 92; - int NUMERIC_ENTRY_VERSION = 93; int READ_WRITE_SNAPSHOT_VIEW = 94; @@ -167,7 +166,6 @@ public interface Ids { int VERSIONED_RESULT = 115; int VERSIONED_RESULTS = 116; - int FUNCTIONAL_ENTRY_VERSION_ADAPTER = 117; int XID_IMPL = 118; diff --git a/core/src/main/java/org/infinispan/container/versioning/FunctionalEntryVersionAdapter.java b/core/src/main/java/org/infinispan/container/versioning/FunctionalEntryVersionAdapter.java deleted file mode 100644 index 5e4c18d3f29c..000000000000 --- a/core/src/main/java/org/infinispan/container/versioning/FunctionalEntryVersionAdapter.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.infinispan.container.versioning; - -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.util.Set; - -import org.infinispan.commons.marshall.AdvancedExternalizer; -import org.infinispan.commons.util.Util; -import org.infinispan.marshall.core.Ids; - -public class FunctionalEntryVersionAdapter implements org.infinispan.functional.EntryVersion { - final EntryVersion delegate; - - public FunctionalEntryVersionAdapter(EntryVersion delegate) { - this.delegate = delegate; - } - - @Override - public EntryVersion get() { - return delegate; - } - - @Override - public CompareResult compareTo(org.infinispan.functional.EntryVersion other) { - switch (delegate.compareTo(other.get())) { - case BEFORE: - return CompareResult.BEFORE; - case AFTER: - return CompareResult.AFTER; - case EQUAL: - return CompareResult.EQUAL; - case CONFLICTING: - return CompareResult.CONFLICTING; - default: - throw new IllegalStateException(); - } - } - - @Override - public String toString() { - return "FunctionalEntryVersionAdapter(" + delegate + ")"; - } - - public static class Externalizer implements AdvancedExternalizer { - @Override - public Set> getTypeClasses() { - return Util.asSet(FunctionalEntryVersionAdapter.class); - } - - @Override - public Integer getId() { - return Ids.FUNCTIONAL_ENTRY_VERSION_ADAPTER; - } - - @Override - public void writeObject(ObjectOutput output, FunctionalEntryVersionAdapter object) throws IOException { - output.writeObject(object.delegate); - } - - @Override - public FunctionalEntryVersionAdapter readObject(ObjectInput input) throws IOException, ClassNotFoundException { - return new FunctionalEntryVersionAdapter((EntryVersion) input.readObject()); - } - } -} diff --git a/core/src/main/java/org/infinispan/functional/EntryVersion.java b/core/src/main/java/org/infinispan/functional/EntryVersion.java deleted file mode 100644 index b2efc4349c7c..000000000000 --- a/core/src/main/java/org/infinispan/functional/EntryVersion.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.infinispan.functional; - -// TODO: Entry version defined in core/ and does not expose internal entry - -import org.infinispan.commons.util.Experimental; - -/** - * Entry version. - * - * @since 8.0 - */ -@Experimental -public interface EntryVersion { - - /** - * Get the underlying representation of the entry's version. - */ - T get(); - - /** - * Compare the entry version. - */ - CompareResult compareTo(EntryVersion other); - - enum CompareResult { - /** - * Denotes a version that was created temporally before another version. - */ - BEFORE, - /** - * Denotes a version that was created temporally after another version. - */ - AFTER, - /** - * Denotes that the two versions being compared are equal. - */ - EQUAL, - /** - * Denotes a version that was created at the same time as another version, but is not equal. This is only really - * useful when using a partition-aware versioning scheme, such as vector or Lamport clocks. - */ - CONFLICTING - } - - final class NumericEntryVersion implements EntryVersion { - private final long version; - - public NumericEntryVersion(long version) { - this.version = version; - } - - @Override - public Long get() { - return version; - } - - @Override - public CompareResult compareTo(EntryVersion other) { - if (version < other.get()) return CompareResult.BEFORE; - else if (version > other.get()) return CompareResult.AFTER; - else return CompareResult.EQUAL; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - NumericEntryVersion that = (NumericEntryVersion) o; - - return version == that.version; - } - - @Override - public int hashCode() { - return (int) (version ^ (version >>> 32)); - } - - @Override - public String toString() { - return "NumericEntryVersion=" + version; - } - } -} diff --git a/core/src/main/java/org/infinispan/functional/MetaParam.java b/core/src/main/java/org/infinispan/functional/MetaParam.java index 98a0dee0dff0..4ef2c1f83584 100644 --- a/core/src/main/java/org/infinispan/functional/MetaParam.java +++ b/core/src/main/java/org/infinispan/functional/MetaParam.java @@ -3,6 +3,7 @@ import java.util.Optional; import org.infinispan.commons.util.Experimental; +import org.infinispan.container.versioning.EntryVersion; /** * An easily extensible metadata parameter that's stored along with the value @@ -197,29 +198,24 @@ public String toString() { * @since 8.0 */ @Experimental - class MetaEntryVersion implements Writable> { - private final EntryVersion entryVersion; + class MetaEntryVersion implements Writable { + private final EntryVersion entryVersion; - public MetaEntryVersion(EntryVersion entryVersion) { + public MetaEntryVersion(EntryVersion entryVersion) { this.entryVersion = entryVersion; } @Override - public EntryVersion get() { + public EntryVersion get() { return entryVersion; } - @SuppressWarnings("unchecked") - public static T type() { - return (T) MetaEntryVersion.class; - } - @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - MetaEntryVersion that = (MetaEntryVersion) o; + MetaEntryVersion that = (MetaEntryVersion) o; return entryVersion.equals(that.entryVersion); diff --git a/core/src/main/java/org/infinispan/functional/impl/EntryViews.java b/core/src/main/java/org/infinispan/functional/impl/EntryViews.java index 2b4e83c29acc..5764284571ae 100644 --- a/core/src/main/java/org/infinispan/functional/impl/EntryViews.java +++ b/core/src/main/java/org/infinispan/functional/impl/EntryViews.java @@ -17,7 +17,6 @@ import org.infinispan.commons.util.Util; import org.infinispan.container.entries.CacheEntry; import org.infinispan.container.versioning.EntryVersion; -import org.infinispan.container.versioning.FunctionalEntryVersionAdapter; import org.infinispan.marshall.core.Ids; import org.infinispan.metadata.Metadata; @@ -461,7 +460,7 @@ private static void updateMetaParams(CacheEntry entry, MetaParam.Wr Optional version = Optional.ofNullable(entry.getMetadata()).map(m -> m.version()); MetaParams metaParams = MetaParams.empty(); if (version.isPresent()) { - metaParams.add(new MetaParam.MetaEntryVersion(new FunctionalEntryVersionAdapter(version.get()))); + metaParams.add(new MetaParam.MetaEntryVersion(version.get())); } if (metas.length != 0) { metaParams.addMany(metas); diff --git a/core/src/main/java/org/infinispan/functional/impl/MetaParamsInternalMetadata.java b/core/src/main/java/org/infinispan/functional/impl/MetaParamsInternalMetadata.java index d5d25133eb31..99189c4e793f 100644 --- a/core/src/main/java/org/infinispan/functional/impl/MetaParamsInternalMetadata.java +++ b/core/src/main/java/org/infinispan/functional/impl/MetaParamsInternalMetadata.java @@ -17,7 +17,6 @@ import org.infinispan.commons.util.Experimental; import org.infinispan.commons.util.Util; import org.infinispan.container.versioning.EntryVersion; -import org.infinispan.container.versioning.FunctionalEntryVersionAdapter; import org.infinispan.marshall.core.Ids; import org.infinispan.metadata.InternalMetadata; import org.infinispan.metadata.Metadata; @@ -88,12 +87,7 @@ public long maxIdle() { @Override public EntryVersion version() { - return params.find(MetaEntryVersion.class).map(MetaParamsInternalMetadata::versionOrNull).orElse(null); - } - - private static EntryVersion versionOrNull(MetaEntryVersion mev) { - org.infinispan.functional.EntryVersion entryVersion = mev.get(); - return entryVersion instanceof FunctionalEntryVersionAdapter ? ((FunctionalEntryVersionAdapter) entryVersion).get() : null; + return params.find(MetaEntryVersion.class).map(MetaEntryVersion::get).orElse(null); } @Override @@ -146,7 +140,7 @@ public Metadata.Builder maxIdle(long time) { @Override public Metadata.Builder version(EntryVersion version) { - params.add(new MetaEntryVersion<>(new FunctionalEntryVersionAdapter(version))); + params.add(new MetaEntryVersion(version)); return this; } diff --git a/core/src/main/java/org/infinispan/marshall/core/InternalExternalizers.java b/core/src/main/java/org/infinispan/marshall/core/InternalExternalizers.java index 419408959af3..8c707377d200 100644 --- a/core/src/main/java/org/infinispan/marshall/core/InternalExternalizers.java +++ b/core/src/main/java/org/infinispan/marshall/core/InternalExternalizers.java @@ -32,7 +32,6 @@ import org.infinispan.container.entries.metadata.MetadataTransientCacheValue; import org.infinispan.container.entries.metadata.MetadataTransientMortalCacheEntry; import org.infinispan.container.entries.metadata.MetadataTransientMortalCacheValue; -import org.infinispan.container.versioning.FunctionalEntryVersionAdapter; import org.infinispan.container.versioning.NumericVersion; import org.infinispan.container.versioning.SimpleClusteredVersion; import org.infinispan.context.Flag; @@ -164,7 +163,6 @@ static ClassToExternalizerMap load( addInternalExternalizer(new EquivalenceExternalizer(), exts); addInternalExternalizer(new ExceptionResponse.Externalizer(), exts); addInternalExternalizer(new Flag.Externalizer(), exts); - addInternalExternalizer(new FunctionalEntryVersionAdapter.Externalizer(), exts); addInternalExternalizer(new GlobalTransaction.Externalizer(), exts); addInternalExternalizer(new KeyFilterAsCacheEventFilter.Externalizer(), exts); addInternalExternalizer(new KeyFilterAsKeyValueFilter.Externalizer(), exts); @@ -198,7 +196,6 @@ static ClassToExternalizerMap load( addInternalExternalizer(new MetadataTransientMortalCacheValue.Externalizer(), exts); // TODO: Untested in core addInternalExternalizer(new MetaParamExternalizers.LifespanExternalizer(), exts); addInternalExternalizer(new MetaParamExternalizers.EntryVersionParamExternalizer(), exts); - addInternalExternalizer(new MetaParamExternalizers.NumericEntryVersionExternalizer(), exts); addInternalExternalizer(new MetaParams.Externalizer(), exts); addInternalExternalizer(new MetaParamsInternalMetadata.Externalizer(), exts); addInternalExternalizer(new MIMECacheEntry.Externalizer(), exts); // new diff --git a/core/src/main/java/org/infinispan/marshall/exts/MetaParamExternalizers.java b/core/src/main/java/org/infinispan/marshall/exts/MetaParamExternalizers.java index bbb3a4ff0046..8125c27178fe 100644 --- a/core/src/main/java/org/infinispan/marshall/exts/MetaParamExternalizers.java +++ b/core/src/main/java/org/infinispan/marshall/exts/MetaParamExternalizers.java @@ -5,8 +5,7 @@ import java.io.ObjectOutput; import java.util.Set; -import org.infinispan.functional.EntryVersion; -import org.infinispan.functional.EntryVersion.NumericEntryVersion; +import org.infinispan.container.versioning.EntryVersion; import org.infinispan.functional.MetaParam.MetaEntryVersion; import org.infinispan.functional.MetaParam.MetaLifespan; import org.infinispan.commons.marshall.AbstractExternalizer; @@ -64,27 +63,4 @@ public Integer getId() { } } - public static final class NumericEntryVersionExternalizer extends AbstractExternalizer { - @Override - public void writeObject(ObjectOutput output, NumericEntryVersion object) throws IOException { - output.writeLong(object.get()); - } - - @Override - public NumericEntryVersion readObject(ObjectInput input) throws IOException, ClassNotFoundException { - long version = input.readLong(); - return new NumericEntryVersion(version); - } - - @Override - public Set> getTypeClasses() { - return Util.>asSet(NumericEntryVersion.class); - } - - @Override - public Integer getId() { - return Ids.NUMERIC_ENTRY_VERSION; - } - } - } diff --git a/core/src/test/java/org/infinispan/functional/FunctionalMapTest.java b/core/src/test/java/org/infinispan/functional/FunctionalMapTest.java index 3306073f8550..5828d36db41f 100644 --- a/core/src/test/java/org/infinispan/functional/FunctionalMapTest.java +++ b/core/src/test/java/org/infinispan/functional/FunctionalMapTest.java @@ -1,6 +1,6 @@ package org.infinispan.functional; -import static org.infinispan.functional.EntryVersion.CompareResult.EQUAL; +import static org.infinispan.container.versioning.InequalVersionComparisonResult.EQUAL; import static org.infinispan.marshall.core.MarshallableFunctions.identity; import static org.infinispan.marshall.core.MarshallableFunctions.removeReturnPrevOrNull; import static org.infinispan.marshall.core.MarshallableFunctions.returnReadOnlyFindOrNull; @@ -45,7 +45,7 @@ import java.util.function.Supplier; import org.infinispan.AdvancedCache; -import org.infinispan.functional.EntryVersion.NumericEntryVersion; +import org.infinispan.container.versioning.NumericVersion; import org.infinispan.functional.EntryView.ReadEntryView; import org.infinispan.functional.EntryView.ReadWriteEntryView; import org.infinispan.functional.EntryView.WriteEntryView; @@ -311,13 +311,13 @@ private void doReadWriteForConditionalParamBasedReplace(Supplier keySuppl ReadWriteMap map1, ReadWriteMap map2) { replaceWithVersion(keySupplier, map1, map2, 100, rw -> { assertEquals("uno", rw.get()); - assertEquals(Optional.of(new MetaEntryVersion<>(new NumericEntryVersion(200))), + assertEquals(Optional.of(new MetaEntryVersion(new NumericVersion(200))), rw.findMetaParam(MetaEntryVersion.class)); } ); replaceWithVersion(keySupplier, map1, map2, 900, rw -> { assertEquals(Optional.of("one"), rw.find()); - assertEquals(Optional.of(new MetaEntryVersion<>(new NumericEntryVersion(100))), + assertEquals(Optional.of(new MetaEntryVersion(new NumericVersion(100))), rw.findMetaParam(MetaEntryVersion.class)); }); } @@ -342,7 +342,7 @@ private static final class SetStringAndVersionConstant implements Function, Void> { @Override public Void apply(ReadWriteEntryView rw) { - rw.set("one", new MetaEntryVersion<>(new NumericEntryVersion(100))); + rw.set("one", new MetaEntryVersion(new NumericVersion(100))); return null; } @@ -370,11 +370,10 @@ private VersionBasedConditionalReplace(long version) { @Override public ReadWriteEntryView apply(ReadWriteEntryView rw) { - Class> clazz = MetaEntryVersion.type(); - Optional> metaParam = rw.findMetaParam(clazz); + Optional metaParam = rw.findMetaParam(MetaEntryVersion.class); metaParam.ifPresent(metaVersion -> { - if (metaVersion.get().compareTo(new NumericEntryVersion(version)) == EQUAL) - rw.set("uno", new MetaEntryVersion<>(new NumericEntryVersion(200))); + if (metaVersion.get().compareTo(new NumericVersion(version)) == EQUAL) + rw.set("uno", new MetaEntryVersion(new NumericVersion(200))); }); return rw; } diff --git a/core/src/test/java/org/infinispan/functional/distribution/rehash/FunctionalNonTxBackupOwnerBecomingPrimaryOwnerTest.java b/core/src/test/java/org/infinispan/functional/distribution/rehash/FunctionalNonTxBackupOwnerBecomingPrimaryOwnerTest.java index e4b4ea016369..711653746416 100644 --- a/core/src/test/java/org/infinispan/functional/distribution/rehash/FunctionalNonTxBackupOwnerBecomingPrimaryOwnerTest.java +++ b/core/src/test/java/org/infinispan/functional/distribution/rehash/FunctionalNonTxBackupOwnerBecomingPrimaryOwnerTest.java @@ -1,13 +1,13 @@ package org.infinispan.functional.distribution.rehash; -import static org.infinispan.functional.EntryVersion.CompareResult.EQUAL; +import static org.infinispan.container.versioning.InequalVersionComparisonResult.EQUAL; import java.io.Serializable; import java.util.function.BiFunction; import java.util.function.Consumer; import org.infinispan.AdvancedCache; -import org.infinispan.functional.EntryVersion.NumericEntryVersion; +import org.infinispan.container.versioning.NumericVersion; import org.infinispan.functional.EntryView.ReadWriteEntryView; import org.infinispan.functional.EntryView.WriteEntryView; import org.infinispan.functional.FunctionalMap.ReadWriteMap; @@ -49,7 +49,7 @@ public void testPrimaryOwnerChangingDuringReplaceBasedOnMeta() throws Exception // TODO: Move initial set and replace with meta logic to TestWriteOperation WriteOnlyMap wo0 = wo(0); Consumer> f = (Consumer> & Serializable) wo -> - wo.set("v0", new MetaEntryVersion<>(new NumericEntryVersion(1))); + wo.set("v0", new MetaEntryVersion(new NumericVersion(1))); wo0.eval("testkey", f); doTest(TestWriteOperation.REPLACE_META_FUNCTIONAL); } @@ -63,11 +63,10 @@ protected Object perform(TestWriteOperation op, AdvancedCache ca case REPLACE_META_FUNCTIONAL: BiFunction, Boolean> f = (BiFunction, Boolean> & Serializable) (v, rw) -> { - Class> type = MetaEntryVersion.type(); - return rw.findMetaParam(type) - .filter(ver -> ver.get().compareTo(new NumericEntryVersion(1)) == EQUAL) + return rw.findMetaParam(MetaEntryVersion.class) + .filter(ver -> ver.get().compareTo(new NumericVersion(1)) == EQUAL) .map(ver -> { - rw.set(v, new MetaEntryVersion<>(new NumericEntryVersion(2))); + rw.set(v, new MetaEntryVersion(new NumericVersion(2))); return true; }).orElse(false); }; diff --git a/core/src/test/java/org/infinispan/functional/impl/MetaParamsTest.java b/core/src/test/java/org/infinispan/functional/impl/MetaParamsTest.java index ca346a95ee1a..a58db3d58593 100644 --- a/core/src/test/java/org/infinispan/functional/impl/MetaParamsTest.java +++ b/core/src/test/java/org/infinispan/functional/impl/MetaParamsTest.java @@ -6,7 +6,7 @@ import java.util.Optional; -import org.infinispan.functional.EntryVersion.NumericEntryVersion; +import org.infinispan.container.versioning.NumericVersion; import org.infinispan.functional.MetaParam.MetaCreated; import org.infinispan.functional.MetaParam.MetaEntryVersion; import org.infinispan.functional.MetaParam.MetaLastUsed; @@ -49,22 +49,21 @@ public void testAddFindMetaParam() { @Test public void testAddFindMultipleMetaParams() { MetaParams metas = MetaParams.empty(); - metas.addMany(new MetaLifespan(1000), new MetaMaxIdle(1000), new MetaEntryVersion<>(new NumericEntryVersion(12345))); + metas.addMany(new MetaLifespan(1000), new MetaMaxIdle(1000), new MetaEntryVersion(new NumericVersion(12345))); assertFalse(metas.isEmpty()); assertEquals(3, metas.size()); Optional maxIdle = metas.find(MetaMaxIdle.class); - Class> type = MetaEntryVersion.type(); - Optional> entryVersion = metas.find(type); + Optional entryVersion = metas.find(MetaEntryVersion.class); assertEquals(Optional.of(new MetaMaxIdle(1000)), maxIdle); assertFalse(900 == maxIdle.get().get().longValue()); - assertEquals(new MetaEntryVersion<>(new NumericEntryVersion(12345)), entryVersion.get()); - assertFalse(new MetaEntryVersion<>(new NumericEntryVersion(23456)).equals(entryVersion.get())); + assertEquals(new MetaEntryVersion(new NumericVersion(12345)), entryVersion.get()); + assertFalse(new MetaEntryVersion(new NumericVersion(23456)).equals(entryVersion.get())); } @Test public void testReplaceFindMultipleMetaParams() { MetaParams metas = MetaParams.empty(); - metas.addMany(new MetaLifespan(1000), new MetaMaxIdle(1000), new MetaEntryVersion<>(new NumericEntryVersion(12345))); + metas.addMany(new MetaLifespan(1000), new MetaMaxIdle(1000), new MetaEntryVersion(new NumericVersion(12345))); assertFalse(metas.isEmpty()); assertEquals(3, metas.size()); metas.addMany(new MetaLifespan(2000), new MetaMaxIdle(2000)); @@ -72,7 +71,7 @@ public void testReplaceFindMultipleMetaParams() { assertEquals(3, metas.size()); assertEquals(Optional.of(new MetaMaxIdle(2000)), metas.find(MetaMaxIdle.class)); assertEquals(Optional.of(new MetaLifespan(2000)), metas.find(MetaLifespan.class)); - assertEquals(Optional.of(new MetaEntryVersion<>(new NumericEntryVersion(12345))), + assertEquals(Optional.of(new MetaEntryVersion(new NumericVersion(12345))), metas.find(MetaEntryVersion.class)); } @@ -92,33 +91,33 @@ public void testConstructors() { @Test public void testDuplicateParametersOnConstruction() { - MetaEntryVersion versionParam1 = new MetaEntryVersion<>(new NumericEntryVersion(100)); - MetaEntryVersion versionParam2 = new MetaEntryVersion<>(new NumericEntryVersion(200)); + MetaEntryVersion versionParam1 = new MetaEntryVersion(new NumericVersion(100)); + MetaEntryVersion versionParam2 = new MetaEntryVersion(new NumericVersion(200)); MetaParams metas = MetaParams.of(versionParam1, versionParam2); assertEquals(1, metas.size()); - assertEquals(Optional.of(new MetaEntryVersion<>(new NumericEntryVersion(200))), + assertEquals(Optional.of(new MetaEntryVersion(new NumericVersion(200))), metas.find(MetaEntryVersion.class)); } @Test public void testDuplicateParametersOnAdd() { - MetaEntryVersion versionParam1 = new MetaEntryVersion<>(new NumericEntryVersion(100)); + MetaEntryVersion versionParam1 = new MetaEntryVersion(new NumericVersion(100)); MetaParams metas = MetaParams.of(versionParam1); assertEquals(1, metas.size()); - assertEquals(Optional.of(new MetaEntryVersion<>(new NumericEntryVersion(100))), + assertEquals(Optional.of(new MetaEntryVersion(new NumericVersion(100))), metas.find(MetaEntryVersion.class)); - MetaEntryVersion versionParam2 = new MetaEntryVersion<>(new NumericEntryVersion(200)); + MetaEntryVersion versionParam2 = new MetaEntryVersion(new NumericVersion(200)); metas.add(versionParam2); assertEquals(1, metas.size()); - assertEquals(Optional.of(new MetaEntryVersion<>(new NumericEntryVersion(200))), + assertEquals(Optional.of(new MetaEntryVersion(new NumericVersion(200))), metas.find(MetaEntryVersion.class)); - MetaEntryVersion versionParam3 = new MetaEntryVersion<>(new NumericEntryVersion(300)); - MetaEntryVersion versionParam4 = new MetaEntryVersion<>(new NumericEntryVersion(400)); + MetaEntryVersion versionParam3 = new MetaEntryVersion(new NumericVersion(300)); + MetaEntryVersion versionParam4 = new MetaEntryVersion(new NumericVersion(400)); metas.addMany(versionParam3, versionParam4); assertEquals(1, metas.size()); - assertEquals(Optional.of(new MetaEntryVersion<>(new NumericEntryVersion(400))), + assertEquals(Optional.of(new MetaEntryVersion(new NumericVersion(400))), metas.find(MetaEntryVersion.class)); }