Projects >> azure-sdk-for-java >>b28db96a07a0712eae7ad2aa6a3f61c0d9e1ffbb

Chunk
Conflicting content 
        return null;
    }

<<<<<<< HEAD
    @Override
    public String getVerb() {
        return "GET";
    }

    @Override
    public Object getRequestContents() {
        return null;
    }
=======
>>>>>>> 56132c721e587657bb3708b9589313b1e7366bea
}
Solution content 
        return null;
    }

<<<<<<< HEAD
    @Override
    public String getVerb() {
        return "GET";
    }

    @Override
    public Object getRequestContents() {
        return null;
    }
=======
>>>>>>> 56132c721e587657bb3708b9589313b1e7366bea
}
File
DefaultActionOperation.java
Developer's decision
Manual
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
     *            the client response
     * @return
     */
<<<<<<< HEAD
    void processResponse(ClientResponse clientResponse);

    String getVerb();

    Object getRequestContents();
=======
    Object processResponse(ClientResponse clientResponse);
>>>>>>> 56132c721e587657bb3708b9589313b1e7366bea
}
Solution content 
     *            the client response
     * @return
     */

    String getVerb();

    Object getRequestContents();

    Object processResponse(ClientResponse clientResponse);
}
File
EntityActionOperation.java
Developer's decision
Combination
Kind of conflict
Method interface
Chunk
Conflicting content 
     * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityContract#action(com.microsoft.windowsazure.services.media.implementation.entities.EntityActionOperation)
     */
    @Override
<<<<<<< HEAD
    public void action(EntityActionOperation entityActionOperation) throws ServiceException {
        Builder webResource = getResource(entityActionOperation.getUri())
                .queryParams(entityActionOperation.getQueryParameters()).accept(MediaType.APPLICATION_ATOM_XML_TYPE)
                .accept(MediaType.APPLICATION_XML_TYPE)
                .entity(entityActionOperation.getRequestContents(), MediaType.APPLICATION_XML_TYPE);
        ClientResponse clientResponse = webResource.method(entityActionOperation.getVerb(), ClientResponse.class);
        entityActionOperation.processResponse(clientResponse);
=======
    public Object action(EntityActionOperation entityActionOperation) throws ServiceException {
        ClientResponse clientResponse = getResource(entityActionOperation.getUri())
                .queryParams(entityActionOperation.getQueryParameters()).accept(entityActionOperation.getAcceptType())
                .get(ClientResponse.class);
        return entityActionOperation.processResponse(clientResponse);
>>>>>>> 56132c721e587657bb3708b9589313b1e7366bea
    }

}
Solution content 
     * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityContract#action(com.microsoft.windowsazure.services.media.implementation.entities.EntityActionOperation)
     */
    @Override
    public void action(EntityActionOperation entityActionOperation) throws ServiceException {
        Builder webResource = getResource(entityActionOperation.getUri())
                .queryParams(entityActionOperation.getQueryParameters()).accept(entityActionOperation.getAcceptType())
                .accept(MediaType.APPLICATION_XML_TYPE)
                .entity(entityActionOperation.getRequestContents(), MediaType.APPLICATION_XML_TYPE);
        ClientResponse clientResponse = webResource.method(entityActionOperation.getVerb(), ClientResponse.class);
        return entityActionOperation.processResponse(clientResponse);
    }
File
EntityRestProxy.java
Developer's decision
Combination
Kind of conflict
Method invocation
Method signature
Return statement
Variable