Browse Source

Simplified Jackson modules registration. Issue #83

master
Nikita 12 years ago
parent
commit
41e8c9d157
  1. 1
      src/main/java/com/corundumstudio/socketio/Configuration.java
  2. 9
      src/main/java/com/corundumstudio/socketio/JsonSupportWrapper.java
  3. 9
      src/main/java/com/corundumstudio/socketio/parser/JacksonJsonSupport.java

1
src/main/java/com/corundumstudio/socketio/Configuration.java

@ -21,7 +21,6 @@ import java.io.InputStream;
import com.corundumstudio.socketio.parser.JacksonJsonSupport;
import com.corundumstudio.socketio.parser.JsonSupport;
import com.corundumstudio.socketio.parser.JsonSupportWrapper;
public class Configuration {

9
src/main/java/com/corundumstudio/socketio/parser/JsonSupportWrapper.java → src/main/java/com/corundumstudio/socketio/JsonSupportWrapper.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.corundumstudio.socketio.parser;
package com.corundumstudio.socketio;
import io.netty.buffer.ByteBufInputStream;
import io.netty.buffer.ByteBufOutputStream;
@ -23,13 +23,16 @@ import java.io.IOException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class JsonSupportWrapper implements JsonSupport {
import com.corundumstudio.socketio.parser.AckArgs;
import com.corundumstudio.socketio.parser.JsonSupport;
class JsonSupportWrapper implements JsonSupport {
private final Logger log = LoggerFactory.getLogger(getClass());
private final JsonSupport delegate;
public JsonSupportWrapper(JsonSupport delegate) {
JsonSupportWrapper(JsonSupport delegate) {
this.delegate = delegate;
}

9
src/main/java/com/corundumstudio/socketio/parser/JacksonJsonSupport.java

@ -38,6 +38,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.Module;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
@ -189,7 +190,15 @@ public class JacksonJsonSupport implements JsonSupport {
private final AckArgsDeserializer ackArgsDeserializer = new AckArgsDeserializer();
public JacksonJsonSupport(Configuration configuration) {
this(configuration, null);
}
public JacksonJsonSupport(Configuration configuration, Module... modules) {
this.configuration = configuration;
if (modules != null && modules.length > 0) {
objectMapper.registerModules(modules);
}
init(objectMapper);
}

Loading…
Cancel
Save