conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import com.microsoft.azure.management.graphrbac.ActiveDirectoryApplication;
=======
import com.microsoft.azure.management.documentdb.DocumentDBAccount;
>>>>>>>
import com.microsoft.azure.management.graphrbac.ActiveDirectoryApplication;
import com.microsoft.azure.management.documentdb.DocumentDBAccount; |
<<<<<<<
=======
import com.microsoft.azure.management.resources.fluentcore.model.*;
>>>>>>>
<<<<<<<
import com.microsoft.azure.management.resources.fluentcore.arm.models.Taggable;
import com.microsoft.azure.management.resources.fluentcore.model.Appliable;
import com.microsoft.azure.management.resources.fluentcore.m... |
<<<<<<<
public ServiceCall enumValidAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumValid(this.client.getMapperAdapter().serializeRaw(enumQuery));
=======
public ServiceCall enumValidAsync(UriColor enumQuery, final ServiceCallback<Void> se... |
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
... |
<<<<<<<
public DefinitionCreatable withProperties(Object properties) {
inner().withProperties(properties);
=======
public GenericResourceImpl withProperties(Object properties) {
inner().setProperties(properties);
>>>>>>>
public GenericResourceImpl withProperties(Object properties) {
... |
<<<<<<<
=======
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required ... |
<<<<<<<
=======
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Get date-time array value ['2000-12... |
<<<<<<<
public AvailabilitySet.DefinitionProvisionable define(String name) {
=======
public AvailabilitySet.DefinitionCreatable define(String name) throws Exception {
>>>>>>>
public AvailabilitySet.DefinitionCreatable define(String name) { |
<<<<<<<
return withHeader("Content-Length", String.valueOf(body.contentLength()));
=======
this.mimeType = mimeType;
headers.set("Content-Length", String.valueOf(body.contentLength()));
return this;
>>>>>>>
headers.set("Content-Length", String.valueOf(body.contentLength()));
... |
<<<<<<<
public VirtualMachineImpl withNewPrimaryPublicIpAddress(PublicIpAddress.DefinitionStages.WithCreate creatable) {
NetworkInterface.DefinitionCreatable nicCreatable = this.nicDefinitionWithPublicIp
=======
public VirtualMachineImpl withNewPrimaryPublicIpAddress(PublicIpAddress.DefinitionCreatabl... |
<<<<<<<
/**
* Returns a list of subscriptions.
*
* @param topicPath
* A <code>String</code> object that represents the name of the topic for the subscriptions to retrieve.
*
* @param options
* A <code>ListSubscriptionsOptions</code> object that represents t... |
<<<<<<<
protected ServiceCall createResourceAsync(final ServiceCallback<Void> callback) {
DeploymentInner inner = new DeploymentInner()
.withProperties(new DeploymentProperties());
inner.properties().withMode(mode());
inner.properties().withTemplate(template());
inner... |
<<<<<<<
public Single<? extends InputStream> getBodyAsInputStreamAsync() {
=======
public boolean hasBody() {
return response.body() != null;
}
@Override
public Single<? extends InputStream> bodyAsInputStreamAsync() {
>>>>>>>
public Single<? extends InputStream> bodyAsInputStreamAsyn... |
<<<<<<<
import com.microsoft.windowsazure.ServiceException;
import com.microsoft.windowsazure.http.ServiceFilter;
import com.microsoft.windowsazure.http.ServiceFilter.Request;
import com.microsoft.windowsazure.http.ServiceFilter.Response;
import com.microsoft.windowsazure.services.serviceBus.models.ListQueuesResult;
im... |
<<<<<<<
HttpClient client = new MockHttpClient(new UserAgentPolicy.Factory("Awesome")) {
@Override
public Single<HttpResponse> sendRequestInternalAsync(HttpRequest request) {
String header = request.headers().value("User-Agent");
Assert.assertEquals("Aweso... |
<<<<<<<
=======
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required ... |
<<<<<<<
import com.fasterxml.jackson.databind.type.TypeBindings;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
=======
>>>>>>>
import com.fasterxml.jackson.databind.type.TypeBindings;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
impor... |
<<<<<<<
@SuppressWarnings("unchecked")
=======
@Override
public Observable<FluentModelT> executeCreateOrUpdateAsync() {
return this.createResourceAsync();
}
>>>>>>>
@Override
public Observable<FluentModelT> executeCreateOrUpdateAsync() {
return this.createResourceAsync();
... |
<<<<<<<
CloudBlobContainer container = null;
try {
container = blobClient.getContainerReference(storageContainer);
} catch (URISyntaxException e) {
} catch (StorageException e) {
}
try {
container.breakL... |
<<<<<<<
@Override
public Update update() throws Exception {
return this;
}
=======
@Override
protected void createResource() throws Exception {
ResourceGroupInner params = new ResourceGroupInner();
params.setLocation(this.inner().location());
params.setTags(this.i... |
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format
<<<<<<<
=======
* Get an array of string ['Arra... |
<<<<<<<
=======
protected String resourceGroupName;
protected boolean isExistingGroup;
>>>>>>>
<<<<<<<
=======
group = this.resourceGroups.define(this.resourceGroupName)
.withLocation(this.location())
.create();
this.isExistingGroup = true;... |
<<<<<<<
SupportsGetting<Feature> {
/**
* Registers a feature in a resource provider.
*
* @param featureName the name of the feature
* @return the immutable client-side feature object created
* @throws IOException exception from serialization/deserializati... |
<<<<<<<
Call<ResponseBody> call = service.enumValid(client.getMapperAdapter().serializeRaw(enumPath));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.enumValid(this.client.getMapperAdapter().serializeRaw(enumPath));
>>>>>>>
Call<Respon... |
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
... |
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format
<<<<<<<
=======
* Get an array of string ['Arra... |
<<<<<<<
public StorageAccountImpl create() throws Exception {
super.creatablesCreate();
return this;
}
@Override
public ServiceCall createAsync(ServiceCallback<StorageAccount> callback) {
return super.creatablesCreateAsync(Utils.toVoidCallback(this, callback));
}
@Overr... |
<<<<<<<
=======
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Get bo... |
<<<<<<<
import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableImpl;
import com.microsoft.azure.management.resources.fluentcore.utils.Utils;
=======
import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl;
>>>>>>>
import com.microsoft.a... |
<<<<<<<
=======
* Get null as date - this should throw or be unusable on the client side, depending on date representation
>>>>>>>
* Get null as date - this should throw or be unusable on the client side, depending on date representation
<<<<<<<
=======
* Get null as date - this should throw or be ... |
<<<<<<<
=======
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Get date-time array value ['2000-12... |
<<<<<<<
public ServiceCall enumValidAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumValid(client.getMapperAdapter().serializeRaw(enumQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> ... |
<<<<<<<
=======
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
>>>>>>>
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
<<<<... |
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァ... |
<<<<<<<
=======
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Get bo... |
<<<<<<<
import com.microsoft.windowsazure.services.media.implementation.entities.EntityCreationOperation;
import com.microsoft.windowsazure.services.media.implementation.entities.EntityDeleteOperation;
import com.microsoft.windowsazure.services.media.implementation.entities.EntityGetOperation;
import com.microsoft.wind... |
<<<<<<<
=======
* Put true Boolean value in request returns 301. This request should not be automatically redirected, but should return the received 301 to the caller for evaluation
>>>>>>>
* Put true Boolean value in request returns 301. This request should not be automatically redirected, but should re... |
<<<<<<<
int osDiskSizeInGb = vm.osDiskSize();
if (osDiskSizeInGb == 0) {
=======
Integer osDiskSizeInGb = windowsVM.osDiskSize();
if (osDiskSizeInGb == null) {
>>>>>>>
int osDiskSizeInGb = windowsVM.osDiskSize();
if (osDi... |
<<<<<<<
import com.microsoft.rest.v2.policy.RequestPolicy;
import com.microsoft.rest.v2.protocol.SerializerAdapter;
import io.reactivex.Single;
import io.reactivex.functions.Function;
=======
import rx.Single;
import rx.functions.Func1;
>>>>>>>
import io.reactivex.Single;
import io.reactivex.functions.Function;
<<<... |
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3'
<<<<<<<
=======
* Get method with unencoded query parameter with value 'value1&q2=value... |
<<<<<<<
=======
import com.microsoft.rest.serializer.JacksonMapperAdapter;
import okhttp3.*;
>>>>>>>
import com.microsoft.rest.serializer.JacksonMapperAdapter;
<<<<<<<
RestClient.Builder restBuilder = new RestClient.Builder("http://localhost", clientBuilder, retrofitBuilder)
.withCredentia... |
<<<<<<<
protected ServiceCall createResourceAsync(final ServiceCallback<Void> callback) {
return client.createOrUpdateAsync(
resourceGroupName(),
resourceProviderNamespace,
parentResourceId,
resourceType,
key(),
... |
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァ... |
<<<<<<<
/**
* Defines the base interface for resources that support listing resources
* in a resource group.
*
* @param <T> the type of the resources listed.
*/
=======
/**
* Provides access to listing Azure resources of a specific type in a specific resource group
* <p>
* (Note: this interface is not intende... |
<<<<<<<
public NetworkSecurityGroup getNetworkSecurityGroup() throws CloudException, IOException {
=======
public NetworkSecurityGroup networkSecurityGroup() {
>>>>>>>
public NetworkSecurityGroup getNetworkSecurityGroup() { |
<<<<<<<
import java.net.URL;
=======
import java.util.Map;
>>>>>>>
import java.net.URL;
import java.util.Map;
<<<<<<<
/**
* Gets the token from the given endpoint.
*
* @param uri the url
* @return the token
* @throws IOException IOException
*/
public final String getTokenFromUr... |
<<<<<<<
=======
* Get a basic complex type while the server doesn't provide a response payload
>>>>>>>
* Get a basic complex type while the server doesn't provide a response payload
<<<<<<<
=======
* Get a basic complex type while the server doesn't provide a response payload
>>>>>>>
* Get a ... |
<<<<<<<
Single<? extends HttpResponse> asyncResponse = next.sendAsync(request);
return asyncResponse.flatMap(new Function<HttpResponse, Single<? extends HttpResponse>>() {
@Override
public Single<? extends HttpResponse> apply(HttpResponse httpResponse) {
if (shoul... |
<<<<<<<
client.sendRequestAsync(new HttpRequest("test", "GET", "localhost"))
.blockingGet();
=======
pipeline.sendRequestAsync(new HttpRequest("test", "GET", "localhost"))
.toBlocking().value();
>>>>>>>
pipeline.sendRequestAsync(new HttpRequest("test", "GET", "... |
<<<<<<<
public final static int STAGEOP_INVALIDATE_XLOC = 15;
public final static int STAGEOP_UPDATE_XLOC = 16;
=======
public final static int STAGEOP_CLOSE_FILE = 15;
>>>>>>>
... |
<<<<<<<
=======
@Override
public Observable<NetworkSecurityGroup> applyUpdateAsync() {
return createResourceAsync();
}
@Override
public List<Subnet> listAssociatedSubnets() {
final List<SubnetInner> subnetRefs = this.inner().subnets();
final Map<String, Network> networks =... |
<<<<<<<
builder = addOptionalAccessConditionHeader(builder, options.getAccessCondition());
=======
builder = addOptionalAccessContitionHeader(builder, options.getAccessCondition());
if (options.isComputeRangeMD5()) {
builder = addOptionalHeader(builder, "x-ms-range-get-content-md5"... |
<<<<<<<
=======
* Get complex types with dictionary property while server doesn't provide a response payload
>>>>>>>
* Get complex types with dictionary property while server doesn't provide a response payload
<<<<<<<
=======
* Get complex types with dictionary property while server doesn't provide... |
<<<<<<<
=======
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
>>>>>>>
* A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages
<<<<... |
<<<<<<<
=======
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid error payload: {'status': 400, 'message': 'c... |
<<<<<<<
=======
* Get a basic complex type while the server doesn't provide a response payload
>>>>>>>
* Get a basic complex type while the server doesn't provide a response payload
<<<<<<<
=======
* Get a basic complex type while the server doesn't provide a response payload
>>>>>>>
* Get a ... |
<<<<<<<
=======
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid error payload: {'status': 400, 'message': 'c... |
<<<<<<<
import com.microsoft.windowsazure.ServiceException;
import com.microsoft.windowsazure.services.serviceBus.models.Queue;
import com.microsoft.windowsazure.services.serviceBus.models.Topic;
=======
import com.microsoft.windowsazure.common.ServiceException;
>>>>>>>
import com.microsoft.windowsazure.common.Servi... |
<<<<<<<
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
=======
>>>>>>>
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collec... |
<<<<<<<
/**
*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*
*/
=======
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project... |
<<<<<<<
private boolean enableTracing;
private String traceTarget;
private String tracingPolicy;
=======
private long quota;
>>>>>>>
private boolean enableTracing;
private String traceTarget;
... |
<<<<<<<
=======
* Get complex types with dictionary property while server doesn't provide a response payload
>>>>>>>
* Get complex types with dictionary property while server doesn't provide a response payload
<<<<<<<
=======
* Get complex types with dictionary property while server doesn't provide... |
<<<<<<<
op = new InvalidateXLocSetOperation(this);
operations.put(op.getProcedureId(), op);
op = new InternalRWRAuthStateInvalidatedOperation(this);
operations.put(op.getProcedureId(), op);
=======
>>>>>>>
op = new InvalidateXLocSetOperation(this);
operati... |
<<<<<<<
import javax.websocket.ContainerProvider;
import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
=======
>>>>>>> |
<<<<<<<
import org.krakenapps.codec.FastEncodingRule;
import org.krakenapps.confdb.Config;
import org.krakenapps.confdb.ConfigDatabase;
=======
>>>>>>>
import org.krakenapps.confdb.Config;
import org.krakenapps.confdb.ConfigDatabase;
<<<<<<<
logger.error("kraken logstorage: cannot delete log data {} of table {... |
<<<<<<<
verify(mChannel).enqueue(errorLog.capture(), eq(Crashes.ERROR_GROUP), eq(PERSISTENCE_CRITICAL));
assertNotNull(errorLog.getValue());
assertNotNull(errorLog.getValue().getException());
assertNotNull(errorLog.getValue().getException().getFrames());
assertEquals(ErrorLogHelp... |
<<<<<<<
import java.lang.reflect.InvocationTargetException;
=======
>>>>>>>
<<<<<<<
class TestDocument{
=======
class Test {
>>>>>>>
class TestDocument{
<<<<<<<
//createDocument(storage);
//readDocument(storage);
deleteDocument(storage);
}catch (Exception ignore) {
... |
<<<<<<<
/* Verifying that 5 items have been persisted. */
=======
/* Verify that 50 items have been persisted. */
>>>>>>>
/* Verify that 5 items have been persisted. */
<<<<<<<
/* Verify that we have called the listener. */
=======
/* Verify that we have called onBeforeSend... |
<<<<<<<
Document<T> createdOrUpdatedDocument = mLocalDocumentStorage.createOrUpdateOffline(partition, documentId, document, documentType, writeOptions);
result.complete(createdOrUpdatedDocument);
=======
postAsyncGetter(new Runnable() {
@Override
pu... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
import com.microsoft.appcenter.http.HttpClient;
import com.microsoft.appcenter.http.HttpClientRetryer;
import com.microsoft.appcenter.http.ServiceCallback;
>>>>>>>
import com.microsoft.appcenter.http.HttpClient;
import com.microsoft.appcenter.http.HttpClientRetryer;
impo... |
<<<<<<<
void deleteOffline(String partition, String documentId) {
PendingOperation operation = new PendingOperation(Constants.PENDING_OPERATION_DELETE_VALUE, partition, documentId, null, 0);
long now = Calendar.getInstance().getTimeInMillis();
mDatabaseManager.replace(getContentValues(operat... |
<<<<<<<
import com.microsoft.azure.mobile.utils.MobileCenterLog;
=======
import java.lang.reflect.Method;
>>>>>>>
import com.microsoft.azure.mobile.utils.MobileCenterLog;
import java.lang.reflect.Method;
<<<<<<<
=======
static final String APP_SECRET = "45d1d9f6-2492-4e68-bd44-7190351eb5f3";
>>>>>>>
<<<<... |
<<<<<<<
decorator.sendAsync(appKey, installId, container, callback);
verify(ingestion).sendAsync(eq(appKey), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback).onCallSucceeded();
=======
decorator.sendAsync(appSecret, installId, container, callback);
ve... |
<<<<<<<
private static StorageException getInvalidPartitionStorageException(String partition) {
return new StorageException(String.format("Partition name can be either '%s' or '%s' but not '%s'.", READONLY, USER, partition));
=======
@Override
public synchronized void onStarted(@NonNull Context co... |
<<<<<<<
import com.microsoft.azure.mobile.utils.MobileCenterLog;
=======
import com.microsoft.azure.mobile.sasquatch.SasquatchDistributeListener;
import org.json.JSONObject;
>>>>>>>
import com.microsoft.azure.mobile.utils.MobileCenterLog;
import org.json.JSONObject;
<<<<<<<
static final String FIREBASE_ENABLE... |
<<<<<<<
=======
// TODO(jdillmann): Share error reporting between ProcessingStage.parseAndExecure and this
private void handleError(RequestMethod m, Throwable err) {
MRCOperation op = m.getOperation();
MRCRequest rq = m.getRequest();
try {
// remove already added replica ... |
<<<<<<<
.withToken(TOKEN));
when(SharedPreferencesManager.getString(READONLY_PARTITION_NAME)).thenReturn(tokenResult);
=======
.withToken(FAKE_TOKEN));
when(SharedPreferencesManager.getString(PREFERENCE_PARTITION_PREFIX + READONLY_PARTITION_NAME)).thenReturn(tokenResult... |
<<<<<<<
return getInstance().instanceCreateOrUpdate(partition, documentId, document, documentType);
=======
return getInstance().instanceCreate(partition, documentId, document, documentType);
>>>>>>>
return getInstance().instanceCreateOrUpdate(partition, documentId, document, documentType);
... |
<<<<<<<
import static org.mockito.Matchers.anyList;
import static org.mockito.Matchers.anyListOf;
=======
import static org.mockito.Matchers.anyListOf;
>>>>>>>
import static org.mockito.Matchers.anyListOf;
<<<<<<<
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), any(ArrayLi... |
<<<<<<<
protected Avalanche() {
mEnabled = true;
=======
private Avalanche() {
>>>>>>>
private Avalanche() {
mEnabled = true;
<<<<<<<
public static Avalanche useFeatures(Application application, String appKey, AvalancheFeature... features) {
Avalanche avalancheHub = getShared... |
<<<<<<<
=======
* Init.
*/
private Auth() {
/* Setup MSAL Logging. */
Logger.getInstance().setLogLevel(Logger.LogLevel.VERBOSE);
try {
Logger.getInstance().setExternalLogger(new ILoggerCallback() {
@Override
public void log(String tag... |
<<<<<<<
import org.mockito.Mock;
=======
>>>>>>>
<<<<<<<
private Context mContext;
@Before
public void setUp() {
mContext = InstrumentationRegistry.getTargetContext();
SharedPreferencesManager.initialize(mContext);
}
@After
public void tearDown() {
SharedPreferencesManager.clear();
}
@Test
publ... |
<<<<<<<
Avalanche.useFeatures(getApplication(), UUIDUtils.randomUUID().toString(), Analytics.class, ErrorReporting.class);
AvalancheLog.setLogLevel(Log.VERBOSE);
=======
Avalanche.start(getApplication(), UUIDUtils.randomUUID().toString(), Analytics.class, Crashes.class);
Avalanche.setL... |
<<<<<<<
=======
if (mSignInDelayed) {
signInInteractively();
}
>>>>>>>
<<<<<<<
private void removeTokenAndAccount() {
=======
private synchronized void removeTokenAndAccount() {
mSignInDelayed = false;
>>>>>>>
private synchronized void removeTokenAndAccount() {
<<... |
<<<<<<<
=======
import avalanche.base.ingestion.http.AvalancheIngestionHttp;
import avalanche.base.ingestion.http.AvalancheIngestionNetworkStateHandler;
import avalanche.base.ingestion.http.AvalancheIngestionRetryer;
import avalanche.base.ingestion.http.DefaultUrlConnectionFactory;
>>>>>>>
import avalanche.base.inge... |
<<<<<<<
=======
* Check state did not change and schedule download of the release.
*
* @param releaseDetails release details.
*/
private synchronized void enqueueDownloadOrShowUnknownSourcesDialog(final ReleaseDetails releaseDetails) {
if (releaseDetails == mReleaseDetails) {
... |
<<<<<<<
*
* @param partition
* @param documentId
* @param document
* @param <T>
* @return
=======
>>>>>>>
<<<<<<<
// Delete a document
// The document type (T) must be JSON deserializable
private synchronized AppCenterFuture<Document<Void>> instanceDelete(final String parti... |
<<<<<<<
=======
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
>>>>>>>
import android.content.SharedPreferences;
<<<<<<<
import com.microsoft.appcenter.utils.AppCenterLog;
import com.microsoft.appcenter.utils.AppNameHelper;
=======
import com.microsoft.appcenter.utils.AppCent... |
<<<<<<<
private final XLocSetCoordinator xLocSetCoordinator;
private final long initTimeMS;
=======
>>>>>>>
private final XLocSetCoordinator xLocSetCoordinator;
private final long initTimeMS;
<<<<<<<
initTimeMS = System.curre... |
<<<<<<<
=======
public void checkInstalled(String forTutorial, String serviceType) {
Runtime runtime = Runtime.getInstance();
Repo repo = runtime.getRepo();
TutorialInfo tutorial = new TutorialInfo();
tutorial.title = forTutorial;
tutorial.isInstalled = repo.isInstalled(serviceType);
}
pub... |
<<<<<<<
import org.xtreemfs.common.xloc.StripingPolicyImpl;
import org.xtreemfs.foundation.buffer.BufferPool;
import org.xtreemfs.foundation.buffer.ReusableBuffer;
import org.xtreemfs.osd.InternalObjectData;
import org.xtreemfs.osd.OSDConfig;
import org.xtreemfs.osd.replication.ObjectSet;
import org.xtreemfs.pbrpc.gene... |
<<<<<<<
meta.addDependency("javax.annotation", "javax.annotation-api", "1.3.2");
=======
meta.addDependency("javax.annotation", "javax.annotation-api", "1.3.2");
>>>>>>>
meta.addDependency("javax.annotation", "javax.annotation-api", "1.3.2");
<<<<<<<
AtmosphereRequest request = r.getReque... |
<<<<<<<
@Ignore("looks like there is a bug the MappingFunction is appearing to be applied to all the sinks, " +
"not just the sink that sent the mapping.")
=======
>>>>>>> |
<<<<<<<
Bytes bytes = applyMapping(tailer, attached);
if (bytes.limit() == 0) {
return true;
}
=======
Bytes bytes;
for (; ; ) {
bytes = applyMapping(tailer, attached, withMappedBuffer);
if (bytes.limit() > 0... |
<<<<<<<
@Override
public void detach(String controllerName) {
// GOOD DESIGN !!! - THIS HAS INPUT STRING - AND WILL
// ROUTE WITH THE APPROPRIATE TYPE - AUTO-MAGICALLY !!!
invoke("detach", Runtime.getService(controllerName));
}
// GOOD DESIGN !!!
@Override
public boolean isAttached(String name)... |
<<<<<<<
@Test
public void testJsonOutput() {
DumpProcessingAction action = new JsonSerializationAction();
action.open();
action.close();
assertEquals(action.getReport(),
"Finished serialization of 0 EntityDocuments in file {PROJECT}-{DATE}.json");
}
@Test
public void testRdfOutput() {
DumpProcessing... |
<<<<<<<
@Parameterized.Parameters
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{ WireType.TEXT },
{ WireType.BINARY }
});
}
// *************************************************************************
//
// **********... |
<<<<<<<
final ValueFactory factory = ValueFactoryImpl.getInstance();
=======
final Sites sites;
>>>>>>>
<<<<<<<
RdfConversionBuffer rdfConversionBuffer) {
=======
RdfConversionBuffer rdfConversionBuffer,
PropertyTypes propertyTypes, Sites sites) {
>>>>>>>
RdfConversionBuffer rdfConversionBuffer, Pr... |
<<<<<<<
public class ItemDocumentImpl extends TermedDocumentImpl implements
ItemDocument, Serializable {
=======
public class ItemDocumentImpl extends TermedStatementDocumentImpl implements
ItemDocument {
>>>>>>>
public class ItemDocumentImpl extends TermedStatementDocumentImpl implements
ItemDocument, Seriali... |
<<<<<<<
@Override
public <T> T accept(SnakVisitor<T> snakVisitor) {
return snakVisitor.visit(this);
}
=======
@Override
public String toString(){
return "SomeValueSnak {pId = " + this.propertyId + "}";
}
>>>>>>>
@Override
public <T> T accept(SnakVisitor<T> snakVisitor) {
return snakVisitor.visit(thi... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.