Fix adapters order
This commit is contained in:
parent
47c505d755
commit
74593538dc
@ -49,12 +49,14 @@ public abstract class MoshiPolymorphic<OBJ> {
|
|||||||
var concreteClasses = getConcreteClasses();
|
var concreteClasses = getConcreteClasses();
|
||||||
var extraAdapters = getExtraAdapters();
|
var extraAdapters = getExtraAdapters();
|
||||||
|
|
||||||
|
extraAdapters.forEach(abstractMoshiBuilder::addLast);
|
||||||
|
|
||||||
for (Class<?> declaredClass : abstractClasses) {
|
for (Class<?> declaredClass : abstractClasses) {
|
||||||
var name = fixType(declaredClass.getSimpleName());
|
var name = fixType(declaredClass.getSimpleName());
|
||||||
JsonAdapter<OBJ> adapter = new PolymorphicAdapter<>(name);
|
JsonAdapter<OBJ> adapter = new PolymorphicAdapter<>(name);
|
||||||
abstractClassesSerializers.put(declaredClass, adapter);
|
abstractClassesSerializers.put(declaredClass, adapter);
|
||||||
customAdapters.put(name, adapter);
|
customAdapters.put(name, adapter);
|
||||||
abstractMoshiBuilder.add(declaredClass, adapter);
|
abstractMoshiBuilder.addLast(declaredClass, adapter);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Class<?> declaredClass : concreteClasses) {
|
for (Class<?> declaredClass : concreteClasses) {
|
||||||
@ -62,12 +64,10 @@ public abstract class MoshiPolymorphic<OBJ> {
|
|||||||
JsonAdapter<OBJ> adapter = new NormalValueAdapter<>(name, declaredClass);
|
JsonAdapter<OBJ> adapter = new NormalValueAdapter<>(name, declaredClass);
|
||||||
concreteClassesSerializers.put(declaredClass, adapter);
|
concreteClassesSerializers.put(declaredClass, adapter);
|
||||||
customAdapters.put(name, adapter);
|
customAdapters.put(name, adapter);
|
||||||
abstractMoshiBuilder.add(declaredClass, adapter);
|
abstractMoshiBuilder.addLast(declaredClass, adapter);
|
||||||
}
|
}
|
||||||
|
|
||||||
extraAdapters.forEach(abstractMoshiBuilder::add);
|
abstractMoshiBuilder.addLast(new RecordsJsonAdapterFactory());
|
||||||
|
|
||||||
abstractMoshiBuilder.add(new RecordsJsonAdapterFactory());
|
|
||||||
|
|
||||||
abstractMoshi = abstractMoshiBuilder.build();
|
abstractMoshi = abstractMoshiBuilder.build();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user