/*
 * Copyright 2016 JBoss by Red Hat.
 *
 * 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.jboss.aerogear.unifiedpush.message.json;

import java.io.IOException;

import org.jboss.aerogear.unifiedpush.message.Priority;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;

/**
 *
 * Class for serializing Priority enums.
=======
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.JsonSerializer;
import org.codehaus.jackson.map.SerializerProvider;
import org.jboss.aerogear.unifiedpush.message.Priority;

/**
 *
 * Class for serializing Priority enums.
 *
 * @author Summers Pittman
>>>>>>> upstream/master
 */
public final class PrioritySerializer extends JsonSerializer<Priority> {

    @Override
    public void serialize(Priority value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
        jgen.writeString(value.toString());
    }
}

@@ -986,326 +986,8 @@
 %0D%0A%0D%0A
-/**%0D%0A *%0D%0A * Class for serializing Priority enums.%0D%0A=======%0Aimport org.codehaus.jackson.JsonGenerator;%0D%0Aimport org.codehaus.jackson.JsonProcessingException;%0D%0Aimport org.codehaus.jackson.map.JsonSerializer;%0D%0Aimport org.codehaus.jackson.map.SerializerProvider;%0D%0Aimport org.jboss.aerogear.unifiedpush.message.Priority;%0D%0A%0D%0A
 /**%0D
@@ -1067,33 +1067,8 @@
 tman
-%0D%0A%3E%3E%3E%3E%3E%3E%3E upstream/master
 %0A */

Fix apidocs failure