From 06e3bd8b16da12baafc9a97ba5949b3f7ffb5e07 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 2 Jun 2018 22:12:44 +1200 Subject: Start Netty 4 migration --- src/org/traccar/CharacterDelimiterFrameDecoder.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/org/traccar/CharacterDelimiterFrameDecoder.java') diff --git a/src/org/traccar/CharacterDelimiterFrameDecoder.java b/src/org/traccar/CharacterDelimiterFrameDecoder.java index d71974e78..5175f9b37 100644 --- a/src/org/traccar/CharacterDelimiterFrameDecoder.java +++ b/src/org/traccar/CharacterDelimiterFrameDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,27 +15,27 @@ */ package org.traccar; -import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; -import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.handler.codec.DelimiterBasedFrameDecoder; public class CharacterDelimiterFrameDecoder extends DelimiterBasedFrameDecoder { - private static ChannelBuffer createDelimiter(char delimiter) { + private static ByteBuf createDelimiter(char delimiter) { byte[] buf = {(byte) delimiter}; - return ChannelBuffers.wrappedBuffer(buf); + return Unpooled.wrappedBuffer(buf); } - private static ChannelBuffer createDelimiter(String delimiter) { + private static ByteBuf createDelimiter(String delimiter) { byte[] buf = new byte[delimiter.length()]; for (int i = 0; i < delimiter.length(); i++) { buf[i] = (byte) delimiter.charAt(i); } - return ChannelBuffers.wrappedBuffer(buf); + return Unpooled.wrappedBuffer(buf); } - private static ChannelBuffer[] convertDelimiters(String[] delimiters) { - ChannelBuffer[] result = new ChannelBuffer[delimiters.length]; + private static ByteBuf[] convertDelimiters(String[] delimiters) { + ByteBuf[] result = new ByteBuf[delimiters.length]; for (int i = 0; i < delimiters.length; i++) { result[i] = createDelimiter(delimiters[i]); } -- cgit v1.2.3