Fixed - codec classLoader wasn't used in TasksRunnerService. #1310

redisson/src/main/java/org/redisson/cache/LocalCachedMessageCodec.java

@@ -150,4 +150,9 @@ public class LocalCachedMessageCodec implements Codec {
         return encoder;
     }
 
+    @Override
+    public ClassLoader getClassLoader() {
+        return getClass().getClassLoader();
+    }
+
 }

redisson/src/main/java/org/redisson/client/codec/BaseCodec.java

@@ -0,0 +1,53 @@
+/**
+ * Copyright 2018 Nikita Koksharov
+ *
+ * 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 org.redisson.client.codec;
+
+import org.redisson.client.protocol.Decoder;
+import org.redisson.client.protocol.Encoder;
+
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public abstract class BaseCodec implements Codec {
+
+    @Override
+    public Decoder<Object> getMapValueDecoder() {
+        return getValueDecoder();
+    }
+
+    @Override
+    public Encoder getMapValueEncoder() {
+        return getValueEncoder();
+    }
+
+    @Override
+    public Decoder<Object> getMapKeyDecoder() {
+        return getValueDecoder();
+    }
+
+    @Override
+    public Encoder getMapKeyEncoder() {
+        return getValueEncoder();
+    }
+
+    @Override
+    public ClassLoader getClassLoader() {
+        return getClass().getClassLoader();
+    }
+    
+}

redisson/src/main/java/org/redisson/client/codec/BitSetCodec.java

@@ -81,4 +81,9 @@ public class BitSetCodec implements Codec {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public ClassLoader getClassLoader() {
+        return getClass().getClassLoader();
+    }
+
 }

redisson/src/main/java/org/redisson/client/codec/ByteArrayCodec.java

@@ -29,7 +29,7 @@ import io.netty.buffer.ByteBufAllocator;
  * @author Nikita Koksharov
  *
  */
-public class ByteArrayCodec implements Codec {
+public class ByteArrayCodec extends BaseCodec {
 
     public static final ByteArrayCodec INSTANCE = new ByteArrayCodec();
 
@@ -62,24 +62,4 @@ public class ByteArrayCodec implements Codec {
         return encoder;
     }
 
-    @Override
-    public Decoder<Object> getMapValueDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapValueEncoder() {
-        return getValueEncoder();
-    }
-
-    @Override
-    public Decoder<Object> getMapKeyDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapKeyEncoder() {
-        return getValueEncoder();
-    }
-
 }

redisson/src/main/java/org/redisson/client/codec/Codec.java

@@ -71,4 +71,11 @@ public interface Codec {
      */
     Encoder getValueEncoder();
     
+    /**
+     * Returns class loader object used to load classes used in decoding process
+     * 
+     * @return class loader
+     */
+    ClassLoader getClassLoader();
+
 }

redisson/src/main/java/org/redisson/client/codec/MapScanCodec.java

@@ -102,4 +102,9 @@ public class MapScanCodec implements Codec {
         return delegate.getMapKeyEncoder();
     }
 
+    @Override
+    public ClassLoader getClassLoader() {
+        return getClass().getClassLoader();
+    }
+
 }

redisson/src/main/java/org/redisson/client/codec/ScanCodec.java

@@ -78,4 +78,9 @@ public class ScanCodec implements Codec {
         return delegate.getMapKeyEncoder();
     }
 
+    @Override
+    public ClassLoader getClassLoader() {
+        return delegate.getClassLoader();
+    }
+
 }

redisson/src/main/java/org/redisson/client/codec/StringCodec.java

@@ -31,7 +31,7 @@ import io.netty.util.CharsetUtil;
  * @author Nikita Koksharov
  *
  */
-public class StringCodec implements Codec {
+public class StringCodec extends BaseCodec {
 
     public static final StringCodec INSTANCE = new StringCodec();
 
@@ -81,24 +81,4 @@ public class StringCodec implements Codec {
         return encoder;
     }
 
-    @Override
-    public Decoder<Object> getMapValueDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapValueEncoder() {
-        return getValueEncoder();
-    }
-
-    @Override
-    public Decoder<Object> getMapKeyDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapKeyEncoder() {
-        return getValueEncoder();
-    }
-
 }

redisson/src/main/java/org/redisson/codec/CompositeCodec.java

@@ -71,4 +71,9 @@ public class CompositeCodec implements Codec {
         return valueCodec.getValueEncoder();
     }
 
+    @Override
+    public ClassLoader getClassLoader() {
+        return getClass().getClassLoader();
+    }
+
 }

