Projects >> atmosphere >>be96a917d958740d1d122698ac24e8e45522717d

Chunk
Conflicting content 
package org.atmosphere.gwt.server;

<<<<<<< HEAD
import com.google.gwt.user.client.rpc.SerializationException;
import com.google.gwt.user.server.rpc.SerializationPolicy;
import com.google.gwt.user.server.rpc.SerializationPolicyProvider;
import com.google.gwt.user.server.rpc.impl.ServerSerializationStreamReader;
=======
import java.util.logging.Level;
import org.atmosphere.cpr.AtmosphereResource;
import org.atmosphere.cpr.AtmosphereServletProcessor;
import org.atmosphere.cpr.Broadcaster;
import org.atmosphere.cpr.BroadcasterFactory;
import org.atmosphere.cpr.DefaultBroadcaster;
import org.atmosphere.gwt.server.impl.GwtAtmosphereResourceImpl;
import org.atmosphere.handler.AbstractReflectorAtmosphereHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
>>>>>>> 460634ed5490858d675f3790e4b9f89bc7730947

import java.io.BufferedReader;
import java.io.IOException;
Solution content 
package org.atmosphere.gwt.server;



import java.io.BufferedReader;
import java.io.IOException;
File
AtmosphereGwtHandler.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
import org.atmosphere.cpr.BroadcasterFactory;
import org.atmosphere.cpr.DefaultBroadcaster;
import org.atmosphere.cpr.FrameworkConfig;
<<<<<<< HEAD
import org.atmosphere.gwt.server.impl.GwtAtmosphereResourceImpl;
import org.atmosphere.gwt.server.impl.RPCUtil;
=======
import org.atmosphere.gwt.server.impl.GwtRpcDeserializer;
import org.atmosphere.gwt.server.spi.JSONSerializerProvider;
>>>>>>> 460634ed5490858d675f3790e4b9f89bc7730947
import org.atmosphere.gwt.shared.Constants;
import org.atmosphere.gwt.shared.SerialMode;
import org.atmosphere.handler.AbstractReflectorAtmosphereHandler;
Solution content 
import org.atmosphere.cpr.BroadcasterFactory;
import org.atmosphere.cpr.DefaultBroadcaster;
import org.atmosphere.cpr.FrameworkConfig;
import org.atmosphere.gwt.server.impl.GwtAtmosphereResourceImpl;
import org.atmosphere.gwt.server.impl.GwtRpcDeserializer;
import org.atmosphere.gwt.server.spi.JSONSerializerProvider;
import org.atmosphere.gwt.shared.Constants;
import org.atmosphere.gwt.shared.SerialMode;
import org.atmosphere.handler.AbstractReflectorAtmosphereHandler;
File
AtmosphereGwtHandler.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
                return getGwtRpc().deserialize(data);
                
            case JSON:
<<<<<<< HEAD
                throw new UnsupportedOperationException("Not implemented");

=======
                return getJSONDeserializer().deserialize(data);
                
>>>>>>> 460634ed5490858d675f3790e4b9f89bc7730947
            case PLAIN:
                return data;
        }
Solution content 
            case PLAIN:
                return getGwtRpc().deserialize(data);
                
            case JSON:
                return getJSONDeserializer().deserialize(data);
                return data;
        }
File
AtmosphereGwtHandler.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Throw statement
Chunk
Conflicting content 
import org.atmosphere.cpr.AtmosphereResponse;
import org.atmosphere.cpr.Broadcaster;

<<<<<<< HEAD
=======
import javax.servlet.http.HttpSession;
import java.io.Serializable;
import java.util.List;
import javax.servlet.ServletContext;

