conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
@RelatedIssue(issueID = "SOC-622")
=======
>>>>>>>
@RelatedIssue(issueID = "MAIN-4322") |
<<<<<<<
@FindBy(css = ".tools-menu li > a[data-name='themedesigner]'")
private WebElement themeDesignerButton;
=======
>>>>>>>
@FindBy(css = ".tools-menu li > a[data-name='themedesigner]'")
private WebElement themeDesignerButton;
<<<<<<<
jQueryClick(
waitForElementByCss(String.format(toolbar... |
<<<<<<<
import java.io.IOException;
import java.net.URISyntaxException;
=======
import java.io.File;
import java.time.LocalDateTime;
>>>>>>>
import java.io.IOException;
import java.net.URISyntaxException;
import java.time.LocalDateTime; |
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
=======
@InBrowser(e... |
<<<<<<<
@Test(groups = "MercuryLightboxTest_002")
@InBrowser(browser = BrowserType.CHROME_ANDROID)
public void MercuryLightboxTest_002_TapOnEdgesChangeImages_SwipeChangeImages() {
=======
@Test(groups = "mercury_lightbox_changeImageByTapOnEdgeAndByGesture")
@InBrowser(browser = Browser.CHROME_ANDROID)
pub... |
<<<<<<<
private URLsContent() {
}
=======
//Wikis with smart banners
public static final String SMART_BANNER_GTA = "gta";
public static final String SMART_BANNER_GLEE = "glee";
>>>>>>>
//Wikis with smart banners
public static final String SMART_BANNER_GTA = "gta";
public static final String SMART_BANNER_... |
<<<<<<<
import com.wikia.webdriver.common.core.annotations.RelatedIssue;
import com.wikia.webdriver.common.core.annotations.ExecuteAs;
import com.wikia.webdriver.common.core.annotations.User;
=======
import com.wikia.webdriver.common.core.configuration.Configuration;
>>>>>>>
import com.wikia.webdriver.common.core.an... |
<<<<<<<
@Test(groups = "MercuryVKWidgetTest_004")
@Execute(onWikia = "mercuryautomationtesting")
public void MercuryVKWidgetTest_004_areLoadedOnFirstVisitDirectlyFromUrl() {
VKWidgetPageObject vkWidget = new VKWidgetPageObject(driver);
vkWidget
.create(2)
.navigate(wikiURL);
Asserti... |
<<<<<<<
import com.wikia.webdriver.Common.Core.CommonExpectedConditions;
import com.wikia.webdriver.Common.Core.CommonFunctions;
=======
>>>>>>>
import com.wikia.webdriver.Common.Core.CommonExpectedConditions;
<<<<<<<
import com.wikia.webdriver.PageObjectsFactory.ComponentObject.Vet.VetAddVideoComponentObject;
===... |
<<<<<<<
@RelatedIssue(issueID = "MAIN-3413")
@ExecuteAs(user = User.USER)
=======
@RelatedIssue(issueID = "QAART-585")
>>>>>>>
@RelatedIssue(issueID = "QAART-585")
@ExecuteAs(user = User.USER) |
<<<<<<<
public abstract String getAppiumIp();
public abstract String getDeviceName();
=======
>>>>>>>
public abstract String getAppiumIp();
public abstract String getDeviceName(); |
<<<<<<<
=======
>>>>>>>
<<<<<<<
public static final String
LIST_ITEMS_ARE_NOT_UNIQUE_MSG =
"there are at least two elements with the same name";
private MercuryMessages() {
}
=======
public static final String LIST_ITEMS_ARE_NOT_UNIQUE_MSG = "there are at least two elements with the same na... |
<<<<<<<
@FindBy(css="input[name=search]")
private WebElement searchInput;
@FindBy(css=".autocomplete div")
private List<WebElement> searchSuggestions;
@FindBy(css=".autocomplete div:nth-child(7)")
private WebElement searchSuggestionsLast;
=======
>>>>>>>
@FindBy(css="input[name=search]")
private WebElement s... |
<<<<<<<
public String getNameForArticle () {
return PageContent.articleNamePrefix + getTimeStamp();
}
=======
public void openSpecialPromoteOnCurrentWiki() {
JavascriptExecutor js = (JavascriptExecutor) driver;
String url = (String) js.executeScript("return wgServer");
getUrl(url + "/" + URLsContent.spec... |
<<<<<<<
// UI Mapping
=======
>>>>>>>
<<<<<<<
@FindBy(css = "input[name='poiCategoryMarkers[]']")
private List<WebElement> uploadMarker;
@FindBy(css = "input[name='wpUploadFile']")
private List<WebElement> uploadInputsCollection;
=======
>>>>>>>
@FindBy(css = "input[name='poiCategoryMarkers[]']")
priv... |
<<<<<<<
/**
* @author Tomasz Napieralski
* @param rgba String representing function rgba(int, int, int, int)
* @return int[], where 0='red', 1='green', 2='blue'
*/
public static int[] convertRGBAFunctiontoIntTable(String rgba) {
int[] extract = new int[3];
int start = rgba.indexOf("(", 0) + 1;
int en... |
<<<<<<<
import com.wikia.webdriver.common.core.annotations.ExecuteAs;
import com.wikia.webdriver.common.core.annotations.User;
=======
import com.wikia.webdriver.common.core.annotations.RelatedIssue;
>>>>>>>
import com.wikia.webdriver.common.core.annotations.RelatedIssue;
import com.wikia.webdriver.common.core.annot... |
<<<<<<<
import com.wikia.webdriver.pageobjectsfactory.pageobject.mercury.JoinPage;
=======
import com.wikia.webdriver.pageobjectsfactory.pageobject.mobile.MobileSignupPageObject;
>>>>>>>
import com.wikia.webdriver.pageobjectsfactory.pageobject.mercury.JoinPage;
import com.wikia.webdriver.pageobjectsfactory.pageobjec... |
<<<<<<<
private static final String[] TAGS = {
"<vk group-id=\"59925174\" />",
"<vk group-id=\"12345\" />",
};
=======
private static final String TAG =
"<vk group-id=\"12345\" />";
private static final String INCORRECT_TAG = "<vk />";
private static final String ERROR_MESSAGE = "Failed to... |
<<<<<<<
@FindBy(css=".video-media")
private WebElement videoContainer;
@FindBy(css=".LightboxHeader h1 a")
private WebElement titleLink;
@FindBy(css=".more-info-button")
private WebElement moreInfoLink;
@FindBy(css=".WikiaLightbox div:not(.video-media)")
private WebElement imageContainer;
=======
@FindBy(css... |
<<<<<<<
public void verifyTOCpresent() {
waitForElementByElement(tableOfContents);
PageObjectLogging.log("verifyTOCpresent", "toc is present", true);
}
public void verifyTOCexpanded() {
waitForElementByElement(tableOfContentsOrderedList);
PageObjectLogging.log("verifyTOCexpanded", "toc is expanded", true);... |
<<<<<<<
public static final String SPECIAL_WHAT_LINKS_HERE = "Special:WhatLinksHere";
=======
public static final String SPECIAL_VERSION = "wiki/Special:Version";
>>>>>>>
public static final String SPECIAL_VERSION = "wiki/Special:Version";
public static final String SPECIAL_WHAT_LINKS_HERE = "Special:WhatLin... |
<<<<<<<
private By editButtonSelector = By.cssSelector("a#ca-edit");
private By editDropDownBy = By.cssSelector("article span.drop");
=======
private By editButtonSelector = By.cssSelector("a#ca-edit");
@FindBy (css = "#WikiaPageHeader h1")
private WebElement wikiFirstHeader;
@FindBy (css = "#WikiaArticle a[... |
<<<<<<<
=======
import java.util.List;
import java.util.concurrent.TimeUnit;
import lombok.Getter;
import org.joda.time.DateTime;
import org.json.JSONException;
import org.json.JSONObject;
import org.openqa.selenium.By;
import org.openqa.selenium.Cookie;
import org.openqa.selenium.Dimension;
import org.openqa.selen... |
<<<<<<<
@FindBy(css="figure.wikia-interactive-map-thumbnail")
private WebElement mapNode;
=======
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-overlay")
private WebElement previewOverlay;
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-title")
private WebElement previewMeditaTitle;
@FindBy(css=".ve-ui-wikiaMediaPre... |
<<<<<<<
@FindBy(css = ".modal-dialog-wrapper.menu .modal-dialog")
private WebElement modal;
@FindBy(css = ".file-upload-label")
private WebElement uploadButton;
@FindBy(css = "#fileUpload")
private WebElement uploadInput;
=======
@FindBy(css = ".modal-dialog .crop-image")
private WebElement cropImageB... |
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInModal().isVisible(), shouldGetModal);
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptI... |
<<<<<<<
import org.joda.time.DateTime;
import org.testng.annotations.Test;
=======
import org.testng.annotations.Test;
>>>>>>>
import org.joda.time.DateTime;
import org.testng.annotations.Test;
<<<<<<<
=======
@Test(groups = {"VetModalCaption", "VetTests", "Media"})
>>>>>>>
@Test(groups = {"VetModalCaption", ... |
<<<<<<<
import java.net.HttpURLConnection;
import java.net.URL;
=======
>>>>>>>
import java.net.HttpURLConnection;
import java.net.URL;
<<<<<<<
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.HttpStatus;
=======
>>>>>>>
im... |
<<<<<<<
public static final String ADS_PUSHSLOT_SCRIPT =
"window.adslots2.push([\"%slot%\",null,\"AdEngine2\"]);";
public static final String AD_DRIVER_FORCED_STATUS_SUCCESS_SCRIPT =
=======
public static final String adsPushSlotScript =
"window.adslots2.push([\"%slot%\"]);";
public static final String adDriv... |
<<<<<<<
AdsBaseObject ads = new AdsBaseObject(page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(
driver,
slot,
ads.findFirstIframeWithAd(slot),
false
=======
AdsBaseObject ads = new AdsBaseObject(driver, page.getUrl());
final AutoplayVuap vuap = new AutoplayVua... |
<<<<<<<
}
public void clickShareButton() {
waitForElementByElement(shareButton);
shareButton.click();
PageObjectLogging.log("clickShareButton", "Share button was clicked", true, driver);
}
public void verifyTwitterIframeVisibility() {
waitForElementByElement(twitterIframe);
PageObjectLogging.log("V... |
<<<<<<<
import com.wikia.webdriver.PageObjectsFactory.PageObject.WikiPage.EditMode.WikiArticleEditMode;
import org.json.JSONException;
import org.json.JSONObject;
import org.openqa.selenium.Cookie;
import org.openqa.selenium.Dimension;
=======
>>>>>>>
import org.json.JSONException;
import org.json.JSONObject;
import... |
<<<<<<<
=======
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.Multiwikifinder.SpecialMultiWikiFinderPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialAdminDashboardPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialCreateTopListPage... |
<<<<<<<
@FindBy(css = ".article-gallery > figure > img")
=======
public MercuryArticlePageObject(WebDriver driver) {
super(driver);
// TODO Auto-generated constructor stub
}
@FindBy(css = ".article-gallery img")
>>>>>>>
@FindBy(css = ".article-gallery img") |
<<<<<<<
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList;
import jav... |
<<<<<<<
private AccountManager accountManager = AccountManager.getInstance();
=======
private final StringProperty evolvable = new SimpleStringProperty();
private final Pokemon pokemon;
>>>>>>>
private final StringProperty evolvable = new SimpleStringProperty();
private final Pokemon pokem... |
<<<<<<<
* 25 Double - gymOffense
* 26 Long - gymDefense
* 27 Double - Move 1 Rating
* 28 Double - Move 2 Rating
* 29 Long - duelAbility IV
* 30 Double - gymOffense IV
* 31 Long - gymDefense IV
=======
* 25 Integer - gymOffense
* 26 Integ... |
<<<<<<<
if (Config.getConfig().getBool("develop", false)) {
new ChooseGuiWindowController();
sPrimaryStage.show();
}
=======
if (ConfigNew.getConfig().getBool(ConfigKey.DEVELOPFLAG))
openGUIChooser(primaryStage);
>>>>>>>
if (ConfigNew.getConfig().g... |
<<<<<<<
config = new JSONObject("{\"login\":{},\"options\":{}}");
saveConfig();
=======
config = new JSONObject("{\"login\":{},\"options\":{\"lang\":\"en\"}}");
Utilities.saveFile(file, config.toString(4));
>>>>>>>
config = new JSONObject("{\"login\":{},\"options\":{\"lang\":\"en\"}}");
saveConfig(... |
<<<<<<<
=======
import static java.lang.Math.min;
import static java.util.Collections.sort;
>>>>>>>
import static java.lang.Math.min;
<<<<<<<
List<Tuple2id> items = popList.stream()
.filter(is -> filter.test(is.v1))
.limit(maxLength)
=======
List<IdxDouble> items = ... |
<<<<<<<
recMap.forEach(Unchecked.biConsumer((name, recommender) -> {
System.out.println("Running " + name);
runner.run(recommender.get(), name);
}));
=======
recMap.forEach((name, recommender) -> {
try {
System.out.println("Running " + name);... |
<<<<<<<
import es.uam.eps.ir.ranksys.core.preference.IdPref;
=======
import org.ranksys.compression.codecs.CODEC;
import static org.ranksys.compression.util.Delta.delta;
import es.uam.eps.ir.ranksys.fast.preference.IdxPref;
>>>>>>>
import es.uam.eps.ir.ranksys.core.preference.IdPref;
<<<<<<<
=======
import java.u... |
<<<<<<<
import static es.uam.eps.ir.ranksys.core.util.FastStringSplitter.split;
import es.uam.eps.ir.ranksys.core.util.parsing.Parser;
=======
import es.uam.eps.ir.ranksys.fast.IdxObject;
>>>>>>>
<<<<<<<
import org.ranksys.core.util.tuples.Tuple2io;
import static org.ranksys.core.util.tuples.Tuples.tuple;
=======
... |
<<<<<<<
List<Tuple2id> recommended = new ArrayList<>();
=======
int N = min(maxLength, randomList.size());
List<IdxDouble> recommended = new ArrayList<>();
>>>>>>>
int N = min(maxLength, randomList.size());
List<Tuple2id> recommended = new ArrayList<>();
<<<<<<<
for (... |
<<<<<<<
import es.uam.eps.ir.ranksys.core.preference.IdPref;
=======
import org.ranksys.fast.preference.StreamsAbstractFastPreferenceData;
>>>>>>>
import es.uam.eps.ir.ranksys.core.preference.IdPref;
<<<<<<<
import it.unimi.dsi.fastutil.doubles.DoubleIterator;
import it.unimi.dsi.fastutil.ints.IntIterator;
======... |
<<<<<<<
public Recommendation(U user, List<IdDouble<I>> items) {
=======
/**
* Constructs the recommendation.
*
* @param user the user that receives the recommendation
* @param items a list of item ID-score pairs sorted by descending score
*/
public Recommendation(U user, List<IdD... |
<<<<<<<
@SuppressWarnings("rawtypes")
private static MapNode[] emptyChildren = {};
=======
private static final long serialVersionUID = 8611758181642617230L;
>>>>>>>
@SuppressWarnings("rawtypes")
private static MapNode[] emptyChildren = {};
private static final long serialVersionUID = 8611758181642617230L; |
<<<<<<<
import java.util.Map;
=======
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
>>>>>>>
import java.io.Serializable;
import java.util.Map;
<<<<<<<
public class MapPatriciaTrie<T> extends PatriciaTrie implements MapTrie<T>{
... |
<<<<<<<
private static int containerCount(int size, int unitSize){
return size / unitSize + ((size % unitSize) != 0 ? 1 : 0);
}
private void writeObject(ObjectOutputStream s)
throws IOException {
trimToSize();
ObjectOutputStream.PutField fields = s.putFields();
fields.put("size", size);
trimToSize();
f... |
<<<<<<<
import brave.Tracing;
import brave.baggage.BaggagePropagation;
import brave.propagation.B3Propagation;
import brave.propagation.B3Propagation.Format;
=======
>>>>>>>
import brave.baggage.BaggagePropagation;
<<<<<<<
// Default for spring-messaging is on 2.2.x is MULTI, though 3.x it is
// SINGLE_NO_PARENT ... |
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
=======
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
>>>>>>>
... |
<<<<<<<
=======
import brave.http.HttpAdapter;
import brave.http.HttpClientParser;
>>>>>>>
<<<<<<<
=======
import brave.http.HttpRequestParser;
import brave.http.HttpResponseParser;
import brave.http.HttpSampler;
import brave.http.HttpServerParser;
>>>>>>>
import brave.http.HttpRequestParser;
import brave.http.H... |
<<<<<<<
return new SkipPatternHttpClientSampler(sleuthWebProperties);
=======
if (sleuthClientSampler != null) {
return sleuthClientSampler;
}
String skipPattern = sleuthWebProperties.getClient().getSkipPattern();
if (skipPattern == null) {
return SamplerFunctions.deferDecision();
}
return new S... |
<<<<<<<
import brave.propagation.B3Propagation;
=======
import brave.handler.MutableSpan;
>>>>>>>
import brave.handler.MutableSpan;
import brave.propagation.B3Propagation;
<<<<<<<
import brave.propagation.TraceContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import zipkin2.Span;
... |
<<<<<<<
final double edgeLength = edgeLengths[up];
final int scaledOffset = matrixSize * probabilityIndices[up];
=======
final int scaledOffset = matrixTraitSize * probabilityIndices[up];
>>>>>>>
final double edgeLength = edgeLengths[up];
final int scaled... |
<<<<<<<
import org.springframework.context.ApplicationListener;
import org.springframework.context.EnvironmentAware;
=======
import org.springframework.context.event.EventListener;
>>>>>>>
import org.springframework.context.ApplicationListener;
<<<<<<<
public class DefaultEndpointLocator implements EndpointLocator,... |
<<<<<<<
private static final String NAMECONTENT = "nameContent";
private static final String PRUNEDNODES = "prunedNodes";
=======
private static final String NAME_CONTENT = "nameContent";
>>>>>>>
private static final String NAME_CONTENT = "nameContent";
private static final String PRUNED_NODES = ... |
<<<<<<<
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
=======
import org.mockito.runners.MockitoJUnitRunner;
>>>>>>>
import org.mockito.junit.MockitoJUnitRunner; |
<<<<<<<
import brave.propagation.TraceContextOrSamplingFlags;
=======
import brave.sampler.RateLimitingSampler;
import brave.sampler.Sampler;
>>>>>>>
import brave.propagation.TraceContextOrSamplingFlags;
import brave.sampler.RateLimitingSampler;
import brave.sampler.Sampler;
<<<<<<<
static class WithMeterRegistry ... |
<<<<<<<
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import zipkin2.Span;
import zipkin2.reporter.Reporter;
=======
import brave.test.TestSpanHandler;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
>>>>>>>
import brave.test.TestSpanHandler;
import org.... |
<<<<<<<
import org.junit.jupiter.api.Test;
=======
import org.junit.Test;
import zipkin2.Span;
import zipkin2.reporter.Reporter;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotatio... |
<<<<<<<
=======
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
>>>>>>>
import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
<<<<<<<
@ConditionalOnBean(TraceWebAutoConfiguration.class)
... |
<<<<<<<
import brave.http.HttpRequest;
=======
import brave.handler.SpanHandler;
>>>>>>>
import brave.handler.SpanHandler;
import brave.http.HttpRequest;
<<<<<<<
import brave.sampler.SamplerFunction;
=======
import brave.test.TestSpanHandler;
>>>>>>>
import brave.sampler.SamplerFunction;
import brave.test.TestSp... |
<<<<<<<
import java.util.List;
import brave.Tracing;
import brave.baggage.BaggageField;
import brave.baggage.BaggagePropagation;
import brave.baggage.BaggagePropagationConfig.SingleBaggageField;
import brave.baggage.BaggagePropagationCustomizer;
import brave.propagation.B3SinglePropagation;
=======
import java.util.... |
<<<<<<<
import brave.http.HttpRequest;
=======
import brave.handler.SpanHandler;
>>>>>>>
import brave.handler.SpanHandler;
import brave.http.HttpRequest;
<<<<<<<
import brave.sampler.SamplerFunction;
=======
import brave.test.TestSpanHandler;
>>>>>>>
import brave.sampler.SamplerFunction;
import brave.test.TestSp... |
<<<<<<<
void should_use_RateLimitedSampler_withFinishedSpanHandler() {
this.contextRunner.withUserConfiguration(WithFinishedSpanHandler.class)
.run((context -> {
final Sampler bean = context.getBean(Sampler.class);
BDDAssertions.then(bean).isInstanceOf(RateLimitingSampler.class);
}));
=======
pu... |
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
=======
import brave.test.TestSpanHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
>>>>>>>
import brave.test.TestSpanHandler;
im... |
<<<<<<<
import org.springframework.cloud.sleuth.instrument.web.TraceWebServletAutoConfiguration;
import org.springframework.context.ApplicationContext;
=======
import org.springframework.cloud.sleuth.ErrorParser;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.instrument.web.Ht... |
<<<<<<<
@Autowired
private TracingClientHttpRequestInterceptor clientInterceptor;
@PostConstruct
public void init() {
Map<String, RestTemplate> restTemplates = BeanFactoryUtils
.beansOfTypeIncludingAncestors(this.applicationContext,
RestTemplate.class);
for (RestTemplate restTemplate ... |
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
=======
import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWi... |
<<<<<<<
import brave.handler.FinishedSpanHandler;
=======
import brave.handler.SpanHandler;
import brave.propagation.B3Propagation;
>>>>>>>
import brave.handler.SpanHandler;
<<<<<<<
import org.springframework.cloud.sleuth.baggage.TraceBaggageConfiguration;
=======
import org.springframework.cloud.sleuth.log.Sleut... |
<<<<<<<
HamiltonianMonteCarloOperator(AdaptationMode mode, double weight, GradientWrtParameterProvider gradientProvider,
Parameter parameter, Transform transform, Parameter mask,
double stepSize, int nSteps,
double... |
<<<<<<<
import brave.propagation.StrictScopeDecorator;
import brave.propagation.ThreadLocalCurrentTraceContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
=======
import brave.propagat... |
<<<<<<<
=======
BeanFactory beanFactory = Mockito.mock(BeanFactory.class);
BDDMockito.given(beanFactory.getBean(TraceWebAutoConfiguration.SkipPatternProvider.class))
.willThrow(new NoSuchBeanDefinitionException("foo"));
>>>>>>>
BDDMockito.given(beanFactory.getBean(TraceWebAutoConfiguration.SkipPatternProvi... |
<<<<<<<
import brave.http.HttpServerParser;
=======
import brave.http.HttpRequestParser;
import brave.http.HttpResponseParser;
import brave.http.HttpSampler;
>>>>>>>
import brave.http.HttpRequestParser;
import brave.http.HttpResponseParser; |
<<<<<<<
import brave.propagation.StrictScopeDecorator;
import brave.propagation.ThreadLocalCurrentTraceContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
=======
import brave.propagation.StrictCurrentTraceContext;
import org.junit.After;
import org.junit.Test;
>>>>>>>
import brave.pr... |
<<<<<<<
@EventListener(ServletWebServerInitializedEvent.class)
public void onApplicationEvent(ServletWebServerInitializedEvent event) {
this.port = event.getSource().getPort();
=======
private String serviceName() {
if (StringUtils.hasText(this.zipkinProperties.getService().getName())) {
return this.zipkinP... |
<<<<<<<
=======
import brave.propagation.StrictCurrentTraceContext;
>>>>>>>
import brave.propagation.StrictCurrentTraceContext;
<<<<<<<
final CurrentTraceContext currentTraceContext = CurrentTraceContext.Default.create();
=======
StrictCurrentTraceContext currentTraceContext = StrictCurrentTraceContext.create()... |
<<<<<<<
map.put("logging.pattern.level",
"%5p [${spring.zipkin.service.name:${spring.application.name:-}},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]");
=======
if (Boolean.parseBoolean(environment.getProperty("spring.sleuth.enabled", "true"))) {
map.put("logging.pattern.level",
"%5p [${... |
<<<<<<<
import org.springframework.cloud.sleuth.internal.DefaultSpanNamer;
import org.springframework.cloud.sleuth.util.ArrayListSpanReporter;
=======
import org.springframework.cloud.sleuth.DefaultSpanNamer;
>>>>>>>
import org.springframework.cloud.sleuth.internal.DefaultSpanNamer; |
<<<<<<<
import java.util.ArrayList;
=======
import java.util.Collections;
>>>>>>>
<<<<<<<
import brave.baggage.BaggagePropagation;
import brave.propagation.B3Propagation;
import brave.propagation.B3SingleFormat;
=======
import brave.handler.MutableSpan;
import brave.handler.SpanHandler;
>>>>>>>
import brave.bagg... |
<<<<<<<
private static class UserInfoRestTemplateCustomizerBPP implements BeanPostProcessor {
=======
@Bean
@ConditionalOnMissingBean
UserInfoRestTemplateCustomizer traceUserInfoRestTemplateCustomizer() {
return new TraceUserInfoRestTemplateCustomizer(this.beanFactory);
}
class UserInfoRestTemplateCus... |
<<<<<<<
import brave.http.HttpRequest;
=======
import brave.handler.SpanHandler;
>>>>>>>
import brave.handler.SpanHandler;
import brave.http.HttpRequest;
<<<<<<<
import brave.sampler.SamplerFunction;
=======
import brave.test.TestSpanHandler;
>>>>>>>
import brave.sampler.SamplerFunction;
import brave.test.TestSp... |
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
=======
import brave.test.TestSpanHandler;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import org... |
<<<<<<<
import brave.propagation.B3SingleFormat;
import brave.propagation.TraceContext;
=======
import brave.handler.SpanHandler;
>>>>>>>
import brave.handler.SpanHandler;
import brave.propagation.B3SingleFormat;
import brave.propagation.TraceContext;
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit... |
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
=======
import brave.test.TestSpanHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
>>>>>>>
import brave.test.TestSpanHandler;
im... |
<<<<<<<
import org.junit.jupiter.api.Test;
=======
import brave.sampler.SamplerFunctions;
import org.junit.Test;
>>>>>>>
import brave.sampler.SamplerFunctions;
import org.junit.jupiter.api.Test;
<<<<<<<
=======
public void configuresClientSkipPattern() throws Exception {
contextRunner()
.withPropertyValues... |
<<<<<<<
import org.springframework.cloud.sleuth.TraceKeys;
import org.springframework.cloud.sleuth.SpanReporter;
=======
>>>>>>>
import org.springframework.cloud.sleuth.TraceKeys;
<<<<<<<
this.traceKeys = traceKeys;
=======
>>>>>>>
this.traceKeys = traceKeys; |
<<<<<<<
=======
import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoRestTemplateCustomizer;
import org.springframework.boot.web.client.RestTemplateBuilder;
>>>>>>>
import org.springframework.boot.web.client.RestTemplateBuilder;
<<<<<<<
@ConditionalOnClass(RestTemplate.class)
static clas... |
<<<<<<<
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.view.Menu;
import android.support.v4.view.MenuItem;
=======
>>>>>>> |
<<<<<<<
import java.net.InetAddress;
=======
import java.net.URL;
>>>>>>>
import java.net.InetAddress;
import java.net.URL;
<<<<<<<
put(InetAddress.class, new InetAddressValueConverter());
=======
put(URL.class, new UrlValueConverter());
>>>>>>>
put(InetAddress.class, new Inet... |
<<<<<<<
=======
private final ConfigurationNode configuration;
private LocalVariableTableParameterNameDiscoverer nameDiscoverer = new LocalVariableTableParameterNameDiscoverer();
private Set<WeakReference<Object>> configuredObjects = new HashSet<WeakReference<Object>>();
>>>>>>>
<<<<<<<
private Map<... |
<<<<<<<
=======
private ImageView sketchBackground;
public static int decorHight;
public static int decorWidth;
>>>>>>>
private ImageView sketchBackground;
public static int decorHight;
public static int decorWidth; |
<<<<<<<
public String getSql() {
return this.sql;
}
=======
@Override
public DecodeContext decodeContext() {
return DecodeContext.textResult();
}
>>>>>>>
public String getSql() {
return this.sql;
}
@Override
public DecodeContext decodeContext() {
... |
<<<<<<<
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.Style;
=======
>>>>>>>
import net.minecraft.client.util.math.MatrixStack;
<<<<<<<
wrappedLines = font.getTextHandler().wrapLines(text, width, Style.EMPTY);
=======
wrappedLines = font.wrapLines(text, width);
>>>>>>>
wrappe... |
<<<<<<<
* @version 2.0 — <em>$Date: 2013-05-27 $</em>
=======
* @version 1.0 — <em>$Date: 2013-06-05 $</em>
>>>>>>>
* @version 2.0 — <em>$Date: 2013-07-12 $</em>
<<<<<<<
=======
/**
* Return a more specific view of this chromosome factory.
*
* @return a more specific view of this chrom... |
<<<<<<<
* @version 1.0 — <em>$Date: 2013-03-26 $</em>
=======
* @version 1.3 — <em>$Date: 2013-06-21 $</em>
>>>>>>>
* @version 1.3 — <em>$Date: 2013-07-12 $</em>
<<<<<<<
public void foreach(final Consumer<? super T> consumer) {
=======
public <R> void foreach(final Function<? super T, ? ext... |
<<<<<<<
=======
import dr.evolution.tree.TreeTrait;
>>>>>>>
import dr.evolution.tree.TreeTrait;
<<<<<<<
import dr.math.matrixAlgebra.WrappedVector;
=======
import dr.math.matrixAlgebra.missingData.InversionResult;
import dr.math.matrixAlgebra.missingData.MissingOps;
>>>>>>>
import dr.math.matrixAlgebra.WrappedV... |
<<<<<<<
* @version 1.0 — <em>$Date: 2013-02-27 $</em>
=======
* @version 1.2 — <em>$Date: 2013-03-11 $</em>
>>>>>>>
* @version 1.2 — <em>$Date: 2013-03-26 $</em>
<<<<<<<
/**
* Combine the given alterers.
*
* @param alterers the alterers to combine.
* @throws NullPointerException if one... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.