diff options
Diffstat (limited to 'guava-gwt/src')
81 files changed, 76 insertions, 3062 deletions
diff --git a/guava-gwt/src/com/google/common/collect/ImmutableAsList_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/DummyJavadocClass.java index d02eb6d03..cd862739a 100644 --- a/guava-gwt/src/com/google/common/collect/ImmutableAsList_CustomFieldSerializer.java +++ b/guava-gwt/src/com/google/common/DummyJavadocClass.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 The Guava Authors + * Copyright (C) 2019 The Guava Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.google.common.collect; +package com.google.common; /** - * Even though {@link ImmutableAsList} cannot be instantiated, we still need a custom field - * serializer. TODO(cpovirk): why? + * A dummy class so that the Maven Javadoc plugin will produce a jar. If it doesn't produce a jar, + * then the Sonatype repository manager issues an error. * - * @author Hayward Chan + * @author Chris Povirk */ -public final class ImmutableAsList_CustomFieldSerializer {} +class DummyJavadocClass {} diff --git a/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml b/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml index f5ec06f6a..e284348df 100644 --- a/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml +++ b/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml @@ -14,6 +14,7 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.gwt.core.Core"/> </module> diff --git a/guava-gwt/src/com/google/common/base/Absent_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/base/Absent_CustomFieldSerializer.java deleted file mode 100644 index 4db1123df..000000000 --- a/guava-gwt/src/com/google/common/base/Absent_CustomFieldSerializer.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2012 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.base; - -import com.google.common.annotations.GwtCompatible; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * Custom GWT serializer for {@link Absent}. - * - * <p>GWT can serialize an absent {@code Optional} on its own, but the resulting object is a - * different instance than the singleton {@code Absent.INSTANCE}, which breaks equality. We - * implement a custom serializer to maintain the singleton property. - * - * @author Chris Povirk - */ -@GwtCompatible -public class Absent_CustomFieldSerializer { - public static void deserialize(SerializationStreamReader reader, Absent<?> instance) {} - - public static Absent<?> instantiate(SerializationStreamReader reader) { - return Absent.INSTANCE; - } - - public static void serialize(SerializationStreamWriter writer, Absent<?> instance) {} -} diff --git a/guava-gwt/src/com/google/common/base/Base.gwt.xml b/guava-gwt/src/com/google/common/base/Base.gwt.xml index cddd48eb0..5ed0fb251 100644 --- a/guava-gwt/src/com/google/common/base/Base.gwt.xml +++ b/guava-gwt/src/com/google/common/base/Base.gwt.xml @@ -14,8 +14,11 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.gwt.core.Core"/> </module> diff --git a/guava-gwt/src/com/google/common/base/GwtSerializationDependencies.java b/guava-gwt/src/com/google/common/base/GwtSerializationDependencies.java deleted file mode 100644 index 69cf0d214..000000000 --- a/guava-gwt/src/com/google/common/base/GwtSerializationDependencies.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS-IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.base; - -import com.google.common.annotations.GwtCompatible; -import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; - -/** - * Contains dummy collection implementations to convince GWT that part of serializing a collection - * is serializing its elements. - * - * <p>See {@linkplain com.google.common.collect.GwtSerializationDependencies the - * com.google.common.collect version} for more details. - * - * @author Chris Povirk - */ -@GwtCompatible -final class GwtSerializationDependencies { - private GwtSerializationDependencies() {} - - static final class OptionalDependencies<T> extends Optional<T> { - @Nullable T value; - - OptionalDependencies() { - super(); - } - - @Override - public boolean isPresent() { - throw new AssertionError(); - } - - @Override - public T get() { - throw new AssertionError(); - } - - @Override - public T or(T defaultValue) { - throw new AssertionError(); - } - - @Override - public Optional<T> or(Optional<? extends T> secondChoice) { - throw new AssertionError(); - } - - @Override - public T or(Supplier<? extends T> supplier) { - throw new AssertionError(); - } - - @Override - public T orNull() { - throw new AssertionError(); - } - - @Override - public Set<T> asSet() { - throw new AssertionError(); - } - - @Override - public <V> Optional<V> transform(Function<? super T, V> function) { - throw new AssertionError(); - } - - @Override - public boolean equals(@Nullable Object object) { - throw new AssertionError(); - } - - @Override - public int hashCode() { - throw new AssertionError(); - } - - @Override - public String toString() { - throw new AssertionError(); - } - } -} diff --git a/guava-gwt/src/com/google/common/base/PairwiseEquivalence_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/base/PairwiseEquivalence_CustomFieldSerializer.java deleted file mode 100644 index 0a34f93ed..000000000 --- a/guava-gwt/src/com/google/common/base/PairwiseEquivalence_CustomFieldSerializer.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2011 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.base; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * GWT serialization logic for {@link PairwiseEquivalence}. - * - * @author Kedar Kanitkar - */ -public class PairwiseEquivalence_CustomFieldSerializer { - - private PairwiseEquivalence_CustomFieldSerializer() {} - - public static void deserialize( - SerializationStreamReader reader, PairwiseEquivalence<?> instance) {} - - public static PairwiseEquivalence<?> instantiate(SerializationStreamReader reader) - throws SerializationException { - return create((Equivalence<?>) reader.readObject()); - } - - private static <T> PairwiseEquivalence<T> create(Equivalence<T> elementEquivalence) { - return new PairwiseEquivalence<T>(elementEquivalence); - } - - public static void serialize(SerializationStreamWriter writer, PairwiseEquivalence<?> instance) - throws SerializationException { - writer.writeObject(instance.elementEquivalence); - } -} diff --git a/guava-gwt/src/com/google/common/base/Present_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/base/Present_CustomFieldSerializer.java deleted file mode 100644 index 710086dbf..000000000 --- a/guava-gwt/src/com/google/common/base/Present_CustomFieldSerializer.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2012 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.base; - -import com.google.common.annotations.GwtCompatible; -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * Custom GWT serializer for {@link Present}. - * - * @author Chris Povirk - */ -@GwtCompatible -public class Present_CustomFieldSerializer { - public static void deserialize(SerializationStreamReader reader, Present<?> instance) {} - - public static Present<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return (Present<Object>) Optional.of(reader.readObject()); - } - - public static void serialize(SerializationStreamWriter writer, Present<?> instance) - throws SerializationException { - writer.writeObject(instance.get()); - } -} diff --git a/guava-gwt/src/com/google/common/cache/Cache.gwt.xml b/guava-gwt/src/com/google/common/cache/Cache.gwt.xml index 225f9231e..615b95f70 100644 --- a/guava-gwt/src/com/google/common/cache/Cache.gwt.xml +++ b/guava-gwt/src/com/google/common/cache/Cache.gwt.xml @@ -14,10 +14,17 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.common.base.Base"/> + <inherits name="com.google.common.collect.Collect"/> + + <inherits name="com.google.common.math.Math"/> + <inherits name="com.google.common.util.concurrent.Concurrent"/> + <inherits name="com.google.gwt.core.Core"/> - + </module> diff --git a/guava-gwt/src/com/google/common/collect/AllEqualOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/AllEqualOrdering_CustomFieldSerializer.java deleted file mode 100644 index ab46c9e11..000000000 --- a/guava-gwt/src/com/google/common/collect/AllEqualOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link AllEqualOrdering}. - * - * @author Chris Povirk - */ -public class AllEqualOrdering_CustomFieldSerializer { - public static void deserialize(SerializationStreamReader reader, AllEqualOrdering instance) {} - - public static AllEqualOrdering instantiate(SerializationStreamReader reader) { - return AllEqualOrdering.INSTANCE; - } - - public static void serialize(SerializationStreamWriter writer, AllEqualOrdering instance) {} -} diff --git a/guava-gwt/src/com/google/common/collect/ArrayListMultimap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ArrayListMultimap_CustomFieldSerializer.java deleted file mode 100644 index a58ca259a..000000000 --- a/guava-gwt/src/com/google/common/collect/ArrayListMultimap_CustomFieldSerializer.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link ArrayListMultimap}. - * - * @author Chris Povirk - */ -public class ArrayListMultimap_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader in, ArrayListMultimap<?, ?> out) {} - - public static ArrayListMultimap<Object, Object> instantiate(SerializationStreamReader in) - throws SerializationException { - return (ArrayListMultimap<Object, Object>) - Multimap_CustomFieldSerializerBase.populate(in, ArrayListMultimap.create()); - } - - public static void serialize(SerializationStreamWriter out, ArrayListMultimap<?, ?> multimap) - throws SerializationException { - Multimap_CustomFieldSerializerBase.serialize(out, multimap); - } -} diff --git a/guava-gwt/src/com/google/common/collect/ByFunctionOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ByFunctionOrdering_CustomFieldSerializer.java deleted file mode 100644 index 812bb5ac5..000000000 --- a/guava-gwt/src/com/google/common/collect/ByFunctionOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.common.base.Function; -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link ByFunctionOrdering}. - * - * @author Chris Povirk - */ -public class ByFunctionOrdering_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, ByFunctionOrdering<?, ?> instance) {} - - @SuppressWarnings("unchecked") // deserialization is unsafe - public static ByFunctionOrdering<Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return new ByFunctionOrdering<>( - (Function<Object, Object>) reader.readObject(), (Ordering<Object>) reader.readObject()); - } - - public static void serialize(SerializationStreamWriter writer, ByFunctionOrdering<?, ?> instance) - throws SerializationException { - writer.writeObject(instance.function); - writer.writeObject(instance.ordering); - } -} diff --git a/guava-gwt/src/com/google/common/collect/Collect.gwt.xml b/guava-gwt/src/com/google/common/collect/Collect.gwt.xml index 72b65ba55..765ac8438 100644 --- a/guava-gwt/src/com/google/common/collect/Collect.gwt.xml +++ b/guava-gwt/src/com/google/common/collect/Collect.gwt.xml @@ -14,11 +14,17 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.common.base.Base"/> + <inherits name="com.google.common.math.Math"/> + <inherits name="com.google.common.primitives.Primitives"/> + <inherits name="com.google.gwt.core.Core"/> </module> diff --git a/guava-gwt/src/com/google/common/collect/ComparatorOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ComparatorOrdering_CustomFieldSerializer.java deleted file mode 100644 index f6cea190a..000000000 --- a/guava-gwt/src/com/google/common/collect/ComparatorOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import java.util.Comparator; - -/** - * This class implements the GWT serialization of {@link ComparatorOrdering}. - * - * @author Chris Povirk - */ -public class ComparatorOrdering_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, ComparatorOrdering<?> instance) {} - - @SuppressWarnings("unchecked") // deserialization is unsafe - public static ComparatorOrdering<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return new ComparatorOrdering<>((Comparator<Object>) reader.readObject()); - } - - public static void serialize(SerializationStreamWriter writer, ComparatorOrdering<?> instance) - throws SerializationException { - writer.writeObject(instance.comparator); - } -} diff --git a/guava-gwt/src/com/google/common/collect/CompoundOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/CompoundOrdering_CustomFieldSerializer.java deleted file mode 100644 index 527c26561..000000000 --- a/guava-gwt/src/com/google/common/collect/CompoundOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; - -/** - * This class implements the GWT serialization of {@link CompoundOrdering}. - * - * @author Chris Povirk - */ -public class CompoundOrdering_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, CompoundOrdering<?> instance) {} - - @SuppressWarnings("unchecked") // deserialization is unsafe - public static CompoundOrdering<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - int n = reader.readInt(); - List<Comparator<Object>> comparators = new ArrayList<>(); - for (int i = 0; i < n; i++) { - comparators.add((Comparator<Object>) reader.readObject()); - } - return new CompoundOrdering<>(comparators); - } - - public static void serialize(SerializationStreamWriter writer, CompoundOrdering<?> instance) - throws SerializationException { - writer.writeInt(instance.comparators.length); - for (Comparator<?> comparator : instance.comparators) { - writer.writeObject(comparator); - } - } -} diff --git a/guava-gwt/src/com/google/common/collect/DenseImmutableTable_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/DenseImmutableTable_CustomFieldSerializer.java deleted file mode 100644 index c02db5b89..000000000 --- a/guava-gwt/src/com/google/common/collect/DenseImmutableTable_CustomFieldSerializer.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2012 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link DenseImmutableTable}. - * - * @author Chris Povirk - */ -public class DenseImmutableTable_CustomFieldSerializer { - public static void deserialize( - SerializationStreamReader reader, DenseImmutableTable<?, ?, ?> instance) {} - - public static DenseImmutableTable<Object, Object, Object> instantiate( - SerializationStreamReader reader) throws SerializationException { - return (DenseImmutableTable<Object, Object, Object>) - ImmutableTable_CustomFieldSerializerBase.instantiate(reader); - } - - public static void serialize( - SerializationStreamWriter writer, DenseImmutableTable<Object, Object, Object> table) - throws SerializationException { - ImmutableTable_CustomFieldSerializerBase.serialize(writer, table); - } -} diff --git a/guava-gwt/src/com/google/common/collect/EmptyImmutableListMultimap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/EmptyImmutableListMultimap_CustomFieldSerializer.java deleted file mode 100644 index 443709e42..000000000 --- a/guava-gwt/src/com/google/common/collect/EmptyImmutableListMultimap_CustomFieldSerializer.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link EmptyImmutableListMultimap}. - * - * @author Chris Povirk - */ -public class EmptyImmutableListMultimap_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, EmptyImmutableListMultimap instance) {} - - public static EmptyImmutableListMultimap instantiate(SerializationStreamReader reader) { - return EmptyImmutableListMultimap.INSTANCE; - } - - public static void serialize( - SerializationStreamWriter writer, EmptyImmutableListMultimap instance) {} -} diff --git a/guava-gwt/src/com/google/common/collect/EmptyImmutableSetMultimap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/EmptyImmutableSetMultimap_CustomFieldSerializer.java deleted file mode 100644 index ac095df99..000000000 --- a/guava-gwt/src/com/google/common/collect/EmptyImmutableSetMultimap_CustomFieldSerializer.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link EmptyImmutableSetMultimap}. - * - * @author Chris Povirk - */ -public class EmptyImmutableSetMultimap_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, EmptyImmutableSetMultimap instance) {} - - public static EmptyImmutableSetMultimap instantiate(SerializationStreamReader reader) { - return EmptyImmutableSetMultimap.INSTANCE; - } - - public static void serialize( - SerializationStreamWriter writer, EmptyImmutableSetMultimap instance) {} -} diff --git a/guava-gwt/src/com/google/common/collect/ExplicitOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ExplicitOrdering_CustomFieldSerializer.java deleted file mode 100644 index 8b02cdf1c..000000000 --- a/guava-gwt/src/com/google/common/collect/ExplicitOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link ExplicitOrdering}. - * - * @author Chris Povirk - */ -public class ExplicitOrdering_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, ExplicitOrdering<?> instance) {} - - @SuppressWarnings("unchecked") // deserialization is unsafe - public static ExplicitOrdering<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return new ExplicitOrdering<>((ImmutableMap<Object, Integer>) reader.readObject()); - } - - public static void serialize(SerializationStreamWriter writer, ExplicitOrdering<?> instance) - throws SerializationException { - writer.writeObject(instance.rankMap); - } -} diff --git a/guava-gwt/src/com/google/common/collect/ForwardingImmutableList_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ForwardingImmutableList_CustomFieldSerializer.java deleted file mode 100644 index dc6328164..000000000 --- a/guava-gwt/src/com/google/common/collect/ForwardingImmutableList_CustomFieldSerializer.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -/** - * Even though {@link ForwardingImmutableList} cannot be instantiated, we still need a custom field - * serializer. TODO(cpovirk): why? - * - * @author Hayward Chan - */ -public final class ForwardingImmutableList_CustomFieldSerializer {} diff --git a/guava-gwt/src/com/google/common/collect/ForwardingImmutableSet_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ForwardingImmutableSet_CustomFieldSerializer.java deleted file mode 100644 index aec60884c..000000000 --- a/guava-gwt/src/com/google/common/collect/ForwardingImmutableSet_CustomFieldSerializer.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -/** - * Even though {@link ForwardingImmutableSet} cannot be instantiated, we still need a custom field - * serializer. TODO(cpovirk): why? - * - * @author Hayward Chan - */ -public final class ForwardingImmutableSet_CustomFieldSerializer {} diff --git a/guava-gwt/src/com/google/common/collect/GwtSerializationDependencies.java b/guava-gwt/src/com/google/common/collect/GwtSerializationDependencies.java deleted file mode 100644 index 0abf5eea9..000000000 --- a/guava-gwt/src/com/google/common/collect/GwtSerializationDependencies.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS-IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.common.annotations.GwtCompatible; -import java.io.Serializable; -import java.util.Comparator; -import java.util.HashMap; -import java.util.TreeMap; - -/** - * Contains dummy collection implementations to convince GWT that part of serializing a collection - * is serializing its elements. - * - * <p>Because of our use of final fields in our collections, GWT's normal heuristic for determining - * which classes might be serialized fails. That heuristic is, roughly speaking, to look at each - * parameter and return type of each RPC interface and to assume that implementations of those types - * might be serialized. Those types have their own dependencies -- their fields -- which are - * analyzed recursively and analogously. - * - * <p>For classes with final fields, GWT assumes that the class itself might be serialized but - * doesn't assume the same about its final fields. To work around this, we provide dummy - * implementations of our collections with their dependencies as non-final fields. Even though these - * implementations are never instantiated, they are visible to GWT when it performs its - * serialization analysis, and it assumes that their fields may be serialized. - * - * <p>Currently we provide dummy implementations of all the immutable collection classes necessary - * to support declarations like {@code ImmutableMultiset<String>} in RPC interfaces. Support for - * {@code ImmutableMultiset} in the interface is support for {@code Multiset}, so there is nothing - * further to be done to support the new collection interfaces. It is not support, however, for an - * RPC interface in terms of {@code HashMultiset}. It is still possible to send a {@code - * HashMultiset} over GWT RPC; it is only the declaration of an interface in terms of {@code - * HashMultiset} that we haven't tried to support. (We may wish to revisit this decision in the - * future.) - * - * @author Chris Povirk - */ -@GwtCompatible -// None of these classes are instantiated, let alone serialized: -@SuppressWarnings("serial") -final class GwtSerializationDependencies { - private GwtSerializationDependencies() {} - - static final class ImmutableListMultimapDependencies<K, V> extends ImmutableListMultimap<K, V> { - K key; - V value; - - ImmutableListMultimapDependencies() { - super(null, 0); - } - } - - // ImmutableMap is covered by ImmutableSortedMap/ImmutableBiMap. - - // ImmutableMultimap is covered by ImmutableSetMultimap/ImmutableListMultimap. - - static final class ImmutableSetMultimapDependencies<K, V> extends ImmutableSetMultimap<K, V> { - K key; - V value; - - ImmutableSetMultimapDependencies() { - super(null, 0, null); - } - } - - /* - * We support an interface declared in terms of LinkedListMultimap because it - * supports entry ordering not supported by other implementations. - */ - static final class LinkedListMultimapDependencies<K, V> extends LinkedListMultimap<K, V> { - K key; - V value; - - LinkedListMultimapDependencies() {} - } - - static final class HashBasedTableDependencies<R, C, V> extends HashBasedTable<R, C, V> { - HashMap<R, HashMap<C, V>> data; - - HashBasedTableDependencies() { - super(null, null); - } - } - - static final class TreeBasedTableDependencies<R, C, V> extends TreeBasedTable<R, C, V> { - TreeMap<R, TreeMap<C, V>> data; - - TreeBasedTableDependencies() { - super(null, null); - } - } - - /* - * We don't normally need "implements Serializable," but we do here. That's - * because ImmutableTable itself is not Serializable as of this writing. We - * need for GWT to believe that this dummy class is serializable, or else it - * won't generate serialization code for R, C, and V. - */ - static final class ImmutableTableDependencies<R, C, V> extends SingletonImmutableTable<R, C, V> - implements Serializable { - R rowKey; - C columnKey; - V value; - - ImmutableTableDependencies() { - super(null, null, null); - } - } - - static final class TreeMultimapDependencies<K, V> extends TreeMultimap<K, V> { - Comparator<? super K> keyComparator; - Comparator<? super V> valueComparator; - K key; - V value; - - TreeMultimapDependencies() { - super(null, null); - } - } -} diff --git a/guava-gwt/src/com/google/common/collect/HashBasedTable_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/HashBasedTable_CustomFieldSerializer.java deleted file mode 100644 index 4ce2b4335..000000000 --- a/guava-gwt/src/com/google/common/collect/HashBasedTable_CustomFieldSerializer.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link HashBasedTable}. - * - * @author Hayward Chan - */ -public class HashBasedTable_CustomFieldSerializer { - public static void deserialize(SerializationStreamReader reader, HashBasedTable<?, ?, ?> table) {} - - public static HashBasedTable<Object, Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return Table_CustomFieldSerializerBase.populate(reader, HashBasedTable.create()); - } - - public static void serialize(SerializationStreamWriter writer, HashBasedTable<?, ?, ?> table) - throws SerializationException { - Table_CustomFieldSerializerBase.serialize(writer, table); - } -} diff --git a/guava-gwt/src/com/google/common/collect/HashMultimap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/HashMultimap_CustomFieldSerializer.java deleted file mode 100644 index cb37d1e5d..000000000 --- a/guava-gwt/src/com/google/common/collect/HashMultimap_CustomFieldSerializer.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link HashMultimap}. - * - * @author Jord Sonneveld - */ -public class HashMultimap_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader in, HashMultimap<?, ?> out) {} - - public static HashMultimap<Object, Object> instantiate(SerializationStreamReader in) - throws SerializationException { - return (HashMultimap<Object, Object>) - Multimap_CustomFieldSerializerBase.populate(in, HashMultimap.create()); - } - - public static void serialize(SerializationStreamWriter out, HashMultimap<?, ?> multimap) - throws SerializationException { - Multimap_CustomFieldSerializerBase.serialize(out, multimap); - } -} diff --git a/guava-gwt/src/com/google/common/collect/HashMultiset_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/HashMultiset_CustomFieldSerializer.java deleted file mode 100644 index 1244e1e4d..000000000 --- a/guava-gwt/src/com/google/common/collect/HashMultiset_CustomFieldSerializer.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link HashMultiset}. - * - * @author Chris Povirk - */ -public class HashMultiset_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, HashMultiset<?> instance) {} - - public static HashMultiset<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return (HashMultiset<Object>) - Multiset_CustomFieldSerializerBase.populate(reader, HashMultiset.create()); - } - - public static void serialize(SerializationStreamWriter writer, HashMultiset<?> instance) - throws SerializationException { - Multiset_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableBiMap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ImmutableBiMap_CustomFieldSerializer.java deleted file mode 100644 index d952317ef..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableBiMap_CustomFieldSerializer.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -/** - * Even though {@link ImmutableBiMap} cannot be instantiated, we still need a custom field - * serializer to unify the type signature of {@code ImmutableBiMap[]} on server and client side. - * - * @author Hayward Chan - */ -public final class ImmutableBiMap_CustomFieldSerializer {} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableEntry_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ImmutableEntry_CustomFieldSerializer.java deleted file mode 100644 index 402c94675..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableEntry_CustomFieldSerializer.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link ImmutableEntry}. - * - * @author Kyle Butt - */ -public class ImmutableEntry_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, ImmutableEntry<?, ?> instance) {} - - public static ImmutableEntry<Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - Object key = reader.readObject(); - Object value = reader.readObject(); - return new ImmutableEntry<>(key, value); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableEntry<?, ?> instance) - throws SerializationException { - writer.writeObject(instance.getKey()); - writer.writeObject(instance.getValue()); - } -} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableEnumMap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ImmutableEnumMap_CustomFieldSerializer.java deleted file mode 100644 index 4e9b9aaba..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableEnumMap_CustomFieldSerializer.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2012 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Map_CustomFieldSerializerBase; -import java.util.Map; - -/** - * This class implements the GWT serialization of {@link ImmutableEnumMap}. - * - * @author Louis Wasserman - */ -public class ImmutableEnumMap_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, ImmutableEnumMap<?, ?> instance) {} - - public static <K extends Enum<K>, V> ImmutableEnumMap<?, ?> instantiate( - SerializationStreamReader reader) throws SerializationException { - Map<K, V> deserialized = Maps.newHashMap(); - Map_CustomFieldSerializerBase.deserialize(reader, deserialized); - /* - * It is safe to cast to ImmutableEnumSet because in order for it to be - * serialized as an ImmutableEnumSet, it must be non-empty to start - * with. - */ - return (ImmutableEnumMap<?, ?>) Maps.immutableEnumMap(deserialized); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableEnumMap<?, ?> instance) - throws SerializationException { - Map_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableEnumSet_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ImmutableEnumSet_CustomFieldSerializer.java deleted file mode 100644 index 72a414ab4..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableEnumSet_CustomFieldSerializer.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Collection_CustomFieldSerializerBase; -import java.util.List; - -/** - * This class implements the GWT serialization of {@link ImmutableEnumSet}. - * - * @author Hayward Chan - */ -public class ImmutableEnumSet_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, ImmutableEnumSet<?> instance) {} - - public static <E extends Enum<E>> ImmutableEnumSet<?> instantiate( - SerializationStreamReader reader) throws SerializationException { - List<E> deserialized = Lists.newArrayList(); - Collection_CustomFieldSerializerBase.deserialize(reader, deserialized); - /* - * It is safe to cast to ImmutableEnumSet because in order for it to be - * serialized as an ImmutableEnumSet, it must be non-empty to start - * with. - */ - return (ImmutableEnumSet<?>) Sets.immutableEnumSet(deserialized); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableEnumSet<?> instance) - throws SerializationException { - Collection_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableListMultimap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ImmutableListMultimap_CustomFieldSerializer.java deleted file mode 100644 index 68a6176cc..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableListMultimap_CustomFieldSerializer.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link ImmutableListMultimap}. - * - * @author Chris Povirk - */ -public class ImmutableListMultimap_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, ImmutableListMultimap<?, ?> instance) {} - - public static ImmutableListMultimap<Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return (ImmutableListMultimap<Object, Object>) - Multimap_CustomFieldSerializerBase.instantiate(reader, ImmutableListMultimap.builder()); - } - - public static void serialize( - SerializationStreamWriter writer, ImmutableListMultimap<?, ?> instance) - throws SerializationException { - Multimap_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableList_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ImmutableList_CustomFieldSerializer.java deleted file mode 100644 index 7ccbe3b3a..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableList_CustomFieldSerializer.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -/** - * Even though {@link ImmutableList} cannot be instantiated, we still need a custom field serializer - * to unify the type signature of {@code ImmutableList[]} on server and client side. - * - * @author Hayward Chan - */ -public final class ImmutableList_CustomFieldSerializer {} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableMultiset_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ImmutableMultiset_CustomFieldSerializer.java deleted file mode 100644 index 16086c3f8..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableMultiset_CustomFieldSerializer.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -/** - * Even though {@link ImmutableMultiset} cannot be instantiated, we still need a custom field - * serializer to unify the type signature of {@code ImmutableMultiset[]} on server and client side. - * - * @author Chris Povirk - */ -public class ImmutableMultiset_CustomFieldSerializer {} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableSetMultimap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ImmutableSetMultimap_CustomFieldSerializer.java deleted file mode 100644 index 3e978d5aa..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableSetMultimap_CustomFieldSerializer.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import java.util.Comparator; - -/** - * This class implements the GWT serialization of {@link ImmutableSetMultimap}. - * - * @author Chris Povirk - */ -public class ImmutableSetMultimap_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, ImmutableSetMultimap<?, ?> instance) {} - - // Serialization type safety is at the caller's mercy. - @SuppressWarnings("unchecked") - public static ImmutableSetMultimap<Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - Comparator<Object> valueComparator = (Comparator<Object>) reader.readObject(); - ImmutableSetMultimap.Builder<Object, Object> builder = ImmutableSetMultimap.builder(); - if (valueComparator != null) { - builder.orderValuesBy(valueComparator); - } - return (ImmutableSetMultimap<Object, Object>) - Multimap_CustomFieldSerializerBase.instantiate(reader, builder); - } - - public static void serialize( - SerializationStreamWriter writer, ImmutableSetMultimap<?, ?> instance) - throws SerializationException { - writer.writeObject(instance.valueComparator()); - Multimap_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableSet_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ImmutableSet_CustomFieldSerializer.java deleted file mode 100644 index d4c414486..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableSet_CustomFieldSerializer.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -/** - * Even though {@link ImmutableSet} cannot be instantiated, we still need a custom field serializer - * to unify the type signature of {@code ImmutableSet[]} on server and client side. - * - * @author Hayward Chan - */ -public final class ImmutableSet_CustomFieldSerializer {} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableSortedMap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ImmutableSortedMap_CustomFieldSerializer.java deleted file mode 100644 index 215ffa623..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableSortedMap_CustomFieldSerializer.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * Even though {@link ImmutableSortedMap} cannot be instantiated, we still need a custom field - * serializer. TODO(cpovirk): why? Does it help if ensure that the GWT and non-GWT classes have the - * same fields? Is that worth the trouble? - * - * @author Chris Povirk - */ -public final class ImmutableSortedMap_CustomFieldSerializer { - public static void deserialize( - SerializationStreamReader reader, ImmutableSortedMap<?, ?> instance) {} - - public static ImmutableSortedMap<?, ?> instantiate(SerializationStreamReader reader) - throws SerializationException { - return ImmutableSortedMap_CustomFieldSerializerBase.instantiate(reader); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableSortedMap<?, ?> instance) - throws SerializationException { - ImmutableSortedMap_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableSortedMap_CustomFieldSerializerBase.java b/guava-gwt/src/com/google/common/collect/ImmutableSortedMap_CustomFieldSerializerBase.java deleted file mode 100644 index 06b434eac..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableSortedMap_CustomFieldSerializerBase.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Map_CustomFieldSerializerBase; -import java.util.Comparator; -import java.util.SortedMap; -import java.util.TreeMap; - -/** - * This class contains static utility methods for writing {@code ImmutableSortedMap} GWT field - * serializers. - * - * @author Chris Povirk - */ -final class ImmutableSortedMap_CustomFieldSerializerBase { - static ImmutableSortedMap<Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - /* - * Nothing we can do, but we're already assuming the serialized form is - * correctly typed, anyway. - */ - @SuppressWarnings("unchecked") - Comparator<Object> comparator = (Comparator<Object>) reader.readObject(); - - SortedMap<Object, Object> entries = new TreeMap<>(comparator); - Map_CustomFieldSerializerBase.deserialize(reader, entries); - - return ImmutableSortedMap.orderedBy(comparator).putAll(entries).build(); - } - - static void serialize(SerializationStreamWriter writer, ImmutableSortedMap<?, ?> instance) - throws SerializationException { - writer.writeObject(instance.comparator()); - - Map_CustomFieldSerializerBase.serialize(writer, instance); - } - - private ImmutableSortedMap_CustomFieldSerializerBase() {} -} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableSortedSet_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ImmutableSortedSet_CustomFieldSerializer.java deleted file mode 100644 index 8924e9e52..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableSortedSet_CustomFieldSerializer.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -/** - * Even though {@link ImmutableSortedSet} cannot be instantiated, we still need a custom field - * serializer to unify the type signature of {@code ImmutableSortedSet[]} on server and client side. - * - * @author Hayward Chan - */ -public final class ImmutableSortedSet_CustomFieldSerializer {} diff --git a/guava-gwt/src/com/google/common/collect/ImmutableTable_CustomFieldSerializerBase.java b/guava-gwt/src/com/google/common/collect/ImmutableTable_CustomFieldSerializerBase.java deleted file mode 100644 index da2fabd84..000000000 --- a/guava-gwt/src/com/google/common/collect/ImmutableTable_CustomFieldSerializerBase.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2012 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Map_CustomFieldSerializerBase; - -/** - * This class contains static utility methods for writing {@link ImmutableTable} GWT field - * serializers. Serializers should delegate to {@link #serialize} and {@link #instantiate}. - * - * @author Chris Povirk - */ -final class ImmutableTable_CustomFieldSerializerBase { - public static ImmutableTable<Object, Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - ImmutableTable.Builder<Object, Object, Object> builder = ImmutableTable.builder(); - int rowCount = reader.readInt(); - for (int i = 0; i < rowCount; i++) { - Object rowKey = reader.readObject(); - int colCount = reader.readInt(); - for (int j = 0; j < colCount; j++) { - builder.put(rowKey, reader.readObject(), reader.readObject()); - } - } - return builder.build(); - } - - public static void serialize( - SerializationStreamWriter writer, ImmutableTable<Object, Object, Object> table) - throws SerializationException { - writer.writeInt(table.rowKeySet().size()); - for (Object rowKey : table.rowKeySet()) { - writer.writeObject(rowKey); - Map_CustomFieldSerializerBase.serialize(writer, table.row(rowKey)); - } - } - - private ImmutableTable_CustomFieldSerializerBase() {} -} diff --git a/guava-gwt/src/com/google/common/collect/IndexedImmutableSet_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/IndexedImmutableSet_CustomFieldSerializer.java deleted file mode 100644 index b5269951a..000000000 --- a/guava-gwt/src/com/google/common/collect/IndexedImmutableSet_CustomFieldSerializer.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2018 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -/** - * Dummy serializer. Otherwise, GWT, in processing JdkBackedImmutableSet -- even though that class - * has a custom field serializer -- would generate its own version of this class, implemented in - * terms of calls to ImmutableSet_CustomFieldSerializer, which is itself a dummy that we've - * provided. That produces GWT compilation errors, albeit ones that are non-fatal (even with -strict - * on, oddly). - */ -public final class IndexedImmutableSet_CustomFieldSerializer {} diff --git a/guava-gwt/src/com/google/common/collect/JdkBackedImmutableBiMap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/JdkBackedImmutableBiMap_CustomFieldSerializer.java deleted file mode 100644 index f635de50d..000000000 --- a/guava-gwt/src/com/google/common/collect/JdkBackedImmutableBiMap_CustomFieldSerializer.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2018 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Map_CustomFieldSerializerBase; -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * This class implements the GWT serialization of {@link JdkBackedImmutableBiMap}. - * - * @author Louis Wasserman - */ -public class JdkBackedImmutableBiMap_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, ImmutableBiMap<?, ?> instance) {} - - public static ImmutableBiMap<Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - Map<Object, Object> entries = new LinkedHashMap<>(); - Map_CustomFieldSerializerBase.deserialize(reader, entries); - return ImmutableBiMap.copyOf(entries); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableBiMap<?, ?> instance) - throws SerializationException { - Map_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/JdkBackedImmutableMap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/JdkBackedImmutableMap_CustomFieldSerializer.java deleted file mode 100644 index 485993113..000000000 --- a/guava-gwt/src/com/google/common/collect/JdkBackedImmutableMap_CustomFieldSerializer.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2018 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Map_CustomFieldSerializerBase; -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * This class implements the GWT serialization of {@link JdkBackedImmutableMap}. - * - * @author Louis Wasserman - */ -public class JdkBackedImmutableMap_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, ImmutableMap<?, ?> instance) {} - - public static ImmutableMap<Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - Map<Object, Object> entries = new LinkedHashMap<>(); - Map_CustomFieldSerializerBase.deserialize(reader, entries); - return ImmutableMap.copyOf(entries); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableMap<?, ?> instance) - throws SerializationException { - Map_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/JdkBackedImmutableMultiset_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/JdkBackedImmutableMultiset_CustomFieldSerializer.java deleted file mode 100644 index 889944643..000000000 --- a/guava-gwt/src/com/google/common/collect/JdkBackedImmutableMultiset_CustomFieldSerializer.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2018 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link JdkBackedImmutableMultiset}. - * - * @author Louis Wasserman - */ -public class JdkBackedImmutableMultiset_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, ImmutableMultiset<?> instance) {} - - public static ImmutableMultiset<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return ImmutableMultiset.copyOf( - Multiset_CustomFieldSerializerBase.populate(reader, LinkedHashMultiset.create())); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableMultiset<?> instance) - throws SerializationException { - Multiset_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/JdkBackedImmutableSet_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/JdkBackedImmutableSet_CustomFieldSerializer.java deleted file mode 100644 index a7c956489..000000000 --- a/guava-gwt/src/com/google/common/collect/JdkBackedImmutableSet_CustomFieldSerializer.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2018 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Collection_CustomFieldSerializerBase; -import java.util.List; - -/** - * This class implements the GWT serialization of {@link JdkBackedImmutableSet}. - * - * @author Louis Wasserman - */ -public class JdkBackedImmutableSet_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, ImmutableSet<?> instance) {} - - public static ImmutableSet<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - List<Object> elements = Lists.newArrayList(); - Collection_CustomFieldSerializerBase.deserialize(reader, elements); - return ImmutableSet.copyOf(elements); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableSet<?> instance) - throws SerializationException { - Collection_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/LexicographicalOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/LexicographicalOrdering_CustomFieldSerializer.java deleted file mode 100644 index 941194d9e..000000000 --- a/guava-gwt/src/com/google/common/collect/LexicographicalOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link LexicographicalOrdering}. - * - * @author Chris Povirk - */ -public class LexicographicalOrdering_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, LexicographicalOrdering<?> instance) {} - - @SuppressWarnings("unchecked") // deserialization is unsafe - public static LexicographicalOrdering<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return new LexicographicalOrdering<>((Ordering<Object>) reader.readObject()); - } - - public static void serialize( - SerializationStreamWriter writer, LexicographicalOrdering<?> instance) - throws SerializationException { - writer.writeObject(instance.elementOrder); - } -} diff --git a/guava-gwt/src/com/google/common/collect/LinkedHashMultimap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/LinkedHashMultimap_CustomFieldSerializer.java deleted file mode 100644 index ba21f4a92..000000000 --- a/guava-gwt/src/com/google/common/collect/LinkedHashMultimap_CustomFieldSerializer.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Map.Entry; - -/** - * This class implements the GWT serialization of {@link LinkedHashMultimap}. - * - * @author Chris Povirk - */ -public class LinkedHashMultimap_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader in, LinkedHashMultimap<?, ?> out) {} - - public static LinkedHashMultimap<Object, Object> instantiate(SerializationStreamReader stream) - throws SerializationException { - LinkedHashMultimap<Object, Object> multimap = LinkedHashMultimap.create(); - - int distinctKeys = stream.readInt(); - Map<Object, Collection<Object>> map = new LinkedHashMap<>(); - for (int i = 0; i < distinctKeys; i++) { - Object key = stream.readObject(); - map.put(key, multimap.createCollection(key)); - } - int entries = stream.readInt(); - for (int i = 0; i < entries; i++) { - Object key = stream.readObject(); - Object value = stream.readObject(); - map.get(key).add(value); - } - multimap.setMap(map); - - return multimap; - } - - public static void serialize(SerializationStreamWriter stream, LinkedHashMultimap<?, ?> multimap) - throws SerializationException { - stream.writeInt(multimap.keySet().size()); - for (Object key : multimap.keySet()) { - stream.writeObject(key); - } - stream.writeInt(multimap.size()); - for (Entry<?, ?> entry : multimap.entries()) { - stream.writeObject(entry.getKey()); - stream.writeObject(entry.getValue()); - } - } -} diff --git a/guava-gwt/src/com/google/common/collect/LinkedHashMultiset_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/LinkedHashMultiset_CustomFieldSerializer.java deleted file mode 100644 index 934bc6958..000000000 --- a/guava-gwt/src/com/google/common/collect/LinkedHashMultiset_CustomFieldSerializer.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link LinkedHashMultiset}. - * - * @author Chris Povirk - */ -public class LinkedHashMultiset_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, LinkedHashMultiset<?> instance) {} - - public static LinkedHashMultiset<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return (LinkedHashMultiset<Object>) - Multiset_CustomFieldSerializerBase.populate(reader, LinkedHashMultiset.create()); - } - - public static void serialize(SerializationStreamWriter writer, LinkedHashMultiset<?> instance) - throws SerializationException { - Multiset_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/LinkedListMultimap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/LinkedListMultimap_CustomFieldSerializer.java deleted file mode 100644 index 84415293f..000000000 --- a/guava-gwt/src/com/google/common/collect/LinkedListMultimap_CustomFieldSerializer.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import java.util.Map.Entry; - -/** - * This class implements the GWT serialization of {@link LinkedListMultimap}. - * - * @author Chris Povirk - */ -public class LinkedListMultimap_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader in, LinkedListMultimap<?, ?> out) {} - - public static LinkedListMultimap<Object, Object> instantiate(SerializationStreamReader in) - throws SerializationException { - LinkedListMultimap<Object, Object> multimap = LinkedListMultimap.create(); - int size = in.readInt(); - for (int i = 0; i < size; i++) { - Object key = in.readObject(); - Object value = in.readObject(); - multimap.put(key, value); - } - return multimap; - } - - public static void serialize(SerializationStreamWriter out, LinkedListMultimap<?, ?> multimap) - throws SerializationException { - out.writeInt(multimap.size()); - for (Entry<?, ?> entry : multimap.entries()) { - out.writeObject(entry.getKey()); - out.writeObject(entry.getValue()); - } - } -} diff --git a/guava-gwt/src/com/google/common/collect/Multimap_CustomFieldSerializerBase.java b/guava-gwt/src/com/google/common/collect/Multimap_CustomFieldSerializerBase.java deleted file mode 100644 index 31a048305..000000000 --- a/guava-gwt/src/com/google/common/collect/Multimap_CustomFieldSerializerBase.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.errorprone.annotations.CanIgnoreReturnValue; -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import java.util.Collection; -import java.util.Map.Entry; - -/** - * This class contains static utility methods for writing {@code Multimap} GWT field serializers. - * Serializers should delegate to {@link #serialize(SerializationStreamWriter, Multimap)} and to - * either {@link #instantiate(SerializationStreamReader, ImmutableMultimap.Builder)} or {@link - * #populate(SerializationStreamReader, Multimap)}. - * - * @author Chris Povirk - */ -public final class Multimap_CustomFieldSerializerBase { - - static ImmutableMultimap<Object, Object> instantiate( - SerializationStreamReader reader, ImmutableMultimap.Builder<Object, Object> builder) - throws SerializationException { - int keyCount = reader.readInt(); - for (int i = 0; i < keyCount; ++i) { - Object key = reader.readObject(); - int valueCount = reader.readInt(); - for (int j = 0; j < valueCount; ++j) { - Object value = reader.readObject(); - builder.put(key, value); - } - } - return builder.build(); - } - - @CanIgnoreReturnValue - public static Multimap<Object, Object> populate( - SerializationStreamReader reader, Multimap<Object, Object> multimap) - throws SerializationException { - int keyCount = reader.readInt(); - for (int i = 0; i < keyCount; ++i) { - Object key = reader.readObject(); - int valueCount = reader.readInt(); - for (int j = 0; j < valueCount; ++j) { - Object value = reader.readObject(); - multimap.put(key, value); - } - } - return multimap; - } - - public static void serialize(SerializationStreamWriter writer, Multimap<?, ?> instance) - throws SerializationException { - writer.writeInt(instance.asMap().size()); - for (Entry<?, ? extends Collection<?>> entry : instance.asMap().entrySet()) { - writer.writeObject(entry.getKey()); - writer.writeInt(entry.getValue().size()); - for (Object value : entry.getValue()) { - writer.writeObject(value); - } - } - } - - private Multimap_CustomFieldSerializerBase() {} -} diff --git a/guava-gwt/src/com/google/common/collect/Multiset_CustomFieldSerializerBase.java b/guava-gwt/src/com/google/common/collect/Multiset_CustomFieldSerializerBase.java deleted file mode 100644 index d03ed6765..000000000 --- a/guava-gwt/src/com/google/common/collect/Multiset_CustomFieldSerializerBase.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class contains static utility methods for writing {@code Multiset} GWT field serializers. - * Serializers should delegate to {@link #serialize(SerializationStreamWriter, Multiset)} and {@link - * #populate(SerializationStreamReader, Multiset)}. - * - * @author Chris Povirk - */ -final class Multiset_CustomFieldSerializerBase { - - static Multiset<Object> populate(SerializationStreamReader reader, Multiset<Object> multiset) - throws SerializationException { - int distinctElements = reader.readInt(); - for (int i = 0; i < distinctElements; i++) { - Object element = reader.readObject(); - int count = reader.readInt(); - multiset.add(element, count); - } - return multiset; - } - - static void serialize(SerializationStreamWriter writer, Multiset<?> instance) - throws SerializationException { - int entryCount = instance.entrySet().size(); - writer.writeInt(entryCount); - for (Multiset.Entry<?> entry : instance.entrySet()) { - writer.writeObject(entry.getElement()); - writer.writeInt(entry.getCount()); - } - } - - private Multiset_CustomFieldSerializerBase() {} -} diff --git a/guava-gwt/src/com/google/common/collect/NaturalOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/NaturalOrdering_CustomFieldSerializer.java deleted file mode 100644 index e75655cf1..000000000 --- a/guava-gwt/src/com/google/common/collect/NaturalOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link NaturalOrdering}. - * - * @author Chris Povirk - */ -public class NaturalOrdering_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, NaturalOrdering instance) {} - - public static NaturalOrdering instantiate(SerializationStreamReader reader) { - return NaturalOrdering.INSTANCE; - } - - public static void serialize(SerializationStreamWriter writer, NaturalOrdering instance) {} -} diff --git a/guava-gwt/src/com/google/common/collect/NullsFirstOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/NullsFirstOrdering_CustomFieldSerializer.java deleted file mode 100644 index 47dac6fbb..000000000 --- a/guava-gwt/src/com/google/common/collect/NullsFirstOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link NullsFirstOrdering}. - * - * @author Chris Povirk - */ -public class NullsFirstOrdering_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, NullsFirstOrdering<?> instance) {} - - @SuppressWarnings("unchecked") // deserialization is unsafe - public static NullsFirstOrdering<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return new NullsFirstOrdering<>((Ordering<Object>) reader.readObject()); - } - - public static void serialize(SerializationStreamWriter writer, NullsFirstOrdering<?> instance) - throws SerializationException { - writer.writeObject(instance.ordering); - } -} diff --git a/guava-gwt/src/com/google/common/collect/NullsLastOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/NullsLastOrdering_CustomFieldSerializer.java deleted file mode 100644 index a850494d2..000000000 --- a/guava-gwt/src/com/google/common/collect/NullsLastOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link NullsLastOrdering}. - * - * @author Chris Povirk - */ -public class NullsLastOrdering_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, NullsLastOrdering<?> instance) {} - - @SuppressWarnings("unchecked") // deserialization is unsafe - public static NullsLastOrdering<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return new NullsLastOrdering<>((Ordering<Object>) reader.readObject()); - } - - public static void serialize(SerializationStreamWriter writer, NullsLastOrdering<?> instance) - throws SerializationException { - writer.writeObject(instance.ordering); - } -} diff --git a/guava-gwt/src/com/google/common/collect/Range_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/Range_CustomFieldSerializer.java deleted file mode 100644 index 18c945ea3..000000000 --- a/guava-gwt/src/com/google/common/collect/Range_CustomFieldSerializer.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2016 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link Range}. - * - * @author Dean de Bree - */ -public class Range_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, Range<?> instance) {} - - public static Range<?> instantiate(SerializationStreamReader reader) - throws SerializationException { - - Cut lowerBound; - boolean hasLowerBound = reader.readBoolean(); - if (hasLowerBound) { - boolean lowerIsClosed = reader.readBoolean(); - Comparable lower = (Comparable) reader.readObject(); - - lowerBound = lowerIsClosed ? Cut.belowValue(lower) : Cut.aboveValue(lower); - } else { - lowerBound = Cut.belowAll(); - } - - Cut upperBound; - boolean hasUpperBound = reader.readBoolean(); - if (hasUpperBound) { - boolean upperIsClosed = reader.readBoolean(); - Comparable upper = (Comparable) reader.readObject(); - - upperBound = upperIsClosed ? Cut.aboveValue(upper) : Cut.belowValue(upper); - } else { - upperBound = Cut.aboveAll(); - } - - return Range.create(lowerBound, upperBound); - } - - public static void serialize(SerializationStreamWriter writer, Range<?> instance) - throws SerializationException { - - if (instance.hasLowerBound()) { - writer.writeBoolean(true); - writer.writeBoolean(instance.lowerBoundType() == BoundType.CLOSED); - writer.writeObject(instance.lowerEndpoint()); - } else { - writer.writeBoolean(false); - } - - if (instance.hasUpperBound()) { - writer.writeBoolean(true); - writer.writeBoolean(instance.upperBoundType() == BoundType.CLOSED); - writer.writeObject(instance.upperEndpoint()); - } else { - writer.writeBoolean(false); - } - } -} diff --git a/guava-gwt/src/com/google/common/collect/RegularImmutableAsList_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/RegularImmutableAsList_CustomFieldSerializer.java deleted file mode 100644 index f2036025d..000000000 --- a/guava-gwt/src/com/google/common/collect/RegularImmutableAsList_CustomFieldSerializer.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2010 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.common.annotations.GwtCompatible; -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Collection_CustomFieldSerializerBase; -import java.util.ArrayList; - -/** - * This class implements the GWT serialization of {@link RegularImmutableAsList}. - * - * @author Hayward Chan - */ -@GwtCompatible(emulated = true) -public class RegularImmutableAsList_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, RegularImmutableAsList<?> instance) {} - - public static RegularImmutableAsList<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - ArrayList<Object> elements = new ArrayList<>(); - Collection_CustomFieldSerializerBase.deserialize(reader, elements); - ImmutableList<Object> delegate = ImmutableList.copyOf(elements); - return new RegularImmutableAsList<>(delegate, delegate); - } - - public static void serialize(SerializationStreamWriter writer, RegularImmutableAsList<?> instance) - throws SerializationException { - Collection_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/RegularImmutableBiMap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/RegularImmutableBiMap_CustomFieldSerializer.java deleted file mode 100644 index a8ec71fb5..000000000 --- a/guava-gwt/src/com/google/common/collect/RegularImmutableBiMap_CustomFieldSerializer.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Map_CustomFieldSerializerBase; -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * This class implements the GWT serialization of {@link RegularImmutableBiMap}. - * - * @author Chris Povirk - */ -public class RegularImmutableBiMap_CustomFieldSerializer { - public static void deserialize(SerializationStreamReader reader, ImmutableBiMap<?, ?> instance) {} - - public static ImmutableBiMap<Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - Map<Object, Object> entries = new LinkedHashMap<>(); - Map_CustomFieldSerializerBase.deserialize(reader, entries); - return ImmutableBiMap.copyOf(entries); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableBiMap<?, ?> instance) - throws SerializationException { - Map_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/RegularImmutableList_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/RegularImmutableList_CustomFieldSerializer.java deleted file mode 100644 index 02b8d2051..000000000 --- a/guava-gwt/src/com/google/common/collect/RegularImmutableList_CustomFieldSerializer.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Collection_CustomFieldSerializerBase; -import java.util.ArrayList; -import java.util.List; - -/** - * This class implements the GWT serialization of {@link RegularImmutableList}. - * - * @author Hayward Chan - */ -public class RegularImmutableList_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, RegularImmutableList<?> instance) {} - - public static RegularImmutableList<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - List<Object> elements = new ArrayList<>(); - Collection_CustomFieldSerializerBase.deserialize(reader, elements); - /* - * For this custom field serializer to be invoked, the list must have been - * RegularImmutableList before it's serialized. Since RegularImmutableList - * always have one or more elements, ImmutableList.copyOf always return - * a RegularImmutableList back. - */ - return (RegularImmutableList<Object>) ImmutableList.copyOf(elements); - } - - public static void serialize(SerializationStreamWriter writer, RegularImmutableList<?> instance) - throws SerializationException { - Collection_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/RegularImmutableMap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/RegularImmutableMap_CustomFieldSerializer.java deleted file mode 100644 index 283caf442..000000000 --- a/guava-gwt/src/com/google/common/collect/RegularImmutableMap_CustomFieldSerializer.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Map_CustomFieldSerializerBase; -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * This class implements the GWT serialization of {@link RegularImmutableMap}. - * - * @author Hayward Chan - */ -public class RegularImmutableMap_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, ImmutableMap<?, ?> instance) {} - - public static ImmutableMap<Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - Map<Object, Object> entries = new LinkedHashMap<>(); - Map_CustomFieldSerializerBase.deserialize(reader, entries); - return ImmutableMap.copyOf(entries); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableMap<?, ?> instance) - throws SerializationException { - Map_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/RegularImmutableMultiset_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/RegularImmutableMultiset_CustomFieldSerializer.java deleted file mode 100644 index 96390db97..000000000 --- a/guava-gwt/src/com/google/common/collect/RegularImmutableMultiset_CustomFieldSerializer.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2011 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link RegularImmutableMultiset}. - * - * @author Louis Wasserman - */ -public class RegularImmutableMultiset_CustomFieldSerializer { - public static void deserialize(SerializationStreamReader reader, ImmutableMultiset<?> instance) {} - - public static ImmutableMultiset<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return ImmutableMultiset.copyOf( - Multiset_CustomFieldSerializerBase.populate(reader, LinkedHashMultiset.create())); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableMultiset<?> instance) - throws SerializationException { - Multiset_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/RegularImmutableSet_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/RegularImmutableSet_CustomFieldSerializer.java deleted file mode 100644 index be88c42d4..000000000 --- a/guava-gwt/src/com/google/common/collect/RegularImmutableSet_CustomFieldSerializer.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Collection_CustomFieldSerializerBase; -import java.util.List; - -/** - * This class implements the GWT serialization of {@link RegularImmutableSet}. - * - * @author Hayward Chan - */ -public class RegularImmutableSet_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, ImmutableSet<?> instance) {} - - public static ImmutableSet<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - List<Object> elements = Lists.newArrayList(); - Collection_CustomFieldSerializerBase.deserialize(reader, elements); - return ImmutableSet.copyOf(elements); - } - - public static void serialize(SerializationStreamWriter writer, ImmutableSet<?> instance) - throws SerializationException { - Collection_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/RegularImmutableSortedSet_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/RegularImmutableSortedSet_CustomFieldSerializer.java deleted file mode 100644 index facf3127d..000000000 --- a/guava-gwt/src/com/google/common/collect/RegularImmutableSortedSet_CustomFieldSerializer.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.google.gwt.user.client.rpc.core.java.util.Collection_CustomFieldSerializerBase; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; - -/** - * This class implements the GWT serialization of {@link RegularImmutableSortedSet}. - * - * @author Chris Povirk - */ -public class RegularImmutableSortedSet_CustomFieldSerializer { - public static void deserialize( - SerializationStreamReader reader, RegularImmutableSortedSet<?> instance) {} - - public static RegularImmutableSortedSet<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - /* - * Nothing we can do, but we're already assuming the serialized form is - * correctly typed, anyway. - */ - @SuppressWarnings("unchecked") - Comparator<Object> comparator = (Comparator<Object>) reader.readObject(); - - List<Object> elements = new ArrayList<>(); - Collection_CustomFieldSerializerBase.deserialize(reader, elements); - /* - * For this custom field serializer to be invoked, the set must have been - * RegularImmutableSortedSet before it's serialized. Since - * RegularImmutableSortedSet always have one or more elements, - * ImmutableSortedSet.copyOf always return a RegularImmutableSortedSet back. - */ - return (RegularImmutableSortedSet<Object>) ImmutableSortedSet.copyOf(comparator, elements); - } - - public static void serialize( - SerializationStreamWriter writer, RegularImmutableSortedSet<?> instance) - throws SerializationException { - writer.writeObject(instance.comparator()); - - Collection_CustomFieldSerializerBase.serialize(writer, instance); - } -} diff --git a/guava-gwt/src/com/google/common/collect/ReverseNaturalOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ReverseNaturalOrdering_CustomFieldSerializer.java deleted file mode 100644 index 0ad94647d..000000000 --- a/guava-gwt/src/com/google/common/collect/ReverseNaturalOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link ReverseNaturalOrdering}. - * - * @author Chris Povirk - */ -public class ReverseNaturalOrdering_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, ReverseNaturalOrdering instance) {} - - public static ReverseNaturalOrdering instantiate(SerializationStreamReader reader) { - return ReverseNaturalOrdering.INSTANCE; - } - - public static void serialize(SerializationStreamWriter writer, ReverseNaturalOrdering instance) {} -} diff --git a/guava-gwt/src/com/google/common/collect/ReverseOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/ReverseOrdering_CustomFieldSerializer.java deleted file mode 100644 index 7b3ecd7dd..000000000 --- a/guava-gwt/src/com/google/common/collect/ReverseOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link ReverseOrdering}. - * - * @author Chris Povirk - */ -public class ReverseOrdering_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader reader, ReverseOrdering<?> instance) {} - - @SuppressWarnings("unchecked") // deserialization is unsafe - public static ReverseOrdering<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - return new ReverseOrdering<>((Ordering<Object>) reader.readObject()); - } - - public static void serialize(SerializationStreamWriter writer, ReverseOrdering<?> instance) - throws SerializationException { - writer.writeObject(instance.forwardOrder); - } -} diff --git a/guava-gwt/src/com/google/common/collect/SingletonImmutableBiMap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/SingletonImmutableBiMap_CustomFieldSerializer.java deleted file mode 100644 index 89fe8ff85..000000000 --- a/guava-gwt/src/com/google/common/collect/SingletonImmutableBiMap_CustomFieldSerializer.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import static com.google.common.base.Preconditions.checkNotNull; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link SingletonImmutableBiMap}. - * - * @author Chris Povirk - */ -public class SingletonImmutableBiMap_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, SingletonImmutableBiMap<?, ?> instance) {} - - public static SingletonImmutableBiMap<Object, Object> instantiate( - SerializationStreamReader reader) throws SerializationException { - Object key = checkNotNull(reader.readObject()); - Object value = checkNotNull(reader.readObject()); - return new SingletonImmutableBiMap<>(key, value); - } - - public static void serialize( - SerializationStreamWriter writer, SingletonImmutableBiMap<?, ?> instance) - throws SerializationException { - writer.writeObject(instance.singleKey); - writer.writeObject(instance.singleValue); - } -} diff --git a/guava-gwt/src/com/google/common/collect/SingletonImmutableList_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/SingletonImmutableList_CustomFieldSerializer.java deleted file mode 100644 index b2a549d22..000000000 --- a/guava-gwt/src/com/google/common/collect/SingletonImmutableList_CustomFieldSerializer.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link SingletonImmutableList}. - * - * @author Chris Povirk - */ -public class SingletonImmutableList_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, SingletonImmutableList<?> instance) {} - - public static SingletonImmutableList<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - Object element = reader.readObject(); - return new SingletonImmutableList<>(element); - } - - public static void serialize(SerializationStreamWriter writer, SingletonImmutableList<?> instance) - throws SerializationException { - writer.writeObject(instance.element); - } -} diff --git a/guava-gwt/src/com/google/common/collect/SingletonImmutableSet_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/SingletonImmutableSet_CustomFieldSerializer.java deleted file mode 100644 index 711a51c09..000000000 --- a/guava-gwt/src/com/google/common/collect/SingletonImmutableSet_CustomFieldSerializer.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link SingletonImmutableSet}. - * - * @author Hayward Chan - */ -public class SingletonImmutableSet_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, SingletonImmutableSet<?> instance) {} - - public static SingletonImmutableSet<Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - Object element = reader.readObject(); - return new SingletonImmutableSet<>(element); - } - - public static void serialize(SerializationStreamWriter writer, SingletonImmutableSet<?> instance) - throws SerializationException { - writer.writeObject(instance.element); - } -} diff --git a/guava-gwt/src/com/google/common/collect/SingletonImmutableTable_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/SingletonImmutableTable_CustomFieldSerializer.java deleted file mode 100644 index 13413d8e7..000000000 --- a/guava-gwt/src/com/google/common/collect/SingletonImmutableTable_CustomFieldSerializer.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link SingletonImmutableTable}. - * - * @author Chris Povirk - */ -public class SingletonImmutableTable_CustomFieldSerializer { - public static void deserialize( - SerializationStreamReader reader, SingletonImmutableTable<?, ?, ?> instance) {} - - public static SingletonImmutableTable<Object, Object, Object> instantiate( - SerializationStreamReader reader) throws SerializationException { - Object rowKey = reader.readObject(); - Object columnKey = reader.readObject(); - Object value = reader.readObject(); - return new SingletonImmutableTable<>(rowKey, columnKey, value); - } - - public static void serialize( - SerializationStreamWriter writer, SingletonImmutableTable<?, ?, ?> instance) - throws SerializationException { - writer.writeObject(instance.singleRowKey); - writer.writeObject(instance.singleColumnKey); - writer.writeObject(instance.singleValue); - } -} diff --git a/guava-gwt/src/com/google/common/collect/SparseImmutableTable_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/SparseImmutableTable_CustomFieldSerializer.java deleted file mode 100644 index 571ddd17f..000000000 --- a/guava-gwt/src/com/google/common/collect/SparseImmutableTable_CustomFieldSerializer.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2012 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link SparseImmutableTable}. - * - * @author Chris Povirk - */ -public class SparseImmutableTable_CustomFieldSerializer { - public static void deserialize( - SerializationStreamReader reader, SparseImmutableTable<?, ?, ?> instance) {} - - public static SparseImmutableTable<Object, Object, Object> instantiate( - SerializationStreamReader reader) throws SerializationException { - return (SparseImmutableTable<Object, Object, Object>) - ImmutableTable_CustomFieldSerializerBase.instantiate(reader); - } - - public static void serialize( - SerializationStreamWriter writer, SparseImmutableTable<Object, Object, Object> table) - throws SerializationException { - ImmutableTable_CustomFieldSerializerBase.serialize(writer, table); - } -} diff --git a/guava-gwt/src/com/google/common/collect/Table_CustomFieldSerializerBase.java b/guava-gwt/src/com/google/common/collect/Table_CustomFieldSerializerBase.java deleted file mode 100644 index cd857d155..000000000 --- a/guava-gwt/src/com/google/common/collect/Table_CustomFieldSerializerBase.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import java.util.Map; -import java.util.Map.Entry; - -/** - * This class contains static utility methods for writing {@link Table} GWT field serializers. - * Serializers should delegate to {@link #serialize} and {@link #populate}. - * - * <p>For {@link ImmutableTable}, see {@link ImmutableTable_CustomFieldSerializerBase}. - * - * @author Chris Povirk - */ -final class Table_CustomFieldSerializerBase { - static <T extends StandardTable<Object, Object, Object>> T populate( - SerializationStreamReader reader, T table) throws SerializationException { - Map<?, ?> hashMap = (Map<?, ?>) reader.readObject(); - for (Entry<?, ?> row : hashMap.entrySet()) { - table.row(row.getKey()).putAll((Map<?, ?>) row.getValue()); - } - return table; - } - - static void serialize(SerializationStreamWriter writer, StandardTable<?, ?, ?> table) - throws SerializationException { - /* - * The backing map of a {Hash,Tree}BasedTable is a {Hash,Tree}Map of {Hash,Tree}Maps. Therefore, - * the backing map is serializable (assuming that the row, column and values, along with any - * comparators, are all serializable). - */ - writer.writeObject(table.backingMap); - } - - private Table_CustomFieldSerializerBase() {} -} diff --git a/guava-gwt/src/com/google/common/collect/TreeBasedTable_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/TreeBasedTable_CustomFieldSerializer.java deleted file mode 100644 index 7258b2a70..000000000 --- a/guava-gwt/src/com/google/common/collect/TreeBasedTable_CustomFieldSerializer.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import java.util.Comparator; - -/** - * This class implements the GWT serialization of {@link TreeBasedTable}. - * - * @author Hayward Chan - */ -public class TreeBasedTable_CustomFieldSerializer { - public static void deserialize(SerializationStreamReader reader, TreeBasedTable<?, ?, ?> table) {} - - public static TreeBasedTable<Object, Object, Object> instantiate(SerializationStreamReader reader) - throws SerializationException { - @SuppressWarnings("unchecked") // The comparator isn't used statically. - Comparator<Object> rowComparator = (Comparator<Object>) reader.readObject(); - @SuppressWarnings("unchecked") // The comparator isn't used statically. - Comparator<Object> columnComparator = (Comparator<Object>) reader.readObject(); - - TreeBasedTable<Object, Object, Object> table = - TreeBasedTable.create(rowComparator, columnComparator); - return Table_CustomFieldSerializerBase.populate(reader, table); - } - - public static void serialize(SerializationStreamWriter writer, TreeBasedTable<?, ?, ?> table) - throws SerializationException { - writer.writeObject(table.rowComparator()); - writer.writeObject(table.columnComparator()); - Table_CustomFieldSerializerBase.serialize(writer, table); - } -} diff --git a/guava-gwt/src/com/google/common/collect/TreeMultimap_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/TreeMultimap_CustomFieldSerializer.java deleted file mode 100644 index 1cb961c0a..000000000 --- a/guava-gwt/src/com/google/common/collect/TreeMultimap_CustomFieldSerializer.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import java.util.Comparator; - -/** - * This class implements the GWT serialization of {@link TreeMultimap}. - * - * @author Nikhil Singhal - */ -public class TreeMultimap_CustomFieldSerializer { - - public static void deserialize(SerializationStreamReader in, TreeMultimap<?, ?> out) {} - - @SuppressWarnings("unchecked") - public static TreeMultimap<Object, Object> instantiate(SerializationStreamReader in) - throws SerializationException { - Comparator<Object> keyComparator = (Comparator<Object>) in.readObject(); - Comparator<Object> valueComparator = (Comparator<Object>) in.readObject(); - - return (TreeMultimap<Object, Object>) - Multimap_CustomFieldSerializerBase.populate( - in, TreeMultimap.create(keyComparator, valueComparator)); - } - - public static void serialize(SerializationStreamWriter out, TreeMultimap<?, ?> multimap) - throws SerializationException { - out.writeObject(multimap.keyComparator()); - out.writeObject(multimap.valueComparator()); - Multimap_CustomFieldSerializerBase.serialize(out, multimap); - } -} diff --git a/guava-gwt/src/com/google/common/collect/UsingToStringOrdering_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/collect/UsingToStringOrdering_CustomFieldSerializer.java deleted file mode 100644 index 54a9e1558..000000000 --- a/guava-gwt/src/com/google/common/collect/UsingToStringOrdering_CustomFieldSerializer.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2009 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect; - -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@link UsingToStringOrdering}. - * - * @author Chris Povirk - */ -public class UsingToStringOrdering_CustomFieldSerializer { - - public static void deserialize( - SerializationStreamReader reader, UsingToStringOrdering instance) {} - - public static UsingToStringOrdering instantiate(SerializationStreamReader reader) { - return UsingToStringOrdering.INSTANCE; - } - - public static void serialize(SerializationStreamWriter writer, UsingToStringOrdering instance) {} -} diff --git a/guava-gwt/src/com/google/common/escape/Escape.gwt.xml b/guava-gwt/src/com/google/common/escape/Escape.gwt.xml index 128412237..d04c253bd 100644 --- a/guava-gwt/src/com/google/common/escape/Escape.gwt.xml +++ b/guava-gwt/src/com/google/common/escape/Escape.gwt.xml @@ -14,8 +14,11 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.common.base.Base"/> + <inherits name="com.google.gwt.core.Core"/> - + </module> diff --git a/guava-gwt/src/com/google/common/html/Html.gwt.xml b/guava-gwt/src/com/google/common/html/Html.gwt.xml index 8ab917eed..143da9bfe 100644 --- a/guava-gwt/src/com/google/common/html/Html.gwt.xml +++ b/guava-gwt/src/com/google/common/html/Html.gwt.xml @@ -14,8 +14,11 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.common.escape.Escape"/> + <inherits name="com.google.gwt.core.Core"/> </module> diff --git a/guava-gwt/src/com/google/common/io/Io.gwt.xml b/guava-gwt/src/com/google/common/io/Io.gwt.xml index cc1193ada..779065564 100644 --- a/guava-gwt/src/com/google/common/io/Io.gwt.xml +++ b/guava-gwt/src/com/google/common/io/Io.gwt.xml @@ -14,10 +14,15 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.common.base.Base"/> + <inherits name="com.google.common.math.Math"/> + <inherits name="com.google.common.primitives.Primitives"/> + <inherits name="com.google.gwt.core.Core"/> - + </module> diff --git a/guava-gwt/src/com/google/common/math/Math.gwt.xml b/guava-gwt/src/com/google/common/math/Math.gwt.xml index 11314f7b3..f5f987910 100644 --- a/guava-gwt/src/com/google/common/math/Math.gwt.xml +++ b/guava-gwt/src/com/google/common/math/Math.gwt.xml @@ -14,9 +14,13 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.common.base.Base"/> + <inherits name="com.google.common.primitives.Primitives"/> + <inherits name="com.google.gwt.core.Core"/> - + </module> diff --git a/guava-gwt/src/com/google/common/net/Net.gwt.xml b/guava-gwt/src/com/google/common/net/Net.gwt.xml index 8e09522d9..19a6cb6fe 100644 --- a/guava-gwt/src/com/google/common/net/Net.gwt.xml +++ b/guava-gwt/src/com/google/common/net/Net.gwt.xml @@ -14,13 +14,21 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.common.base.Base"/> + <inherits name="com.google.common.collect.Collect"/> + <inherits name="com.google.common.escape.Escape"/> + <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixPatterns"/> + <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType"/> + <inherits name="com.google.gwt.core.Core"/> - + </module> diff --git a/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml b/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml index 4200ce499..505f45cca 100644 --- a/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml +++ b/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml @@ -14,9 +14,13 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.common.base.Base"/> + <inherits name="com.google.gwt.core.Core"/> </module> diff --git a/guava-gwt/src/com/google/common/primitives/UnsignedLong_CustomFieldSerializer.java b/guava-gwt/src/com/google/common/primitives/UnsignedLong_CustomFieldSerializer.java deleted file mode 100644 index 06403201d..000000000 --- a/guava-gwt/src/com/google/common/primitives/UnsignedLong_CustomFieldSerializer.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2011 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.primitives; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; - -/** - * This class implements the GWT serialization of {@code UnsignedLong}. - * - * @author Louis Wasserman - */ -public class UnsignedLong_CustomFieldSerializer { - public static void deserialize(SerializationStreamReader reader, UnsignedLong instance) {} - - public static UnsignedLong instantiate(SerializationStreamReader reader) - throws SerializationException { - return UnsignedLong.fromLongBits(reader.readLong()); - } - - public static void serialize(SerializationStreamWriter writer, UnsignedLong instance) - throws SerializationException { - writer.writeLong(instance.longValue()); - } -} diff --git a/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml b/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml index 398ee57e1..e80620d4b 100644 --- a/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml +++ b/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml @@ -14,9 +14,15 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.common.base.Base"/> + <inherits name="com.google.common.collect.Collect"/> + + <inherits name="elemental2.promise.Promise"/> + <inherits name="com.google.gwt.core.Core"/> </module> diff --git a/guava-gwt/src/com/google/common/xml/Xml.gwt.xml b/guava-gwt/src/com/google/common/xml/Xml.gwt.xml index 7e6cebe08..d00c0edbd 100644 --- a/guava-gwt/src/com/google/common/xml/Xml.gwt.xml +++ b/guava-gwt/src/com/google/common/xml/Xml.gwt.xml @@ -14,9 +14,13 @@ <super-source path="super"/> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.common.base.Base"/> + <inherits name="com.google.common.escape.Escape"/> + <inherits name="com.google.gwt.core.Core"/> </module> diff --git a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml index 49446182a..d5dd2908c 100644 --- a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml +++ b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml @@ -20,5 +20,11 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /><inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType" /><inherits name="com.google.common.annotations.Annotations" /><inherits name="com.google.common.base.Base" /><inherits name="com.google.common.collect.Collect" /><inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> + +<inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType" /> +<inherits name="com.google.common.annotations.Annotations" /> +<inherits name="com.google.common.base.Base" /> +<inherits name="com.google.common.collect.Collect" /> +<inherits name="com.google.gwt.core.Core" /> </module> diff --git a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml index b4f1c4fb1..ffbcaf104 100644 --- a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml +++ b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml @@ -20,5 +20,8 @@ (I hope that this workaround does not cause its own problems in the future.) --> <super-source path="super"/> -<inherits name="com.google.gwt.user.User" /><inherits name="com.google.common.annotations.Annotations" /><inherits name="com.google.gwt.core.Core" /> +<inherits name="com.google.gwt.user.User" /> + +<inherits name="com.google.common.annotations.Annotations" /> +<inherits name="com.google.gwt.core.Core" /> </module> |