Projects >> metrics >>f7ae0c27b847bbf0e1ccd0e8ab856e22f09096b9

Chunk
Conflicting content 
import static com.codahale.metrics.MetricRegistry.name;

<<<<<<< HEAD
class InstrumentedRequestDirector extends DefaultRequestDirector {
=======
public class InstrumentedRequestDirector extends DefaultRequestDirector {
    private final static String GET = "GET", POST = "POST", HEAD = "HEAD", PUT = "PUT",
            OPTIONS = "OPTIONS", DELETE = "DELETE", TRACE = "TRACE",
            CONNECT = "CONNECT", MOVE = "MOVE", PATCH = "PATCH";
>>>>>>> 4ff25d5066a4e12252ea467e722b8d2659ae31a2

    private final MetricRegistry registry;
    private final HttpClientMetricNameStrategy metricNameStrategy;
Solution content 
public class InstrumentedRequestDirector extends DefaultRequestDirector {

    private final MetricRegistry registry;
    private final HttpClientMetricNameStrategy metricNameStrategy;
File
InstrumentedRequestDirector.java
Developer's decision
Combination
Kind of conflict
Attribute
Class signature
Chunk
Conflicting content 
    private final HttpClientMetricNameStrategy metricNameStrategy;
    private final String name;

<<<<<<< HEAD
    InstrumentedRequestDirector(MetricRegistry registry,
                                String name,
                                HttpClientMetricNameStrategy metricNameStrategy,
                                Log log,
                                HttpRequestExecutor requestExec,
                                ClientConnectionManager conman,
                                ConnectionReuseStrategy reustrat,
                                ConnectionKeepAliveStrategy kastrat,
                                HttpRoutePlanner rouplan,
                                HttpProcessor httpProcessor,
                                HttpRequestRetryHandler retryHandler,
                                RedirectStrategy redirectStrategy,
                                AuthenticationStrategy targetAuthStrategy,
                                AuthenticationStrategy proxyAuthStrategy,
                                UserTokenHandler userTokenHandler,
                                HttpParams params) {
=======
    public InstrumentedRequestDirector(MetricRegistry registry,
                                       String name,
                                       Log log,
                                       HttpRequestExecutor requestExec,
                                       ClientConnectionManager conman,
                                       ConnectionReuseStrategy reustrat,
                                       ConnectionKeepAliveStrategy kastrat,
                                       HttpRoutePlanner rouplan,
                                       HttpProcessor httpProcessor,
                                       HttpRequestRetryHandler retryHandler,
                                       RedirectStrategy redirectStrategy,
                                       AuthenticationStrategy targetAuthStrategy,
                                       AuthenticationStrategy proxyAuthStrategy,
                                       UserTokenHandler userTokenHandler,
                                       HttpParams params) {
>>>>>>> 4ff25d5066a4e12252ea467e722b8d2659ae31a2
        super(log,
              requestExec,
              conman,
Solution content 
    private final HttpClientMetricNameStrategy metricNameStrategy;
    private final String name;

    public InstrumentedRequestDirector(MetricRegistry registry,
                                String name,
                                HttpClientMetricNameStrategy metricNameStrategy,
                                Log log,
                                HttpRequestExecutor requestExec,
                                ClientConnectionManager conman,
                                ConnectionReuseStrategy reustrat,
                                ConnectionKeepAliveStrategy kastrat,
                                HttpRoutePlanner rouplan,
                                HttpProcessor httpProcessor,
                                HttpRequestRetryHandler retryHandler,
                                RedirectStrategy redirectStrategy,
                                AuthenticationStrategy targetAuthStrategy,
                                AuthenticationStrategy proxyAuthStrategy,
                                UserTokenHandler userTokenHandler,
                                HttpParams params) {
        super(log,
              requestExec,
              conman,
File
InstrumentedRequestDirector.java
Developer's decision
Combination
Kind of conflict
Method signature