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.model.Creatable;
import com.microsoft.azure.management.resources.fluentcore.model.Refreshable;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
=======
import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
>>>>>>>
import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
import com.microsoft.azure.management.resources.fluentcore.model.Refreshable;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
<<<<<<<
import java.util.Map;
/**
* Defines an interface for accessing a generic resource in Azure.
*/
=======
>>>>>>>
<<<<<<<
/**
* A deployment definition with sufficient inputs to create a new
* resource in the cloud, but exposing additional optional inputs to
* specify.
*/
interface DefinitionCreatable extends Creatable<GenericResource> { // Properties, tags are optional
=======
interface DefinitionCreatable extends
Creatable<GenericResource>,
Resource.DefinitionWithTags<DefinitionCreatable> {
>>>>>>>
/**
* A deployment definition with sufficient inputs to create a new
* resource in the cloud, but exposing additional optional inputs to
* specify.
*/
interface DefinitionCreatable extends
Creatable<GenericResource>,
Resource.DefinitionWithTags<DefinitionCreatable> {
<<<<<<<
DefinitionCreatable withTags(Map<String, String> tags);
DefinitionCreatable withTag(String key, String value);
}
//CHECKSTYLE IGNORE TodoComment FOR NEXT 1 LINE
// TODO: Updatable properties needs to be revised.
//CHECKSTYLE IGNORE JavadocType FOR NEXT 5 LINES
interface Update extends UpdateBlank, Appliable<Update> {
}
interface UpdateBlank extends Taggable<Update> {
=======
>>>>>>> |
<<<<<<<
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> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.enumValid(client.getMapperAdapter().serializeRaw(enumQuery));
>>>>>>>
public ServiceCall enumValidAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.enumValid(this.client.getMapperAdapter().serializeRaw(enumQuery));
<<<<<<<
public ServiceCall enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumNull(this.client.getMapperAdapter().serializeRaw(enumQuery));
=======
public ServiceCall enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.enumNull(client.getMapperAdapter().serializeRaw(enumQuery));
>>>>>>>
public ServiceCall enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.enumNull(this.client.getMapperAdapter().serializeRaw(enumQuery));
<<<<<<<
public ServiceCall dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateNull(this.client.getMapperAdapter().serializeRaw(dateQuery));
=======
public ServiceCall dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.dateNull(client.getMapperAdapter().serializeRaw(dateQuery));
>>>>>>>
public ServiceCall dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.dateNull(this.client.getMapperAdapter().serializeRaw(dateQuery));
<<<<<<<
public ServiceCall dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateTimeNull(this.client.getMapperAdapter().serializeRaw(dateTimeQuery));
=======
public ServiceCall dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.dateTimeNull(client.getMapperAdapter().serializeRaw(dateTimeQuery));
>>>>>>>
public ServiceCall dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
if (serviceCallback == null) {
throw new IllegalArgumentException("ServiceCallback is required for async calls.");
}
Call<ResponseBody> call = service.dateTimeNull(this.client.getMapperAdapter().serializeRaw(dateTimeQuery)); |
<<<<<<<
=======
* 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
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 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
<<<<<<<
=======
* 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 max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 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) {
inner().withProperties(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 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 integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional string. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional string. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional string. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional string. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null. |
<<<<<<<
=======
* 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-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']
<<<<<<<
=======
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
>>>>>>>
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
<<<<<<<
=======
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
>>>>>>>
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
<<<<<<<
=======
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
>>>>>>>
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
<<<<<<<
=======
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
>>>>>>>
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
<<<<<<<
=======
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
>>>>>>>
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
<<<<<<<
=======
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
>>>>>>>
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
<<<<<<<
=======
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value []
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value []
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value []
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value []
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}] |
<<<<<<<
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()));
return this; |
<<<<<<<
public VirtualMachineImpl withNewPrimaryPublicIpAddress(PublicIpAddress.DefinitionStages.WithCreate creatable) {
NetworkInterface.DefinitionCreatable nicCreatable = this.nicDefinitionWithPublicIp
=======
public VirtualMachineImpl withNewPrimaryPublicIpAddress(PublicIpAddress.DefinitionCreatable creatable) {
NetworkInterface.DefinitionStages.WithCreate nicCreatable = this.nicDefinitionWithCreate
>>>>>>>
public VirtualMachineImpl withNewPrimaryPublicIpAddress(PublicIpAddress.DefinitionStages.WithCreate creatable) {
NetworkInterface.DefinitionStages.WithCreate nicCreatable = this.nicDefinitionWithCreate
<<<<<<<
.withRegion(this.regionName());
NetworkInterface.DefinitionWithNetwork definitionWithNetwork;
=======
.withRegion(this.region());
NetworkInterface.DefinitionStages.WithPrimaryNetwork definitionWithNetwork;
>>>>>>>
.withRegion(this.regionName());
NetworkInterface.DefinitionStages.WithPrimaryNetwork definitionWithNetwork;
<<<<<<<
.withRegion(this.regionName());
NetworkInterface.DefinitionWithNetwork definitionAfterGroup;
=======
.withRegion(this.region());
NetworkInterface.DefinitionStages.WithPrimaryNetwork definitionAfterGroup;
>>>>>>>
.withRegion(this.regionName());
NetworkInterface.DefinitionStages.WithPrimaryNetwork definitionAfterGroup; |
<<<<<<<
/**
* 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 the options to list subscriptions.
*
* @return A <code>ListSubscriptionsResult</code> object that represents the result.
*
* @exception ServiceException
* If a service exception is encountered.
*/
=======
/**
* List subscriptions.
*
* @param topicPath
* the topic path
* @param options
* the options
* @return the list subscriptions result
* @throws ServiceException
* the service exception
*/
>>>>>>>
/**
* 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 the options to list subscriptions.
*
* @return A <code>ListSubscriptionsResult</code> object that represents the result.
*
* @throws ServiceException
* the service exception
*/
<<<<<<<
/**
* Returns a list of rules.
*
* @param topicPath
* A <code>String</code> object that represents the name of the topic for the subscription.
* @param subscriptionName
* A <code>String</code> object that represents the name of the subscription whose rules are being
* retrieved.
* @param options
* A <code>ListRulesOptions</code> object that represents the options to retrieve rules.
*
* @return A <code>ListRulesResult</code> object that represents the result.
*
* @exception ServiceException
* If a service exception is encountered.
*/
=======
/**
* List rules.
*
* @param topicPath
* the topic path
* @param subscriptionName
* the name of the subscription
* @param options
* the options
* @return the list rules result
* @throws ServiceException
* If a service exception is encountered.
*/
>>>>>>>
/**
* Returns a list of rules.
*
* @param topicPath
* A <code>String</code> object that represents the name of the topic for the subscription.
* @param subscriptionName
* A <code>String</code> object that represents the name of the subscription whose rules are being
* retrieved.
* @param options
* A <code>ListRulesOptions</code> object that represents the options to retrieve rules.
*
* @throws ServiceException
* If a service exception is encountered.
*/ |
<<<<<<<
protected ServiceCall createResourceAsync(final ServiceCallback<Void> callback) {
DeploymentInner inner = new DeploymentInner()
.withProperties(new DeploymentProperties());
inner.properties().withMode(mode());
inner.properties().withTemplate(template());
inner.properties().withTemplateLink(templateLink());
inner.properties().withParameters(parameters());
inner.properties().withParametersLink(parametersLink());
return client.createOrUpdateAsync(resourceGroupName(), name(), inner, new ServiceCallback<DeploymentExtendedInner>() {
@Override
public void failure(Throwable t) {
callback.failure(t);
}
@Override
public void success(ServiceResponse<DeploymentExtendedInner> result) {
callback.success(new ServiceResponse<Void>(result.getHeadResponse()));
}
});
}
@Override
public Update update() throws Exception {
return this;
}
@Override
public Deployment apply() throws Exception {
=======
public DeploymentImpl apply() throws Exception {
>>>>>>>
protected ServiceCall createResourceAsync(final ServiceCallback<Void> callback) {
DeploymentInner inner = new DeploymentInner()
.withProperties(new DeploymentProperties());
inner.properties().withMode(mode());
inner.properties().withTemplate(template());
inner.properties().withTemplateLink(templateLink());
inner.properties().withParameters(parameters());
inner.properties().withParametersLink(parametersLink());
return client.createOrUpdateAsync(resourceGroupName(), name(), inner, new ServiceCallback<DeploymentExtendedInner>() {
@Override
public void failure(Throwable t) {
callback.failure(t);
}
@Override
public void success(ServiceResponse<DeploymentExtendedInner> result) {
callback.success(new ServiceResponse<Void>(result.getHeadResponse()));
}
});
}
public DeploymentImpl apply() throws Exception { |
<<<<<<<
public Single<? extends InputStream> getBodyAsInputStreamAsync() {
=======
public boolean hasBody() {
return response.body() != null;
}
@Override
public Single<? extends InputStream> bodyAsInputStreamAsync() {
>>>>>>>
public Single<? extends InputStream> bodyAsInputStreamAsync() { |
<<<<<<<
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;
import com.microsoft.windowsazure.services.serviceBus.models.ListRulesResult;
import com.microsoft.windowsazure.services.serviceBus.models.ListSubscriptionsResult;
import com.microsoft.windowsazure.services.serviceBus.models.ListTopicsResult;
import com.microsoft.windowsazure.services.serviceBus.models.Message;
import com.microsoft.windowsazure.services.serviceBus.models.Queue;
import com.microsoft.windowsazure.services.serviceBus.models.ReceiveMessageOptions;
import com.microsoft.windowsazure.services.serviceBus.models.Rule;
import com.microsoft.windowsazure.services.serviceBus.models.Subscription;
import com.microsoft.windowsazure.services.serviceBus.models.Topic;
=======
import com.microsoft.windowsazure.common.Configuration;
import com.microsoft.windowsazure.common.ServiceException;
import com.microsoft.windowsazure.common.ServiceFilter;
import com.microsoft.windowsazure.common.ServiceFilter.Request;
import com.microsoft.windowsazure.common.ServiceFilter.Response;
>>>>>>>
import com.microsoft.windowsazure.common.Configuration;
import com.microsoft.windowsazure.common.ServiceException;
import com.microsoft.windowsazure.common.ServiceFilter;
import com.microsoft.windowsazure.common.ServiceFilter.Request;
import com.microsoft.windowsazure.common.ServiceFilter.Response;
import com.microsoft.windowsazure.services.serviceBus.models.ListQueuesResult;
import com.microsoft.windowsazure.services.serviceBus.models.ListRulesResult;
import com.microsoft.windowsazure.services.serviceBus.models.ListSubscriptionsResult;
import com.microsoft.windowsazure.services.serviceBus.models.ListTopicsResult;
import com.microsoft.windowsazure.services.serviceBus.models.Message;
import com.microsoft.windowsazure.services.serviceBus.models.Queue;
import com.microsoft.windowsazure.services.serviceBus.models.ReceiveMessageOptions;
import com.microsoft.windowsazure.services.serviceBus.models.Rule;
import com.microsoft.windowsazure.services.serviceBus.models.Subscription;
import com.microsoft.windowsazure.services.serviceBus.models.Topic; |
<<<<<<<
HttpClient client = new MockHttpClient(new UserAgentPolicy.Factory("Awesome")) {
@Override
public Single<HttpResponse> sendRequestInternalAsync(HttpRequest request) {
String header = request.headers().value("User-Agent");
Assert.assertEquals("Awesome", header);
return Single.<HttpResponse>just(new MockHttpResponse(200));
}
};
HttpResponse response = client.sendRequestAsync(new HttpRequest("customUserAgentTests", "GET", "http://localhost")).blockingGet();
=======
HttpPipeline pipeline = HttpPipeline.build(
new MockHttpClient() {
@Override
public Single<HttpResponse> sendRequestAsync(HttpRequest request) {
String header = request.headers().value("User-Agent");
Assert.assertEquals("Awesome", header);
return Single.<HttpResponse>just(new MockHttpResponse(200));
}
},
new UserAgentPolicy.Factory("Awesome"));
HttpResponse response = pipeline.sendRequestAsync(new HttpRequest("customUserAgentTests", "GET", "http://localhost")).toBlocking().value();
>>>>>>>
HttpPipeline pipeline = HttpPipeline.build(
new MockHttpClient() {
@Override
public Single<HttpResponse> sendRequestAsync(HttpRequest request) {
String header = request.headers().value("User-Agent");
Assert.assertEquals("Awesome", header);
return Single.<HttpResponse>just(new MockHttpResponse(200));
}
},
new UserAgentPolicy.Factory("Awesome"));
HttpResponse response = pipeline.sendRequestAsync(new HttpRequest("customUserAgentTests", "GET", "http://localhost")).blockingGet(); |
<<<<<<<
=======
* 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 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 integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a valid int-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid int-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required integer. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a valid string-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional integer. Please put a valid string-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required string. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional string. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional string. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional string. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional string. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
>>>>>>>
* Test explicitly optional array. Please put a valid array-wrapper with 'value' = null.
<<<<<<<
=======
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
>>>>>>>
* Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
<<<<<<<
=======
* Test explicitly optional integer. Please put a header 'headerParameter' => null.
>>>>>>>
* Test explicitly optional integer. Please put a header 'headerParameter' => null. |
<<<<<<<
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;
import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
<<<<<<<
if (encoding == Encoding.XML) {
return (T) xmlMapper.readValue(value, constructJavaType(type));
} else {
return (T) serializer().readValue(value, constructJavaType(type));
}
}
@Override
@SuppressWarnings("unchecked")
public <T> T deserialize(String value, final Type type) throws IOException {
return deserialize(value, type, Encoding.JSON);
=======
final JacksonTypeFactory typeFactory = getTypeFactory();
final JavaType javaType = typeFactory.create(type);
return (T) serializer().readValue(value, javaType);
>>>>>>>
final JacksonTypeFactory typeFactory = getTypeFactory();
final JavaType javaType = typeFactory.create(type);
if (encoding == Encoding.XML) {
return (T) xmlMapper.readValue(value, javaType);
} else {
return (T) serializer().readValue(value, javaType);
}
}
@Override
@SuppressWarnings("unchecked")
public <T> T deserialize(String value, final Type type) throws IOException {
return deserialize(value, type, Encoding.JSON); |
<<<<<<<
@SuppressWarnings("unchecked")
=======
@Override
public Observable<FluentModelT> executeCreateOrUpdateAsync() {
return this.createResourceAsync();
}
>>>>>>>
@Override
public Observable<FluentModelT> executeCreateOrUpdateAsync() {
return this.createResourceAsync();
}
@SuppressWarnings("unchecked") |
<<<<<<<
CloudBlobContainer container = null;
try {
container = blobClient.getContainerReference(storageContainer);
} catch (URISyntaxException e) {
} catch (StorageException e) {
}
try {
container.breakLease(0);
} catch (StorageException e) {
}
try {
container.delete();
} catch (StorageException e) {
}
try {
=======
MockCloudBlobContainer container = null;
try {
container = blobClient.getContainerReference(storageContainer);
} catch (URISyntaxException e) {
} catch (StorageException e) {
}
try {
container.breakLease(0);
} catch (StorageException e) {
}
try {
container.delete();
} catch (StorageException e) {
}
try {
>>>>>>>
MockCloudBlobContainer container = null;
try {
container = blobClient.getContainerReference(storageContainer);
} catch (URISyntaxException e) {
} catch (StorageException e) {
}
try {
container.breakLease(0);
} catch (StorageException e) {
}
try {
container.delete();
} catch (StorageException e) {
}
try {
<<<<<<<
=======
>>>>>>> |
<<<<<<<
@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.inner().tags());
client.createOrUpdate(this.key, params);
}
>>>>>>>
@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.inner().tags());
client.createOrUpdate(this.key, params);
} |
<<<<<<<
=======
* 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 ['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 ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format |
<<<<<<<
=======
protected String resourceGroupName;
protected boolean isExistingGroup;
>>>>>>>
<<<<<<<
=======
group = this.resourceGroups.define(this.resourceGroupName)
.withLocation(this.location())
.create();
this.isExistingGroup = true;
return group;
} else {
return resourceGroups.get(resourceGroupName);
>>>>>>>
<<<<<<<
this.groupName = groupName;
return (FluentModelImplT) this;
=======
this.resourceGroupName = groupName;
this.isExistingGroup = true;
return (FluentModelImplT)this;
>>>>>>>
this.groupName = groupName;
return (FluentModelImplT) this;
<<<<<<<
this.groupName = groupName;
return this.withNewGroup(resourceGroups.define(groupName).withLocation(location()));
=======
this.resourceGroupName = groupName;
this.isExistingGroup = false;
return (FluentModelImplT) this;
>>>>>>>
this.groupName = groupName;
return this.withNewGroup(resourceGroups.define(groupName).withLocation(location()));
<<<<<<<
@SuppressWarnings("unchecked")
public final FluentModelImplT withNewGroup(ResourceGroup.DefinitionProvisionable groupDefinition) {
this.groupName = groupDefinition.id();
this.newGroup = groupDefinition;
this.prerequisites().put(groupDefinition.id(), this.newGroup);
return (FluentModelImplT) this;
=======
public final FluentModelImplT withNewGroup(ResourceGroup.DefinitionCreatable groupDefinition) throws Exception {
return withExistingGroup(groupDefinition.create());
>>>>>>>
@SuppressWarnings("unchecked")
public final FluentModelImplT withNewGroup(ResourceGroup.DefinitionCreatable groupDefinition) {
this.groupName = groupDefinition.id();
this.newGroup = groupDefinition;
this.prerequisites().put(groupDefinition.id(), this.newGroup);
return (FluentModelImplT) this; |
<<<<<<<
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/deserialization
* @throws CloudException exception from Azure
*/
=======
SupportsGettingByName<Feature> {
>>>>>>>
SupportsGettingByName<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/deserialization
* @throws CloudException exception from Azure
*/ |
<<<<<<<
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<ResponseBody> call = service.enumValid(this.client.getMapperAdapter().serializeRaw(enumPath));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Call<ResponseBody> call = service.enumNull(client.getMapperAdapter().serializeRaw(enumPath));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.enumNull(this.client.getMapperAdapter().serializeRaw(enumPath));
>>>>>>>
Call<ResponseBody> call = service.enumNull(this.client.getMapperAdapter().serializeRaw(enumPath));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Call<ResponseBody> call = service.dateValid(client.getMapperAdapter().serializeRaw(datePath));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.dateValid(this.client.getMapperAdapter().serializeRaw(datePath));
>>>>>>>
Call<ResponseBody> call = service.dateValid(this.client.getMapperAdapter().serializeRaw(datePath));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Call<ResponseBody> call = service.dateNull(client.getMapperAdapter().serializeRaw(datePath));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.dateNull(this.client.getMapperAdapter().serializeRaw(datePath));
>>>>>>>
Call<ResponseBody> call = service.dateNull(this.client.getMapperAdapter().serializeRaw(datePath));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Call<ResponseBody> call = service.dateTimeValid(client.getMapperAdapter().serializeRaw(dateTimePath));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.dateTimeValid(this.client.getMapperAdapter().serializeRaw(dateTimePath));
>>>>>>>
Call<ResponseBody> call = service.dateTimeValid(this.client.getMapperAdapter().serializeRaw(dateTimePath));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Call<ResponseBody> call = service.dateTimeNull(client.getMapperAdapter().serializeRaw(dateTimePath));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.dateTimeNull(this.client.getMapperAdapter().serializeRaw(dateTimePath));
>>>>>>>
Call<ResponseBody> call = service.dateTimeNull(this.client.getMapperAdapter().serializeRaw(dateTimePath));
final ServiceCall serviceCall = new ServiceCall(call); |
<<<<<<<
=======
* 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
>>>>>>>
* Put max datetime value with positive numoffset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999+14:00
>>>>>>>
* Get max datetime value with positive num offset 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
<<<<<<<
=======
* 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 max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31T23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
<<<<<<<
=======
* Get max datetime value with positive num offset 9999-12-31t23:59:59.9999999-14:00
>>>>>>>
* Get max datetime value with positive num offset 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 ['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 ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format
<<<<<<<
=======
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format
>>>>>>>
* Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format |
<<<<<<<
public StorageAccountImpl create() throws Exception {
super.creatablesCreate();
return this;
}
@Override
public ServiceCall createAsync(ServiceCallback<StorageAccount> callback) {
return super.creatablesCreateAsync(Utils.toVoidCallback(this, callback));
}
@Override
=======
>>>>>>>
<<<<<<<
protected ServiceCall createResourceAsync(final ServiceCallback<Void> callback) {
createParameters.withLocation(this.region());
createParameters.withTags(this.inner().getTags());
final StorageAccountImpl self = this;
return this.client.createAsync(this.resourceGroupName(), this.name(), createParameters,
new ServiceCallback<StorageAccountInner>() {
@Override
public void failure(Throwable t) {
callback.failure(t);
}
@Override
public void success(ServiceResponse<StorageAccountInner> result) {
client.getPropertiesAsync(resourceGroupName(), name(),
Utils.fromVoidCallback(self, callback));
clearWrapperProperties();
}
});
}
@Override
public StorageAccountImpl update() throws Exception {
=======
public StorageAccountImpl update() {
>>>>>>>
protected ServiceCall createResourceAsync(final ServiceCallback<Void> callback) {
createParameters.withLocation(this.region());
createParameters.withTags(this.inner().getTags());
final StorageAccountImpl self = this;
return this.client.createAsync(this.resourceGroupName(), this.name(), createParameters,
new ServiceCallback<StorageAccountInner>() {
@Override
public void failure(Throwable t) {
callback.failure(t);
}
@Override
public void success(ServiceResponse<StorageAccountInner> result) {
client.getPropertiesAsync(resourceGroupName(), name(),
Utils.fromVoidCallback(self, callback));
clearWrapperProperties();
}
});
}
@Override
public StorageAccountImpl update() { |
<<<<<<<
=======
* 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 boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
>>>>>>>
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
<<<<<<<
=======
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
>>>>>>>
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
<<<<<<<
=======
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
>>>>>>>
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
<<<<<<<
=======
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
>>>>>>>
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
<<<<<<<
=======
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
>>>>>>>
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
<<<<<<<
=======
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
>>>>>>>
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
<<<<<<<
=======
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
>>>>>>>
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
>>>>>>>
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}} |
<<<<<<<
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.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl;
import com.microsoft.azure.management.resources.fluentcore.utils.Utils;
<<<<<<<
public ResourceGroupImpl create() throws Exception { // FLUENT: implementation of ResourceGroup.DefinitionCreatable.Creatable<ResourceGroup>
super.creatablesCreate();
return this;
}
@Override
public ServiceCall createAsync(final ServiceCallback<ResourceGroup> callback) {
return super.creatablesCreateAsync(Utils.toVoidCallback(this, callback));
}
@Override
public ResourceGroupImpl refresh() throws Exception {
=======
public ResourceGroupImpl refresh() throws Exception { // FLUENT: implementation of ResourceGroup.Refreshable<ResourceGroup>
>>>>>>>
public ResourceGroupImpl refresh() throws Exception { |
<<<<<<<
=======
* 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 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-time, should be disallowed or throw depending on representation of date-time
>>>>>>>
* Get null as date-time, should be disallowed or throw depending on representation of date-time
<<<<<<<
=======
* Get null as date-time, should be disallowed or throw depending on representation of date-time
>>>>>>>
* Get null as date-time, should be disallowed or throw depending on representation of date-time |
<<<<<<<
=======
* 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-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']
<<<<<<<
=======
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
>>>>>>>
* Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']
<<<<<<<
=======
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
>>>>>>>
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
<<<<<<<
=======
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
>>>>>>>
* Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64
<<<<<<<
=======
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
>>>>>>>
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
<<<<<<<
=======
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
>>>>>>>
* Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64
<<<<<<<
=======
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
>>>>>>>
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
<<<<<<<
=======
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
>>>>>>>
* Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded
<<<<<<<
=======
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
>>>>>>>
* Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
>>>>>>>
* Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value []
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value []
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value []
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value []
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
<<<<<<<
=======
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]
>>>>>>>
* Get an array of Dictionaries of type <string, string> with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}] |
<<<<<<<
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> 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> serviceCallback) {
Call<ResponseBody> call = service.enumValid(this.client.getMapperAdapter().serializeRaw(enumQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
public ServiceCall enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumNull(client.getMapperAdapter().serializeRaw(enumQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumNull(this.client.getMapperAdapter().serializeRaw(enumQuery));
>>>>>>>
public ServiceCall enumNullAsync(UriColor enumQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.enumNull(this.client.getMapperAdapter().serializeRaw(enumQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Call<ResponseBody> call = service.dateValid(client.getMapperAdapter().serializeRaw(dateQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.dateValid(this.client.getMapperAdapter().serializeRaw(dateQuery));
>>>>>>>
Call<ResponseBody> call = service.dateValid(this.client.getMapperAdapter().serializeRaw(dateQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
public ServiceCall dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateNull(client.getMapperAdapter().serializeRaw(dateQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateNull(this.client.getMapperAdapter().serializeRaw(dateQuery));
>>>>>>>
public ServiceCall dateNullAsync(LocalDate dateQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateNull(this.client.getMapperAdapter().serializeRaw(dateQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Call<ResponseBody> call = service.dateTimeValid(client.getMapperAdapter().serializeRaw(dateTimeQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
Call<ResponseBody> call = service.dateTimeValid(this.client.getMapperAdapter().serializeRaw(dateTimeQuery));
>>>>>>>
Call<ResponseBody> call = service.dateTimeValid(this.client.getMapperAdapter().serializeRaw(dateTimeQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
public ServiceCall dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateTimeNull(client.getMapperAdapter().serializeRaw(dateTimeQuery));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateTimeNull(this.client.getMapperAdapter().serializeRaw(dateTimeQuery));
>>>>>>>
public ServiceCall dateTimeNullAsync(DateTime dateTimeQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.dateTimeNull(this.client.getMapperAdapter().serializeRaw(dateTimeQuery));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
=======
Call<ResponseBody> call = service.arrayStringCsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
<<<<<<<
public ServiceCall arrayStringCsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringCsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringCsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
public ServiceCall arrayStringCsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvNull(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
=======
Call<ResponseBody> call = service.arrayStringCsvNull(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvNull(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
<<<<<<<
public ServiceCall arrayStringCsvNullAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvNull(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringCsvNullAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringCsvNull(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
public ServiceCall arrayStringCsvNullAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvNull(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvEmpty(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
=======
Call<ResponseBody> call = service.arrayStringCsvEmpty(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringCsvEmpty(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
<<<<<<<
public ServiceCall arrayStringCsvEmptyAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvEmpty(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringCsvEmptyAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringCsvEmpty(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
>>>>>>>
public ServiceCall arrayStringCsvEmptyAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringCsvEmpty(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.CSV));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringSsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
=======
Call<ResponseBody> call = service.arrayStringSsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringSsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
<<<<<<<
public ServiceCall arrayStringSsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringSsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringSsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringSsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
>>>>>>>
public ServiceCall arrayStringSsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringSsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.SSV));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringTsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
=======
Call<ResponseBody> call = service.arrayStringTsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringTsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
<<<<<<<
public ServiceCall arrayStringTsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringTsvValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringTsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringTsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
>>>>>>>
public ServiceCall arrayStringTsvValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringTsvValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.TSV));
final ServiceCall serviceCall = new ServiceCall(call);
<<<<<<<
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringPipesValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
=======
Call<ResponseBody> call = service.arrayStringPipesValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
>>>>>>>
Validator.validate(arrayQuery);
Call<ResponseBody> call = service.arrayStringPipesValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
<<<<<<<
public ServiceCall arrayStringPipesValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringPipesValid(client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
final ServiceCall serviceCall = new ServiceCall(call);
=======
public Call<ResponseBody> arrayStringPipesValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Call<ResponseBody> call = service.arrayStringPipesValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
>>>>>>>
public ServiceCall arrayStringPipesValidAsync(List<String> arrayQuery, final ServiceCallback<Void> serviceCallback) {
Validator.validate(arrayQuery, serviceCallback);
Call<ResponseBody> call = service.arrayStringPipesValid(this.client.getMapperAdapter().serializeList(arrayQuery, CollectionFormat.PIPES));
final ServiceCall serviceCall = new ServiceCall(call); |
<<<<<<<
=======
* 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
<<<<<<<
=======
* 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
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* 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
<<<<<<<
=======
* 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
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. |
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>' |
<<<<<<<
=======
* 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 boolean dictionary value {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
>>>>>>>
* Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }
<<<<<<<
=======
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}
<<<<<<<
=======
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
>>>>>>>
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
<<<<<<<
=======
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
>>>>>>>
* Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}
<<<<<<<
=======
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
>>>>>>>
* Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}
<<<<<<<
=======
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
>>>>>>>
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
<<<<<<<
=======
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
>>>>>>>
* Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64
<<<<<<<
=======
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
>>>>>>>
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
<<<<<<<
=======
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
>>>>>>>
* Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
<<<<<<<
=======
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
>>>>>>>
* Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded
<<<<<<<
=======
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
>>>>>>>
* Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}
<<<<<<<
=======
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
>>>>>>>
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
>>>>>>>
* Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
>>>>>>>
* Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
<<<<<<<
=======
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}
>>>>>>>
* Get an dictionaries of dictionaries of type <string, string> with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}} |
<<<<<<<
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.windowsazure.services.media.implementation.entities.EntityListOperation;
import com.microsoft.windowsazure.services.media.implementation.entities.EntityUpdateOperation;
import com.microsoft.windowsazure.services.media.models.ListResult;
=======
import com.microsoft.windowsazure.services.media.models.AccessPolicyInfo;
import com.microsoft.windowsazure.services.media.models.AccessPolicyPermission;
import com.microsoft.windowsazure.services.media.models.AssetInfo;
import com.microsoft.windowsazure.services.media.models.CreateAssetOptions;
import com.microsoft.windowsazure.services.media.models.CreateJobOptions;
import com.microsoft.windowsazure.services.media.models.CreateLocatorOptions;
import com.microsoft.windowsazure.services.media.models.CreateTaskOptions;
import com.microsoft.windowsazure.services.media.models.JobInfo;
import com.microsoft.windowsazure.services.media.models.ListAccessPolicyOptions;
import com.microsoft.windowsazure.services.media.models.ListAssetsOptions;
import com.microsoft.windowsazure.services.media.models.ListJobsOptions;
import com.microsoft.windowsazure.services.media.models.ListJobsResult;
import com.microsoft.windowsazure.services.media.models.ListLocatorsOptions;
import com.microsoft.windowsazure.services.media.models.ListLocatorsResult;
import com.microsoft.windowsazure.services.media.models.ListMediaProcessorsOptions;
import com.microsoft.windowsazure.services.media.models.ListMediaProcessorsResult;
import com.microsoft.windowsazure.services.media.models.ListTasksOptions;
import com.microsoft.windowsazure.services.media.models.ListTasksResult;
import com.microsoft.windowsazure.services.media.models.LocatorInfo;
import com.microsoft.windowsazure.services.media.models.LocatorType;
import com.microsoft.windowsazure.services.media.models.UpdateAssetOptions;
import com.microsoft.windowsazure.services.media.models.UpdateLocatorOptions;
>>>>>>>
<<<<<<<
=======
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#listLocators(com.microsoft.windowsazure.services.media.models.ListLocatorsOptions)
*/
@Override
public ListLocatorsResult listLocators(ListLocatorsOptions listLocatorsOptions) throws ServiceException {
try {
return service.listLocators(listLocatorsOptions);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#createLocator(java.lang.String, java.lang.String, com.microsoft.windowsazure.services.media.models.LocatorType)
*/
@Override
public LocatorInfo createLocator(String accessPolicyId, String assetId, LocatorType locatorType)
throws ServiceException {
try {
return service.createLocator(accessPolicyId, assetId, locatorType);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#listMediaProcessors()
*/
@Override
public ListMediaProcessorsResult listMediaProcessors() throws ServiceException {
try {
return service.listMediaProcessors();
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#listMediaProcessors(com.microsoft.windowsazure.services.media.models.ListMediaProcessorsOptions)
*/
@Override
public ListMediaProcessorsResult listMediaProcessors(ListMediaProcessorsOptions listMediaProcessorsOptions)
throws ServiceException {
try {
return service.listMediaProcessors(listMediaProcessorsOptions);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#listJobs()
*/
@Override
public ListJobsResult listJobs() throws ServiceException {
try {
return service.listJobs();
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#createJob(java.util.List, com.microsoft.windowsazure.services.media.models.CreateJobOptions)
*/
@Override
public JobInfo createJob(CreateJobOptions createJobOptions, List<CreateTaskOptions> createTaskOptions)
throws ServiceException {
try {
return service.createJob(createJobOptions, createTaskOptions);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#cancelJob(java.lang.String)
*/
@Override
public void cancelJob(String jobId) throws ServiceException {
try {
service.cancelJob(jobId);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#listTasks()
*/
@Override
public ListTasksResult listTasks() throws ServiceException {
try {
return service.listTasks();
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#listJobTasks(java.lang.String)
*/
@Override
public ListTasksResult listJobTasks(String jobId) throws ServiceException {
try {
return service.listJobTasks(jobId);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#getJob(java.lang.String)
*/
@Override
public JobInfo getJob(String jobId) throws ServiceException {
try {
return service.getJob(jobId);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#listJobs(com.microsoft.windowsazure.services.media.models.ListJobsOptions)
*/
@Override
public ListJobsResult listJobs(ListJobsOptions listJobsOptions) throws ServiceException {
try {
return service.listJobs(listJobsOptions);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#listTasks(com.microsoft.windowsazure.services.media.models.ListTasksOptions)
*/
@Override
public ListTasksResult listTasks(ListTasksOptions listTasksOptions) throws ServiceException {
try {
return service.listTasks(listTasksOptions);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#listJobTasks(java.lang.String, com.microsoft.windowsazure.services.media.models.ListTasksOptions)
*/
@Override
public ListTasksResult listJobTasks(String jobId, ListTasksOptions listTasksOptions) throws ServiceException {
try {
return service.listJobTasks(jobId, listTasksOptions);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
/* (non-Javadoc)
* @see com.microsoft.windowsazure.services.media.MediaContract#createJob(java.lang.String, com.microsoft.windowsazure.services.media.models.CreateJobOptions)
*/
@Override
public JobInfo createJob(String templateId, CreateJobOptions createJobOptions) throws ServiceException {
try {
return service.createJob(templateId, createJobOptions);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
@Override
public void deleteJob(String jobId) throws ServiceException {
try {
service.deleteJob(jobId);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
}
catch (ClientHandlerException e) {
throw processCatch(new ServiceException(e));
}
}
>>>>>>> |
<<<<<<<
=======
* 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 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 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 return the received 301 to the caller for evaluation
<<<<<<<
=======
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
>>>>>>>
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
<<<<<<<
=======
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
>>>>>>>
* Patch true Boolean value in request returns 302. This request should not be automatically redirected, but should return the received 302 to the caller for evaluation
<<<<<<<
=======
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code
>>>>>>>
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code
<<<<<<<
=======
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code
>>>>>>>
* Post true Boolean value in request returns 303. This request should be automatically redirected usign a get, ultimately returning a 200 status code |
<<<<<<<
int osDiskSizeInGb = vm.osDiskSize();
if (osDiskSizeInGb == 0) {
=======
Integer osDiskSizeInGb = windowsVM.osDiskSize();
if (osDiskSizeInGb == null) {
>>>>>>>
int osDiskSizeInGb = windowsVM.osDiskSize();
if (osDiskSizeInGb == 0) { |
<<<<<<<
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;
<<<<<<<
return service.refreshToken(tenant, bodyString)
.map(new Function<RefreshTokenResponse, AuthenticationResult>() {
=======
return service.refreshToken(baseUrl, tenant, bodyString)
.map(new Func1<RefreshTokenResponse, AuthenticationResult>() {
>>>>>>>
return service.refreshToken(baseUrl, tenant, bodyString)
.map(new Function<RefreshTokenResponse, AuthenticationResult>() { |
<<<<<<<
=======
* 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=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=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=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=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=value2&q3=value3'
>>>>>>>
* Get method with unencoded query parameter with value 'value1&q2=value2&q3=value3' |
<<<<<<<
=======
import com.microsoft.rest.serializer.JacksonMapperAdapter;
import okhttp3.*;
>>>>>>>
import com.microsoft.rest.serializer.JacksonMapperAdapter;
<<<<<<<
RestClient.Builder restBuilder = new RestClient.Builder("http://localhost", clientBuilder, retrofitBuilder)
.withCredentials(credentials)
.withInterceptor(new Interceptor() {
=======
RestClient.Builder restBuilder = new RestClient.Builder("http://localhost", clientBuilder, retrofitBuilder)
.withMapperAdapter(new JacksonMapperAdapter())
.withCredentials(credentials)
.withInterceptor(new Interceptor() {
>>>>>>>
RestClient.Builder restBuilder = new RestClient.Builder("http://localhost", clientBuilder, retrofitBuilder)
.withMapperAdapter(new JacksonMapperAdapter())
.withCredentials(credentials)
.withInterceptor(new Interceptor() {
<<<<<<<
ServiceClient serviceClient = new ServiceClient(restBuilder.build()) { };
Response response = serviceClient.restClient().httpClient().newCall(new Request.Builder().url("http://localhost").build()).execute();
Assert.assertEquals(200, response.code());
}
@Test
public void tokenCredentialsTest() throws Exception {
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
Retrofit.Builder retrofitBuilder = new Retrofit.Builder();
TokenCredentials credentials = new TokenCredentials(null, "this_is_a_token");
RestClient.Builder restBuilder = new RestClient.Builder("http://localhost", clientBuilder, retrofitBuilder)
.withCredentials(credentials)
.withInterceptor(new Interceptor() {
@Override
public Response intercept(Chain chain) throws IOException {
String header = chain.request().header("Authorization");
Assert.assertEquals("Bearer this_is_a_token", header);
return new Response.Builder()
.request(chain.request())
.code(200)
.protocol(Protocol.HTTP_1_1)
.build();
}
});
ServiceClient serviceClient = new ServiceClient(restBuilder.build()) { };
Response response = serviceClient.restClient().httpClient().newCall(new Request.Builder().url("http://localhost").build()).execute();
Assert.assertEquals(200, response.code());
=======
ServiceClient serviceClient = new ServiceClient(restBuilder.build()) { };
Response response = serviceClient.restClient().httpClient().newCall(new Request.Builder().url("http://localhost").build()).execute();
Assert.assertEquals(200, response.code());
}
@Test
public void tokenCredentialsTest() throws Exception {
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
Retrofit.Builder retrofitBuilder = new Retrofit.Builder();
TokenCredentials credentials = new TokenCredentials(null, "this_is_a_token");
RestClient.Builder restBuilder = new RestClient.Builder("http://localhost", clientBuilder, retrofitBuilder)
.withMapperAdapter(new JacksonMapperAdapter())
.withCredentials(credentials)
.withInterceptor(new Interceptor() {
@Override
public Response intercept(Chain chain) throws IOException {
String header = chain.request().header("Authorization");
Assert.assertEquals("Bearer this_is_a_token", header);
return new Response.Builder()
.request(chain.request())
.code(200)
.protocol(Protocol.HTTP_1_1)
.build();
}
});
ServiceClient serviceClient = new ServiceClient(restBuilder.build()) { };
Response response = serviceClient.restClient().httpClient().newCall(new Request.Builder().url("http://localhost").build()).execute();
Assert.assertEquals(200, response.code());
>>>>>>>
ServiceClient serviceClient = new ServiceClient(restBuilder.build()) { };
Response response = serviceClient.restClient().httpClient().newCall(new Request.Builder().url("http://localhost").build()).execute();
Assert.assertEquals(200, response.code());
}
@Test
public void tokenCredentialsTest() throws Exception {
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
Retrofit.Builder retrofitBuilder = new Retrofit.Builder();
TokenCredentials credentials = new TokenCredentials(null, "this_is_a_token");
RestClient.Builder restBuilder = new RestClient.Builder("http://localhost", clientBuilder, retrofitBuilder)
.withMapperAdapter(new JacksonMapperAdapter())
.withCredentials(credentials)
.withInterceptor(new Interceptor() {
@Override
public Response intercept(Chain chain) throws IOException {
String header = chain.request().header("Authorization");
Assert.assertEquals("Bearer this_is_a_token", header);
return new Response.Builder()
.request(chain.request())
.code(200)
.protocol(Protocol.HTTP_1_1)
.build();
}
});
ServiceClient serviceClient = new ServiceClient(restBuilder.build()) { };
Response response = serviceClient.restClient().httpClient().newCall(new Request.Builder().url("http://localhost").build()).execute();
Assert.assertEquals(200, response.code()); |
<<<<<<<
protected ServiceCall createResourceAsync(final ServiceCallback<Void> callback) {
return client.createOrUpdateAsync(
resourceGroupName(),
resourceProviderNamespace,
parentResourceId,
resourceType,
key(),
apiVersion,
inner(),
Utils.fromVoidCallback(this, callback));
}
@Override
public UpdateWithApiVersion update() throws Exception {
return this;
}
@Override
public GenericResource apply() throws Exception {
=======
public GenericResourceImpl apply() throws Exception {
>>>>>>>
protected ServiceCall createResourceAsync(final ServiceCallback<Void> callback) {
return client.createOrUpdateAsync(
resourceGroupName(),
resourceProviderNamespace,
parentResourceId,
resourceType,
key(),
apiVersion,
inner(),
Utils.fromVoidCallback(this, callback));
}
@Override
public GenericResourceImpl apply() throws Exception { |
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Get mbcs string value '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
>>>>>>>
* Set string value mbcs '啊齄丂狛狜隣郎隣兀﨩ˊ▇█〞〡￤℡㈱‐ー﹡﹢﹫、〓ⅰⅹ⒈€㈠㈩ⅠⅫ！￣ぁんァヶΑ︴АЯаяāɡㄅㄩ─╋︵﹄︻︱︳︴ⅰⅹɑɡ〇〾⿻⺁䜣€ '
<<<<<<<
=======
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Get string value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
<<<<<<<
=======
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>'
>>>>>>>
* Set String value with leading and trailing whitespace '<tab><space><space>Now is the time for all good men to come to the aid of their country<tab><space><space>' |
<<<<<<<
/**
* 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 intended to be implemented by user code)
*/
>>>>>>>
/**
* Provides access to listing Azure resources of a specific type in a specific resource group
*
* (Note: this interface is not intended to be implemented by user code)
*
* @param <T> the type of the resources listed.
*/
<<<<<<<
/**
* List resources in the resource group.
*
* @param groupName the name of the resource group.
* @return the list of resources.
* @throws CloudException exception thrown from the cloud.
* @throws IOException exception thrown from serialization/deserialization.
*/
PagedList<T> list(String groupName) throws CloudException, IOException;
=======
/** Lists resources of the specified type in the specified resource group
* @param groupName the name of the resource group to list the resources from
* @return list of resources
* @throws Exception
*/
PagedList<T> list(String groupName) throws CloudException, IOException;
>>>>>>>
/**
* Lists resources of the specified type in the specified resource group.
*
* @param groupName the name of the resource group to list the resources from
* @return the list of resources
* @throws CloudException exception thrown from the cloud
* @throws IOException exception thrown from serialization/deserialization
*/
PagedList<T> list(String groupName) throws CloudException, IOException; |
<<<<<<<
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 getTokenFromUri(String uri) throws IOException {
URL url = new URL(uri);
String host = url.getHost();
for (String endpoint : environment().endpoints().values()) {
if (host.contains(endpoint)) {
// Remove leading dots
host = endpoint.replaceAll("^\\.*", "");
break;
=======
@Override
protected final String getToken(Request request) throws IOException {
String host = request.url().toString().toLowerCase();
String resource = environment().activeDirectoryResourceId();
for (Map.Entry<String, String> endpoint : environment().endpoints().entrySet()) {
if (host.contains(endpoint.getValue())) {
if (endpoint.getKey().equals(Endpoint.KEYVAULT.identifier())) {
resource = String.format("https://%s/", endpoint.getValue().replaceAll("^\\.*", ""));
break;
} else if (endpoint.getKey().equals(Endpoint.GRAPH.identifier())) {
resource = environment().graphEndpoint();
}
>>>>>>>
/**
* Gets the token from the given endpoint.
*
* @param uri the url
* @return the token
* @throws IOException IOException
*/
public final String getTokenFromUri(String uri) throws IOException {
URL url = new URL(uri);
String host = url.getHost();
String resource = environment().activeDirectoryResourceId();
for (Map.Entry<String, String> endpoint : environment().endpoints().entrySet()) {
if (host.contains(endpoint.getValue())) {
if (endpoint.getKey().equals(Endpoint.KEYVAULT.identifier())) {
resource = String.format("https://%s/", endpoint.getValue().replaceAll("^\\.*", ""));
break;
} else if (endpoint.getKey().equals(Endpoint.GRAPH.identifier())) {
resource = environment().graphEndpoint();
} |
<<<<<<<
=======
* 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 basic complex type while the server doesn't provide a response payload |
<<<<<<<
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 (shouldRetry(httpResponse)) {
tryCount++;
return sendAsync(request);
} else {
return Single.just(httpResponse);
}
}
});
=======
Single<HttpResponse> result;
try {
final HttpRequest bufferedRequest = request.buffer();
result = next.sendAsync(request)
.flatMap(new Func1<HttpResponse, Single<? extends HttpResponse>>() {
@Override
public Single<HttpResponse> call(HttpResponse httpResponse) {
Single<HttpResponse> result;
if (shouldRetry(httpResponse)) {
tryCount++;
try {
result = sendAsync(bufferedRequest.buffer());
} catch (IOException e) {
result = Single.error(e);
}
} else {
result = Single.just(httpResponse);
}
return result;
}
});
} catch (IOException e) {
result = Single.error(e);
}
return result;
>>>>>>>
Single<HttpResponse> result;
try {
final HttpRequest bufferedRequest = request.buffer();
result = next.sendAsync(request)
.flatMap(new Function<HttpResponse, Single<? extends HttpResponse>>() {
@Override
public Single<HttpResponse> apply(HttpResponse httpResponse) {
Single<HttpResponse> result;
if (shouldRetry(httpResponse)) {
tryCount++;
try {
result = sendAsync(bufferedRequest.buffer());
} catch (IOException e) {
result = Single.error(e);
}
} else {
result = Single.just(httpResponse);
}
return result;
}
});
} catch (IOException e) {
result = Single.error(e);
}
return result; |
<<<<<<<
client.sendRequestAsync(new HttpRequest("test", "GET", "localhost"))
.blockingGet();
=======
pipeline.sendRequestAsync(new HttpRequest("test", "GET", "localhost"))
.toBlocking().value();
>>>>>>>
pipeline.sendRequestAsync(new HttpRequest("test", "GET", "localhost"))
.blockingGet(); |
<<<<<<<
public final static int STAGEOP_INVALIDATE_XLOC = 15;
public final static int STAGEOP_UPDATE_XLOC = 16;
=======
public final static int STAGEOP_CLOSE_FILE = 15;
>>>>>>>
public final static int STAGEOP_CLOSE_FILE = 15;
public final static int STAGEOP_INVALIDATE_XLOC = 16;
public final static int STAGEOP_UPDATE_XLOC = 17;
<<<<<<<
case STAGEOP_INVALIDATE_XLOC:
doInvalidateXLocSet(m);
break;
case STAGEOP_UPDATE_XLOC:
doUpdateXLocSetFromFlease(m);
break;
=======
case STAGEOP_CLOSE_FILE:
doClose(m);
break;
>>>>>>>
case STAGEOP_CLOSE_FILE:
doClose(m);
break;
case STAGEOP_INVALIDATE_XLOC:
doInvalidateXLocSet(m);
break;
case STAGEOP_UPDATE_XLOC:
doUpdateXLocSetFromFlease(m);
break; |
<<<<<<<
=======
@Override
public Observable<NetworkSecurityGroup> applyUpdateAsync() {
return createResourceAsync();
}
@Override
public List<Subnet> listAssociatedSubnets() {
final List<SubnetInner> subnetRefs = this.inner().subnets();
final Map<String, Network> networks = new HashMap<>();
final List<Subnet> subnets = new ArrayList<>();
if (subnetRefs != null) {
for (SubnetInner subnetRef : subnetRefs) {
String networkId = ResourceUtils.parentResourcePathFromResourceId(subnetRef.id());
Network network = networks.get(networkId);
if (network == null) {
network = this.myManager.networks().getById(networkId);
networks.put(networkId, network);
}
String subnetName = ResourceUtils.nameFromResourceId(subnetRef.id());
subnets.add(network.subnets().get(subnetName));
}
}
return subnets;
}
>>>>>>>
@Override
public List<Subnet> listAssociatedSubnets() {
final List<SubnetInner> subnetRefs = this.inner().subnets();
final Map<String, Network> networks = new HashMap<>();
final List<Subnet> subnets = new ArrayList<>();
if (subnetRefs != null) {
for (SubnetInner subnetRef : subnetRefs) {
String networkId = ResourceUtils.parentResourcePathFromResourceId(subnetRef.id());
Network network = networks.get(networkId);
if (network == null) {
network = this.myManager.networks().getById(networkId);
networks.put(networkId, network);
}
String subnetName = ResourceUtils.nameFromResourceId(subnetRef.id());
subnets.add(network.subnets().get(subnetName));
}
}
return subnets;
} |
<<<<<<<
builder = addOptionalAccessConditionHeader(builder, options.getAccessCondition());
=======
builder = addOptionalAccessContitionHeader(builder, options.getAccessCondition());
if (options.isComputeRangeMD5()) {
builder = addOptionalHeader(builder, "x-ms-range-get-content-md5", "true");
}
>>>>>>>
builder = addOptionalAccessConditionHeader(builder, options.getAccessCondition());
if (options.isComputeRangeMD5()) {
builder = addOptionalHeader(builder, "x-ms-range-get-content-md5", "true");
} |
<<<<<<<
=======
* 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 response payload
>>>>>>>
* Get complex types with dictionary property while server doesn't provide a response payload |
<<<<<<<
=======
* 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
<<<<<<<
=======
* 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
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* 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
<<<<<<<
=======
* 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
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
<<<<<<<
=======
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually.
>>>>>>>
* A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. |
<<<<<<<
=======
* 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': 'client error'}
>>>>>>>
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
<<<<<<<
=======
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
>>>>>>>
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
<<<<<<<
=======
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
>>>>>>>
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
>>>>>>>
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
<<<<<<<
=======
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
>>>>>>>
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
<<<<<<<
=======
* Send a 400 response with no payload client should treat as an http error with no error model
>>>>>>>
* Send a 400 response with no payload client should treat as an http error with no error model
<<<<<<<
=======
* Send a 400 response with no payload client should treat as an http error with no error model
>>>>>>>
* Send a 400 response with no payload client should treat as an http error with no error model |
<<<<<<<
=======
* 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 basic complex type while the server doesn't provide a response payload |
<<<<<<<
=======
* 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': 'client error'}
>>>>>>>
* Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}
<<<<<<<
=======
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
>>>>>>>
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
<<<<<<<
=======
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
>>>>>>>
* Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
>>>>>>>
* Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}
<<<<<<<
=======
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
>>>>>>>
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
<<<<<<<
=======
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
>>>>>>>
* Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A
<<<<<<<
=======
* Send a 400 response with no payload client should treat as an http error with no error model
>>>>>>>
* Send a 400 response with no payload client should treat as an http error with no error model
<<<<<<<
=======
* Send a 400 response with no payload client should treat as an http error with no error model
>>>>>>>
* Send a 400 response with no payload client should treat as an http error with no error model |
<<<<<<<
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.ServiceException;
import com.microsoft.windowsazure.services.serviceBus.models.Queue;
import com.microsoft.windowsazure.services.serviceBus.models.Topic; |
<<<<<<<
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.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
<<<<<<<
import com.microsoft.azure.management.network.TransportProtocol;
import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils;
import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
=======
>>>>>>>
import com.microsoft.azure.management.network.TransportProtocol;
import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils;
<<<<<<<
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
import com.microsoft.azure.management.resources.fluentcore.model.implementation.ResourceServiceCall;
=======
>>>>>>>
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
<<<<<<<
public ProbeImpl updateTcpProbe(String name) {
return (ProbeImpl) this.tcpProbes.get(name);
}
=======
public LoadBalancer createResource() throws Exception {
ensureCreationPrerequisites();
>>>>>>>
public ProbeImpl updateTcpProbe(String name) {
return (ProbeImpl) this.tcpProbes.get(name);
}
<<<<<<<
public Map<String, InboundNatPool> inboundNatPools() {
return Collections.unmodifiableMap(this.inboundNatPools);
}
@Override
public Map<String, TcpProbe> tcpProbes() {
return Collections.unmodifiableMap(this.tcpProbes);
}
@Override
public Map<String, Frontend> frontends() {
return Collections.unmodifiableMap(this.frontends);
}
@Override
public Map<String, InboundNatRule> inboundNatRules() {
return Collections.unmodifiableMap(this.inboundNatRules);
}
@Override
public Map<String, HttpProbe> httpProbes() {
return Collections.unmodifiableMap(this.httpProbes);
}
@Override
public Map<String, LoadBalancingRule> loadBalancingRules() {
return Collections.unmodifiableMap(this.loadBalancingRules);
}
@Override
public List<String> publicIpAddressIds() {
List<String> publicIpAddressIds = new ArrayList<>();
if (this.inner().frontendIPConfigurations() != null) {
for (FrontendIPConfigurationInner frontEndIpConfig : this.inner().frontendIPConfigurations()) {
publicIpAddressIds.add(frontEndIpConfig.publicIPAddress().id());
}
}
return Collections.unmodifiableList(publicIpAddressIds);
}
public ServiceCall<Resource> createResourceAsync(final ServiceCallback<Resource> callback) {
beforeCreating();
ResourceServiceCall<LoadBalancer, LoadBalancerInner, LoadBalancerImpl> serviceCall = new ResourceServiceCall<>(this);
serviceCall.withSuccessHandler(new ResourceServiceCall.SuccessHandler<LoadBalancerInner>() {
@Override
public void success(ServiceResponse<LoadBalancerInner> response) {
try {
afterCreating();
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
});
this.innerCollection.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner(), serviceCall.wrapCallBack(callback));
return serviceCall;
=======
public Observable<LoadBalancer> createResourceAsync() {
final LoadBalancer self = this;
ensureCreationPrerequisites();
return this.innerCollection.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
.flatMap(new Func1<ServiceResponse<LoadBalancerInner>, Observable<LoadBalancer>>() {
@Override
public Observable<LoadBalancer> call(ServiceResponse<LoadBalancerInner> loadBalancerInner) {
setInner(loadBalancerInner.getBody());
try {
runPostCreationTasks();
return Observable.just(self);
} catch (Exception e) {
return Observable.error(e);
}
}
});
>>>>>>>
public Map<String, InboundNatPool> inboundNatPools() {
return Collections.unmodifiableMap(this.inboundNatPools);
}
@Override
public Map<String, TcpProbe> tcpProbes() {
return Collections.unmodifiableMap(this.tcpProbes);
}
@Override
public Map<String, Frontend> frontends() {
return Collections.unmodifiableMap(this.frontends);
}
@Override
public Map<String, InboundNatRule> inboundNatRules() {
return Collections.unmodifiableMap(this.inboundNatRules);
}
@Override
public Map<String, HttpProbe> httpProbes() {
return Collections.unmodifiableMap(this.httpProbes);
}
@Override
public Map<String, LoadBalancingRule> loadBalancingRules() {
return Collections.unmodifiableMap(this.loadBalancingRules);
}
@Override
public List<String> publicIpAddressIds() {
List<String> publicIpAddressIds = new ArrayList<>();
if (this.inner().frontendIPConfigurations() != null) {
for (FrontendIPConfigurationInner frontEndIpConfig : this.inner().frontendIPConfigurations()) {
publicIpAddressIds.add(frontEndIpConfig.publicIPAddress().id());
}
}
return Collections.unmodifiableList(publicIpAddressIds);
}
public Observable<LoadBalancer> createResourceAsync() {
final LoadBalancer self = this;
beforeCreating();
return this.innerCollection.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
.flatMap(new Func1<ServiceResponse<LoadBalancerInner>, Observable<LoadBalancer>>() {
@Override
public Observable<LoadBalancer> call(ServiceResponse<LoadBalancerInner> loadBalancerInner) {
setInner(loadBalancerInner.getBody());
try {
afterCreating();
return Observable.just(self);
} catch (Exception e) {
return Observable.error(e);
}
}
}); |
<<<<<<<
/**
*
* 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 root for
* license information.
*/
>>>>>>>
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/ |
<<<<<<<
private boolean enableTracing;
private String traceTarget;
private String tracingPolicy;
=======
private long quota;
>>>>>>>
private boolean enableTracing;
private String traceTarget;
private String tracingPolicy;
private long quota;
<<<<<<<
if (tracingPolicyAttr != null)
enableTracing = "true".equalsIgnoreCase(new String(enableTracingAttr));
if (traceTargetAttr != null)
traceTarget = new String(traceTargetAttr);
else
traceTarget = "";
if (tracingPolicyAttr != null)
tracingPolicy = new String(tracingPolicyAttr);
else
tracingPolicy = "";
=======
if (quotaAttr != null)
quota = Long.valueOf(new String(quotaAttr));
>>>>>>>
if (tracingPolicyAttr != null)
enableTracing = "true".equalsIgnoreCase(new String(enableTracingAttr));
if (traceTargetAttr != null)
traceTarget = new String(traceTargetAttr);
else
traceTarget = "";
if (tracingPolicyAttr != null)
tracingPolicy = new String(tracingPolicyAttr);
else
tracingPolicy = "";
if (quotaAttr != null)
quota = Long.valueOf(new String(quotaAttr)); |
<<<<<<<
=======
* 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 response payload
>>>>>>>
* Get complex types with dictionary property while server doesn't provide a response payload |
<<<<<<<
op = new InvalidateXLocSetOperation(this);
operations.put(op.getProcedureId(), op);
op = new InternalRWRAuthStateInvalidatedOperation(this);
operations.put(op.getProcedureId(), op);
=======
>>>>>>>
op = new InvalidateXLocSetOperation(this);
operations.put(op.getProcedureId(), op);
op = new InternalRWRAuthStateInvalidatedOperation(this);
operations.put(op.getProcedureId(), op); |
<<<<<<<
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 {}", f.getAbsolutePath(), tableName);
=======
logger.info("kraken logstorage: cannot delete log data {} of table {}", f.getAbsolutePath(),
tableName);
>>>>>>>
logger.error("kraken logstorage: cannot delete log data {} of table {}", f.getAbsolutePath(), tableName); |
<<<<<<<
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(ErrorLogHelper.FRAME_LIMIT, errorLog.getValue().getException().getFrames().size());
=======
verify(mChannel).enqueue(errorLog.capture(), eq(Crashes.ERROR_GROUP));
>>>>>>>
verify(mChannel).enqueue(errorLog.capture(), eq(Crashes.ERROR_GROUP), eq(PERSISTENCE_CRITICAL)); |
<<<<<<<
import java.lang.reflect.InvocationTargetException;
=======
>>>>>>>
<<<<<<<
class TestDocument{
=======
class Test {
>>>>>>>
class TestDocument{
<<<<<<<
//createDocument(storage);
//readDocument(storage);
deleteDocument(storage);
}catch (Exception ignore) {
=======
storage.getMethod("read", String.class, String.class).invoke(null, "User124", "3456");
storage.getMethod("delete", String.class, String.class).invoke(null, "User123c456q", "34567006");
storage.getMethod("create", String.class, String.class, Object.class).invoke(null, "User1235", "dfrer", new Test());
} catch (Exception ignore) {
>>>>>>>
//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 onBeforeSending in the listener. */
verify(mockListener).onBeforeSending(any(Log.class));
/* Verify that we have called onFailure in the listener. */
>>>>>>>
/* Verify that we have called onBeforeSending in the listener. */
verify(mockListener).onBeforeSending(any(Log.class));
/* Verify that we have called the listener. */ |
<<<<<<<
Document<T> createdOrUpdatedDocument = mLocalDocumentStorage.createOrUpdateOffline(partition, documentId, document, documentType, writeOptions);
result.complete(createdOrUpdatedDocument);
=======
postAsyncGetter(new Runnable() {
@Override
public void run() {
Document<T> createdOrUpdatedDocument = mLocalDocumentStorage.createOrUpdate(partition, documentId, document, documentType, writeOptions);
result.complete(createdOrUpdatedDocument);
}
}, result, null);
>>>>>>>
postAsyncGetter(new Runnable() {
@Override
public void run() {
Document<T> createdOrUpdatedDocument = mLocalDocumentStorage.createOrUpdateOffline(partition, documentId, document, documentType, writeOptions);
result.complete(createdOrUpdatedDocument);
}
}, result, null);
<<<<<<<
public void onCallSucceeded(String payload, Map<String, String> headers) {
Document<T> cosmosDbDocument = Utils.parseDocument(payload, documentType);
completeFuture(cosmosDbDocument, result);
mLocalDocumentStorage.writeOnline(cosmosDbDocument, writeOptions);
=======
public void onCallSucceeded(final String payload, Map<String, String> headers) {
post(new Runnable() {
@Override
public void run() {
Document<T> cosmosDbDocument = Utils.parseDocument(payload, documentType);
completeFuture(cosmosDbDocument, result);
mLocalDocumentStorage.write(cosmosDbDocument, writeOptions);
}
});
>>>>>>>
public void onCallSucceeded(final String payload, Map<String, String> headers) {
post(new Runnable() {
@Override
public void run() {
Document<T> cosmosDbDocument = Utils.parseDocument(payload, documentType);
completeFuture(cosmosDbDocument, result);
mLocalDocumentStorage.write(cosmosDbDocument, writeOptions);
}
});
<<<<<<<
@Override
public void callCosmosDb(final TokenResult tokenResult) {
callCosmosDbDeleteApi(tokenResult, documentId, result);
}
=======
@Override
public void callCosmosDb(TokenResult tokenResult) {
callCosmosDbDeleteApi(tokenResult, documentId, result);
}
>>>>>>>
@Override
public void callCosmosDb(TokenResult tokenResult) {
callCosmosDbDeleteApi(tokenResult, documentId, result);
}
<<<<<<<
completeFuture(new Document<Void>(), result);
mLocalDocumentStorage.deleteOnline(tokenResult.partition(), documentId);
=======
post(new Runnable() {
@Override
public void run() {
completeFuture(new Document<Void>(), result);
mLocalDocumentStorage.delete(tokenResult.partition(), documentId);
}
});
>>>>>>>
post(new Runnable() {
@Override
public void run() {
completeFuture(new Document<Void>(), result);
mLocalDocumentStorage.deleteOnline(tokenResult.partition(), documentId);
}
});
<<<<<<<
mLocalDocumentStorage.writeOnline((Document)value, new WriteOptions());
=======
mLocalDocumentStorage.write((Document) value, new WriteOptions(), null);
>>>>>>>
mLocalDocumentStorage.writeOnline((Document)value, new WriteOptions()); |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
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;
import com.microsoft.appcenter.http.ServiceCallback;
<<<<<<<
=======
import com.microsoft.appcenter.storage.client.CosmosDb;
import com.microsoft.appcenter.storage.client.TokenExchange;
import com.microsoft.appcenter.storage.models.Document;
import com.microsoft.appcenter.utils.async.AppCenterFuture;
>>>>>>>
import com.microsoft.appcenter.storage.client.CosmosDb;
import com.microsoft.appcenter.storage.client.TokenExchange;
import com.microsoft.appcenter.storage.models.Document;
import com.microsoft.appcenter.utils.async.AppCenterFuture;
<<<<<<<
=======
>>>>>>>
<<<<<<<
import org.powermock.modules.junit4.PowerMockRunner;
=======
import java.util.HashMap;
>>>>>>>
import java.util.HashMap;
<<<<<<<
=======
import static com.microsoft.appcenter.http.DefaultHttpClient.METHOD_DELETE;
import static com.microsoft.appcenter.http.DefaultHttpClient.METHOD_GET;
import static com.microsoft.appcenter.http.DefaultHttpClient.METHOD_POST;
import static org.junit.Assert.assertEquals;
>>>>>>>
import static com.microsoft.appcenter.http.DefaultHttpClient.METHOD_DELETE;
import static com.microsoft.appcenter.http.DefaultHttpClient.METHOD_GET;
import static com.microsoft.appcenter.http.DefaultHttpClient.METHOD_POST;
import static org.junit.Assert.assertEquals;
<<<<<<<
=======
import static org.mockito.Matchers.anyMapOf;
import static org.mockito.Matchers.endsWith;
>>>>>>>
import static org.mockito.Matchers.anyMapOf;
import static org.mockito.Matchers.endsWith;
<<<<<<<
=======
import static org.mockito.Matchers.notNull;
>>>>>>> |
<<<<<<<
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(operation, now), PARTITION_COLUMN_NAME, DOCUMENT_ID_COLUMN_NAME);
}
void deleteOnline(String partition, String documentId) {
=======
/**
* Creates or overwrites specified document entry in the cache. Sets the de-serialized value of
* the document to null and the pending operation to DELETE.
*
* @param partition Partition key.
* @param documentId Document id.
* @return True if cache was successfully written to, false otherwise.
*/
boolean markForDeletion(String partition, String documentId) {
Document<Void> writeDocument = new Document<>(null, partition, documentId);
long rowId = write(writeDocument, new WriteOptions(), Constants.PENDING_OPERATION_DELETE_VALUE);
return rowId > 0;
}
/**
* Deletes the specified document from the local cache.
* @param partition Partition key.
* @param documentId Document id.
*/
void delete(String partition, String documentId) {
>>>>>>>
/**
* Creates or overwrites specified document entry in the cache. Sets the de-serialized value of
* the document to null and the pending operation to DELETE.
*
* @param partition Partition key.
* @param documentId Document id.
* @return True if cache was successfully written to, false otherwise.
*/
boolean markForDeletion(String partition, String documentId) {
Document<Void> writeDocument = new Document<>(null, partition, documentId);
long rowId = write(writeDocument, new WriteOptions(), Constants.PENDING_OPERATION_DELETE_VALUE);
return rowId > 0;
}
/**
* Deletes the specified document from the local cache.
*
* @param partition Partition key.
* @param documentId Document id.
*/
void deleteOnline(String partition, String documentId) {
<<<<<<<
void deletePendingOperation(PendingOperation pendingOperation) {
deleteOnline(pendingOperation.getPartition(), pendingOperation.getDocumentId());
=======
/**
* Deletes the specified document from the cache.
* @param pendingOperation Pending operation to delete.
*/
void delete(PendingOperation pendingOperation) {
delete(pendingOperation.getPartition(), pendingOperation.getDocumentId());
>>>>>>>
/**
* Deletes the specified document from the cache.
* @param pendingOperation Pending operation to delete.
*/
void deletePendingOperation(PendingOperation pendingOperation) {
deleteOnline(pendingOperation.getPartition(), pendingOperation.getDocumentId()); |
<<<<<<<
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";
>>>>>>>
<<<<<<<
static final String SERVER_URL_KEY = "serverUrl";
private static final String LOG_TAG = "MobileCenterSasquatch";
=======
static final String LOG_URL_KEY = "logUrl";
private static final String LOG_TAG = "MobileCenterSasquatch";
>>>>>>>
static final String LOG_URL_KEY = "logUrl";
private static final String LOG_TAG = "MobileCenterSasquatch";
<<<<<<<
String serverUrl = sSharedPreferences.getString(SERVER_URL_KEY, getString(R.string.server_url));
if (!TextUtils.isEmpty(serverUrl)) {
MobileCenter.setServerUrl(serverUrl);
=======
/* Set custom log URL if one was configured in settings. */
String logUrl = sSharedPreferences.getString(LOG_URL_KEY, null);
if (logUrl != null) {
try {
/* Method name changed and jCenter not yet updated so need to use reflection. */
Method setLogUrl;
try {
setLogUrl = MobileCenter.class.getMethod("setLogUrl", String.class);
} catch (NoSuchMethodException e) {
setLogUrl = MobileCenter.class.getMethod("setServerUrl", String.class);
}
setLogUrl.invoke(null, logUrl);
} catch (Exception e) {
throw new RuntimeException(e);
}
>>>>>>>
/* Set custom log URL if one was configured in settings. */
String logUrl = sSharedPreferences.getString(LOG_URL_KEY, getString(R.string.log_url));
if (!TextUtils.isEmpty(logUrl)) {
try {
/* Method name changed and jCenter not yet updated so need to use reflection. */
Method setLogUrl;
try {
setLogUrl = MobileCenter.class.getMethod("setLogUrl", String.class);
} catch (NoSuchMethodException e) {
setLogUrl = MobileCenter.class.getMethod("setServerUrl", String.class);
}
setLogUrl.invoke(null, logUrl);
} catch (Exception e) {
throw new RuntimeException(e);
} |
<<<<<<<
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);
verify(ingestion).sendAsync(eq(appSecret), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback).success();
>>>>>>>
decorator.sendAsync(appSecret, installId, container, callback);
verify(ingestion).sendAsync(eq(appSecret), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback).onCallSucceeded();
<<<<<<<
decorator.sendAsync(appKey, installId, container, callback);
verify(ingestion).sendAsync(eq(appKey), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback).onCallFailed(new HttpException(503));
=======
decorator.sendAsync(appSecret, installId, container, callback);
verify(ingestion).sendAsync(eq(appSecret), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback).failure(new HttpException(503));
>>>>>>>
decorator.sendAsync(appSecret, installId, container, callback);
verify(ingestion).sendAsync(eq(appSecret), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback).onCallFailed(new HttpException(503));
<<<<<<<
verify(ingestion, times(0)).sendAsync(eq(appKey), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback, times(0)).onCallSucceeded();
=======
verify(ingestion, times(0)).sendAsync(eq(appSecret), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback, times(0)).success();
>>>>>>>
verify(ingestion, times(0)).sendAsync(eq(appSecret), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback, times(0)).onCallSucceeded();
<<<<<<<
verify(ingestion).sendAsync(eq(appKey), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback).onCallSucceeded();
=======
verify(ingestion).sendAsync(eq(appSecret), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback).success();
>>>>>>>
verify(ingestion).sendAsync(eq(appSecret), eq(installId), eq(container), any(ServiceCallback.class));
verify(callback).onCallSucceeded(); |
<<<<<<<
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 context, @NonNull Channel channel, String appSecret, String transmissionTargetToken, boolean startedFromApp) {
mNetworkStateHelper = NetworkStateHelper.getSharedInstance(context);
mHttpClient = createHttpClient(context);
mAppSecret = appSecret;
mLocalDocumentStorage = new LocalDocumentStorage(context);
mAuthListener = new AbstractTokenContextListener() {
@Override
public void onNewUser(UserInformation userInfo) {
if (userInfo == null) {
TokenManager.getInstance().removeAllCachedTokens();
}
}
};
super.onStarted(context, channel, appSecret, transmissionTargetToken, startedFromApp);
>>>>>>>
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 context, @NonNull Channel channel, String appSecret, String transmissionTargetToken, boolean startedFromApp) {
mNetworkStateHelper = NetworkStateHelper.getSharedInstance(context);
mHttpClient = createHttpClient(context);
mAppSecret = appSecret;
mLocalDocumentStorage = new LocalDocumentStorage(context);
mAuthListener = new AbstractTokenContextListener() {
@Override
public void onNewUser(UserInformation userInfo) {
if (userInfo == null) {
TokenManager.getInstance().removeAllCachedTokens();
}
}
};
super.onStarted(context, channel, appSecret, transmissionTargetToken, startedFromApp); |
<<<<<<<
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_ENABLED_KEY = "firebaseEnabled";
=======
@VisibleForTesting
static final CountingIdlingResource analyticsIdlingResource = new CountingIdlingResource("analytics");
@VisibleForTesting
static final CountingIdlingResource crashesIdlingResource = new CountingIdlingResource("crashes");
>>>>>>>
static final String FIREBASE_ENABLED_KEY = "firebaseEnabled";
@VisibleForTesting
static final CountingIdlingResource analyticsIdlingResource = new CountingIdlingResource("analytics");
@VisibleForTesting
static final CountingIdlingResource crashesIdlingResource = new CountingIdlingResource("crashes"); |
<<<<<<<
=======
// 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 from quota via voucher management
if (m.getRequestType().equals(RequestType.ADD_REPLICAS)) {
VolumeManager vMan = master.getVolumeManager();
GlobalFileIdResolver idRes = new GlobalFileIdResolver(m.getFileId());
StorageManager sMan = vMan.getStorageManager(idRes.getVolumeId());
FileMetadata file = sMan.getMetadata(idRes.getLocalFileId());
if(file != null) {
QuotaFileInformation quotaFileInformation = new QuotaFileInformation(idRes.getVolumeId(), file);
AtomicDBUpdate update = sMan.createAtomicDBUpdate(null, null);
master.getMrcVoucherManager().removeReplica(quotaFileInformation, update);
update.execute();
}
}
// simply rethrow the exception
throw err;
} catch (UserException exc) {
reportUserError(op, rq, exc, exc.getErrno());
} catch (MRCException exc) {
Throwable cause = exc.getCause();
if (cause instanceof DatabaseException
&& ((DatabaseException) cause).getType() == ExceptionType.NOT_ALLOWED)
reportUserError(op, rq, exc, POSIXErrno.POSIX_ERROR_EPERM);
else
reportServerError(op, rq, exc);
} catch (DatabaseException exc) {
if (exc.getType() == ExceptionType.NOT_ALLOWED) {
reportUserError(op, rq, exc, POSIXErrno.POSIX_ERROR_EPERM);
} else if (exc.getType() == ExceptionType.REDIRECT) {
try {
redirect(rq,
exc.getAttachment() != null ? (String) exc.getAttachment() : master.getReplMasterUUID());
} catch (MRCException e) {
reportServerError(op, rq, e);
}
} else
reportServerError(op, rq, exc);
} catch (Throwable exc) {
reportServerError(op, rq, exc);
}
}
private void reportUserError(MRCOperation op, MRCRequest rq, Throwable exc, POSIXErrno errno) {
if (Logging.isDebug())
Logging.logUserError(Logging.LEVEL_DEBUG, Category.proc, this, exc);
op.finishRequest(rq, new ErrorRecord(ErrorType.ERRNO, errno, exc.getMessage(), exc));
}
private void reportServerError(MRCOperation op, MRCRequest rq, Throwable exc) {
if (Logging.isDebug())
Logging.logUserError(Logging.LEVEL_DEBUG, Category.proc, this, exc);
op.finishRequest(rq, new ErrorRecord(ErrorType.INTERNAL_SERVER_ERROR, POSIXErrno.POSIX_ERROR_NONE,
"An error has occurred at the MRC. Details: " + exc.getMessage(), exc));
}
private void redirect(MRCRequest rq, String uuid) {
rq.getRPCRequest().sendRedirect(uuid);
}
>>>>>>> |
<<<<<<<
.withToken(TOKEN));
when(SharedPreferencesManager.getString(READONLY_PARTITION_NAME)).thenReturn(tokenResult);
=======
.withToken(FAKE_TOKEN));
when(SharedPreferencesManager.getString(PREFERENCE_PARTITION_PREFIX + READONLY_PARTITION_NAME)).thenReturn(tokenResult);
>>>>>>>
.withToken(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);
<<<<<<<
public static <T> AppCenterFuture<Document<T>> replace(String partition, String documentId, T document, Class<T> documentType) {
/*
In the current version we do not support E-tag optimistic concurrency logic and `replace` will call
Create (POST) operation instead of Replace (PUT)
*/
AppCenterLog.debug(LOG_TAG, "Replace started");
return Storage.create(partition, documentId, document, documentType);
=======
public static AppCenterFuture<Document<Void>> delete(String partition, String documentId) {
return getInstance().instanceDelete(partition, documentId);
>>>>>>>
public static AppCenterFuture<Document<Void>> delete(String partition, String documentId) {
return getInstance().instanceDelete(partition, documentId);
<<<<<<<
//endregion
//region Delete implementation
private synchronized <T> void callCosmosDbCreateOrUpdateApi(
=======
private synchronized <T> void callCosmosDbCreateApi(
>>>>>>>
private synchronized <T> void callCosmosDbCreateOrUpdateApi(
<<<<<<<
new Document<T>(document, partition, documentId).toString(),
new HashMap<String, String>(){{put("x-ms-documentdb-is-upsert","true");}},
=======
new Document<>(document, partition, documentId).toString(),
>>>>>>>
new Document<>(document, partition, documentId).toString(),
new HashMap<String, String>(){{put("x-ms-documentdb-is-upsert","true");}}, |
<<<<<<<
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(ArrayList.class))).then(getGetLogsAnswer(50)).then(getGetLogsAnswer(1)).then(getGetLogsAnswer(2));
=======
when(mockPersistence.getLogs(any(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer(50)).then(getGetLogsAnswer(1)).then(getGetLogsAnswer(2));
>>>>>>>
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer(50)).then(getGetLogsAnswer(1)).then(getGetLogsAnswer(2));
<<<<<<<
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), any(ArrayList.class))).then(getGetLogsAnswer()).then(getGetLogsAnswer(49)).then(getGetLogsAnswer());
=======
when(mockPersistence.getLogs(any(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer()).then(getGetLogsAnswer(49)).then(getGetLogsAnswer());
>>>>>>>
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer()).then(getGetLogsAnswer(49)).then(getGetLogsAnswer());
<<<<<<<
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), any(ArrayList.class))).then(getGetLogsAnswer());
=======
when(mockPersistence.getLogs(any(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer());
>>>>>>>
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer());
<<<<<<<
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), any(ArrayList.class)))
=======
when(mockPersistence.getLogs(any(String.class), anyInt(), anyListOf(Log.class)))
>>>>>>>
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), anyListOf(Log.class)))
<<<<<<<
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), any(ArrayList.class)))
=======
when(mockPersistence.getLogs(any(String.class), anyInt(), anyListOf(Log.class)))
>>>>>>>
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), anyListOf(Log.class)))
<<<<<<<
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), any(ArrayList.class))).then(getGetLogsAnswer());
=======
when(mockPersistence.getLogs(any(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer());
>>>>>>>
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer());
<<<<<<<
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), any(ArrayList.class))).then(getGetLogsAnswer(1));
=======
when(mockPersistence.getLogs(any(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer(1));
>>>>>>>
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer(1));
<<<<<<<
when(mockPersistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyList())).thenAnswer(getGetLogsAnswer(10));
=======
when(mockPersistence.getLogs(anyString(), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(10));
>>>>>>>
when(mockPersistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(10));
<<<<<<<
when(mockPersistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyList())).thenAnswer(getGetLogsAnswer(1));
=======
when(mockPersistence.getLogs(anyString(), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(1));
>>>>>>>
when(mockPersistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(1));
<<<<<<<
when(persistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyList())).thenAnswer(getGetLogsAnswer(1));
=======
when(persistence.getLogs(anyString(), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(1));
>>>>>>>
when(persistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(1));
<<<<<<<
when(persistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyList())).thenAnswer(getGetLogsAnswer(1));
=======
when(persistence.getLogs(anyString(), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(1));
>>>>>>>
when(persistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(1));
<<<<<<<
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer(50));
=======
when(mockPersistence.getLogs(any(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer(50));
>>>>>>>
when(mockPersistence.getLogs(any(String.class), anyListOf(String.class), anyInt(), anyListOf(Log.class))).then(getGetLogsAnswer(50));
<<<<<<<
when(persistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyList())).thenAnswer(getGetLogsAnswer(3));
=======
when(persistence.getLogs(anyString(), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(3));
>>>>>>>
when(persistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(3));
<<<<<<<
when(persistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyList())).thenAnswer(getGetLogsAnswer(50)).thenAnswer(getGetLogsAnswer(50)).thenAnswer(getGetLogsAnswer(3));
=======
when(persistence.getLogs(anyString(), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(50)).thenAnswer(getGetLogsAnswer(50)).thenAnswer(getGetLogsAnswer(3));
>>>>>>>
when(persistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(50)).thenAnswer(getGetLogsAnswer(50)).thenAnswer(getGetLogsAnswer(3));
<<<<<<<
when(persistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyList())).thenAnswer(getGetLogsAnswer(3));
=======
when(persistence.getLogs(anyString(), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(3));
>>>>>>>
when(persistence.getLogs(anyString(), anyListOf(String.class), anyInt(), anyListOf(Log.class))).thenAnswer(getGetLogsAnswer(3));
<<<<<<<
when(mockPersistence.getLogs(eq(TEST_GROUP), anyListOf(String.class), anyInt(), any(ArrayList.class)))
=======
when(mockPersistence.getLogs(eq(TEST_GROUP), anyInt(), anyListOf(Log.class)))
>>>>>>>
when(mockPersistence.getLogs(eq(TEST_GROUP), anyListOf(String.class), anyInt(), anyListOf(Log.class)))
<<<<<<<
when(mockPersistence.getLogs(eq(TEST_GROUP), anyListOf(String.class), anyInt(), any(ArrayList.class)))
=======
when(mockPersistence.getLogs(eq(TEST_GROUP), anyInt(), anyListOf(Log.class)))
>>>>>>>
when(mockPersistence.getLogs(eq(TEST_GROUP), anyListOf(String.class), anyInt(), anyListOf(Log.class)))
<<<<<<<
when(mockPersistence.getLogs(eq(TEST_GROUP), anyListOf(String.class), anyInt(), any(ArrayList.class)))
=======
when(mockPersistence.getLogs(eq(TEST_GROUP), anyInt(), anyListOf(Log.class)))
>>>>>>>
when(mockPersistence.getLogs(eq(TEST_GROUP), anyListOf(String.class), anyInt(), anyListOf(Log.class))) |
<<<<<<<
protected Avalanche() {
mEnabled = true;
=======
private Avalanche() {
>>>>>>>
private Avalanche() {
mEnabled = true;
<<<<<<<
public static Avalanche useFeatures(Application application, String appKey, AvalancheFeature... features) {
Avalanche avalancheHub = getSharedInstance().initialize(application, appKey);
=======
public static void useFeatures(Application application, String appKey, AvalancheFeature... features) {
Avalanche avalancheHub = getSharedInstance().initialize(application, UUID.fromString(appKey));
>>>>>>>
public static void useFeatures(Application application, String appKey, AvalancheFeature... features) {
Avalanche avalancheHub = getSharedInstance().initialize(application, appKey);
<<<<<<<
private Avalanche initialize(Application application, String appKey) {
if (application == null) {
throw new IllegalArgumentException("Application must not be null!");
}
try {
mAppKey = UUID.fromString(appKey);
} catch (NullPointerException e) {
AvalancheLog.error("App Key must be set for initializing the Avalanche SDK!");
} catch (IllegalArgumentException e) {
AvalancheLog.error("App Key is not valid!", e);
}
mApplicationWeakReference = new WeakReference<>(application);
mFeatures.clear();
if (mChannel == null) { // TODO we must rethink this multiple useFeatures calls
Context context = application.getApplicationContext();
Constants.loadFromContext(context);
StorageHelper.initialize(context);
AvalancheChannel channel = new DirectAvalancheChannel(context, mAppKey, mLogSerializer); // TODO replace direct by default impl once problems there are fixed
AvalancheChannelSessionDecorator sessionChannel = new AvalancheChannelSessionDecorator(context, channel);
application.registerActivityLifecycleCallbacks(sessionChannel);
mChannel = sessionChannel;
}
return this;
}
/**
* Add and enable a configured feature.
*
* @param feature feature to add.
*/
public void addFeature(AvalancheFeature feature) {
if (feature == null) {
return;
}
Application application = getApplication();
if (application != null) {
/*
* FIXME feature is a list in android so we can have duplicates,
* anyway we should avoid double initializations when calling useFeatures the second time,
* we need to make a diff and release removed modules.
*/
application.unregisterActivityLifecycleCallbacks(feature);
application.registerActivityLifecycleCallbacks(feature);
if (feature.getLogFactories() != null) {
for (Map.Entry<String, LogFactory> logFactory : feature.getLogFactories().entrySet()) {
mLogSerializer.addLogFactory(logFactory.getKey(), logFactory.getValue());
}
}
mFeatures.add(feature);
feature.onChannelReady(mChannel);
}
}
/**
* Get the configured application object.
*
* @return The application instance or null if not set.
*/
public Application getApplication() {
return mApplicationWeakReference.get();
}
=======
>>>>>>>
<<<<<<<
public String getAppKey() {
return mAppKey.toString();
=======
public static UUID getAppKey() {
return getSharedInstance().mAppKey;
>>>>>>>
public static UUID getAppKey() {
return getSharedInstance().mAppKey; |
<<<<<<<
=======
* Init.
*/
private Auth() {
/* Setup MSAL Logging. */
Logger.getInstance().setLogLevel(Logger.LogLevel.VERBOSE);
try {
Logger.getInstance().setExternalLogger(new ILoggerCallback() {
@Override
public void log(String tag, Logger.LogLevel logLevel, String message, boolean containsPII) {
if (!containsPII) {
String prefixedTag = LOG_TAG + TAG_DELIMITER + tag;
switch (logLevel) {
case VERBOSE:
AppCenterLog.verbose(prefixedTag, message);
break;
case INFO:
AppCenterLog.info(prefixedTag, message);
break;
case WARNING:
AppCenterLog.warn(prefixedTag, message);
break;
case ERROR:
AppCenterLog.error(prefixedTag, message);
break;
}
}
}
});
} catch (Exception e) {
/* Should only happen in tests when resetting the external logger. */
AppCenterLog.error(LOG_TAG, "Enabling MSAL logging failed.", e);
}
}
/**
>>>>>>> |
<<<<<<<
import org.mockito.Mock;
=======
>>>>>>>
<<<<<<<
private Context mContext;
@Before
public void setUp() {
mContext = InstrumentationRegistry.getTargetContext();
SharedPreferencesManager.initialize(mContext);
}
@After
public void tearDown() {
SharedPreferencesManager.clear();
}
@Test
public void testPreferenceTokenStorage() {
/* Mock token. */
AuthTokenStorage tokenStorage = TokenStorageFactory.getTokenStorage(mContext);
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
/* Save the token into storage. */
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
/* Assert that storage returns the same token.*/
assertEquals(mockToken, tokenStorage.getToken());
assertEquals(mockAccountId, tokenStorage.getHomeAccountId());
/* Remove the token from storage. */
tokenStorage.saveToken(null, null, null);
/* Assert that there's no token in storage. */
assertNull(tokenStorage.getToken());
assertNull(tokenStorage.getHomeAccountId());
}
@Test
public void saveToken() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
tokenStorage.saveToken(null, null, null);
assertEquals(2, tokenStorage.loadTokenHistory().size());
}
@Test
public void tokenHistoryLimit() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
for (int i = 0; i < TOKEN_HISTORY_LIMIT + 3; i++) {
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
}
assertEquals(TOKEN_HISTORY_LIMIT, tokenStorage.loadTokenHistory().size());
}
@Test
public void removeTokenFromHistory() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
assertEquals(2, tokenStorage.loadTokenHistory().size());
tokenStorage.removeToken(null);
assertEquals(1, tokenStorage.loadTokenHistory().size());
SharedPreferencesManager.clear();
tokenStorage.removeToken(null);
assertNull(tokenStorage.loadTokenHistory());
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
}
@Test
public void loadTokenHistory() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
assertNull(tokenStorage.loadTokenHistory());
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
assertEquals(2, tokenStorage.loadTokenHistory().size());
SharedPreferencesManager.putString(PREFERENCE_KEY_TOKEN_HISTORY, "some bad json");
assertEquals(0, tokenStorage.loadTokenHistory().size());
}
@Test
public void getOldestToken() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
assertNull(tokenStorage.getOldestToken().getEndTime());
for (int i = 0; i < 10; i++) {
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
}
assertNotNull(tokenStorage.getOldestToken());
assertNotNull(tokenStorage.getOldestToken().getEndTime());
tokenStorage.saveTokenHistory(new ArrayList<PreferenceTokenStorage.TokenStoreEntity>());
assertNotNull(tokenStorage.getOldestToken());
assertNull(tokenStorage.getOldestToken().getEndTime());
}
@Test
public void removeTokenWithTokenNotNull(){
CryptoUtils cryptoUtils = CryptoUtils.getInstance(mContext);
when(CryptoUtils.getInstance(mContext)).thenReturn(cryptoUtils);
when(cryptoUtils.encrypt(anyString())).thenReturn("token-cript");
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
assertNull(tokenStorage.loadTokenHistory());
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
assertEquals(2, tokenStorage.loadTokenHistory().size());
}
@Test
public void loadTokenHistoryTestJsonParseException() throws JsonParseException {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
assertNull(tokenStorage.loadTokenHistory());
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId, new Date());
assertEquals(2, tokenStorage.loadTokenHistory().size());
SharedPreferencesManager.putString(PREFERENCE_KEY_TOKEN_HISTORY, "some bad json");
List<PreferenceTokenStorage.TokenStoreEntity> list = tokenStorage.loadTokenHistory();
assertEquals(0, ((List) list).size());
}
=======
private Context mContext;
@Before
public void setUp() {
mContext = InstrumentationRegistry.getTargetContext();
SharedPreferencesManager.initialize(mContext);
}
@After
public void tearDown() {
SharedPreferencesManager.clear();
}
@Test
public void testPreferenceTokenStorage() {
/* Mock token. */
AuthTokenStorage tokenStorage = TokenStorageFactory.getTokenStorage(mContext);
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
/* Save the token into storage. */
tokenStorage.saveToken(mockToken, mockAccountId);
/* Assert that storage returns the same token. */
assertEquals(mockToken, tokenStorage.getToken());
assertEquals(mockAccountId, tokenStorage.getHomeAccountId());
/* Remove the token from storage. */
tokenStorage.saveToken(null, null);
/* Assert that there's no token in storage. */
assertNull(tokenStorage.getToken());
assertNull(tokenStorage.getHomeAccountId());
}
@Test
public void saveToken() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
tokenStorage.saveToken(null, null);
assertEquals(2, tokenStorage.loadTokenHistory().size());
}
@Test
public void tokenHistoryLimit() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
for (int i = 0; i < TOKEN_HISTORY_LIMIT + 3; i++) {
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId);
}
assertEquals(TOKEN_HISTORY_LIMIT, tokenStorage.loadTokenHistory().size());
}
@Test
public void removeTokenFromHistory() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId);
assertEquals(2, tokenStorage.loadTokenHistory().size());
tokenStorage.removeToken(null);
assertEquals(1, tokenStorage.loadTokenHistory().size());
SharedPreferencesManager.clear();
tokenStorage.removeToken(null);
assertNull(tokenStorage.loadTokenHistory());
tokenStorage.saveToken(mockToken, mockAccountId);
}
@Test
public void loadTokenHistory() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
assertNull(tokenStorage.loadTokenHistory());
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId);
assertEquals(2, tokenStorage.loadTokenHistory().size());
SharedPreferencesManager.putString(PREFERENCE_KEY_TOKEN_HISTORY, "some bad json");
assertEquals(0, tokenStorage.loadTokenHistory().size());
}
@Test
public void getOldestToken() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
assertNull(tokenStorage.getOldestToken().getEndTime());
for (int i = 0; i < 10; i++) {
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId);
}
assertNotNull(tokenStorage.getOldestToken());
assertNotNull(tokenStorage.getOldestToken().getEndTime());
tokenStorage.saveTokenHistory(new ArrayList<PreferenceTokenStorage.TokenStoreEntity>());
assertNotNull(tokenStorage.getOldestToken());
assertNull(tokenStorage.getOldestToken().getEndTime());
}
>>>>>>>
private Context mContext;
@Before
public void setUp() {
mContext = InstrumentationRegistry.getTargetContext();
SharedPreferencesManager.initialize(mContext);
}
@After
public void tearDown() {
SharedPreferencesManager.clear();
}
@Test
public void testPreferenceTokenStorage() {
/* Mock token. */
AuthTokenStorage tokenStorage = TokenStorageFactory.getTokenStorage(mContext);
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
/* Save the token into storage. */
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
/* Assert that storage returns the same token. */
assertEquals(mockToken, tokenStorage.getToken());
assertEquals(mockAccountId, tokenStorage.getHomeAccountId());
/* Remove the token from storage. */
tokenStorage.saveToken(null, null, null);
/* Assert that there's no token in storage. */
assertNull(tokenStorage.getToken());
assertNull(tokenStorage.getHomeAccountId());
}
@Test
public void saveToken() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
tokenStorage.saveToken(null, null, null);
assertEquals(2, tokenStorage.loadTokenHistory().size());
}
@Test
public void tokenHistoryLimit() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
for (int i = 0; i < TOKEN_HISTORY_LIMIT + 3; i++) {
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
}
assertEquals(TOKEN_HISTORY_LIMIT, tokenStorage.loadTokenHistory().size());
}
@Test
public void removeTokenFromHistory() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
assertEquals(2, tokenStorage.loadTokenHistory().size());
tokenStorage.removeToken(null);
assertEquals(1, tokenStorage.loadTokenHistory().size());
SharedPreferencesManager.clear();
tokenStorage.removeToken(null);
assertNull(tokenStorage.loadTokenHistory());
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
}
@Test
public void loadTokenHistory() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
assertNull(tokenStorage.loadTokenHistory());
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
assertEquals(2, tokenStorage.loadTokenHistory().size());
SharedPreferencesManager.putString(PREFERENCE_KEY_TOKEN_HISTORY, "some bad json");
assertEquals(0, tokenStorage.loadTokenHistory().size());
}
@Test
public void getOldestToken() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
assertNull(tokenStorage.getOldestToken().getEndTime());
for (int i = 0; i < 10; i++) {
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId, any(Date.class));
}
assertNotNull(tokenStorage.getOldestToken());
assertNotNull(tokenStorage.getOldestToken().getEndTime());
tokenStorage.saveTokenHistory(new ArrayList<PreferenceTokenStorage.TokenStoreEntity>());
assertNotNull(tokenStorage.getOldestToken());
assertNull(tokenStorage.getOldestToken().getEndTime());
}
@Test
public void loadTokenHistoryTestJsonParseException() {
PreferenceTokenStorage tokenStorage = new PreferenceTokenStorage(mContext);
assertNull(tokenStorage.loadTokenHistory());
String mockToken = UUIDUtils.randomUUID().toString();
String mockAccountId = UUIDUtils.randomUUID().toString();
tokenStorage.saveToken(mockToken, mockAccountId, new Date());
assertEquals(2, tokenStorage.loadTokenHistory().size());
SharedPreferencesManager.putString(PREFERENCE_KEY_TOKEN_HISTORY, "some bad json");
List<PreferenceTokenStorage.TokenStoreEntity> list = tokenStorage.loadTokenHistory();
assertEquals(0, ((List) list).size());
} |
<<<<<<<
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.setLogLevel(Log.VERBOSE);
>>>>>>>
Avalanche.start(getApplication(), UUIDUtils.randomUUID().toString(), Analytics.class, ErrorReporting.class);
Avalanche.setLogLevel(Log.VERBOSE); |
<<<<<<<
=======
if (mSignInDelayed) {
signInInteractively();
}
>>>>>>>
<<<<<<<
private void removeTokenAndAccount() {
=======
private synchronized void removeTokenAndAccount() {
mSignInDelayed = false;
>>>>>>>
private synchronized void removeTokenAndAccount() {
<<<<<<<
initAuthenticationClient(payload);
=======
boolean configurationValid = initAuthenticationClient(payload);
if (configurationValid && mSignInDelayed) {
selectSignInTypeAndSignIn();
}
>>>>>>>
initAuthenticationClient(payload);
<<<<<<<
private synchronized void signInFromUI() {
if (mAuthenticationClient != null && mActivity != null) {
if (!NetworkStateHelper.getSharedInstance(mContext).isNetworkConnected()) {
completeSignIn(null, new NetworkErrorException("Sign in failed. No internet connection."));
}
=======
private synchronized void signInInteractively() {
if (mActivity != null) {
>>>>>>>
private synchronized void signInInteractively() {
if (!NetworkStateHelper.getSharedInstance(mContext).isNetworkConnected()) {
completeSignIn(null, new NetworkErrorException("Sign in failed. No internet connection."));
}
if (mAuthenticationClient != null && mActivity != null) { |
<<<<<<<
=======
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.ingestion.http.AvalancheIngestionHttp;
import avalanche.base.ingestion.http.AvalancheIngestionNetworkStateHandler;
import avalanche.base.ingestion.http.AvalancheIngestionRetryer;
import avalanche.base.ingestion.http.DefaultUrlConnectionFactory;
<<<<<<<
=======
import avalanche.base.utils.IdHelper;
import avalanche.base.utils.NetworkStateHelper;
>>>>>>>
import avalanche.base.utils.NetworkStateHelper;
<<<<<<<
public DefaultAvalancheChannel(@NonNull UUID appKey, @NonNull UUID installId, @NonNull AvalanchePersistence persistence, @NonNull AvalancheIngestion ingestion) {
=======
public DefaultAvalancheChannel(@NonNull Context context, @NonNull UUID appKey, @NonNull LogSerializer logSerializer) {
>>>>>>>
public DefaultAvalancheChannel(@NonNull Context context, @NonNull UUID appKey, @NonNull UUID installId, @NonNull LogSerializer logSerializer) {
<<<<<<<
mInstallId = installId;
mPersistence = persistence;
mIngestion = ingestion;
=======
mInstallId = IdHelper.getInstallId();
mPersistence = new DefaultAvalanchePersistence();
AvalancheIngestionHttp api = new AvalancheIngestionHttp();
api.setUrlConnectionFactory(new DefaultUrlConnectionFactory());
api.setLogSerializer(logSerializer);
api.setBaseUrl("http://avalanche-perf.westus.cloudapp.azure.com:8081"); //TODO make that a parameter
AvalancheIngestionRetryer retryer = new AvalancheIngestionRetryer(api);
mIngestion = new AvalancheIngestionNetworkStateHandler(retryer, NetworkStateHelper.getSharedInstance(context));
>>>>>>>
mInstallId = installId;
mPersistence = new DefaultAvalanchePersistence();
AvalancheIngestionHttp api = new AvalancheIngestionHttp();
api.setUrlConnectionFactory(new DefaultUrlConnectionFactory());
api.setLogSerializer(logSerializer);
api.setBaseUrl("http://avalanche-perf.westus.cloudapp.azure.com:8081"); //TODO make that a parameter
AvalancheIngestionRetryer retryer = new AvalancheIngestionRetryer(api);
mIngestion = new AvalancheIngestionNetworkStateHandler(retryer, NetworkStateHelper.getSharedInstance(context)); |
<<<<<<<
=======
* 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) {
if (InstallerUtils.isUnknownSourcesEnabled(mContext)) {
MobileCenterLog.debug(LOG_TAG, "Schedule download...");
if (releaseDetails.isMandatoryUpdate()) {
showDownloadProgress();
}
mCheckedDownload = true;
mDownloadTask = AsyncTaskUtils.execute(LOG_TAG, new DownloadTask(mContext, releaseDetails));
/*
* If we restored a cached dialog, we also started a new check release call.
* We might have time to click on download before the call completes (easy to
* reproduce with network down).
* In that case the download will start and we'll see a new update dialog if we
* don't cancel the call.
*/
if (mCheckReleaseApiCall != null) {
mCheckReleaseApiCall.cancel();
}
} else {
showUnknownSourcesDialog();
}
} else {
showDisabledToast();
}
}
/**
>>>>>>>
* 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) {
if (InstallerUtils.isUnknownSourcesEnabled(mContext)) {
MobileCenterLog.debug(LOG_TAG, "Schedule download...");
if (releaseDetails.isMandatoryUpdate()) {
showDownloadProgress();
}
mCheckedDownload = true;
mDownloadTask = AsyncTaskUtils.execute(LOG_TAG, new DownloadTask(mContext, releaseDetails));
/*
* If we restored a cached dialog, we also started a new check release call.
* We might have time to click on download before the call completes (easy to
* reproduce with network down).
* In that case the download will start and we'll see a new update dialog if we
* don't cancel the call.
*/
if (mCheckReleaseApiCall != null) {
mCheckReleaseApiCall.cancel();
}
} else {
showUnknownSourcesDialog();
}
} else {
showDisabledToast();
}
}
/** |
<<<<<<<
*
* @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 partition, final String documentId) {
=======
private synchronized AppCenterFuture<Document<Void>> instanceDelete(final String partition, final String documentId){
>>>>>>>
/**
* Implements {@link #setApiUrl(String)}}.
*/
private synchronized void setInstanceApiUrl(String apiUrl) {
mApiUrl = apiUrl;
}
@Override
public synchronized void onStarted(@NonNull Context context, @NonNull Channel channel, String appSecret, String transmissionTargetToken, boolean startedFromApp) {
mContext = context;
mHttpClient = createHttpClient(mContext);
mAppSecret = appSecret;
super.onStarted(context, channel, appSecret, transmissionTargetToken, startedFromApp);
}
/**
* React to enable state change.
*
* @param enabled current state.
*/
@Override
protected synchronized void applyEnabledState(boolean enabled) {
if (enabled) {
} else {
for (Map.Entry<DefaultAppCenterFuture<?>, ServiceCall> call : mPendingCalls.entrySet()) {
call.getKey().complete(null);
call.getValue().cancel();
}
mPendingCalls.clear();
}
}
@Override
protected String getGroupName() {
return STORAGE_GROUP;
}
//region Read implementation
@Override
public String getServiceName() {
return SERVICE_NAME;
}
@Override
protected String getLoggerTag() {
return LOG_TAG;
}
//endregion
//region List implementation
private synchronized <T> AppCenterFuture<Document<T>> instanceRead(final String partition, final String documentId) {
final DefaultAppCenterFuture<Document<T>> result = new DefaultAppCenterFuture<>();
getTokenAndCallCosmosDbApi(
partition,
result,
new TokenExchange.TokenExchangeServiceCallback() {
@Override
public void callCosmosDb(final TokenResult tokenResult) {
callCosmosDbReadApi(tokenResult, documentId, result);
}
@Override
public void completeFuture(Exception e) {
completeFutureAndRemovePendingCall(e, result);
}
});
return result;
}
//endregion
//region Create implementation
private synchronized <T> void callCosmosDbReadApi(final TokenResult tokenResult, final String documentId, final DefaultAppCenterFuture<Document<T>> result) {
ServiceCall cosmosDbCall = CosmosDb.callCosmosDbApi(
tokenResult,
documentId,
mHttpClient,
METHOD_GET,
null,
new ServiceCallback() {
@Override
public void onCallSucceeded(String payload, Map<String, String> headers) {
completeFutureAndRemovePendingCall(Utils.<T>parseDocument(payload), result);
}
@Override
public void onCallFailed(Exception e) {
completeFutureAndRemovePendingCall(e, result);
}
});
mPendingCalls.put(result, cosmosDbCall);
}
/**
* List (need optional signature to configure page size)
* The document type (T) must be JSON deserializable
*/
public <T> AppCenterFuture<Documents<T>> list(String partition, Class<T> documentType) {
return null;
}
/**
* Create a document
* The document type (T) must be JSON deserializable
*/
private synchronized <T> AppCenterFuture<Document<T>> instanceCreate(final String partition, final String documentId, final T document) {
final DefaultAppCenterFuture<Document<T>> result = new DefaultAppCenterFuture<>();
getTokenAndCallCosmosDbApi(
partition,
result,
new TokenExchange.TokenExchangeServiceCallback() {
@Override
public void callCosmosDb(final TokenResult tokenResult) {
callCosmosDbCreateApi(tokenResult, document, partition, documentId, result);
}
@Override
public void completeFuture(Exception e) {
completeFutureAndRemovePendingCall(e, result);
}
});
return result;
}
//endregion
//region Replace implementation
private synchronized <T> void callCosmosDbCreateApi(
final TokenResult tokenResult,
T document,
String partition,
final String documentId,
final DefaultAppCenterFuture<Document<T>> result) {
CosmosDb.callCosmosDbApi(
tokenResult,
null,
mHttpClient,
METHOD_POST,
new Document<T>(document, partition, documentId).toString(),
new ServiceCallback() {
@Override
public void onCallSucceeded(String payload, Map<String, String> headers) {
completeFutureAndRemovePendingCall(Utils.<T>parseDocument(payload), result);
}
@Override
public void onCallFailed(Exception e) {
completeFutureAndRemovePendingCall(e, result);
}
});
}
//endregion
//region Delete implementation
/**
* Replace a document
* The document instance (T) must be JSON serializable
*/
public <T> AppCenterFuture<Document<T>> replace(String partition, String documentId, T document) {
return null;
}
private synchronized AppCenterFuture<Document<Void>> instanceDelete(final String partition, final String documentId) { |
<<<<<<<
=======
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.AppCenterLog;
>>>>>>>
import com.microsoft.appcenter.utils.AppCenterLog;
import com.microsoft.appcenter.utils.AppNameHelper;
<<<<<<<
import static com.microsoft.appcenter.distribute.DistributeConstants.POSTPONE_TIME_THRESHOLD;
=======
import static com.microsoft.appcenter.distribute.DistributeConstants.POSTPONE_TIME_THRESHOLD;
import static com.microsoft.appcenter.distribute.DistributeConstants.PREFERENCES_NAME_MOBILE_CENTER;
>>>>>>>
import static com.microsoft.appcenter.distribute.DistributeConstants.POSTPONE_TIME_THRESHOLD;
import static com.microsoft.appcenter.distribute.DistributeConstants.PREFERENCES_NAME_MOBILE_CENTER; |
<<<<<<<
private final XLocSetCoordinator xLocSetCoordinator;
private final long initTimeMS;
=======
>>>>>>>
private final XLocSetCoordinator xLocSetCoordinator;
private final long initTimeMS;
<<<<<<<
initTimeMS = System.currentTimeMillis();
=======
>>>>>>>
initTimeMS = System.currentTimeMillis();
<<<<<<<
xLocSetCoordinator = new XLocSetCoordinator(this);
xLocSetCoordinator.setLifeCycleListener(this);
=======
>>>>>>>
xLocSetCoordinator = new XLocSetCoordinator(this);
xLocSetCoordinator.setLifeCycleListener(this);
<<<<<<<
=======
>>>>>>>
<<<<<<<
xLocSetCoordinator.shutdown();
=======
>>>>>>>
xLocSetCoordinator.shutdown();
<<<<<<<
xLocSetCoordinator.start();
xLocSetCoordinator.waitForStartup();
=======
>>>>>>>
xLocSetCoordinator.start();
xLocSetCoordinator.waitForStartup();
<<<<<<<
xLocSetCoordinator.shutdown();
xLocSetCoordinator.waitForShutdown();
=======
>>>>>>>
xLocSetCoordinator.shutdown();
xLocSetCoordinator.waitForShutdown();
<<<<<<<
return uuid;
=======
return uuid;
>>>>>>>
return uuid; |
<<<<<<<
=======
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);
}
public boolean isServoActivated() {
return isServoActivated;
}
/**
* execute an Intro resource script
* @param introScriptName
*/
public void execScript(String introScriptName) {
try {
Python p = (Python)Runtime.start("python", "Python");
String script = getResourceAsString(introScriptName);
p.exec(script, true);
} catch (Exception e) {
error("unable to execute script %s", introScriptName);
}
}
/**
* This method will load a python file into the python interpreter.
*/
@Deprecated
public boolean loadFile(String file) {
File f = new File(file);
Python p = (Python) Runtime.getService("python");
log.info("Loading Python file {}", f.getAbsolutePath());
if (p == null) {
log.error("Python instance not found");
return false;
}
String script = null;
try {
script = FileIO.toString(f.getAbsolutePath());
} catch (IOException e) {
log.error("IO Error loading file : ", e);
return false;
}
// evaluate the scripts in a blocking way.
boolean result = p.exec(script, true);
if (!result) {
log.error("Error while loading file {}", f.getAbsolutePath());
return false;
} else {
log.debug("Successfully loaded {}", f.getAbsolutePath());
}
return true;
}
public void speakBlocking(String text) {
if (speech != null) {
speech.speak(text);
}
}
public void startSpeech() {
speech = (AbstractSpeechSynthesis)Runtime.start("speech", "WebKitSpeechSynthesis");
isSpeechActivated = true;
}
public void stopSpeech() {
if (speech != null) {
speech.releaseService();
}
isSpeechActivated = false;
speech = null;
}
@Deprecated
public void startServo() {
startServo("COM3", 3);
}
@Deprecated
public void startServo(String port) {
startServo(port, 3);
}
@Deprecated
public void startServo(String port, int pin) {
if (servo == null) {
speakBlocking("starting servo");
isServoActivated = true;
servo = (ServoControl) startPeer("servo");
if (port != null) {
try {
speakBlocking(port);
controller = (ServoController) startPeer("controller");
((PortConnector)controller).connect(port);
controller.attach(servo);
} catch (Exception e) {
error(e);
}
}
}
}
@Deprecated
public void stopServo() {
speakBlocking("stopping servo");
releasePeer("servo");
isServoActivated = false;
}
/**
* This static method returns all the details of the class without it having
* to be constructed. It has description, categories, dependencies, and peer
* definitions.
*
* @return ServiceType - returns all the data
*
*/
static public ServiceType getMetaData() {
ServiceType meta = new ServiceType(Intro.class);
meta.addDescription("Introduction to MyRobotlab");
meta.setAvailable(true);
meta.addCategory("general");
// meta.addPeer("speech", "WebKitSpeechSynthesis", "speech");
// meta.addPeer("servo", "Servo", "servo");
// meta.addPeer("controller", "Arduino", "Arduino controller for this servo");
return meta;
}
>>>>>>>
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);
}
public boolean isServoActivated() {
return isServoActivated;
}
/**
* execute an Intro resource script
* @param introScriptName
*/
public void execScript(String introScriptName) {
try {
Python p = (Python)Runtime.start("python", "Python");
String script = getResourceAsString(introScriptName);
p.exec(script, true);
} catch (Exception e) {
error("unable to execute script %s", introScriptName);
}
}
/**
* This method will load a python file into the python interpreter.
*/
@Deprecated
public boolean loadFile(String file) {
File f = new File(file);
Python p = (Python) Runtime.getService("python");
log.info("Loading Python file {}", f.getAbsolutePath());
if (p == null) {
log.error("Python instance not found");
return false;
}
String script = null;
try {
script = FileIO.toString(f.getAbsolutePath());
} catch (IOException e) {
log.error("IO Error loading file : ", e);
return false;
}
// evaluate the scripts in a blocking way.
boolean result = p.exec(script, true);
if (!result) {
log.error("Error while loading file {}", f.getAbsolutePath());
return false;
} else {
log.debug("Successfully loaded {}", f.getAbsolutePath());
}
return true;
}
public void speakBlocking(String text) {
if (speech != null) {
speech.speak(text);
}
}
public void startSpeech() {
speech = (AbstractSpeechSynthesis)Runtime.start("speech", "WebKitSpeechSynthesis");
isSpeechActivated = true;
}
public void stopSpeech() {
if (speech != null) {
speech.releaseService();
}
isSpeechActivated = false;
speech = null;
}
@Deprecated
public void startServo() {
startServo("COM3", 3);
}
@Deprecated
public void startServo(String port) {
startServo(port, 3);
}
@Deprecated
public void startServo(String port, int pin) {
if (servo == null) {
speakBlocking("starting servo");
isServoActivated = true;
servo = (ServoControl) startPeer("servo");
if (port != null) {
try {
speakBlocking(port);
controller = (ServoController) startPeer("controller");
((PortConnector)controller).connect(port);
controller.attach(servo);
} catch (Exception e) {
error(e);
}
}
}
}
@Deprecated
public void stopServo() {
speakBlocking("stopping servo");
releasePeer("servo");
isServoActivated = false;
} |
<<<<<<<
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.generatedinterfaces.OSD.TruncateLog;
import org.xtreemfs.pbrpc.generatedinterfaces.OSD.XLocSetVersionState;
=======
>>>>>>>
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.generatedinterfaces.OSD.TruncateLog;
import org.xtreemfs.pbrpc.generatedinterfaces.OSD.XLocSetVersionState;
<<<<<<<
* the ID of the file.
* @param deleteMetadata
* delete metadata and empty directories.
=======
* the ID of the file
* @param deleteMetadata
* delete file metadata
>>>>>>>
* the ID of the file
* @param deleteMetadata
* delete metadata and empty directories. |
<<<<<<<
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.getRequest();
if (log.isDebugEnabled()) {
log.debug(">> {} - {} - [{}]", request.getMethod(), request.getRequestURI(), request.body().asString());
}
// try {
Api api = ApiFactory.getApiProcessor(apiKey);
api.process(this, apiKey, r);
// FIXME - header SAS token for authentication ???
// Map<String, String> headers = getHeadersInfo(request);
// GET vs POST - post assumes low-level messaging
// GET is high level synchronous
// String httpMethod = request.getMethod();
// get default encoder
// FIXME FIXME FIXME - this IS A CODEC !!! NOT AN API-TYPE !!! -
// CHANGE to MIME_TYPE_APPLICATION_JSON !!!
// ========================================
// POST || GET http://{host}:{port}/api/messages
// POST || GET http://{host}:{port}/api/services
// ========================================
// TODO - add handleSwaggerApi
/*
* switch (apiKey) {
*
* case ApiFactory.API_TYPE_MESSAGES: { handleMessagesApi(r); break; }
*
* case ApiFactory.API_TYPE_MESSAGES_BLOCKING: { // decode to service api //
* call service api handleMessagesBlockingApi(r); break; }
*
* case ApiFactory.API_TYPE_SERVICE: { handleServiceApi(r); break; }
*
* default: { // handleInvalidApi(r); // TODO - swagger list of apis ? throw
* new IOException("invalid api: " + apiKey); } }
*
* } catch (Exception e) { // TODO - handle in process
*
* }
*/
=======
=================================
// POST || GET http://{host}:{port}/api/messages
// POST || GET http://{host}:{port}/api/services
// ========================================
// TODO - add handleSwaggerApi
/*
* switch (apiKey) {
*
* case ApiFactory.API_TYPE_MESSAGES: { handleMessagesApi(r); break; }
*
* case ApiFactory.API_TYPE_MESSAGES_BLOCKING: { // decode to service api //
* call service api handleMessagesBlockingApi(r); break; }
*
* case ApiFactory.API_TYPE_SERVICE: { handleServiceApi(r); break; }
*
* default: { // handleInvalidApi(r); // TODO - swagger list of apis ? throw
* new IOException("invalid api: " + apiKey); } }
*
* } catch (Exception e) { // TODO - handle in process
*
* }
*/
=======
>>>>>>>
<<<<<<<
Runtime.main(new String[] {"--interactive"});
// Runtime.start("python", "Python");
//Arduino arduino = (Arduino)Runtime.start("arduino", "Arduino");
=======
Runtime.main(new String[] { "--interactive", "--id", "admin" });
Runtime.start("python", "Python");
>>>>>>>
Runtime.main(new String[] { "--interactive", "--id", "admin" });
// Runtime.start("python", "Python");
//Arduino arduino = (Arduino)Runtime.start("arduino", "Arduino");
<<<<<<<
//Runtime.start("gui", "SwingGui");
=======
Runtime.start("gui", "SwingGui");
webgui.start();
>>>>>>>
//Runtime.start("gui", "SwingGui");
webgui.start(); |
<<<<<<<
@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)
break;
if (!tailer.nextIndex())
return false;
}
>>>>>>>
Bytes bytes;
for (; ; ) {
bytes = applyMapping(tailer, attached, withMappedBuffer);
if (bytes.limit() > 0) {
break;
}
if (!tailer.nextIndex()) {
return false;
}
}
<<<<<<<
/**
* applies a mapping if the mapping is not set to {@code}null{code}
*
* @param source the tailer for the mapping to be applied to
* @param attached the key attachment
* @return returns the tailer or the mapped bytes
* @see
*/
private Bytes applyMapping(final ExcerptTailer source, Object attached) {
if (attached == null) {
return tailer;
}
=======
}
>>>>>>>
protected boolean onQuery(final SelectionKey key, long data) throws IOException {
if (tailer.index(data)) {
final long now = System.currentTimeMillis();
setLastHeartbeat(now);
while (true) {
if (tailer.nextIndex()) {
sendSizeAndIndex(ChronicleTcp.SYNC_IDX_LEN, tailer.index());
tailer.finish();
break;
} else {
if (lastHeartbeat <= now) {
sendSizeAndIndex(ChronicleTcp.IN_SYNC_LEN, ChronicleTcp.IDX_NONE);
break;
}
}
}
} else {
sendSizeAndIndex(ChronicleTcp.IN_SYNC_LEN, 0L);
}
return true;
}
protected boolean onUnsubscribe(final SelectionKey key, long data) throws IOException {
key.interestOps(key.interestOps() & ~SelectionKey.OP_WRITE);
return true;
}
protected abstract boolean onSubscribe(final SelectionKey key, long data) throws IOException ;
protected abstract boolean onSubmit(final SelectionKey key, long size, boolean ack) throws IOException ;
protected abstract boolean write(Object attachment) throws IOException;
}
/**
* IndexedChronicle session handler
*/
private class IndexedSessionHandler extends SessionHandler {
private long index;
private Bytes withMappedBuffer = new ByteBufferBytes(ByteBuffer.allocate(1024));
private IndexedSessionHandler(final @NotNull SocketChannel socketChannel) {
super(socketChannel);
this.index = -1;
}
@Override
protected boolean onSubscribe(final SelectionKey key, long data) throws IOException {
this.index = data;
if (this.index == ChronicleTcp.IDX_TO_START) {
this.index = -1;
} else if (this.index == ChronicleTcp.IDX_TO_END) {
this.index = tailer.toEnd().index();
}
sendSizeAndIndex(ChronicleTcp.SYNC_IDX_LEN, this.index);
key.interestOps(SelectionKey.OP_READ | SelectionKey.OP_WRITE);
return true;
}
@Override
protected boolean onSubmit(final SelectionKey key, long size, boolean ack) throws IOException {
if(ack) {
sendSizeAndIndex(ChronicleTcp.NACK_LEN, ChronicleTcp.IDX_NOT_SUPPORTED);
}
return true;
}
@Override
protected boolean write(Object attached) throws IOException {
if (!tailer.index(index)) {
if (tailer.wasPadding()) {
if (index >= 0) {
sendSizeAndIndex(ChronicleTcp.PADDED_LEN, tailer.index());
}
index++;
}
pause();
if (running.get() && !tailer.index(index)) {
return false;
}
}
pauseReset();
Bytes bytes;
for (; ; ) {
bytes = applyMapping(tailer, attached, withMappedBuffer);
if (bytes.limit() > 0) {
break;
}
// if the excepts is filtered out, move onto the next one
if (!tailer.index(index++)) {
return false;
}
}
final long size = bytes.limit();
long remaining = size + ChronicleTcp.HEADER_SIZE;
writeBuffer.clear();
writeBuffer.putInt((int) size);
writeBuffer.putLong(tailer.index());
// for large objects send one at a time.
if (size > writeBuffer.capacity() / 2) {
while (remaining > 0) {
int size2 = (int) Math.min(remaining, writeBuffer.capacity());
writeBuffer.limit(size2);
bytes.read(writeBuffer);
writeBuffer.flip();
remaining -= writeBuffer.remaining();
connection.writeAll(writeBuffer);
}
} else {
writeBuffer.limit((int) remaining);
bytes.read(writeBuffer);
for (int count = builder.maxExcerptsPerMessage(); (count > 0) && tailer.index(index + 1); ) {
bytes = applyMapping(tailer, attached, withMappedBuffer);
// skip excepts that are filtered out by the MappingFunction
if (bytes.limit() == 0) {
index++;
continue;
}
if (!tailer.wasPadding()) {
if (hasRoomForExcerpt(writeBuffer, bytes)) {
// if there is free space, copy another one.
int size2 = (int) bytes.limit();
writeBuffer.limit(writeBuffer.position() + size2 + ChronicleTcp.HEADER_SIZE);
writeBuffer.putInt(size2);
writeBuffer.putLong(tailer.index());
bytes.read(writeBuffer);
index++;
count--;
} else {
break;
}
} else {
index++;
}
}
writeBuffer.flip();
connection.writeAll(writeBuffer);
}
if (writeBuffer.remaining() > 0) {
throw new EOFException("Failed to send index=" + index);
}
index++;
return true;
}
}
/**
* VanillaChronicle session handler
*/
private class VanillaSessionHandler extends SessionHandler {
private boolean nextIndex;
private long index;
private Bytes withMappedBuffer = new ByteBufferBytes(ByteBuffer.allocate(1024));
private VanillaSessionHandler(final @NotNull SocketChannel socketChannel) {
super(socketChannel);
this.nextIndex = true;
this.index = -1;
}
@Override
protected boolean onSubscribe(final SelectionKey key, long data) throws IOException {
this.index = data;
if (this.index == ChronicleTcp.IDX_TO_START) {
this.nextIndex = true;
this.tailer = tailer.toStart();
this.index = -1;
} else if (this.index == ChronicleTcp.IDX_TO_END) {
this.nextIndex = false;
this.tailer = tailer.toEnd();
this.index = tailer.index();
if (this.index == -1) {
this.nextIndex = true;
this.tailer = tailer.toStart();
this.index = -1;
}
} else {
this.nextIndex = false;
}
sendSizeAndIndex(ChronicleTcp.SYNC_IDX_LEN, this.index);
key.interestOps(SelectionKey.OP_READ | SelectionKey.OP_WRITE);
return false;
}
@Override
protected boolean onSubmit(final SelectionKey key, long size, boolean ack) throws IOException {
readUpTo((int) size);
appender.startExcerpt((int) size);
appender.write(readBuffer);
appender.finish();
pauser.unpause();
if(ack) {
sendSizeAndIndex(ChronicleTcp.ACK_LEN, appender.lastWrittenIndex());
}
return true;
}
@Override
protected boolean write(Object attached) throws IOException {
if (nextIndex) {
if (!tailer.nextIndex()) {
pause();
if (running.get() && !tailer.nextIndex()) {
return false;
}
}
} else {
if (!tailer.index(this.index)) {
return false;
} else {
this.nextIndex = true;
}
}
pauseReset();
Bytes bytes;
for (; ; ) {
bytes = applyMapping(tailer, attached, withMappedBuffer);
if (bytes.limit() > 0) {
break;
}
if (!tailer.nextIndex()) {
return false;
}
}
final long size = bytes.limit();
long remaining = size + ChronicleTcp.HEADER_SIZE;
writeBuffer.clear();
writeBuffer.putInt((int) size);
writeBuffer.putLong(tailer.index());
// for large objects send one at a time.
if (size > writeBuffer.capacity() / 2) {
while (remaining > 0) {
int size2 = (int) Math.min(remaining, writeBuffer.capacity());
writeBuffer.limit(size2);
bytes.read(writeBuffer);
writeBuffer.flip();
remaining -= writeBuffer.remaining();
connection.writeAll(writeBuffer);
}
} else {
writeBuffer.limit((int) remaining);
bytes.read(writeBuffer);
for (int count = builder.maxExcerptsPerMessage(); (count > 0) && tailer.nextIndex(); ) {
if (!tailer.wasPadding()) {
bytes = applyMapping(tailer, attached, withMappedBuffer);
// skip excepts that are filtered out by the MappingFunction
if (bytes.limit() == 0) {
continue;
}
if (hasRoomForExcerpt(writeBuffer, bytes)) {
// if there is free space, copy another one.
int size2 = (int) bytes.limit();
writeBuffer.limit(writeBuffer.position() + size2 + ChronicleTcp.HEADER_SIZE);
writeBuffer.putInt(size2);
writeBuffer.putLong(tailer.index());
bytes.read(writeBuffer);
count--;
} else {
break;
}
} else {
throw new AssertionError("Entry should not be padding - remove");
}
}
writeBuffer.flip();
connection.writeAll(writeBuffer);
}
if (writeBuffer.remaining() > 0) {
throw new EOFException("Failed to send index=" + tailer.index());
}
return true;
}
} |
<<<<<<<
@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) {
return deviceList.containsKey(name);
}
@Override
public Set<String> getAttached() {
return deviceList.keySet();
}
=======
@Override
public void servoSetAcceleration(ServoControl servo) {
// TODO Auto-generated method stub
msg.servoSetAcceleration(getDeviceId(servo), servo.getAcceleration());
}
>>>>>>>
@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) {
return deviceList.containsKey(name);
}
@Override
public Set<String> getAttached() {
return deviceList.keySet();
}
@Override
public void servoSetAcceleration(ServoControl servo) {
// TODO Auto-generated method stub
msg.servoSetAcceleration(getDeviceId(servo), servo.getAcceleration());
} |
<<<<<<<
@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() {
DumpProcessingAction action = new RdfSerializationAction();
action.open();
action.close();
assertEquals(action.getReport(),
"Finished serialization of 24 RDF triples in file null");
}
=======
@Test
public void testNonReadyActionWithDumps() throws ParseException,
IOException {
String[] args = new String[] { "-a", "rdf", "--dumps", "/tmp" };
Client client = new Client(mockDpc, args);
client.performActions(); // print help
Mockito.verify(mockDpc, Mockito.never()).processDump(
Mockito.<MwDumpFile> any());
Mockito.verify(mockDpc, Mockito.never()).getSitesInformation();
Mockito.verify(mockDpc).setDownloadDirectory("/tmp");
}
@Test
public void testSitesAction() throws ParseException, IOException {
String[] args = new String[] { "-a", "rdf", "--rdftasks",
"items,labels" };
Client client = new Client(mockDpc, args);
client.performActions();
Mockito.verify(mockDpc).processDump(Mockito.<MwDumpFile> any());
Mockito.verify(mockDpc).getSitesInformation();
}
@Test
public void testSetDumpsDirectoryException() throws ParseException,
IOException {
Mockito.doThrow(new IOException()).when(mockDpc)
.setDownloadDirectory(Mockito.anyString());
String[] args = new String[] { "-a", "rdf", "--rdftasks",
"items,labels", "--dumps", "/tmp/" };
Client client = new Client(mockDpc, args);
client.performActions(); // print help
Mockito.verify(mockDpc, Mockito.never()).processDump(
Mockito.<MwDumpFile> any());
Mockito.verify(mockDpc, Mockito.never()).getSitesInformation();
}
@Test
public void testSitesActionException() throws ParseException, IOException {
Mockito.doThrow(new IOException()).when(mockDpc).getSitesInformation();
String[] args = new String[] { "-a", "rdf", "--rdftasks",
"items,labels" };
Client client = new Client(mockDpc, args);
client.performActions(); // print help
Mockito.verify(mockDpc, Mockito.never()).processDump(
Mockito.<MwDumpFile> any());
Mockito.verify(mockDpc).getSitesInformation();
}
@Test
public void testNonSitesAction() throws ParseException, IOException {
String[] args = new String[] { "-a", "json", "-q" };
Client client = new Client(mockDpc, args);
client.performActions(); // print help
Mockito.verify(mockDpc).processDump(Mockito.<MwDumpFile> any());
Mockito.verify(mockDpc, Mockito.never()).getSitesInformation();
}
>>>>>>>
@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() {
DumpProcessingAction action = new RdfSerializationAction();
action.open();
action.close();
assertEquals(action.getReport(),
"Finished serialization of 24 RDF triples in file null");
}
public void testNonReadyActionWithDumps() throws ParseException,
IOException {
String[] args = new String[] { "-a", "rdf", "--dumps", "/tmp" };
Client client = new Client(mockDpc, args);
client.performActions(); // print help
Mockito.verify(mockDpc, Mockito.never()).processDump(
Mockito.<MwDumpFile> any());
Mockito.verify(mockDpc, Mockito.never()).getSitesInformation();
Mockito.verify(mockDpc).setDownloadDirectory("/tmp");
}
@Test
public void testSitesAction() throws ParseException, IOException {
String[] args = new String[] { "-a", "rdf", "--rdftasks",
"items,labels" };
Client client = new Client(mockDpc, args);
client.performActions();
Mockito.verify(mockDpc).processDump(Mockito.<MwDumpFile> any());
Mockito.verify(mockDpc).getSitesInformation();
}
@Test
public void testSetDumpsDirectoryException() throws ParseException,
IOException {
Mockito.doThrow(new IOException()).when(mockDpc)
.setDownloadDirectory(Mockito.anyString());
String[] args = new String[] { "-a", "rdf", "--rdftasks",
"items,labels", "--dumps", "/tmp/" };
Client client = new Client(mockDpc, args);
client.performActions(); // print help
Mockito.verify(mockDpc, Mockito.never()).processDump(
Mockito.<MwDumpFile> any());
Mockito.verify(mockDpc, Mockito.never()).getSitesInformation();
}
@Test
public void testSitesActionException() throws ParseException, IOException {
Mockito.doThrow(new IOException()).when(mockDpc).getSitesInformation();
String[] args = new String[] { "-a", "rdf", "--rdftasks",
"items,labels" };
Client client = new Client(mockDpc, args);
client.performActions(); // print help
Mockito.verify(mockDpc, Mockito.never()).processDump(
Mockito.<MwDumpFile> any());
Mockito.verify(mockDpc).getSitesInformation();
}
@Test
public void testNonSitesAction() throws ParseException, IOException {
String[] args = new String[] { "-a", "json", "-q" };
Client client = new Client(mockDpc, args);
client.performActions(); // print help
Mockito.verify(mockDpc).processDump(Mockito.<MwDumpFile> any());
Mockito.verify(mockDpc, Mockito.never()).getSitesInformation();
} |
<<<<<<<
@Parameterized.Parameters
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{ WireType.TEXT },
{ WireType.BINARY }
});
}
// *************************************************************************
//
// *************************************************************************
private final WireType wireType;
/**
*
* @param wireType
*/
public SingleChronicleQueueTest(WireType wireType) {
this.wireType = wireType;
}
=======
int cycle() {
return (int) (System.currentTimeMillis() / RollCycles.DAYS.length());
}
>>>>>>>
@Parameterized.Parameters
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{ WireType.TEXT },
{ WireType.BINARY }
});
}
// *************************************************************************
//
// *************************************************************************
private final WireType wireType;
/**
*
* @param wireType
*/
public SingleChronicleQueueTest(WireType wireType) {
this.wireType = wireType;
}
int cycle() {
return (int) (System.currentTimeMillis() / RollCycles.DAYS.length());
}
<<<<<<<
final ChronicleQueue queue = new SingleChronicleQueueBuilder(getTmpDir())
.wireType(this.wireType)
.rollCycle(RollCycle.SECONDS)
=======
final ChronicleQueue queue = SingleChronicleQueueBuilder.text(getTmpDir())
.rollCycle(RollCycles.SECONDS)
>>>>>>>
final ChronicleQueue queue = new SingleChronicleQueueBuilder(getTmpDir())
.wireType(this.wireType)
.rollCycle(RollCycle.SECONDS) |
<<<<<<<
final ValueFactory factory = ValueFactoryImpl.getInstance();
=======
final Sites sites;
>>>>>>>
<<<<<<<
RdfConversionBuffer rdfConversionBuffer) {
=======
RdfConversionBuffer rdfConversionBuffer,
PropertyTypes propertyTypes, Sites sites) {
>>>>>>>
RdfConversionBuffer rdfConversionBuffer, PropertyTypes propertyTypes) {
<<<<<<<
this.propertyTypes = new PropertyTypes("http://www.wikidata.org/w/api.php");
=======
this.sites = sites;
this.propertyTypes = propertyTypes;
>>>>>>>
this.propertyTypes = propertyTypes; |
<<<<<<<
public class ItemDocumentImpl extends TermedDocumentImpl implements
ItemDocument, Serializable {
=======
public class ItemDocumentImpl extends TermedStatementDocumentImpl implements
ItemDocument {
>>>>>>>
public class ItemDocumentImpl extends TermedStatementDocumentImpl implements
ItemDocument, Serializable { |
<<<<<<<
@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(this);
}
@Override
public String toString(){
return "SomeValueSnak {pId = " + this.propertyId + "}";
} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.