>>>>>>> 460634ed5490858d675f3790e4b9f89bc7730947
public interface GwtAtmosphereResource {
    public Broadcaster getBroadcaster();
Solution content 
import org.atmosphere.cpr.AtmosphereResponse;
import org.atmosphere.cpr.Broadcaster;

import javax.servlet.http.HttpSession;
import java.io.Serializable;
import java.util.List;
import javax.servlet.ServletContext;

public interface GwtAtmosphereResource {
    public Broadcaster getBroadcaster();
File
GwtAtmosphereResource.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
 */
package org.atmosphere.gwt.server.impl;

<<<<<<< HEAD
import com.google.gwt.rpc.server.ClientOracle;
import com.google.gwt.user.server.rpc.SerializationPolicy;

import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;

import javax.servlet.http.HttpSession;

=======
import javax.servlet.ServletContext;
>>>>>>> 460634ed5490858d675f3790e4b9f89bc7730947
import org.atmosphere.cpr.AtmosphereRequest;
import org.atmosphere.cpr.AtmosphereResource;
import org.atmosphere.cpr.AtmosphereResourceEvent;
Solution content 
 */
package org.atmosphere.gwt.server.impl;

import javax.servlet.ServletContext;
import org.atmosphere.cpr.AtmosphereRequest;
import org.atmosphere.cpr.AtmosphereResource;
import org.atmosphere.cpr.AtmosphereResourceEvent;
File
GwtAtmosphereResourceImpl.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

<<<<<<< HEAD
=======
import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import org.atmosphere.gwt.server.SerializationException;

>>>>>>> 460634ed5490858d675f3790e4b9f89bc7730947
/**
 * @author p.havelaar
 */
Solution content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import org.atmosphere.gwt.server.SerializationException;

/**
 * @author p.havelaar
 */
File
GwtAtmosphereResourceImpl.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
 */
package org.atmosphere.gwt.server.impl;

<<<<<<< HEAD
import com.google.gwt.rpc.server.ClientOracle;
import com.google.gwt.user.client.rpc.SerializationException;
import com.google.gwt.user.server.rpc.SerializationPolicy;
import com.google.gwt.user.server.rpc.impl.ServerSerializationStreamWriter;

=======
import org.atmosphere.gwt.server.GwtResponseWriter;
import org.atmosphere.gwt.server.deflate.DeflaterOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
>>>>>>> 460634ed5490858d675f3790e4b9f89bc7730947
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
Solution content 
 */
package org.atmosphere.gwt.server.impl;


import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
File
GwtResponseWriterImpl.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.ServiceLoader;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.atomic.AtomicInteger;
<<<<<<< HEAD

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;

import org.atmosphere.gwt.server.GwtResponseWriter;
import org.atmosphere.gwt.server.deflate.DeflaterOutputStream;
=======
import org.atmosphere.gwt.server.JSONSerializer;
import org.atmosphere.gwt.server.SerializationException;
import org.atmosphere.gwt.server.spi.JSONSerializerProvider;
>>>>>>> 460634ed5490858d675f3790e4b9f89bc7730947
import org.atmosphere.gwt.shared.Constants;
import org.atmosphere.gwt.shared.SerialMode;
import org.slf4j.Logger;
Solution content 
import java.util.ServiceLoader;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.atomic.AtomicInteger;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;

import org.atmosphere.gwt.server.GwtResponseWriter;
import org.atmosphere.gwt.server.deflate.DeflaterOutputStream;

import org.atmosphere.gwt.server.JSONSerializer;
import org.atmosphere.gwt.server.SerializationException;
import org.atmosphere.gwt.server.spi.JSONSerializerProvider;

import org.atmosphere.gwt.shared.Constants;
import org.atmosphere.gwt.shared.SerialMode;
import org.slf4j.Logger;
File
GwtResponseWriterImpl.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
    protected final GwtAtmosphereResourceImpl resource;
    protected final int connectionID;
    protected final Logger logger = LoggerFactory.getLogger(getClass());
<<<<<<< HEAD
    protected boolean shouldEscapeText = true;
=======
    private GwtRpcSerializer gwtRpc;
    private JSONSerializer jsonSerializer;
>>>>>>> 460634ed5490858d675f3790e4b9f89bc7730947