redisson/src/main/java/org/redisson/codec/FstCodec.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 import org.nustaq.serialization.FSTConfiguration;
 import org.nustaq.serialization.FSTObjectInput;
 import org.nustaq.serialization.FSTObjectOutput;
-import org.redisson.client.codec.Codec;
+import org.redisson.client.codec.BaseCodec;
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
 import org.redisson.client.protocol.Encoder;
@@ -39,7 +39,7 @@ import io.netty.buffer.ByteBufOutputStream;
  * @author Nikita Koksharov
  *
  */
-public class FstCodec implements Codec {
+public class FstCodec extends BaseCodec {
 
     private final FSTConfiguration config;
 
@@ -95,33 +95,22 @@ public class FstCodec implements Codec {
     };
 
     @Override
-    public Decoder<Object> getMapValueDecoder() {
+    public Decoder<Object> getValueDecoder() {
-        return getValueDecoder();
+        return decoder;
-    }
-
-    @Override
-    public Encoder getMapValueEncoder() {
-        return getValueEncoder();
-    }
-
-    @Override
-    public Decoder<Object> getMapKeyDecoder() {
-        return getValueDecoder();
     }
 
     @Override
-    public Encoder getMapKeyEncoder() {
+    public Encoder getValueEncoder() {
-        return getValueEncoder();
+        return encoder;
     }
     
     @Override
-    public Decoder<Object> getValueDecoder() {
+    public ClassLoader getClassLoader() {
-        return decoder;
+        if (config.getClassLoader() != null) {
+            return config.getClassLoader();
         }
 
-    @Override
+        return super.getClassLoader();
-    public Encoder getValueEncoder() {
-        return encoder;
     }
 
 }

redisson/src/main/java/org/redisson/codec/JsonJacksonCodec.java

@@ -21,7 +21,7 @@ import java.io.OutputStream;
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import org.redisson.client.codec.Codec;
+import org.redisson.client.codec.BaseCodec;
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
 import org.redisson.client.protocol.Encoder;
@@ -32,6 +32,7 @@ import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import com.fasterxml.jackson.core.JsonGenerator.Feature;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.MapperFeature;
@@ -55,7 +56,7 @@ import io.netty.buffer.ByteBufOutputStream;
  * @author Nikita Koksharov
  *
  */
-public class JsonJacksonCodec implements Codec {
+public class JsonJacksonCodec extends BaseCodec {
 
     public static final JsonJacksonCodec INSTANCE = new JsonJacksonCodec();
 
@@ -155,45 +156,36 @@ public class JsonJacksonCodec implements Codec {
         objectMapper.registerModule(new DefenceModule());
         
         objectMapper.setSerializationInclusion(Include.NON_NULL);
-        objectMapper.setVisibilityChecker(objectMapper.getSerializationConfig().getDefaultVisibilityChecker()
+        objectMapper.setVisibility(objectMapper.getSerializationConfig()
-                .withFieldVisibility(JsonAutoDetect.Visibility.ANY).withGetterVisibility(JsonAutoDetect.Visibility.NONE)
+                                                    .getDefaultVisibilityChecker()
+                                                        .withFieldVisibility(JsonAutoDetect.Visibility.ANY)
+                                                        .withGetterVisibility(JsonAutoDetect.Visibility.NONE)
                                                         .withSetterVisibility(JsonAutoDetect.Visibility.NONE)
                                                         .withCreatorVisibility(JsonAutoDetect.Visibility.NONE));
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-        objectMapper.configure(SerializationFeature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.enable(Feature.WRITE_BIGDECIMAL_AS_PLAIN);
-        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+        objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
-        objectMapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);
+        objectMapper.enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY);
         objectMapper.addMixIn(Throwable.class, ThrowableMixIn.class);
     }
 
     @Override
-    public Decoder<Object> getMapValueDecoder() {
+    public Decoder<Object> getValueDecoder() {
-        return decoder;
-    }
-
-    @Override
-    public Encoder getMapValueEncoder() {
-        return encoder;
-    }
-
-    @Override
-    public Decoder<Object> getMapKeyDecoder() {
         return decoder;
     }
 
     @Override
-    public Encoder getMapKeyEncoder() {
+    public Encoder getValueEncoder() {
         return encoder;
     }
     
     @Override
-    public Decoder<Object> getValueDecoder() {
+    public ClassLoader getClassLoader() {
-        return decoder;
+        if (mapObjectMapper.getTypeFactory().getClassLoader() != null) {
+            return mapObjectMapper.getTypeFactory().getClassLoader();
         }
 
-    @Override
+        return super.getClassLoader();
-    public Encoder getValueEncoder() {
-        return encoder;
     }
 
     public ObjectMapper getObjectMapper() {

redisson/src/main/java/org/redisson/codec/KryoCodec.java

@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.redisson.client.codec.Codec;
+import org.redisson.client.codec.BaseCodec;
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
 import org.redisson.client.protocol.Encoder;
@@ -40,7 +40,7 @@ import io.netty.buffer.ByteBufOutputStream;
  * @author Nikita Koksharov
  *
  */
-public class KryoCodec implements Codec {
+public class KryoCodec extends BaseCodec {
 
     public interface KryoPool {
 
@@ -48,6 +48,8 @@ public class KryoCodec implements Codec {
 
         void yield(Kryo kryo);
         
+        ClassLoader getClassLoader();
+
     }
 
     public static class KryoPoolImpl implements KryoPool {
@@ -90,6 +92,11 @@ public class KryoCodec implements Codec {
             return kryo;
         }
 
+        @Override
+        public ClassLoader getClassLoader() {
+            return classLoader;
+        }
+
     }
 
     public class RedissonKryoCodecException extends RuntimeException {
@@ -171,26 +178,6 @@ public class KryoCodec implements Codec {
         this.kryoPool = kryoPool;
     }
 
-    @Override
-    public Decoder<Object> getMapValueDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapValueEncoder() {
-        return getValueEncoder();
-    }
-
-    @Override
-    public Decoder<Object> getMapKeyDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapKeyEncoder() {
-        return getValueEncoder();
-    }
-
     @Override
     public Decoder<Object> getValueDecoder() {
         return decoder;
@@ -201,4 +188,12 @@ public class KryoCodec implements Codec {
         return encoder;
     }
     
+    @Override
+    public ClassLoader getClassLoader() {
+        if (kryoPool.getClassLoader() != null) {
+            return kryoPool.getClassLoader();
+        }
+        return super.getClassLoader();
+    }
+
 }

redisson/src/main/java/org/redisson/codec/LZ4Codec.java

@@ -18,6 +18,7 @@ package org.redisson.codec;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
+import org.redisson.client.codec.BaseCodec;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -41,7 +42,7 @@ import net.jpountz.lz4.LZ4SafeDecompressor;
  * @author Nikita Koksharov
  *
  */
-public class LZ4Codec implements Codec {
+public class LZ4Codec extends BaseCodec {
 
     private static final int DECOMPRESSION_HEADER_SIZE = Integer.SIZE / 8;
     private final LZ4Factory factory = LZ4Factory.fastestInstance();
@@ -108,26 +109,6 @@ public class LZ4Codec implements Codec {
         }
     };
 
-    @Override
-    public Decoder<Object> getMapValueDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapValueEncoder() {
-        return getValueEncoder();
-    }
-
-    @Override
-    public Decoder<Object> getMapKeyDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapKeyEncoder() {
-        return getValueEncoder();
-    }
-
     @Override
     public Decoder<Object> getValueDecoder() {
         return decoder;

redisson/src/main/java/org/redisson/codec/MapCacheEventCodec.java

@@ -104,4 +104,9 @@ public class MapCacheEventCodec implements Codec {
         return key;
     }
 
+    @Override
+    public ClassLoader getClassLoader() {
+        return getClass().getClassLoader();
+    }
+
 }

redisson/src/main/java/org/redisson/codec/SerializationCodec.java

@@ -114,4 +114,12 @@ public class SerializationCodec implements Codec {
         return encoder;
     }
     
+    @Override
+    public ClassLoader getClassLoader() {
+        if (classLoader != null) {
+            return classLoader;
+        }
+        return getClass().getClassLoader();
+    }
+
 }

redisson/src/main/java/org/redisson/codec/SnappyCodec.java

@@ -17,6 +17,7 @@ package org.redisson.codec;
 
 import java.io.IOException;
 
+import org.redisson.client.codec.BaseCodec;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -36,7 +37,7 @@ import io.netty.handler.codec.compression.Snappy;
  * @author Nikita Koksharov
  *
  */
-public class SnappyCodec implements Codec {
+public class SnappyCodec extends BaseCodec {
 
     private static final ThreadLocal<Snappy> snappyDecoder = new ThreadLocal<Snappy>() {
         protected Snappy initialValue() {
@@ -110,26 +111,6 @@ public class SnappyCodec implements Codec {
         }
     };
 
-    @Override
-    public Decoder<Object> getMapValueDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapValueEncoder() {
-        return getValueEncoder();
-    }
-
-    @Override
-    public Decoder<Object> getMapKeyDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapKeyEncoder() {
-        return getValueEncoder();
-    }
-
     @Override
     public Decoder<Object> getValueDecoder() {
         return decoder;
@@ -140,4 +121,9 @@ public class SnappyCodec implements Codec {
         return encoder;
     }
     
+    @Override
+    public ClassLoader getClassLoader() {
+        return innerCodec.getClassLoader();
+    }
+    
 }

redisson/src/main/java/org/redisson/executor/TasksRunnerService.java

@@ -48,6 +48,7 @@ public class TasksRunnerService implements RemoteExecutorService {
     private final ClassLoaderDelegator classLoader = new ClassLoaderDelegator();
     
     private final Codec codec;
+    private final ClassLoader codecClassLoader;
     private final String name;
     private final CommandExecutor commandExecutor;
 
@@ -68,6 +69,7 @@ public class TasksRunnerService implements RemoteExecutorService {
         this.responses = responses;
         
         try {
+            this.codecClassLoader = codec.getClassLoader();
             this.codec = codec.getClass().getConstructor(ClassLoader.class).newInstance(classLoader);
         } catch (Exception e) {
             throw new IllegalStateException("Unable to initialize codec with ClassLoader parameter", e);
@@ -166,7 +168,7 @@ public class TasksRunnerService implements RemoteExecutorService {
         try {
             buf.writeBytes(state);
             
-            RedissonClassLoader cl = new RedissonClassLoader(getClass().getClassLoader());
+            RedissonClassLoader cl = new RedissonClassLoader(codecClassLoader);
             cl.loadClass(className, classBody);
             classLoader.setCurrentClassLoader(cl);
             
@@ -199,7 +201,7 @@ public class TasksRunnerService implements RemoteExecutorService {
         try {
             buf.writeBytes(state);
             
-            RedissonClassLoader cl = new RedissonClassLoader(getClass().getClassLoader());
+            RedissonClassLoader cl = new RedissonClassLoader(codecClassLoader);
             cl.loadClass(className, classBody);
             classLoader.setCurrentClassLoader(cl);
         

redisson/src/main/java/org/redisson/jcache/JCacheEventCodec.java

@@ -107,4 +107,9 @@ public class JCacheEventCodec implements Codec {
         throw new UnsupportedOperationException();
     }
     
+    @Override
+    public ClassLoader getClassLoader() {
+        return getClass().getClassLoader();
+    }
+
 }

redisson/src/test/java/org/redisson/ErrorsCodec.java

@@ -17,14 +17,14 @@ package org.redisson;
 
 import java.io.IOException;
 
-import org.redisson.client.codec.Codec;
+import org.redisson.client.codec.BaseCodec;
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
 import org.redisson.client.protocol.Encoder;
 
 import io.netty.buffer.ByteBuf;
 
-public class ErrorsCodec implements Codec {
+public class ErrorsCodec extends BaseCodec {
 
     public static final ErrorsCodec INSTANCE = new ErrorsCodec();
 
@@ -55,24 +55,4 @@ public class ErrorsCodec implements Codec {
         return encoder;
     }
 
-    @Override
-    public Decoder<Object> getMapValueDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapValueEncoder() {
-        return getValueEncoder();
-    }
-
-    @Override
-    public Decoder<Object> getMapKeyDecoder() {
-        return getValueDecoder();
-    }
-
-    @Override
-    public Encoder getMapKeyEncoder() {
-        return getValueEncoder();
-    }
-
 }