defaultConvert
This commit is contained in:
@@ -6,6 +6,8 @@ import java.util.*;
|
||||
import org.redkale.annotation.AutoLoad;
|
||||
import org.redkale.annotation.ResourceChanged;
|
||||
import org.redkale.annotation.ResourceType;
|
||||
import org.redkale.convert.json.JsonConvert;
|
||||
import org.redkale.convert.json.JsonFactory;
|
||||
import org.redkale.inject.Resourcable;
|
||||
import org.redkale.inject.ResourceEvent;
|
||||
import org.redkale.inject.ResourceFactory;
|
||||
@@ -56,6 +58,9 @@ public abstract class AbstractCacheSource extends AbstractService implements Cac
|
||||
// @since 2.8.0 //是否非阻塞式
|
||||
public static final String CACHE_SOURCE_NON_BLOCKING = "non-blocking";
|
||||
|
||||
protected static final JsonConvert defaultConvert =
|
||||
JsonFactory.create().skipAllIgnore(true).getConvert();
|
||||
|
||||
@ResourceChanged
|
||||
public abstract void onResourceChange(ResourceEvent[] events);
|
||||
|
||||
|
||||
@@ -39,9 +39,6 @@ import org.redkale.util.*;
|
||||
@ResourceType(CacheSource.class)
|
||||
public final class CacheMemorySource extends AbstractCacheSource {
|
||||
|
||||
@Resource(required = false)
|
||||
private JsonConvert defaultConvert = JsonConvert.root();
|
||||
|
||||
@Resource(name = Resource.PARENT_NAME + "_convert", required = false)
|
||||
private JsonConvert convert;
|
||||
|
||||
@@ -127,10 +124,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
|
||||
@SuppressWarnings("unchecked")
|
||||
public void init(AnyValue conf) {
|
||||
if (this.convert == null) {
|
||||
this.convert = this.defaultConvert;
|
||||
}
|
||||
if (this.convert == null) {
|
||||
this.convert = JsonConvert.root();
|
||||
this.convert = defaultConvert;
|
||||
}
|
||||
final CacheMemorySource self = this;
|
||||
AnyValue prop = conf == null ? null : conf.getAnyValue("properties");
|
||||
|
||||
Reference in New Issue
Block a user