    protected GwtResponseWriterImpl(GwtAtmosphereResourceImpl resource) {
Solution content 
    protected final GwtAtmosphereResourceImpl resource;
    protected final int connectionID;
    protected final Logger logger = LoggerFactory.getLogger(getClass());

    protected boolean shouldEscapeText = true;

    private GwtRpcSerializer gwtRpc;
    private JSONSerializer jsonSerializer;

    

    protected GwtResponseWriterImpl(GwtAtmosphereResourceImpl resource) {
File
GwtResponseWriterImpl.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
        return terminated;
    }

<<<<<<< HEAD
    protected boolean isDeRPC() {
        return clientOracle != null;
    }

=======
>>>>>>> 460634ed5490858d675f3790e4b9f89bc7730947
    protected SerialMode getSerializationMode() {
        String mode = resource.getRequest().getParameter(Constants.CLIENT_DESERIALZE_MODE_PARAMETER);
        if (mode != null) {
Solution content 
        return terminated;
    }


    protected SerialMode getSerializationMode() {
        String mode = resource.getRequest().getParameter(Constants.CLIENT_DESERIALZE_MODE_PARAMETER);
        if (mode != null) {
File
GwtResponseWriterImpl.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
        return session != null;
    }

<<<<<<< HEAD
    protected String serialize(Object message) throws NotSerializableException, UnsupportedEncodingException {
        try {
            switch (getSerializationMode()) {
            case RPC:
                ServerSerializationStreamWriter streamWriter = new ServerSerializationStreamWriter(serializationPolicy);
                streamWriter.prepareToWrite();
                streamWriter.writeObject(message);
                return streamWriter.toString();

            case JSON:
                throw new UnsupportedOperationException("Not implemented yet");

            default:
            case PLAIN:
                return message.toString();
=======
    protected String serialize(Object message) throws SerializationException {
        switch (getSerializationMode()) {
        case RPC:
            return gwtRpc.serialize(message);

        case JSON:
            return getJsonSerializer().serialize(message);

        default:
        case PLAIN:
            return message.toString();
        }
    }
    
    protected JSONSerializer getJsonSerializer() {
        if (jsonSerializer == null) {
            ServiceLoader loader = ServiceLoader.load(JSONSerializerProvider.class,
                    getClass().getClassLoader());
            if (loader != null && loader.iterator().hasNext()) {
                jsonSerializer = loader.iterator().next().getSerializer();
            }
            
            if (jsonSerializer == null) {
                jsonSerializer = new JSONSerializer() {
                    @Override
                    public String serialize(Object data) {
                        return "{\"data\": \"" + 
                                data.toString()
                                    .replaceAll("\n", "\\n")
                                    .replaceAll("\"", "\\\"")
                                    .replaceAll("'", "\\'")
                                + "\"}";
                    }
                };
>>>>>>> 460634ed5490858d675f3790e4b9f89bc7730947
            }
        }
        return jsonSerializer;
Solution content 
            }
            
        return session != null;
    }


    protected String serialize(Object message) throws SerializationException {
        switch (getSerializationMode()) {
        case RPC:
            return gwtRpc.serialize(message);

        case JSON:
            return getJsonSerializer().serialize(message);

        default:
        case PLAIN:
            return message.toString();
        }
    }
    
    protected JSONSerializer getJsonSerializer() {
        if (jsonSerializer == null) {
            ServiceLoader loader = ServiceLoader.load(JSONSerializerProvider.class,
                    getClass().getClassLoader());
            if (loader != null && loader.iterator().hasNext()) {
                jsonSerializer = loader.iterator().next().getSerializer();
            if (jsonSerializer == null) {
                jsonSerializer = new JSONSerializer() {
                    @Override
                    public String serialize(Object data) {
                        return "{\"data\": \"" + 
                                data.toString()
                                    .replaceAll("\n", "\\n")
                                    .replaceAll("\"", "\\\"")
                                    .replaceAll("'", "\\'")
                                + "\"}";
                    }
                };

            }
        }
        return jsonSerializer;
File
GwtResponseWriterImpl.java
Developer's decision
Version 2
Kind of conflict
Attribute
Case statement
If statement
Method declaration
Method invocation
Method signature
Return statement
Switch statement
Throw statement
Try statement
Variable