Add ConcurrentHashMap.KeySetView serializer

Author: bergander

src/com/esotericsoftware/kryo/serializers/DefaultSerializers.java

@@ -1,15 +1,15 @@
 /* Copyright (c) 2008-2025, Nathan Sweet
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
  * conditions are met:
- * 
+ *
  * - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
  * disclaimer in the documentation and/or other materials provided with the distribution.
  * - Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived
  * from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
  * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
  * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
@@ -855,18 +855,20 @@ private PriorityQueue createPriorityQueue (Class<? extends Collection> type, int
 
 	/** Serializer for {@link ConcurrentHashMap.KeySetView}.
 	 * @author Andreas Bergander */
-	public static class KeySetViewSerializer extends CollectionSerializer<ConcurrentHashMap.KeySetView> {
-		protected void writeHeader (Kryo kryo, Output output, ConcurrentHashMap.KeySetView set) {
+	public static class KeySetViewSerializer extends Serializer<ConcurrentHashMap.KeySetView> {
+		public void write (Kryo kryo, Output output, ConcurrentHashMap.KeySetView set) {
 			kryo.writeClassAndObject(output, set.getMap());
 			kryo.writeClassAndObject(output, set.getMappedValue());
 		}
 
-		protected ConcurrentHashMap.KeySetView create (Kryo kryo, Input input, Class<? extends ConcurrentHashMap.KeySetView> type, int size) {
+		public ConcurrentHashMap.KeySetView read (Kryo kryo, Input input, Class<? extends ConcurrentHashMap.KeySetView> type) {
 			return createKeySetView((ConcurrentHashMap)kryo.readClassAndObject(input), kryo.readClassAndObject(input));
 		}
 
-		protected ConcurrentHashMap.KeySetView createCopy (Kryo kryo, ConcurrentHashMap.KeySetView original) {
-			return createKeySetView(original.getMap(), original.getMappedValue());
+		public ConcurrentHashMap.KeySetView copy (Kryo kryo, ConcurrentHashMap.KeySetView original) {
+
+			ConcurrentHashMap newMap = kryo.copy(original.getMap());
+			return newMap.keySet(kryo.copy(original.getMappedValue()));
 		}
 
 		private ConcurrentHashMap.KeySetView createKeySetView (ConcurrentHashMap map, Object mappedValue) {

test/com/esotericsoftware/kryo/serializers/DefaultSerializersTest.java

@@ -1,15 +1,15 @@
 /* Copyright (c) 2008-2025, Nathan Sweet
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
  * conditions are met:
- * 
+ *
  * - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
  * disclaimer in the documentation and/or other materials provided with the distribution.
  * - Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived
  * from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
  * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
  * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
@@ -460,7 +460,7 @@ void testConcurrentHashMapKeySetView () {
 		set.add(12);
 		kryo.register(ConcurrentHashMap.KeySetView.class, new KeySetViewSerializer());
 		kryo.register(ConcurrentHashMap.class);
-		roundTrip(13, set);
+		roundTrip(9, set);
 	}
 
 	@Test
@@ -474,15 +474,15 @@ void testConcurrentHashMapKeySetViewFromExistingMap () {
 
 		kryo.register(ConcurrentHashMap.KeySetView.class, new KeySetViewSerializer());
 		kryo.register(ConcurrentHashMap.class);
-		roundTrip(22, set);
+		roundTrip(15, set);
 	}
 
 	@Test
 	void testEmptyConcurrentHashMapKeySetView () {
 		ConcurrentHashMap.KeySetView set = ConcurrentHashMap.newKeySet();
 		kryo.register(ConcurrentHashMap.KeySetView.class, new KeySetViewSerializer());
 		kryo.register(ConcurrentHashMap.class);
-		roundTrip(6, set);
+		roundTrip(5, set);
 	}
 
 	@Test