conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
protected static ResourceCache<GVRImage> mTextureCache = new ResourceCache<GVRImage>();
protected static HashMap<String, GVRImage> mEmbeddedCache = new HashMap<String, GVRImage>();
=======
protected static ResourceCache<GVRTexture> mTextureCache = new ResourceCache<GVRTexture>();
protected static HashMap<String, GVRTexture> mEmbeddedCache = new HashMap<String, GVRTexture>();
protected static ResourceCache<GVRMesh> mMeshCache = new ResourceCache<GVRMesh>();
>>>>>>>
protected static ResourceCache<GVRImage> mTextureCache = new ResourceCache<GVRImage>();
protected static HashMap<String, GVRImage> mEmbeddedCache = new HashMap<String, GVRImage>();
protected static ResourceCache<GVRMesh> mMeshCache = new ResourceCache<GVRMesh>();
<<<<<<<
/**
* Loads a compressed cubemap texture asynchronously with default priority and quality.
*
* This method can only load compressed cubemaps. To load an un-compressed
* cubemap you can use {@link #loadCubemapTexture(GVRAndroidResource)}.
*
* @param resource
* Basically, a stream containing a texture file. The
* {@link GVRAndroidResource} class has six constructors to
* handle a wide variety of Android resource types. Taking a
* {@code GVRAndroidResource} here eliminates six overloads.
*/
public GVRTexture loadCompressedCubemapTexture(GVRAndroidResource resource, TextureCallback callback)
=======
/**
* Simple, high-level method to load a compressed cube map texture asynchronously,
* for use with {@link GVRShaders#setMainTexture(Future)} and
* {@link GVRShaders#setTexture(String, Future)}.
*
* @param resource
* A steam containing a zip file which contains six compressed textures.
* The six textures correspond to +x, -x, +y, -y, +z, and -z faces of
* the cube map texture respectively. The default names of the
* six images are "posx.pkm", "negx.pkm", "posy.pkm", "negx.pkm",
* "posz.pkm", and "negz.pkm", which can be changed by calling
* {@link GVRCubemapTexture#setFaceNames(String[])}.
* @return A {@link Future} that you can pass to methods like
* {@link GVRShaders#setMainTexture(Future)}
*
* @since 3.2
*
* @throws IllegalArgumentException
* If you 'abuse' request consolidation by passing the same
* {@link GVRAndroidResource} descriptor to multiple load calls.
* <p>
* It's fairly common for multiple scene objects to use the same
* texture or the same mesh. Thus, if you try to load, say,
* {@code R.raw.whatever} while you already have a pending
* request for {@code R.raw.whatever}, it will only be loaded
* once; the same resource will be used to satisfy both (all)
* requests. This "consolidation" uses
* {@link GVRAndroidResource#equals(Object)}, <em>not</em>
* {@code ==} (aka "reference equality"): The problem with using
* the same resource descriptor is that if requests can't be
* consolidated (because the later one(s) came in after the
* earlier one(s) had already completed) the resource will be
* reloaded ... but the original descriptor will have been
* closed.
*/
public Future<GVRTexture> loadFutureCompressedCubemapTexture(GVRAndroidResource resource)
>>>>>>>
/**
* Loads a compressed cubemap texture asynchronously with default priority and quality.
*
* This method can only load compressed cubemaps. To load an un-compressed
* cubemap you can use {@link #loadCubemapTexture(GVRAndroidResource)}.
*
* @param resource
* Basically, a stream containing a texture file. The
* {@link GVRAndroidResource} class has six constructors to
* handle a wide variety of Android resource types. Taking a
* {@code GVRAndroidResource} here eliminates six overloads.
*/
public GVRTexture loadCompressedCubemapTexture(GVRAndroidResource resource, TextureCallback callback) |
<<<<<<<
else if (qName.equalsIgnoreCase("appearance")) {
/* This gives the X3D-only Shader */
if (!UNIVERSAL_LIGHTS)
attributeValue = attributes.getValue("USE");
if (attributeValue != null) { // shared Appearance node, GVRMaterial
DefinedItem useItem = null;
for (DefinedItem definedItem : mDefinedItems) {
if (attributeValue.equals(definedItem.getName())) {
useItem = definedItem;
break;
}
}
if (useItem != null) {
gvrMaterial = useItem.getGVRMaterial();
gvrRenderData.setMaterial(gvrMaterial);
gvrMaterialUSEd = true; // for DEFine and USE, we encounter a USE,
// and thus have set the material
}
} else {
attributeValue = attributes.getValue("DEF");
if (attributeValue != null) {
shaderSettings.setAppearanceName(attributeValue);
=======
else if (qName.equalsIgnoreCase("Appearance")) {
/* This gives the X3D-only Shader */
if (!UNIVERSAL_LIGHTS)
mX3DTandLShaderTest = new X3DTandLShader(gvrContext);
attributeValue = attributes.getValue("USE");
if (attributeValue != null) { // shared Appearance node, GVRMaterial
DefinedItem useItem = null;
for (DefinedItem definedItem : mDefinedItems) {
if (attributeValue.equals(definedItem.getName())) {
useItem = definedItem;
break;
>>>>>>>
else if (qName.equalsIgnoreCase("Appearance")) {
/* This gives the X3D-only Shader */
attributeValue = attributes.getValue("USE");
if (attributeValue != null) { // shared Appearance node, GVRMaterial
DefinedItem useItem = null;
for (DefinedItem definedItem : mDefinedItems) {
if (attributeValue.equals(definedItem.getName())) {
useItem = definedItem;
break;
}
}
if (useItem != null) {
gvrMaterial = useItem.getGVRMaterial();
gvrRenderData.setMaterial(gvrMaterial);
gvrMaterialUSEd = true; // for DEFine and USE, we encounter a USE,
// and thus have set the material
}
} else {
attributeValue = attributes.getValue("DEF");
if (attributeValue != null) {
shaderSettings.setAppearanceName(attributeValue);
<<<<<<<
attributeValue = attributes.getValue("USE");
if (attributeValue != null) {
DefinedItem useItem = null;
for (DefinedItem definedItem : mDefinedItems) {
if (attributeValue.equals(definedItem.getName())) {
useItem = definedItem;
break;
=======
attributeValue = attributes.getValue("USE");
if (attributeValue != null) {
DefinedItem useItem = null;
for (DefinedItem definedItem : mDefinedItems) {
if (attributeValue.equals(definedItem.getName())) {
useItem = definedItem;
break;
}
}
if (useItem != null) {
gvrTexture = useItem.getGVRTexture();
}
} else {
gvrTextureParameters = new GVRTextureParameters(gvrContext);
gvrTextureParameters.setWrapSType(TextureWrapType.GL_REPEAT);
gvrTextureParameters.setWrapTType(TextureWrapType.GL_REPEAT);
gvrTextureParameters.setMinFilterType(GVRTextureParameters.TextureFilterType.GL_LINEAR_MIPMAP_NEAREST);
String urlAttribute = attributes.getValue("url");
if (urlAttribute != null) {
urlAttribute = urlAttribute.replace("\"", ""); // remove double and
// single quotes
urlAttribute = urlAttribute.replace("\'", "");
// urlAttribute = urlAttribute.toLowerCase();
final String filename = urlAttribute;
String repeatSAttribute = attributes.getValue("repeatS");
if (repeatSAttribute != null) {
if (!parseBooleanString(repeatSAttribute)) {
gvrTextureParameters
.setWrapSType(TextureWrapType.GL_CLAMP_TO_EDGE);
>>>>>>>
attributeValue = attributes.getValue("USE");
if (attributeValue != null) {
DefinedItem useItem = null;
for (DefinedItem definedItem : mDefinedItems) {
if (attributeValue.equals(definedItem.getName())) {
useItem = definedItem;
break;
<<<<<<<
final String defValue = attributes.getValue("DEF");
gvrTexture = new GVRTexture(gvrContext, gvrTextureParameters);
GVRAssetLoader.TextureRequest request = new GVRAssetLoader.TextureRequest(assetRequest, gvrTexture, filename);
assetRequest.loadTexture(request);
shaderSettings.setTexture(gvrTexture);
if (defValue != null) {
DefinedItem item = new DefinedItem(defValue);
item.setGVRTexture(gvrTexture);
mDefinedItems.add(item);
}
=======
final String defValue = attributes.getValue("DEF");
GVRAssetLoader.TextureRequest request = new GVRAssetLoader.TextureRequest(assetRequest,
(inlineSubdirectory + filename), gvrTextureParameters);
Future<GVRTexture> texture = assetRequest
.loadFutureTexture(request);
shaderSettings.setTexture(texture);
if (defValue != null) {
DefinedItem item = new DefinedItem(defValue);
item.setGVRTexture(texture);
mDefinedItems.add(item);
>>>>>>>
final String defValue = attributes.getValue("DEF");
gvrTexture = new GVRTexture(gvrContext, gvrTextureParameters);
GVRAssetLoader.TextureRequest request = new GVRAssetLoader.TextureRequest(assetRequest, gvrTexture, (inlineSubdirectory + filename));
assetRequest.loadTexture(request);
shaderSettings.setTexture(gvrTexture);
if (defValue != null) {
DefinedItem item = new DefinedItem(defValue);
item.setGVRTexture(gvrTexture);
mDefinedItems.add(item);
}
<<<<<<<
/********** Inline **********/
else if (qName.equalsIgnoreCase("Inline")) {
// Inline data saved, and added after the inital .x3d program is parsed
String name = "";
String[] url = {};
attributeValue = attributes.getValue("DEF");
if (attributeValue != null) {
name = attributeValue;
}
attributeValue = attributes.getValue("url");
if (attributeValue != null) {
url = parseMFString(attributeValue);
GVRSceneObject inlineGVRSceneObject = currentSceneObject; // preserve
// the
// currentSceneObject
if (lodManager.isActive()) {
inlineGVRSceneObject = AddGVRSceneObject();
inlineGVRSceneObject.setName("inlineGVRSceneObject"
+ lodManager.getCurrentRangeIndex());
final GVRSceneObject parent = inlineGVRSceneObject.getParent();
if (null == parent.getComponent(GVRLODGroup.getComponentType())) {
parent.attachComponent(new GVRLODGroup(gvrContext));
}
final GVRLODGroup lodGroup = (GVRLODGroup) parent.getComponent(GVRLODGroup.getComponentType());
lodGroup.addRange(lodManager.getMinRange(), inlineGVRSceneObject);
lodManager.increment();
}
InlineObject inlineObject = new InlineObject(inlineGVRSceneObject,
url);
inlineObjects.add(inlineObject);
}
=======
/********** Inline **********/
else if (qName.equalsIgnoreCase("Inline")) {
// Inline data saved, and added after the inital .x3d program is parsed
String name = "";
String[] url = new String[1];
attributeValue = attributes.getValue("DEF");
if (attributeValue != null) {
name = attributeValue;
}
attributeValue = attributes.getValue("url");
if (attributeValue != null) {
//url = parseMFString(attributeValue);
url[0] = attributeValue;
GVRSceneObject inlineGVRSceneObject = currentSceneObject; // preserve
// the
// currentSceneObject
if (lodManager.isActive()) {
inlineGVRSceneObject = AddGVRSceneObject();
inlineGVRSceneObject.setName("inlineGVRSceneObject"
+ lodManager.getCurrentRangeIndex());
final GVRSceneObject parent = inlineGVRSceneObject.getParent();
if (null == parent.getComponent(GVRLODGroup.getComponentType())) {
parent.attachComponent(new GVRLODGroup(gvrContext));
}
final GVRLODGroup lodGroup = (GVRLODGroup) parent.getComponent(GVRLODGroup.getComponentType());
lodGroup.addRange(lodManager.getMinRange(), inlineGVRSceneObject);
lodManager.increment();
}
InlineObject inlineObject = new InlineObject(inlineGVRSceneObject,
url);
inlineObjects.add(inlineObject);
}
>>>>>>>
/********** Inline **********/
else if (qName.equalsIgnoreCase("Inline")) {
// Inline data saved, and added after the inital .x3d program is parsed
String name = "";
String[] url = new String[1];
attributeValue = attributes.getValue("DEF");
if (attributeValue != null) {
name = attributeValue;
}
attributeValue = attributes.getValue("url");
if (attributeValue != null) {
//url = parseMFString(attributeValue);
url[0] = attributeValue;
GVRSceneObject inlineGVRSceneObject = currentSceneObject; // preserve
// the
// currentSceneObject
if (lodManager.isActive()) {
inlineGVRSceneObject = AddGVRSceneObject();
inlineGVRSceneObject.setName("inlineGVRSceneObject"
+ lodManager.getCurrentRangeIndex());
final GVRSceneObject parent = inlineGVRSceneObject.getParent();
if (null == parent.getComponent(GVRLODGroup.getComponentType())) {
parent.attachComponent(new GVRLODGroup(gvrContext));
}
final GVRLODGroup lodGroup = (GVRLODGroup) parent.getComponent(GVRLODGroup.getComponentType());
lodGroup.addRange(lodManager.getMinRange(), inlineGVRSceneObject);
lodManager.increment();
}
InlineObject inlineObject = new InlineObject(inlineGVRSceneObject,
url);
inlineObjects.add(inlineObject);
}
<<<<<<<
"Inline file reading: GVRAndroidResource File Not Found Exception: "
+ e);
=======
"Inline file reading: File Not Found: url " + urls[j] + ", Exception "
+ e);
>>>>>>>
"Inline file reading: File Not Found: url " + urls[j] + ", Exception "
+ e);
<<<<<<<
"Inline file reading: GVRAndroidResource IOException url["
+ j + "] url " + urls[j]);
Log.e(TAG, "Inline file reading: " + ioException.toString());
=======
"Inline file reading url " + urls[j]);
Log.e(TAG, "IOException: " + ioException.toString());
>>>>>>>
"Inline file reading url " + urls[j]);
Log.e(TAG, "IOException: " + ioException.toString());
<<<<<<<
Log.e(TAG, "Inline file reading: GVRAndroidResource Exception: "
+ exception);
=======
Log.e(TAG, "Inline file reading error: Exception "
+ exception);
>>>>>>>
Log.e(TAG, "Inline file reading error: Exception "
+ exception); |
<<<<<<<
material.setMainTexture(texture);
generateSphereObject(gvrContext, stackNumber, sliceNumber, facingOut, material);
=======
material.setMainTexture(futureTexture);
generateSphereObject(gvrContext, stackNumber, sliceNumber, facingOut, material, 1);
>>>>>>>
material.setMainTexture(texture);
generateSphereObject(gvrContext, stackNumber, sliceNumber, facingOut, material, 1);
<<<<<<<
GVRMesh mesh = new GVRMesh(gvrContext, "float3 a_position float2 a_texcoord float3 a_normal");
=======
// multiply by radius > 0
//float radius = 1;
for (int i = 0; i < vertices.length; i++) {
vertices[i] *= radius;
}
GVRMesh mesh = new GVRMesh(gvrContext);
>>>>>>>
// multiply by radius > 0
//float radius = 1;
for (int i = 0; i < vertices.length; i++) {
vertices[i] *= radius;
}
GVRMesh mesh = new GVRMesh(gvrContext, "float3 a_position float2 a_texcoord float3 a_normal"); |
<<<<<<<
import java.util.List;
=======
import java.util.HashMap;
>>>>>>>
<<<<<<<
private String[] z;
private List<String>[] c;
private Person1[] p;
=======
private T desc;
private D desc1;
>>>>>>>
<<<<<<<
=======
public T getDesc() {
return desc;
}
public void setDesc(T desc) {
this.desc = desc;
}
{
System.out.println("xxxxx2");
}
public static void main (String[] args) {
//new Person();
// System.out.println(Person.a);
// String sb = "{\"flag\":1,\"success\":1,\"expired\":0,\"page\":{\"data\":[{\"fxsno\":\"0110198385\",\"fxsname\":\"佳电（上海）管理有限公司（云贵）\",\"matnr\":\"90EACTO1WW0109829092\",\"mtart\":\"扬天T6900CI7-6700 8G 1T DVD-RW 2G独显\",\"quantity\":27,\"createby\":\"\",\"productgroupno\":\"68\",\"createdate\":\"2017-04-12 11:45:29\"}],\"pageSize\":10,\"pageindex\":1,\"sort\":1,\"sortfield\":\"fxsname\",\"total_number\":1}}";
// JSONObject json = JSON.parseObject(sb);
// JSONObject jsonObject = new JSONObject();
// jsonObject.put("status", 1);
// jsonObject.put("body", sb);
// System.out.println(JSON.toJSONString(jsonObject));
JSONObject json = new JSONObject();
System.out.println(JSON.parseObject("{\"a\":1}", Map.class).getClass());
JSONArray array = new JSONArray();
array.add("hahha");
array.add("hahha1");
json.put("a", array.toJSONString());
// json.put("b", new byte[]{1,2,3,4});
System.out.println(json.toJSONString());
// System.out.println(new String(new byte[]{1,2,3,4}));
// System.out.println(JSON.toJSONString(new byte[]{1,2,3,4}));
// String a = "AQIDBA==";
// byte[] b = (byte[])JSON.parseObject(a, byte[].class);
// System.out.println(b.length);
// Method[] method = DemoService.class.getMethods();
//
// String a = "true";
// try {
// Number number = NumberFormat.getInstance().parse(a);
// System.out.println(number instanceof Double);
// } catch (ParseException e) {
// e.printStackTrace();
// }
Person<String, Integer> p = new Person<String, Integer>();
try {
TypeVariable<?>[] types = p.getClass().getTypeParameters();
for (TypeVariable<?> type : types) {
System.out.println(type);
}
Field field = p.getClass().getDeclaredField("desc");
Map<String, Integer> map = new HashMap<String, Integer>();
for (Method method : map.getClass().getMethods()) {
if (method.getName().equals("get")) {
Type returnType = method.getGenericReturnType();
if(returnType instanceof ParameterizedType){
Type [] genericTypes2 =((ParameterizedType)returnType).getActualTypeArguments();
for(Type genericType2:genericTypes2){
System.out.println("返回值，泛型类型"+genericType2);
}
}
}
}
// System.out.print(((TypeVariable)field.getGenericType()).get);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
>>>>>>> |
<<<<<<<
/**
* @return the translations
*/
public List<Translation> getTranslations() {
return translations;
}
// merge the grammar rules for disk hyper-graphs
// if (JoshuaConfiguration.save_disk_hg) {
// HashMap<Integer,Integer> tblDone = new HashMap<Integer,Integer>();
// BufferedWriter rulesWriter = FileUtility.getWriteFileStream(nbestFile + ".hg.rules");
// for (DecoderThread decoder : this.decoderThreads) {
// decoder.hypergraphSerializer.writeRulesParallel(rulesWriter, tblDone);
// //decoder.hypergraphSerializer.closeReaders();
// }
// rulesWriter.flush();
// rulesWriter.close();
// }
=======
>>>>>>>
/**
* @return the translations
*/
public List<Translation> getTranslations() {
return translations;
} |
<<<<<<<
@Test
public void nameSourceDefaultsToName() throws Exception {
nameSource("bla.zip", "test1.xml", ZipArchiveEntry.NameSource.NAME);
}
@Test
public void nameSourceIsSetToUnicodeExtraField() throws Exception {
nameSource("utf8-winzip-test.zip", "\u20AC_for_Dollar.txt",
ZipArchiveEntry.NameSource.UNICODE_EXTRA_FIELD);
}
@Test
public void nameSourceIsSetToEFS() throws Exception {
nameSource("utf8-7zip-test.zip", "\u20AC_for_Dollar.txt",
ZipArchiveEntry.NameSource.NAME_WITH_EFS_FLAG);
}
=======
/**
* @see "https://issues.apache.org/jira/browse/COMPRESS-380"
*/
@Test
public void readDeflate64CompressedStream() throws Exception {
final File input = getFile("COMPRESS-380/COMPRESS-380-input");
final File archive = getFile("COMPRESS-380/COMPRESS-380.zip");
try (FileInputStream in = new FileInputStream(input);
ZipFile zf = new ZipFile(archive)) {
byte[] orig = IOUtils.toByteArray(in);
ZipArchiveEntry e = zf.getEntry("input2");
try (InputStream s = zf.getInputStream(e)) {
byte[] fromZip = IOUtils.toByteArray(s);
assertArrayEquals(orig, fromZip);
}
}
}
>>>>>>>
@Test
public void nameSourceDefaultsToName() throws Exception {
nameSource("bla.zip", "test1.xml", ZipArchiveEntry.NameSource.NAME);
}
@Test
public void nameSourceIsSetToUnicodeExtraField() throws Exception {
nameSource("utf8-winzip-test.zip", "\u20AC_for_Dollar.txt",
ZipArchiveEntry.NameSource.UNICODE_EXTRA_FIELD);
}
@Test
public void nameSourceIsSetToEFS() throws Exception {
nameSource("utf8-7zip-test.zip", "\u20AC_for_Dollar.txt",
ZipArchiveEntry.NameSource.NAME_WITH_EFS_FLAG);
}
/**
* @see "https://issues.apache.org/jira/browse/COMPRESS-380"
*/
@Test
public void readDeflate64CompressedStream() throws Exception {
final File input = getFile("COMPRESS-380/COMPRESS-380-input");
final File archive = getFile("COMPRESS-380/COMPRESS-380.zip");
try (FileInputStream in = new FileInputStream(input);
ZipFile zf = new ZipFile(archive)) {
byte[] orig = IOUtils.toByteArray(in);
ZipArchiveEntry e = zf.getEntry("input2");
try (InputStream s = zf.getInputStream(e)) {
byte[] fromZip = IOUtils.toByteArray(s);
assertArrayEquals(orig, fromZip);
}
}
} |
<<<<<<<
inputStream.close();
=======
// Close all the input streams in sparseInputStreams
if(sparseInputStreams != null) {
for (InputStream inputStream : sparseInputStreams) {
inputStream.close();
}
}
is.close();
>>>>>>>
// Close all the input streams in sparseInputStreams
if(sparseInputStreams != null) {
for (InputStream inputStream : sparseInputStreams) {
inputStream.close();
}
}
inputStream.close();
<<<<<<<
final long available = entrySize - entryOffset;
final long skipped = IOUtils.skip(inputStream, Math.min(n, available));
=======
long available = currEntry.getRealSize() - entryOffset;
long skipped;
if(!currEntry.isSparse()) {
skipped = IOUtils.skip(is, Math.min(n, available));
} else {
skipped = skipSparse(n);
}
>>>>>>>
final long available = currEntry.getRealSize() - entryOffset;
final long skipped;
if(!currEntry.isSparse()) {
skipped = IOUtils.skip(inputStream, Math.min(n, available));
} else {
skipped = skipSparse(n);
}
<<<<<<<
// NOTE, using a Map here makes it impossible to ever support GNU
// sparse files using the PAX Format 0.0, see
// https://www.gnu.org/software/tar/manual/html_section/tar_92.html#SEC188
Map<String, String> parsePaxHeaders(final InputStream inputStream)
=======
/**
* For PAX Format 0.1, the sparse headers are stored in a single variable : GNU.sparse.map
* GNU.sparse.map
* Map of non-null data chunks. It is a string consisting of comma-separated values "offset,size[,offset-1,size-1...]"
*
* @param sparseMap the sparse map string consisting of comma-separated values "offset,size[,offset-1,size-1...]"
* @return sparse headers parsed from sparse map
* @throws IOException
*/
private List<TarArchiveStructSparse> parsePAX01SparseHeaders(String sparseMap) throws IOException {
List<TarArchiveStructSparse> sparseHeaders = new ArrayList<>();
String[] sparseHeaderStrings = sparseMap.split(",");
for (int i = 0; i < sparseHeaderStrings.length;i += 2) {
long sparseOffset = Long.parseLong(sparseHeaderStrings[i]);
long sparseNumbytes = Long.parseLong(sparseHeaderStrings[i + 1]);
sparseHeaders.add(new TarArchiveStructSparse(sparseOffset, sparseNumbytes));
}
return sparseHeaders;
}
/**
* For PAX Format 1.X:
* The sparse map itself is stored in the file data block, preceding the actual file data.
* It consists of a series of decimal numbers delimited by newlines. The map is padded with nulls to the nearest block boundary.
* The first number gives the number of entries in the map. Following are map entries, each one consisting of two numbers
* giving the offset and size of the data block it describes.
* @return sparse headers
* @throws IOException
*/
private List<TarArchiveStructSparse> parsePAX1XSparseHeaders() throws IOException {
// for 1.X PAX Headers
List<TarArchiveStructSparse> sparseHeaders = new ArrayList<>();
long bytesRead = 0;
long[] readResult;
long sparseHeadersCount;
readResult = readLineOfNumberForPax1X(is);
sparseHeadersCount = readResult[0];
bytesRead += readResult[1];
while (sparseHeadersCount-- > 0) {
readResult = readLineOfNumberForPax1X(is);
long sparseOffset = readResult[0];
bytesRead += readResult[1];
readResult = readLineOfNumberForPax1X(is);
long sparseNumbytes = readResult[0];
bytesRead += readResult[1];
sparseHeaders.add(new TarArchiveStructSparse(sparseOffset, sparseNumbytes));
}
// skip the rest of this record data
long bytesToSkip = recordSize - bytesRead % recordSize;
IOUtils.skip(is, bytesToSkip);
return sparseHeaders;
}
/**
* For 1.X PAX Format, the sparse headers are stored in the file data block, preceding the actual file data.
* It consists of a series of decimal numbers delimited by newlines.
*
* @param inputStream the input stream of the tar file
* @return the decimal number delimited by '\n', and the bytes read from input stream
* @throws IOException
*/
private long[] readLineOfNumberForPax1X(InputStream inputStream) throws IOException {
int number;
long result = 0;
long bytesRead = 0;
while((number = inputStream.read()) != '\n') {
bytesRead += 1;
if(number == -1) {
throw new IOException("Unexpected EOF when reading parse information of 1.X PAX format");
}
result = result * 10 + (number - '0');
}
bytesRead += 1;
return new long[] {result, bytesRead};
}
/**
* For PAX Format 0.0, the sparse headers(GNU.sparse.offset and GNU.sparse.numbytes)
* may appear multi times, and they look like:
*
* GNU.sparse.size=size
* GNU.sparse.numblocks=numblocks
* repeat numblocks times
* GNU.sparse.offset=offset
* GNU.sparse.numbytes=numbytes
* end repeat
*
* For PAX Format 0.1, the sparse headers are stored in a single variable : GNU.sparse.map
*
* GNU.sparse.map
* Map of non-null data chunks. It is a string consisting of comma-separated values "offset,size[,offset-1,size-1...]"
*
* @param i inputstream to read keys and values
* @param sparseHeaders used in PAX Format 0.0 & 0.1, as it may appear multi times,
* the sparse headers need to be stored in an array, not a map
* @return
* @throws IOException
*/
Map<String, String> parsePaxHeaders(final InputStream i, List<TarArchiveStructSparse> sparseHeaders)
>>>>>>>
/**
* For PAX Format 0.1, the sparse headers are stored in a single variable : GNU.sparse.map
* GNU.sparse.map
* Map of non-null data chunks. It is a string consisting of comma-separated values "offset,size[,offset-1,size-1...]"
*
* @param sparseMap the sparse map string consisting of comma-separated values "offset,size[,offset-1,size-1...]"
* @return sparse headers parsed from sparse map
* @throws IOException
*/
private List<TarArchiveStructSparse> parsePAX01SparseHeaders(String sparseMap) throws IOException {
List<TarArchiveStructSparse> sparseHeaders = new ArrayList<>();
String[] sparseHeaderStrings = sparseMap.split(",");
for (int i = 0; i < sparseHeaderStrings.length;i += 2) {
long sparseOffset = Long.parseLong(sparseHeaderStrings[i]);
long sparseNumbytes = Long.parseLong(sparseHeaderStrings[i + 1]);
sparseHeaders.add(new TarArchiveStructSparse(sparseOffset, sparseNumbytes));
}
return sparseHeaders;
}
/**
* For PAX Format 1.X:
* The sparse map itself is stored in the file data block, preceding the actual file data.
* It consists of a series of decimal numbers delimited by newlines. The map is padded with nulls to the nearest block boundary.
* The first number gives the number of entries in the map. Following are map entries, each one consisting of two numbers
* giving the offset and size of the data block it describes.
* @return sparse headers
* @throws IOException
*/
private List<TarArchiveStructSparse> parsePAX1XSparseHeaders() throws IOException {
// for 1.X PAX Headers
List<TarArchiveStructSparse> sparseHeaders = new ArrayList<>();
long bytesRead = 0;
long[] readResult;
long sparseHeadersCount;
readResult = readLineOfNumberForPax1X(inputStream);
sparseHeadersCount = readResult[0];
bytesRead += readResult[1];
while (sparseHeadersCount-- > 0) {
readResult = readLineOfNumberForPax1X(inputStream);
long sparseOffset = readResult[0];
bytesRead += readResult[1];
readResult = readLineOfNumberForPax1X(inputStream);
long sparseNumbytes = readResult[0];
bytesRead += readResult[1];
sparseHeaders.add(new TarArchiveStructSparse(sparseOffset, sparseNumbytes));
}
// skip the rest of this record data
long bytesToSkip = recordSize - bytesRead % recordSize;
IOUtils.skip(inputStream, bytesToSkip);
return sparseHeaders;
}
/**
* For 1.X PAX Format, the sparse headers are stored in the file data block, preceding the actual file data.
* It consists of a series of decimal numbers delimited by newlines.
*
* @param inputStream the input stream of the tar file
* @return the decimal number delimited by '\n', and the bytes read from input stream
* @throws IOException
*/
private long[] readLineOfNumberForPax1X(InputStream inputStream) throws IOException {
int number;
long result = 0;
long bytesRead = 0;
while((number = inputStream.read()) != '\n') {
bytesRead += 1;
if(number == -1) {
throw new IOException("Unexpected EOF when reading parse information of 1.X PAX format");
}
result = result * 10 + (number - '0');
}
bytesRead += 1;
return new long[] {result, bytesRead};
}
/**
* For PAX Format 0.0, the sparse headers(GNU.sparse.offset and GNU.sparse.numbytes)
* may appear multi times, and they look like:
*
* GNU.sparse.size=size
* GNU.sparse.numblocks=numblocks
* repeat numblocks times
* GNU.sparse.offset=offset
* GNU.sparse.numbytes=numbytes
* end repeat
*
* For PAX Format 0.1, the sparse headers are stored in a single variable : GNU.sparse.map
*
* GNU.sparse.map
* Map of non-null data chunks. It is a string consisting of comma-separated values "offset,size[,offset-1,size-1...]"
*
* @param i inputstream to read keys and values
* @param sparseHeaders used in PAX Format 0.0 & 0.1, as it may appear multi times,
* the sparse headers need to be stored in an array, not a map
* @return
* @throws IOException
*/
Map<String, String> parsePaxHeaders(final InputStream inputStream, List<TarArchiveStructSparse> sparseHeaders)
<<<<<<<
totalRead = inputStream.read(buf, offset, numToRead);
=======
if (currEntry.isSparse()) {
// for sparse entries, we need to read them in another way
totalRead = readSparse(buf, offset, numToRead);
} else {
totalRead = is.read(buf, offset, numToRead);
}
>>>>>>>
if (currEntry.isSparse()) {
// for sparse entries, we need to read them in another way
totalRead = readSparse(buf, offset, numToRead);
} else {
totalRead = inputStream.read(buf, offset, numToRead);
} |
<<<<<<<
int slot = InventoryUtils.inventoryHasItem( container.getInventory(), getItem().getTypeId(), (byte)getItem().getDurability());
=======
int slot = ItemUtils.inventoryHasItem( container.getInventory(), getItem().getTypeId(), getItem().getDurability());
>>>>>>>
int slot = InventoryUtils.inventoryHasItem( container.getInventory(), getItem().getTypeId(), getItem().getDurability()); |
<<<<<<<
// Org creation fields
private boolean createOrg;
private String orgName;
private String orgShortName;
private String orgAddress;
private String orgType;
// Getter and setter
public String getRecaptcha_challenge_field() {
return recaptcha_challenge_field;
}
public void setRecaptcha_challenge_field(String recaptcha_challenge_field) {
this.recaptcha_challenge_field = recaptcha_challenge_field;
}
=======
>>>>>>>
// Org creation fields
private boolean createOrg;
private String orgName;
private String orgShortName;
private String orgAddress;
private String orgType; |
<<<<<<<
static HashMap<Class, Class> primitiveToWrapper = new HashMap<>();
=======
/**
* Clean the source handling possible edge cases:
*
* <ol>
* <li>Scientific notation conversions
* </ol>
*
* @return the cleaned source
*/
static Object cleanSource(Object source, Class target) {
BigDecimal bigDecimal = getBigDecimalFromScientificNotation(source, target);
return bigDecimal != null ? bigDecimal : source;
}
/**
* @return a BigDecimal in case the source is a String in scientific notation and the target is
* an integral number, null otherwise
*/
static BigDecimal getBigDecimalFromScientificNotation(Object source, Class target) {
if (source instanceof String
&& (Long.class.equals(target)
|| Integer.class.equals(target)
|| Short.class.equals(target)
|| Byte.class.equals(target)
|| BigInteger.class.equals(target))) {
try {
return ((String) source).toUpperCase().contains("E")
? new BigDecimal((String) source)
: null;
} catch (NumberFormatException ex) {
if (LOGGER.isLoggable(Level.FINEST)) {
LOGGER.finest("NumberFormatException for source=" + source);
}
}
}
return null;
}
static HashMap<Class, Class> primitiveToWrapper = new HashMap();
>>>>>>>
/**
* Clean the source handling possible edge cases:
*
* <ol>
* <li>Scientific notation conversions
* </ol>
*
* @return the cleaned source
*/
static Object cleanSource(Object source, Class target) {
BigDecimal bigDecimal = getBigDecimalFromScientificNotation(source, target);
return bigDecimal != null ? bigDecimal : source;
}
/**
* @return a BigDecimal in case the source is a String in scientific notation and the target is
* an integral number, null otherwise
*/
static BigDecimal getBigDecimalFromScientificNotation(Object source, Class target) {
if (source instanceof String
&& (Long.class.equals(target)
|| Integer.class.equals(target)
|| Short.class.equals(target)
|| Byte.class.equals(target)
|| BigInteger.class.equals(target))) {
try {
return ((String) source).toUpperCase().contains("E")
? new BigDecimal((String) source)
: null;
} catch (NumberFormatException ex) {
if (LOGGER.isLoggable(Level.FINEST)) {
LOGGER.finest("NumberFormatException for source=" + source);
}
}
}
return null;
}
static HashMap<Class, Class> primitiveToWrapper = new HashMap<>(); |
<<<<<<<
import org.geotools.gce.imagemosaic.geomhandler.DefaultGranuleHandler;
import org.geotools.gce.imagemosaic.geomhandler.GranuleHandler;
import org.geotools.gce.imagemosaic.geomhandler.GranuleHandlerFactoryFinder;
import org.geotools.gce.imagemosaic.geomhandler.GranuleHandlerFactorySPI;
import org.geotools.gce.imagemosaic.geomhandler.GranuleHandlingException;
=======
import org.geotools.gce.imagemosaic.granulehandler.DefaultGranuleHandler;
import org.geotools.gce.imagemosaic.granulehandler.GranuleHandler;
import org.geotools.gce.imagemosaic.granulehandler.GranuleHandlerFactoryFinder;
import org.geotools.gce.imagemosaic.granulehandler.GranuleHandlerFactorySPI;
>>>>>>>
import org.geotools.gce.imagemosaic.granulehandler.DefaultGranuleHandler;
import org.geotools.gce.imagemosaic.granulehandler.GranuleHandler;
import org.geotools.gce.imagemosaic.granulehandler.GranuleHandlerFactoryFinder;
import org.geotools.gce.imagemosaic.granulehandler.GranuleHandlerFactorySPI;
import org.geotools.gce.imagemosaic.granulehandler.GranuleHandlingException;
<<<<<<<
try {
geometryHandler.handleGeometry(
(StructuredGridCoverage2DReader) inputReader,
destFeature,
destFeature.getFeatureType(),
sourceFeature,
sourceFeature.getFeatureType(),
mosaicConfiguration);
} catch (GranuleHandlingException e) {
throw new RuntimeException("Error handling structured coverage granule", e);
}
=======
geometryHandler.handleGranule(
fileBeingProcessed,
(StructuredGridCoverage2DReader) inputReader,
destFeature,
destFeature.getFeatureType(),
sourceFeature,
sourceFeature.getFeatureType(),
mosaicConfiguration);
>>>>>>>
try {
geometryHandler.handleGranule(
fileBeingProcessed,
(StructuredGridCoverage2DReader) inputReader,
destFeature,
destFeature.getFeatureType(),
sourceFeature,
sourceFeature.getFeatureType(),
mosaicConfiguration);
} catch (GranuleHandlingException e) {
throw new RuntimeException("Error handling structured coverage granule", e);
} |
<<<<<<<
@SuppressWarnings("unchecked")
public DateRange(final MeasurementRange<?> range, final Date origin)
throws IncommensurableException {
=======
public DateRange(final MeasurementRange<?> range, final Date origin) {
>>>>>>>
@SuppressWarnings("unchecked")
public DateRange(final MeasurementRange<?> range, final Date origin) { |
<<<<<<<
return (T) destGeometry;
=======
// preserve the SRID
if (destGeometry != null) {
destGeometry.setSRID(sourceGeometry.getSRID());
}
return destGeometry;
>>>>>>>
// preserve the SRID
if (destGeometry != null) {
destGeometry.setSRID(sourceGeometry.getSRID());
}
return (T) destGeometry; |
<<<<<<<
CoreSubscriber<? super ByteBuf> actual;
=======
// important to not loose the downstream too early and miss discard hook, while
// having relevant hasDownstreams()
boolean hasDownstream;
volatile CoreSubscriber<? super T> actual;
volatile boolean cancelled;
volatile boolean terminated;
volatile int once;
>>>>>>>
CoreSubscriber<? super ByteBuf> actual;
<<<<<<<
if (checkTerminated(empty, a)) {
=======
if (checkTerminated(d, empty, a)) {
if (!empty) {
release(t);
}
>>>>>>>
if (checkTerminated(empty, a)) {
if (!empty) {
release(t);
}
<<<<<<<
=======
if (cancelled) {
if (terminated) {
this.clear();
}
hasDownstream = false;
return;
}
>>>>>>>
<<<<<<<
expectedState = wipRemoveMissing(this, expectedState);
if (isCancelled(expectedState)) {
=======
missed = WIP.addAndGet(this, -missed);
if (missed == 0) {
break;
}
}
}
public void drain() {
if (WIP.getAndIncrement(this) != 0) {
if ((!outputFused && cancelled) || terminated) {
this.clear();
}
return;
}
int missed = 1;
for (; ; ) {
Subscriber<? super T> a = actual;
if (a != null) {
if (outputFused) {
drainFused(a);
} else {
drainRegular(a);
}
>>>>>>>
expectedState = wipRemoveMissing(this, expectedState);
if (isCancelled(expectedState)) {
<<<<<<<
final long state = wipIncrement(this);
if (isWorkInProgress(state)) {
return;
=======
if (WIP.getAndIncrement(this) == 0) {
if (!outputFused || terminated) {
this.clear();
}
hasDownstream = false;
>>>>>>>
final long state = wipIncrement(this);
if (isWorkInProgress(state)) {
return;
<<<<<<<
void clearSafely() {
=======
@Override
public void clear() {
terminated = true;
>>>>>>>
void clearSafely() {
<<<<<<<
clearUnsafely();
=======
T t;
while ((t = queue.poll()) != null) {
release(t);
}
while ((t = priorityQueue.poll()) != null) {
release(t);
}
>>>>>>>
clearUnsafely(); |
<<<<<<<
public static Attribute Animation = new Attribute("animation");
=======
public static Attribute RequiresFadingEdge = new Attribute("requiresFadingEdge");
public static Attribute FadingEdgeLength = new Attribute("fadingEdgeLength");
>>>>>>>
public static Attribute Animation = new Attribute("animation");
public static Attribute RequiresFadingEdge = new Attribute("requiresFadingEdge");
public static Attribute FadingEdgeLength = new Attribute("fadingEdgeLength"); |
<<<<<<<
=======
/**
* Get the handler registered with the supplied view type
* @param viewType
* @return
*/
@Override
public LayoutHandler getHandler(String viewType)
{
return layoutHandlers.get(viewType);
}
>>>>>>>
/**
* Get the handler registered with the supplied view type
* @param viewType
* @return
*/
@Override
public LayoutHandler getHandler(String viewType)
{
return layoutHandlers.get(viewType);
} |
<<<<<<<
=======
import android.annotation.TargetApi;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.drawable.ClipDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.graphics.drawable.ShapeDrawable;
import android.os.Build;
import android.view.Gravity;
import android.widget.ProgressBar;
import com.flipkart.layoutengine.ParserContext;
>>>>>>>
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.drawable.ClipDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.graphics.drawable.ShapeDrawable;
import android.os.Build;
import android.view.Gravity;
<<<<<<<
=======
import com.flipkart.layoutengine.processor.ColorResourceProcessor;
import com.flipkart.layoutengine.processor.JsonDataProcessor;
>>>>>>>
import com.flipkart.layoutengine.processor.ColorResourceProcessor;
import com.flipkart.layoutengine.processor.JsonDataProcessor;
<<<<<<<
=======
addHandler(Attributes.ProgressBar.ProgressTint, new JsonDataProcessor<T>() {
@Override
public void handle(ParserContext parserContext, String attributeKey, JsonElement attributeValue, T view, ProteusView proteusView, ProteusView parent, JsonObject layout, int index) {
if (!attributeValue.isJsonObject() || attributeValue.isJsonNull()) {
return;
}
JsonObject data = attributeValue.getAsJsonObject();
int background = Color.TRANSPARENT;
int progress = Color.TRANSPARENT;
String value = Utils.getPropertyAsString(data, "background");
if (value != null) {
background = ParseHelper.parseColor(value);
}
value = Utils.getPropertyAsString(data, "progress");
if (value != null) {
progress = ParseHelper.parseColor(value);
}
view.setProgressDrawable(getLayerDrawable(progress, background));
}
});
addHandler(Attributes.ProgressBar.SecondaryProgressTint, new ColorResourceProcessor<T>() {
@Override
public void setColor(T view, int color) {
}
@Override
public void setColor(T view, ColorStateList colors) {
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
{
view.setSecondaryProgressTintList(colors);
}
}
});
addHandler(Attributes.ProgressBar.IndeterminateTint, new ColorResourceProcessor<T>() {
@Override
public void setColor(T view, int color) {
}
@Override
public void setColor(T view, ColorStateList colors) {
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
{
view.setIndeterminateTintList(colors);
}
}
});
}
private Drawable getLayerDrawable(int progress, int background) {
ShapeDrawable shape = new ShapeDrawable();
shape.getPaint().setStyle(Paint.Style.FILL);
shape.getPaint().setColor(background);
ShapeDrawable shapeD = new ShapeDrawable();
shapeD.getPaint().setStyle(Paint.Style.FILL);
shapeD.getPaint().setColor(progress);
ClipDrawable clipDrawable = new ClipDrawable(shapeD, Gravity.LEFT, ClipDrawable.HORIZONTAL);
return new LayerDrawable(new Drawable[]{shape, clipDrawable});
>>>>>>>
addHandler(Attributes.ProgressBar.ProgressTint, new JsonDataProcessor<T>() {
@Override
public void handle(String key, JsonElement valueElement, T view) {
if (!valueElement.isJsonObject() || valueElement.isJsonNull()) {
return;
}
JsonObject data = valueElement.getAsJsonObject();
int background = Color.TRANSPARENT;
int progress = Color.TRANSPARENT;
String value = Utils.getPropertyAsString(data, "background");
if (value != null) {
background = ParseHelper.parseColor(value);
}
value = Utils.getPropertyAsString(data, "progress");
if (value != null) {
progress = ParseHelper.parseColor(value);
}
view.setProgressDrawable(getLayerDrawable(progress, background));
}
});
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
addHandler(Attributes.ProgressBar.SecondaryProgressTint, new ColorResourceProcessor<T>() {
@Override
public void setColor(T view, int color) {
}
@Override
public void setColor(T view, ColorStateList colors) {
//noinspection AndroidLintNewApi
view.setSecondaryProgressTintList(colors);
}
});
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
addHandler(Attributes.ProgressBar.IndeterminateTint, new ColorResourceProcessor<T>() {
@Override
public void setColor(T view, int color) {
}
@Override
public void setColor(T view, ColorStateList colors) {
//noinspection AndroidLintNewApi
view.setIndeterminateTintList(colors);
}
});
}
}
private Drawable getLayerDrawable(int progress, int background) {
ShapeDrawable shape = new ShapeDrawable();
shape.getPaint().setStyle(Paint.Style.FILL);
shape.getPaint().setColor(background);
ShapeDrawable shapeD = new ShapeDrawable();
shapeD.getPaint().setStyle(Paint.Style.FILL);
shapeD.getPaint().setColor(progress);
ClipDrawable clipDrawable = new ClipDrawable(shapeD, Gravity.LEFT, ClipDrawable.HORIZONTAL);
return new LayerDrawable(new Drawable[]{shape, clipDrawable}); |
<<<<<<<
import java.io.IOException;
import java.net.InetAddress;
import java.net.Inet6Address;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
=======
import java.net.Inet6Address;
>>>>>>>
import java.net.Inet6Address;
import java.net.Inet6Address;
<<<<<<<
nsre_low_watermark = config.getInt("hbase.nsre.low_watermark");
nsre_high_watermark = config.getInt("hbase.nsre.high_watermark");
=======
nsre_low_watermark = config.getShort("hbase.nsre.low_watermark");
nsre_high_watermark = config.getShort("hbase.nsre.high_watermark");
if (config.properties.containsKey("hbase.increments.durable")) {
increment_buffer_durable = config.getBoolean("hbase.increments.durable");
}
>>>>>>>
nsre_low_watermark = config.getInt("hbase.nsre.low_watermark");
nsre_high_watermark = config.getInt("hbase.nsre.high_watermark");
if (config.properties.containsKey("hbase.increments.durable")) {
increment_buffer_durable = config.getBoolean("hbase.increments.durable");
}
<<<<<<<
nsre_low_watermark = config.getInt("hbase.nsre.low_watermark");
nsre_high_watermark = config.getInt("hbase.nsre.high_watermark");
=======
nsre_low_watermark = config.getShort("hbase.nsre.low_watermark");
nsre_high_watermark = config.getShort("hbase.nsre.high_watermark");
if (config.properties.containsKey("hbase.increments.durable")) {
increment_buffer_durable = config.getBoolean("hbase.increments.durable");
}
>>>>>>>
nsre_low_watermark = config.getInt("hbase.nsre.low_watermark");
nsre_high_watermark = config.getInt("hbase.nsre.high_watermark");
if (config.properties.containsKey("hbase.increments.durable")) {
increment_buffer_durable = config.getBoolean("hbase.increments.durable");
} |
<<<<<<<
=======
import io.appium.uiautomator2.handler.W3CActions;
import io.appium.uiautomator2.handler.request.BaseRequestHandler;
>>>>>>>
import io.appium.uiautomator2.handler.W3CActions;
import io.appium.uiautomator2.handler.request.BaseRequestHandler; |
<<<<<<<
import com.xin.util.match.FList;
import com.xin.util.match.MinusculeMatcher;
import com.xin.util.match.TextRange;
import com.xin.view.FilterableTreeItem;
=======
import com.xin.service.ConfService;
import com.xin.view.AlertTemplate;
>>>>>>>
<<<<<<<
private EventHandler<ActionEvent> expandNodeAction = getExpandNodeAction();
private EventHandler<ActionEvent> unExpandNodeAction = getUnExpandNodeAction();
=======
private EventHandler<ActionEvent> exportNodeAction = getExportNodeAction();
>>>>>>>
private EventHandler<ActionEvent> expandNodeAction = getExpandNodeAction();
private EventHandler<ActionEvent> unExpandNodeAction = getUnExpandNodeAction();
private EventHandler<ActionEvent> exportNodeAction = getExportNodeAction();
<<<<<<<
MenuItem expandNode = new MenuItem("展开所有节点");
expandNode.setOnAction(expandNodeAction);
contextMenu.getItems().add(expandNode);
MenuItem unExpandNode = new MenuItem("收缩所有节点");
unExpandNode.setOnAction(unExpandNodeAction);
contextMenu.getItems().add(unExpandNode);
=======
MenuItem exportNode = new MenuItem("导出节点");
exportNode.setOnAction(exportNodeAction);
contextMenu.getItems().add(exportNode);
>>>>>>>
MenuItem expandNode = new MenuItem("展开所有节点");
expandNode.setOnAction(expandNodeAction);
contextMenu.getItems().add(expandNode);
MenuItem unExpandNode = new MenuItem("收缩所有节点");
unExpandNode.setOnAction(unExpandNodeAction);
contextMenu.getItems().add(unExpandNode);
MenuItem exportNode = new MenuItem("导出节点");
exportNode.setOnAction(exportNodeAction);
contextMenu.getItems().add(exportNode); |
<<<<<<<
* (C) Copyright IBM Corporation 2014, 2017.
=======
* (C) Copyright IBM Corporation 2014,2017.
>>>>>>>
* (C) Copyright IBM Corporation 2014, 2017.
<<<<<<<
}
//copy files over
copyConfigFiles();
exportParametersToXml();
}
/*
* Export plugin configuration parameters to target/liberty-plugin-config.xml
*/
private void exportParametersToXml() throws Exception {
PluginConfigXmlDocument configDocument = PluginConfigXmlDocument.newInstance("liberty-plugin-config");
@SuppressWarnings("unchecked")
List<Profile> profiles = project.getActiveProfiles();
configDocument.createActiveBuildProfilesElement("activeBuildProfiles", profiles);
configDocument.createElement("installDirectory", installDirectory);
configDocument.createElement("serverDirectory", serverDirectory);
configDocument.createElement("userDirectory", userDirectory);
configDocument.createElement("serverOutputDirectory", new File(outputDirectory, serverName));
configDocument.createElement("serverName", serverName);
if (getFileFromConfigDirectory("server.xml", configFile) != null) {
configDocument.createElement("configFile", getFileFromConfigDirectory("server.xml", configFile));
}
if (getFileFromConfigDirectory("bootstrap.properties", bootstrapPropertiesFile) != null) {
configDocument.createElement("bootstrapPropertiesFile", getFileFromConfigDirectory("bootstrap.properties", bootstrapPropertiesFile));
=======
}
// copy files _after_ we create the server
copyConfigFiles(true);
exportParametersToXml();
}
/*
* Export plugin configuration parameters to target/liberty-plugin-config.xml
*/
private void exportParametersToXml() throws Exception {
PluginConfigXmlDocument configDocument = PluginConfigXmlDocument.newInstance("liberty-plugin-config");
@SuppressWarnings("unchecked")
List<Profile> profiles = project.getActiveProfiles();
configDocument.createActiveBuildProfilesElement("activeBuildProfiles", profiles);
configDocument.createElement("installDirectory", installDirectory);
configDocument.createElement("serverDirectory", serverDirectory);
configDocument.createElement("userDirectory", userDirectory);
configDocument.createElement("serverOutputDirectory", new File(outputDirectory, serverName));
configDocument.createElement("serverName", serverName);
if (getFileFromConfigDirectory("server.xml", configFile) != null) {
configDocument.createElement("configFile", getFileFromConfigDirectory("server.xml", configFile));
}
if (getFileFromConfigDirectory("bootstrap.properties", bootstrapPropertiesFile) != null) {
configDocument.createElement("bootstrapPropertiesFile", getFileFromConfigDirectory("bootstrap.properties", bootstrapPropertiesFile));
>>>>>>>
}
// copy files _after_ we create the server
copyConfigFiles();
exportParametersToXml();
}
/*
* Export plugin configuration parameters to target/liberty-plugin-config.xml
*/
private void exportParametersToXml() throws Exception {
PluginConfigXmlDocument configDocument = PluginConfigXmlDocument.newInstance("liberty-plugin-config");
@SuppressWarnings("unchecked")
List<Profile> profiles = project.getActiveProfiles();
configDocument.createActiveBuildProfilesElement("activeBuildProfiles", profiles);
configDocument.createElement("installDirectory", installDirectory);
configDocument.createElement("serverDirectory", serverDirectory);
configDocument.createElement("userDirectory", userDirectory);
configDocument.createElement("serverOutputDirectory", new File(outputDirectory, serverName));
configDocument.createElement("serverName", serverName);
if (getFileFromConfigDirectory("server.xml", configFile) != null) {
configDocument.createElement("configFile", getFileFromConfigDirectory("server.xml", configFile));
}
if (getFileFromConfigDirectory("bootstrap.properties", bootstrapPropertiesFile) != null) {
configDocument.createElement("bootstrapPropertiesFile", getFileFromConfigDirectory("bootstrap.properties", bootstrapPropertiesFile)); |
<<<<<<<
=======
this.slaveCpus = Double.parseDouble(slaveCpus);
this.slaveMem = Integer.parseInt(slaveMem);
this.maxExecutors = Integer.parseInt(maxExecutors);
this.executorCpus = Double.parseDouble(executorCpus);
this.executorMem = Integer.parseInt(executorMem);
this.remoteFSRoot = StringUtils.isNotBlank(remoteFSRoot) ? remoteFSRoot
.trim() : "jenkins";
this.idleTerminationMinutes = Integer.parseInt(idleTerminationMinutes);
this.labelString = Util.fixEmptyAndTrim(labelString);
this.mode = mode != null ? mode : Mode.NORMAL;
this.jvmArgs = StringUtils.isNotBlank(jvmArgs) ? cleanseJvmArgs(jvmArgs)
: DEFAULT_JVM_ARGS;
this.jnlpArgs = StringUtils.isNotBlank(jnlpArgs) ? jnlpArgs : "";
this.defaultSlave = Boolean.valueOf(defaultSlave);
this.containerInfo = containerInfo;
this.additionalURIs = additionalURIs;
this.nodeProperties.replaceBy(nodeProperties == null ? new ArrayList<NodeProperty<?>>() : nodeProperties);
// Ensure minExecutors is at least equal to 1
int minExecutorsVal = Integer.parseInt(minExecutors);
this.minExecutors = minExecutorsVal < 1 ? 1 : minExecutorsVal;
>>>>>>> |
<<<<<<<
import org.threadly.concurrent.VirtualRunnable;
=======
import java.util.LinkedList;
>>>>>>>
import org.threadly.concurrent.VirtualRunnable;
import java.util.LinkedList;
<<<<<<<
public class TestRunnable extends VirtualRunnable {
=======
public class TestRunnable implements Runnable {
private static final int DEFAULT_TIMEOUT_PER_RUN = 2000;
>>>>>>>
public class TestRunnable extends VirtualRunnable {
private static final int DEFAULT_TIMEOUT_PER_RUN = 2000; |
<<<<<<<
import edu.uw.covidsafe.hcp.SubmitNarrowcastMessageTask;
import edu.uw.covidsafe.preferences.AppPreferencesHelper;
=======
import edu.uw.covidsafe.symptoms.SymptomDbModel;
import edu.uw.covidsafe.symptoms.SymptomUtils;
import edu.uw.covidsafe.symptoms.SymptomsRecord;
>>>>>>>
import edu.uw.covidsafe.hcp.SubmitNarrowcastMessageTask;
import edu.uw.covidsafe.preferences.AppPreferencesHelper;
import edu.uw.covidsafe.symptoms.SymptomDbModel;
import edu.uw.covidsafe.symptoms.SymptomUtils;
import edu.uw.covidsafe.symptoms.SymptomsRecord; |
<<<<<<<
import edu.uw.covidsafe.comms.NetworkConstant;
import edu.uw.covidsafe.preferences.AppPreferencesHelper;
=======
import edu.uw.covidsafe.gps.GpsOpsAsyncTask;
import edu.uw.covidsafe.gps.GpsRecord;
import edu.uw.covidsafe.symptoms.SymptomTrackerFragment;
import edu.uw.covidsafe.symptoms.SymptomsOpsAsyncTask;
import edu.uw.covidsafe.symptoms.SymptomsRecord;
import edu.uw.covidsafe.ui.contact_log.ContactLogFragment;
>>>>>>>
import edu.uw.covidsafe.comms.NetworkConstant;
import edu.uw.covidsafe.preferences.AppPreferencesHelper;
import edu.uw.covidsafe.gps.GpsOpsAsyncTask;
import edu.uw.covidsafe.gps.GpsRecord;
import edu.uw.covidsafe.symptoms.SymptomTrackerFragment;
import edu.uw.covidsafe.symptoms.SymptomsOpsAsyncTask;
import edu.uw.covidsafe.symptoms.SymptomsRecord;
import edu.uw.covidsafe.ui.contact_log.ContactLogFragment; |
<<<<<<<
import edu.uw.covidsafe.preferences.AppPreferencesHelper;
=======
import edu.uw.covidsafe.contact_trace.GpsHistoryRecyclerViewAdapter2;
import edu.uw.covidsafe.contact_trace.HumanRecord;
import edu.uw.covidsafe.contact_trace.NonSwipeableViewPager;
import edu.uw.covidsafe.gps.GpsRecord;
>>>>>>>
import edu.uw.covidsafe.preferences.AppPreferencesHelper;
import edu.uw.covidsafe.contact_trace.GpsHistoryRecyclerViewAdapter2;
import edu.uw.covidsafe.contact_trace.HumanRecord;
import edu.uw.covidsafe.contact_trace.NonSwipeableViewPager;
import edu.uw.covidsafe.gps.GpsRecord; |
<<<<<<<
import edu.uw.covidsafe.json.Location;
=======
import edu.uw.covidsafe.gps.ImportLocationHistoryFragment;
>>>>>>>
import edu.uw.covidsafe.json.Location;
import edu.uw.covidsafe.gps.ImportLocationHistoryFragment;
<<<<<<<
if (Constants.CurrentFragment.toString().toLowerCase().contains("location")) {
Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
if(fragment instanceof LocationFragment && fragment.isVisible()){
((LocationFragment) fragment).updateLocationView(CalendarDay.from(year, month, day), getApplicationContext());
}
=======
Log.e("justin",Constants.CurrentFragment.getClass().toString());
if (Constants.CurrentFragment.getClass().toString().contains(Constants.LocationFragment.getClass().toString())) {
LocationFragment.updateLocationView(CalendarDay.from(year,month,day),
getApplicationContext());
>>>>>>>
if (Constants.CurrentFragment.getClass().toString().contains(Constants.LocationFragment.getClass().toString())) {
Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
if (fragment instanceof LocationFragment && fragment.isVisible()){
((LocationFragment) fragment).updateLocationView(CalendarDay.from(year, month, day), getApplicationContext());
} |
<<<<<<<
if (attrs.hasValue(R.styleable.PullToRefresh_ptrHeaderBackground)) {
Drawable background = attrs.getDrawable(R.styleable.PullToRefresh_ptrHeaderBackground);
if (null != background) {
setBackgroundDrawable(background);
}
}
=======
if (attrs.hasValue(R.styleable.PullToRefresh_ptrHeaderSubTextColor)) {
ColorStateList colors = attrs.getColorStateList(R.styleable.PullToRefresh_ptrHeaderSubTextColor);
setSubTextColor(null != colors ? colors : ColorStateList.valueOf(0xFF000000));
}
>>>>>>>
if (attrs.hasValue(R.styleable.PullToRefresh_ptrHeaderSubTextColor)) {
ColorStateList colors = attrs.getColorStateList(R.styleable.PullToRefresh_ptrHeaderSubTextColor);
setSubTextColor(null != colors ? colors : ColorStateList.valueOf(0xFF000000));
}
if (attrs.hasValue(R.styleable.PullToRefresh_ptrHeaderBackground)) {
Drawable background = attrs.getDrawable(R.styleable.PullToRefresh_ptrHeaderBackground);
if (null != background) {
setBackgroundDrawable(background);
}
} |
<<<<<<<
import android.os.SystemClock;
=======
>>>>>>>
<<<<<<<
=======
private Drawable mBoxSelected;
private Drawable mBoxPressed;
private Drawable mBoxLongPressed;
>>>>>>>
<<<<<<<
=======
mBoxSelected = mResources.getDrawable(R.drawable.month_view_selected);
mBoxPressed = mResources.getDrawable(R.drawable.month_view_pressed);
mBoxLongPressed = mResources.getDrawable(R.drawable.month_view_longpress);
mTodayBackground = mResources.getDrawable(R.drawable.month_view_today_background);
>>>>>>> |
<<<<<<<
import com.android.calendar.event.EventViewUtils;
=======
import com.android.timezonepicker.TimeZoneInfo;
import com.android.timezonepicker.TimeZonePickerDialog;
import com.android.timezonepicker.TimeZonePickerDialog.OnTimeZoneSetListener;
import com.android.timezonepicker.TimeZonePickerUtils;
>>>>>>>
import com.android.calendar.event.EventViewUtils;
import com.android.timezonepicker.TimeZoneInfo;
import com.android.timezonepicker.TimeZonePickerDialog;
import com.android.timezonepicker.TimeZonePickerDialog.OnTimeZoneSetListener;
import com.android.timezonepicker.TimeZonePickerUtils;
<<<<<<<
mHomeTZ = (ListPreference) preferenceScreen.findPreference(KEY_HOME_TZ);
String tz = mHomeTZ.getValue();
mSnoozeDelay = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_SNOOZE_DELAY);
buildSnoozeDelayEntries();
=======
mHomeTZ = preferenceScreen.findPreference(KEY_HOME_TZ);
>>>>>>>
mHomeTZ = preferenceScreen.findPreference(KEY_HOME_TZ);
mSnoozeDelay = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_SNOOZE_DELAY);
buildSnoozeDelayEntries(); |
<<<<<<<
mCalendarOwnerAccount = mCalendarsCursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT);
mOrganizerCanRespond = mCalendarsCursor.getInt(CALENDARS_INDEX_OWNER_CAN_RESPOND) != 0;
String displayName = mCalendarsCursor.getString(CALENDARS_INDEX_DISPLAY_NAME);
mIsDuplicateName = isDuplicateName(displayName);
=======
String tempAccount = mCalendarsCursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT);
mCalendarOwnerAccount = (tempAccount == null) ? "" : tempAccount;
>>>>>>>
String tempAccount = mCalendarsCursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT);
mCalendarOwnerAccount = (tempAccount == null) ? "" : tempAccount;
mOrganizerCanRespond = mCalendarsCursor.getInt(CALENDARS_INDEX_OWNER_CAN_RESPOND) != 0;
String displayName = mCalendarsCursor.getString(CALENDARS_INDEX_DISPLAY_NAME);
mIsDuplicateName = isDuplicateName(displayName); |
<<<<<<<
package de.teamlapen.vampirism.proxy;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ResourceLocation;
public class ServerProxy extends CommonProxy {
@Override
public void registerKeyBindings() {
// Client side only
}
@Override
public void registerRenderer() {
// Client side only
}
@Override
public void registerSounds() {
// Client side only
}
@Override
public void registerSubscriptions() {
super.registerSubscriptions();
}
@Override
public EntityPlayer getSPPlayer() {
return null;
}
@Override
public String translateToLocal(String s) {
return s;
}
@Override
public ResourceLocation checkVampireTexture(Entity entity, ResourceLocation loc) {
return loc;
}
}
=======
package de.teamlapen.vampirism.proxy;
import java.util.Iterator;
import java.util.List;
import de.teamlapen.vampirism.entity.player.VampirePlayer;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.WorldServer;
public class ServerProxy extends CommonProxy {
private boolean allPlayersSleepingInCoffin;
private List playerEntities;
private WorldServer server = MinecraftServer.getServer()
.worldServerForDimension(0);
@Override
public void registerKeyBindings() {
// Client side only
}
@Override
public void registerRenderer() {
// Client side only
}
@Override
public void registerSounds() {
// Client side only
}
@Override
public void registerSubscriptions() {
super.registerSubscriptions();
}
@Override
public EntityPlayer getSPPlayer() {
return null;
}
@Override
public String translateToLocal(String s) {
return s;
}
public void updateAllPlayersSleepingFlagCoffin() {
this.playerEntities = server.playerEntities;
this.allPlayersSleepingInCoffin = !this.playerEntities.isEmpty();
Iterator iterator = this.playerEntities.iterator();
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
if (!entityplayer.isPlayerSleeping()) {
this.allPlayersSleepingInCoffin = false;
break;
}
}
}
public boolean areAllPlayersAsleepCoffin()
{
if (this.allPlayersSleepingInCoffin) //&& !this.isRemote()
{
Iterator iterator = this.playerEntities.iterator();
EntityPlayer entityplayer;
do
{
if (!iterator.hasNext())
{
return true;
}
entityplayer = (EntityPlayer)iterator.next();
}
while (VampirePlayer.get(entityplayer).isPlayerFullyAsleepCoffin());
return false;
}
else
{
return false;
}
}
public void wakeAllPlayers() {
this.allPlayersSleepingInCoffin = false;
Iterator iterator = this.playerEntities.iterator();
while (iterator.hasNext())
{
EntityPlayer entityplayer = (EntityPlayer)iterator.next();
if (VampirePlayer.get(entityplayer).sleepingCoffin)
{
entityplayer.wakeUpPlayer(false, false, true);
}
}
server.provider.resetRainAndThunder();
}
}
>>>>>>>
package de.teamlapen.vampirism.proxy;
import java.util.Iterator;
import java.util.List;
import de.teamlapen.vampirism.entity.player.VampirePlayer;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.WorldServer;
public class ServerProxy extends CommonProxy {
private boolean allPlayersSleepingInCoffin;
private List playerEntities;
private WorldServer server = MinecraftServer.getServer()
.worldServerForDimension(0);
@Override
public void registerKeyBindings() {
// Client side only
}
@Override
public void registerRenderer() {
// Client side only
}
@Override
public void registerSounds() {
// Client side only
}
@Override
public void registerSubscriptions() {
super.registerSubscriptions();
}
@Override
public EntityPlayer getSPPlayer() {
return null;
}
@Override
public String translateToLocal(String s) {
return s;
}
public void updateAllPlayersSleepingFlagCoffin() {
this.playerEntities = server.playerEntities;
this.allPlayersSleepingInCoffin = !this.playerEntities.isEmpty();
Iterator iterator = this.playerEntities.iterator();
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
if (!entityplayer.isPlayerSleeping()) {
this.allPlayersSleepingInCoffin = false;
break;
}
}
}
public boolean areAllPlayersAsleepCoffin()
{
if (this.allPlayersSleepingInCoffin) //&& !this.isRemote()
{
Iterator iterator = this.playerEntities.iterator();
EntityPlayer entityplayer;
do
{
if (!iterator.hasNext())
{
return true;
}
entityplayer = (EntityPlayer)iterator.next();
}
while (VampirePlayer.get(entityplayer).isPlayerFullyAsleepCoffin());
return false;
}
else
{
return false;
}
}
public void wakeAllPlayers() {
this.allPlayersSleepingInCoffin = false;
Iterator iterator = this.playerEntities.iterator();
while (iterator.hasNext())
{
EntityPlayer entityplayer = (EntityPlayer)iterator.next();
if (VampirePlayer.get(entityplayer).sleepingCoffin)
{
entityplayer.wakeUpPlayer(false, false, true);
}
}
server.provider.resetRainAndThunder();
}
@Override
public ResourceLocation checkVampireTexture(Entity entity, ResourceLocation loc) {
return loc;
}
} |
<<<<<<<
import org.onepf.oms.appstore.NokiaStore;
import org.onepf.oms.appstore.fortumo.FortumoStore;
=======
import org.onepf.oms.appstore.FortumoStore;
>>>>>>>
import org.onepf.oms.appstore.NokiaStore;
import org.onepf.oms.appstore.FortumoStore; |
<<<<<<<
=======
>>>>>>>
<<<<<<<
final String storeSku = i.getSku();
if (Logger.isDebuggable()) {
Logger.v(String.format("Item: %s\n Type: %s\n SKU: %s\n Price: %s\n Description: %s\n",
i.getTitle(), i.getItemType(), storeSku, i.getPrice(), i.getDescription()));
}
=======
if (isDebugLog()) Log.v(TAG, String.format("Item: %s\n Type: %s\n SKU: %s\n Price: %s\n Description: %s\n", i.getTitle(), i.getItemType(), i.getSku(), i.getPrice(), i.getDescription()));
>>>>>>>
final String storeSku = i.getSku();
if (Logger.isDebuggable()) {
Logger.v(String.format("Item: %s\n Type: %s\n SKU: %s\n Price: %s\n Description: %s\n",
i.getTitle(), i.getItemType(), storeSku, i.getPrice(), i.getDescription()));
} |
<<<<<<<
class AppstoreServiceManager {
private static final String TAG = AppstoreServiceManager.class.getSimpleName();
=======
public class AppstoreServiceManager {
private static final String TAG = "IabHelper";
>>>>>>>
public class AppstoreServiceManager {
private static final String TAG = AppstoreServiceManager.class.getSimpleName();
<<<<<<<
/**
* Lookup for requested service in store based on isInstaller()/canBeInstaller() conditions
*
* @param appstoreService - ID of service. @see {@link OpenIabHelper#SERVICE_IN_APP_BILLING}
*/
public Appstore getAppstoreForService(int appstoreService) {
//TODO: implement logic to choose app store.
String packageName = mContext.getPackageName();
if (appstoreService == OpenIabHelper.SERVICE_IN_APP_BILLING) {
=======
public Appstore getAppstoreForService(AppstoreService appstoreService) {
if (appstoreService == AppstoreService.IN_APP_BILLING) {
if (appstores.size() == 1) {
return appstores.get(0);
}
>>>>>>>
/**
* Lookup for requested service in store based on isInstaller()/canBeInstaller() conditions
*
* @param appstoreService - ID of service. @see {@link OpenIabHelper#SERVICE_IN_APP_BILLING}
*/
public Appstore getAppstoreForService(int appstoreService) {
//TODO: implement logic to choose app store.
String packageName = mContext.getPackageName();
if (appstoreService == OpenIabHelper.SERVICE_IN_APP_BILLING) {
// TODO: should be better approach to select store manually
if (appstores.size() == 1) {
return appstores.get(0);
} |
<<<<<<<
new Options.Builder()
.addStoreKeys(storeKeys)
.addPreferredStoreName(prefferedStores)
.addAvailableStores(availableStores)
.build()
=======
new Options.Builder()
.addStoreKeys(storeKeys)
.addPreferredStoreName(preferredStores)
.addAvailableStores(availableStores)
.build()
>>>>>>>
new Options.Builder()
.addStoreKeys(storeKeys)
.addPreferredStoreName(preferredStores)
.addAvailableStores(availableStores)
.build()
<<<<<<<
=======
this.notifyHandler = new Handler();
>>>>>>>
<<<<<<<
if (setupState == SETUP_DISPOSED) {
return;
}
if (isDebugLog()) Log.d(TAG, in() + " " + "fireSetupFinished() === SETUP DONE === result: " + result
+ (mAppstore != null ? ", appstore: " + mAppstore.getAppstoreName() : ""));
=======
if (setupState == SETUP_DISPOSED) {
return;
}
if (mAppstore != null) {
Logger.dWithTimeFromUp("fireSetupFinished() === SETUP DONE === result: ", result, ", appstore: ",
mAppstore.getAppstoreName());
} else {
Logger.dWithTimeFromUp("fireSetupFinished() === SETUP DONE === result: ", result);
}
>>>>>>>
if (setupState == SETUP_DISPOSED) {
return;
}
if (mAppstore != null) {
Logger.dWithTimeFromUp("fireSetupFinished() === SETUP DONE === result: ", result, ", appstore: ",
mAppstore.getAppstoreName());
} else {
Logger.dWithTimeFromUp("fireSetupFinished() === SETUP DONE === result: ", result);
} |
<<<<<<<
generatorConfig.setEncoding(encodingChoice.getValue());
=======
generatorConfig.setUseExampe(useExample.isSelected());
>>>>>>>
generatorConfig.setEncoding(encodingChoice.getValue());
generatorConfig.setUseExampe(useExample.isSelected()); |
<<<<<<<
boolean hasPk = introspectedTable.hasPrimaryKeyColumns();
JavaFormatter javaFormatter = context.getJavaFormatter();
=======
JavaFormatter javaFormatter = context.getJavaFormatter();
>>>>>>>
boolean hasPk = introspectedTable.hasPrimaryKeyColumns();
JavaFormatter javaFormatter = context.getJavaFormatter();
<<<<<<<
mapperInterface.addJavaDocLine(" * " + "@param <Model> The Model Class 这里是泛型不是Model类");
mapperInterface.addJavaDocLine(" * " + "@param <PK> The Primary Key Class 如果是无主键，则可以用Model来跳过，如果是多主键则是Key类");
mapperInterface.addJavaDocLine(" * " + "@param <E> The Example Class");
=======
mapperInterface.addJavaDocLine(" * " + "@param <Model> The Model Class");
mapperInterface.addJavaDocLine(" * " + "@param <PK> The Primary Key Class");
if (useExample) {
mapperInterface.addJavaDocLine(" * " + "@param <E> The Example Class");
}
>>>>>>>
mapperInterface.addJavaDocLine(" * " + "@param <Model> The Model Class 这里是泛型不是Model类");
mapperInterface.addJavaDocLine(" * " + "@param <PK> The Primary Key Class 如果是无主键，则可以用Model来跳过，如果是多主键则是Key类");
if (useExample) {
mapperInterface.addJavaDocLine(" * " + "@param <E> The Example Class");
} |
<<<<<<<
/**
* Set whether when going backwards should clear the error state from the Tab. Default is false
* @param mShowErrorStateOnBack
*/
public void setShowErrorStateOnBack(boolean mShowErrorStateOnBack) {
this.mShowErrorStateOnBack = mShowErrorStateOnBack;
}
public void setErrorStep(int stepPosition, boolean hasError){
if(mStepTitles.size() < stepPosition)
return;
StepTab childTab = (StepTab) mTabsInnerContainer.getChildAt(stepPosition);
childTab.updateErrorState(hasError);
}
private View createStepTab(final int position, @StringRes int title) {
=======
private View createStepTab(final int position, @Nullable CharSequence title) {
>>>>>>>
/**
* Set whether when going backwards should clear the error state from the Tab. Default is false
* @param mShowErrorStateOnBack
*/
public void setShowErrorStateOnBack(boolean mShowErrorStateOnBack) {
this.mShowErrorStateOnBack = mShowErrorStateOnBack;
}
public void setErrorStep(int stepPosition, boolean hasError){
if(mStepTitles.size() < stepPosition)
return;
StepTab childTab = (StepTab) mTabsInnerContainer.getChildAt(stepPosition);
childTab.updateErrorState(hasError);
}
private View createStepTab(final int position, @Nullable CharSequence title) { |
<<<<<<<
import ca.mcgill.cs.stg.jetuml.graph.ObjectNode;
import ca.mcgill.cs.stg.jetuml.graph.PackageNode;
=======
import ca.mcgill.cs.stg.jetuml.graph.ParentNode;
>>>>>>>
import ca.mcgill.cs.stg.jetuml.graph.ObjectNode;
import ca.mcgill.cs.stg.jetuml.graph.PackageNode;
import ca.mcgill.cs.stg.jetuml.graph.ParentNode; |
<<<<<<<
=======
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
>>>>>>>
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
<<<<<<<
=======
import javax.swing.JLabel;
>>>>>>>
import javax.swing.JLabel; |
<<<<<<<
import io.palaima.debugdrawer.module.DrawerModule;
=======
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import io.palaima.debugdrawer.base.DebugModule;
>>>>>>>
import io.palaima.debugdrawer.base.DebugModule;
<<<<<<<
=======
private final List<DebugModule> mDrawerItems;
>>>>>>>
<<<<<<<
mDebugView.onStart();
=======
for (DebugModule drawerItem : mDrawerItems) {
drawerItem.onStart();
}
>>>>>>>
mDebugView.onStart();
<<<<<<<
mDebugView.onStop();
=======
for (DebugModule drawerItem : mDrawerItems) {
drawerItem.onStop();
}
>>>>>>>
mDebugView.onStop();
<<<<<<<
private DrawerModule[] mDrawerItems;
=======
private List<DebugModule> mDrawerItems;
>>>>>>>
private DebugModule[] mDrawerItems;
<<<<<<<
public Builder modules(DrawerModule... drawerItems) {
mDrawerItems = drawerItems;
=======
public Builder modules(DebugModule... drawerItems) {
if (this.mDrawerItems == null) {
this.mDrawerItems = new ArrayList<>();
}
if (drawerItems != null) {
Collections.addAll(this.mDrawerItems, drawerItems);
}
>>>>>>>
public Builder modules(DebugModule... drawerItems) {
mDrawerItems = drawerItems;
<<<<<<<
if (mDrawerItems != null && !(mDrawerItems.length == 0)) {
for (DrawerModule drawerItem : mDrawerItems) {
=======
if (mDrawerItems != null && !mDrawerItems.isEmpty()) {
for (DebugModule drawerItem : mDrawerItems) {
>>>>>>>
if (mDrawerItems != null && mDrawerItems.length != 0) {
for (DebugModule drawerItem : mDrawerItems) {
<<<<<<<
if (mDrawerItems != null && !(mDrawerItems.length == 0)) {
for (DrawerModule drawerItem : mDrawerItems) {
=======
if (mDrawerItems != null && !mDrawerItems.isEmpty()) {
for (DebugModule drawerItem : mDrawerItems) {
>>>>>>>
if (mDrawerItems != null && mDrawerItems.length != 0) {
for (DebugModule drawerItem : mDrawerItems) {
<<<<<<<
mDebugView.initModules(mDrawerItems);
=======
LayoutInflater inflater = LayoutInflater.from(mActivity);
if (mDrawerItems != null && !mDrawerItems.isEmpty()) {
DebugModule drawerItem;
for (int i = 0; i < mDrawerItems.size(); i++) {
drawerItem = mDrawerItems.get(i);
mContainer.addView(drawerItem.onCreateView(inflater, mContainer), i);
}
}
mDrawerLayout.addView(mSliderLayout, 1);
>>>>>>>
mDebugView.modules(mDrawerItems); |
<<<<<<<
import java.util.concurrent.ConcurrentHashMap;
=======
import edu.stanford.nlp.math.ArrayMath;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
>>>>>>>
import java.util.concurrent.ConcurrentHashMap;
import edu.stanford.nlp.math.ArrayMath; |
<<<<<<<
alignmentWriter.printf("%d %s %s%n", sourceInputId, FlatNBestList.FIELD_DELIM,
translation.alignmentString());
=======
alignmentWriter.printf("%d %s %s%n", sourceInputId, FlatPhraseTable.FIELD_DELIM,
translation.sourceTargetAlignmentString());
>>>>>>>
alignmentWriter.printf("%d %s %s%n", sourceInputId, FlatPhraseTable.FIELD_DELIM,
translation.alignmentString()); |
<<<<<<<
* Return true of the feature is cacheable and false otherwise.
*/
public static <T> boolean isCacheable(FeatureValue<T> feature) {
return feature instanceof CacheableFeatureValue;
}
/**
* Convert a collection of feature values to a counter.
=======
>>>>>>>
* Convert a collection of feature values to a counter. |
<<<<<<<
++numPoppedItems;
=======
++numPoppedItems;
seenCompatiblePrefix = seenCompatiblePrefix || item.derivation.length >= targets.get(0).size();
>>>>>>>
++numPoppedItems;
<<<<<<<
=======
>>>>>>> |
<<<<<<<
// TM (phrase table) query for applicable rules
if (DEBUG) System.err.println("Generating Translation Options");
List<ConcreteTranslationOption<TK,FV>> options = phraseGenerator
.translationOptions(source, targets, sourceInputId, scorer);
=======
// retrieve translation options
if (DEBUG)
System.err.println("Generating Translation Options");
List<ConcreteRule<TK,FV>> options = phraseGenerator
.getRules(source, targets, sourceInputId, scorer);
>>>>>>>
// TM (phrase table) query for applicable rules
if (DEBUG) System.err.println("Generating Translation Options");
List<ConcreteRule<TK,FV>> options = phraseGenerator
.getRules(source, targets, sourceInputId, scorer);
<<<<<<<
// Generate null/start hypothesis
List<List<ConcreteTranslationOption<TK,FV>>> allOptions = new ArrayList<List<ConcreteTranslationOption<TK,FV>>>();
=======
// insert initial hypothesis
List<List<ConcreteRule<TK,FV>>> allOptions = new ArrayList<List<ConcreteRule<TK,FV>>>();
>>>>>>>
// Generate null/start hypothesis
List<List<ConcreteRule<TK,FV>>> allOptions = new ArrayList<List<ConcreteRule<TK,FV>>>();
<<<<<<<
Hypothesis<TK, FV> bestHyp = beams[i].iterator().next();
System.err.printf("Annotator output for best hypothesis (%d vs %d)%n",
bestHyp.annotators.size(), annotators.size());
=======
Derivation<TK, FV> bestHyp = beams[i].iterator().next();
System.err.printf("Annotator output for best hypothesis (%d vs %d)\n", bestHyp.annotators.size(), annotators.size());
>>>>>>>
Derivation<TK, FV> bestHyp = beams[i].iterator().next();
System.err.printf("Annotator output for best hypothesis (%d vs %d)\n", bestHyp.annotators.size(), annotators.size());
<<<<<<<
/**
* Sloppy beam search from Pharoah / early version of Moses. This algorithm
* creates many hypotheses that will eventually be discarded.
*
* @param beams
* @param beamId
* @param sourceSz
* @param optionGrid
* @param constrainedOutputSpace
* @param sourceInputId
* @return number of generated hypotheses
*/
private int expandBeam(Beam<Hypothesis<TK, FV>>[] beams, int beamId,
=======
private int expandBeam(Beam<Derivation<TK, FV>>[] beams, int beamId,
>>>>>>>
/**
* Sloppy beam search from Pharoah / early version of Moses. This algorithm
* creates many hypotheses that will eventually be discarded.
*
* @param beams
* @param beamId
* @param sourceSz
* @param optionGrid
* @param constrainedOutputSpace
* @param sourceInputId
* @return number of generated hypotheses
*/
private int expandBeam(Beam<Derivation<TK, FV>>[] beams, int beamId,
<<<<<<<
// Try to expand each hypothesis
for (Hypothesis<TK, FV> hyp : beams[beamId]) {
=======
for (Derivation<TK, FV> hyp : beams[beamId]) {
>>>>>>>
for (Derivation<TK, FV> hyp : beams[beamId]) {
<<<<<<<
// Create new hypothesis by extending current hypothesis with
// the current rule.
Hypothesis<TK, FV> newHyp = new Hypothesis<TK, FV>(sourceInputId,
=======
/*
* if (option.abstractOption.phraseScoreNames[0] ==
* UnknownWordFeaturizer.UNKNOWN_PHRASE_TAG && hypNextForeignPos
* != startPos) { continue; // lets not allow untranslated foreign
* phrases to float around randomly }
*/
Derivation<TK, FV> newHyp = new Derivation<TK, FV>(sourceInputId,
>>>>>>>
Derivation<TK, FV> newHyp = new Derivation<TK, FV>(sourceInputId,
<<<<<<<
=======
void writeAlignments(BufferedWriter alignmentDump, Derivation<TK, FV> bestHyp)
throws IOException {
if (alignmentDump == null)
return;
alignmentDump.append(bestHyp.featurizable.targetPrefix.toString())
.append("\n");
alignmentDump.append(bestHyp.featurizable.sourceSentence.toString())
.append("\n");
for (Derivation<TK, FV> hyp = bestHyp; hyp.featurizable != null; hyp = hyp.preceedingDerivation) {
alignmentDump.append(String.format("%d:%d => %d:%d # %s => %s\n",
hyp.featurizable.sourcePosition, hyp.featurizable.sourcePosition
+ hyp.featurizable.sourcePhrase.size() - 1,
hyp.featurizable.targetPosition,
hyp.featurizable.targetPosition
+ hyp.featurizable.targetPhrase.size() - 1,
hyp.featurizable.sourcePhrase, hyp.featurizable.targetPhrase));
}
alignmentDump.append("\n");
}
>>>>>>> |
<<<<<<<
if (!initialized) {
mainWatch.watchDirectoryPath(soundFilePath);
}
=======
if (!soundFilePath.toFile().exists()) {
System.out.println("creating directory: " + soundFilePath.toFile().toString());
boolean result = false;
try{
soundFilePath.toFile().mkdir();
result = true;
}
catch(SecurityException se){
LOG.fatal("Could not create directory: " + soundFilePath.toFile().toString());
}
if(result) {
LOG.info("DIR: " + soundFilePath.toFile().toString() + " created.");
}
}
mainWatch.watchDirectoryPath(soundFilePath);
>>>>>>>
if (!initialized) {
mainWatch.watchDirectoryPath(soundFilePath);
}
if (!soundFilePath.toFile().exists()) {
System.out.println("creating directory: " + soundFilePath.toFile().toString());
boolean result = false;
try{
soundFilePath.toFile().mkdir();
result = true;
}
catch(SecurityException se){
LOG.fatal("Could not create directory: " + soundFilePath.toFile().toString());
}
if(result) {
LOG.info("DIR: " + soundFilePath.toFile().toString() + " created.");
}
}
mainWatch.watchDirectoryPath(soundFilePath); |
<<<<<<<
switch (type) {
case PHAROAH_PHRASE_TABLE:
case PHAROAH_PHRASE_TABLE_ALT:
phraseTables.add((new FlatPhraseTable<FV>(filename)));
break;
case DTU_GENERATOR:
phraseTables.add(new DTUTable<FV>(filename));
break;
default:
throw new RuntimeException(String.format(
"Unknown phrase table type: '%s'\n", type));
=======
if (type.equals(PHAROAH_PHRASE_TABLE)
|| type.equals(PHAROAH_PHRASE_TABLE_ALT)) {
PhraseGenerator<IString,FV> pt = new FlatPhraseTable<FV>(filename);
generators.add(pt);
tables.add((PhraseTable<IString>) pt);
} else if (type.equals(DTU_GENERATOR)) {
PhraseGenerator<IString,FV> pt = new DTUTable<FV>(filename);
generators.add(pt);
tables.add((PhraseTable<IString>) pt);
} else {
throw new RuntimeException(String.format(
"Unknown phrase table type: '%s'\n", type));
>>>>>>>
switch (type) {
case PHAROAH_PHRASE_TABLE:
case PHAROAH_PHRASE_TABLE_ALT:
PhraseGenerator<IString,FV> pt = new FlatPhraseTable<FV>(filename);
generators.add(pt);
tables.add((PhraseTable<IString>) pt);
break;
case DTU_GENERATOR:
pt = new DTUTable<FV>(filename);
generators.add(pt);
tables.add((PhraseTable<IString>) pt);
break;
default:
throw new RuntimeException(String.format(
"Unknown phrase table type: '%s'\n", type)); |
<<<<<<<
import java.util.Map;
import java.util.PriorityQueue;
=======
>>>>>>>
import java.util.PriorityQueue; |
<<<<<<<
String sessionClustered = $(ejbRef).child("clustered").content();
sessionClustered = StringUtils.trim(sessionClustered);
=======
//transaction timeout
Map<String, Integer> txTimeouts = parseTxTimeout(ejbRef, ejbName);
>>>>>>>
String sessionClustered = $(ejbRef).child("clustered").content();
sessionClustered = StringUtils.trim(sessionClustered);
//transaction timeout
Map<String, Integer> txTimeouts = parseTxTimeout(ejbRef, ejbName);
<<<<<<<
if(StringUtils.equalsIgnoreCase("true", sessionClustered)) {
ejb.setClustered(true);
}
=======
ejb.setTxTimeouts(txTimeouts);
>>>>>>>
if(StringUtils.equalsIgnoreCase("true", sessionClustered)) {
ejb.setClustered(true);
}
ejb.setTxTimeouts(txTimeouts); |
<<<<<<<
/**
* Creates a new Call
* @param newCall the Call to create
* @return the newly created object
*/
public Call post(final Call newCall) throws ClientException {
=======
@Nonnull
public Call post(@Nonnull final Call newCall) throws ClientException {
>>>>>>>
/**
* Creates a new Call
* @param newCall the Call to create
* @return the newly created object
*/
@Nonnull
public Call post(@Nonnull final Call newCall) throws ClientException {
<<<<<<<
public CallCollectionRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public CallCollectionRequest expand(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
return (CallCollectionRequest)this;
>>>>>>>
@Nonnull
public CallCollectionRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public CallCollectionRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public CallCollectionRequest filter(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
return (CallCollectionRequest)this;
>>>>>>>
@Nonnull
public CallCollectionRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public CallCollectionRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public CallCollectionRequest orderBy(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (CallCollectionRequest)this;
>>>>>>>
@Nonnull
public CallCollectionRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this;
<<<<<<<
public CallCollectionRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public CallCollectionRequest select(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
return (CallCollectionRequest)this;
>>>>>>>
@Nonnull
public CallCollectionRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public CallCollectionRequest skipToken(final String skipToken) {
addSkipTokenOption(skipToken);
return this;
=======
@Nonnull
public CallCollectionRequest skipToken(@Nonnull final String skipToken) {
addQueryOption(new QueryOption("$skiptoken", skipToken));
return (CallCollectionRequest)this;
}
@Nonnull
public CallCollectionPage buildFromResponse(@Nonnull final CallCollectionResponse response) {
final CallCollectionRequestBuilder builder;
if (response.nextLink != null) {
builder = new CallCollectionRequestBuilder(response.nextLink, getBaseRequest().getClient(), /* options */ null);
} else {
builder = null;
}
final CallCollectionPage page = new CallCollectionPage(response, builder);
page.setRawObject(response.getSerializer(), response.getRawObject());
return page;
>>>>>>>
@Nonnull
public CallCollectionRequest skipToken(@Nonnull final String skipToken) {
addSkipTokenOption(skipToken);
return this; |
<<<<<<<
public CallRecordItemRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public CallRecordItemRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (CallRecordItemRequest)this;
>>>>>>>
@Nonnull
public CallRecordItemRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public CallRecordItemRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public CallRecordItemRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (CallRecordItemRequest)this;
>>>>>>>
@Nonnull
public CallRecordItemRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public CallRecordItemRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public CallRecordItemRequest filter(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$filter", value));
return (CallRecordItemRequest)this;
>>>>>>>
@Nonnull
public CallRecordItemRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public CallRecordItemRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public CallRecordItemRequest orderBy(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (CallRecordItemRequest)this;
>>>>>>>
@Nonnull
public CallRecordItemRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this; |
<<<<<<<
public TimeOffRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public TimeOffRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (TimeOffRequest)this;
>>>>>>>
@Nonnull
public TimeOffRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public TimeOffRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public TimeOffRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (TimeOffRequest)this;
>>>>>>>
@Nonnull
public TimeOffRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
public DirectoryObjectCollectionWithReferencesRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, DirectoryObjectReferenceRequestBuilder.class, DirectoryObjectCollectionReferenceRequest.class, DirectoryObjectCollectionReferenceRequestBuilder.class);
=======
public DirectoryObjectCollectionWithReferencesRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions);
}
/**
* Creates the request
*
* @param requestOptions the options for this request
* @return the IUserRequest instance
*/
@Nonnull
public DirectoryObjectCollectionWithReferencesRequest buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
return buildRequest(getOptions(requestOptions));
}
/**
* Creates the request
*
* @param requestOptions the options for this request
* @return the IUserRequest instance
*/
@Nonnull
public DirectoryObjectCollectionWithReferencesRequest buildRequest(@Nonnull final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
return new DirectoryObjectCollectionWithReferencesRequest(getRequestUrl(), getClient(), requestOptions);
}
@Nonnull
public DirectoryObjectWithReferenceRequestBuilder byId(@Nonnull final String id) {
return new DirectoryObjectWithReferenceRequestBuilder(getRequestUrlWithAdditionalSegment(id), getClient(), getOptions());
}
@Nonnull
public DirectoryObjectCollectionReferenceRequestBuilder references(){
return new DirectoryObjectCollectionReferenceRequestBuilder(getRequestUrl() + "/$ref", getClient(), getOptions());
>>>>>>>
public DirectoryObjectCollectionWithReferencesRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, DirectoryObjectReferenceRequestBuilder.class, DirectoryObjectCollectionReferenceRequest.class, DirectoryObjectCollectionReferenceRequestBuilder.class); |
<<<<<<<
/**
* Creates a new TimeOffRequest
* @param newTimeOffRequest the TimeOffRequest to create
* @return the newly created object
*/
public TimeOffRequest post(final TimeOffRequest newTimeOffRequest) throws ClientException {
=======
@Nonnull
public TimeOffRequest post(@Nonnull final TimeOffRequest newTimeOffRequest) throws ClientException {
>>>>>>>
/**
* Creates a new TimeOffRequest
* @param newTimeOffRequest the TimeOffRequest to create
* @return the newly created object
*/
@Nonnull
public TimeOffRequest post(@Nonnull final TimeOffRequest newTimeOffRequest) throws ClientException {
<<<<<<<
public TimeOffRequestCollectionRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public TimeOffRequestCollectionRequest expand(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
return (TimeOffRequestCollectionRequest)this;
>>>>>>>
@Nonnull
public TimeOffRequestCollectionRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public TimeOffRequestCollectionRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public TimeOffRequestCollectionRequest filter(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
return (TimeOffRequestCollectionRequest)this;
>>>>>>>
@Nonnull
public TimeOffRequestCollectionRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public TimeOffRequestCollectionRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public TimeOffRequestCollectionRequest orderBy(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (TimeOffRequestCollectionRequest)this;
>>>>>>>
@Nonnull
public TimeOffRequestCollectionRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this;
<<<<<<<
public TimeOffRequestCollectionRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public TimeOffRequestCollectionRequest select(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
return (TimeOffRequestCollectionRequest)this;
>>>>>>>
@Nonnull
public TimeOffRequestCollectionRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public TimeOffRequestCollectionRequest skipToken(final String skipToken) {
addSkipTokenOption(skipToken);
return this;
=======
@Nonnull
public TimeOffRequestCollectionRequest skipToken(@Nonnull final String skipToken) {
addQueryOption(new QueryOption("$skiptoken", skipToken));
return (TimeOffRequestCollectionRequest)this;
}
@Nonnull
public TimeOffRequestCollectionPage buildFromResponse(@Nonnull final TimeOffRequestCollectionResponse response) {
final TimeOffRequestCollectionRequestBuilder builder;
if (response.nextLink != null) {
builder = new TimeOffRequestCollectionRequestBuilder(response.nextLink, getBaseRequest().getClient(), /* options */ null);
} else {
builder = null;
}
final TimeOffRequestCollectionPage page = new TimeOffRequestCollectionPage(response, builder);
page.setRawObject(response.getSerializer(), response.getRawObject());
return page;
>>>>>>>
@Nonnull
public TimeOffRequestCollectionRequest skipToken(@Nonnull final String skipToken) {
addSkipTokenOption(skipToken);
return this; |
<<<<<<<
/**
* Creates a new TimeOff
* @param newTimeOff the TimeOff to create
* @return the newly created object
*/
public TimeOff post(final TimeOff newTimeOff) throws ClientException {
=======
@Nonnull
public TimeOff post(@Nonnull final TimeOff newTimeOff) throws ClientException {
>>>>>>>
/**
* Creates a new TimeOff
* @param newTimeOff the TimeOff to create
* @return the newly created object
*/
@Nonnull
public TimeOff post(@Nonnull final TimeOff newTimeOff) throws ClientException {
<<<<<<<
public TimeOffCollectionRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public TimeOffCollectionRequest expand(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
return (TimeOffCollectionRequest)this;
>>>>>>>
@Nonnull
public TimeOffCollectionRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public TimeOffCollectionRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public TimeOffCollectionRequest filter(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
return (TimeOffCollectionRequest)this;
>>>>>>>
@Nonnull
public TimeOffCollectionRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public TimeOffCollectionRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public TimeOffCollectionRequest orderBy(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (TimeOffCollectionRequest)this;
>>>>>>>
@Nonnull
public TimeOffCollectionRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this;
<<<<<<<
public TimeOffCollectionRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public TimeOffCollectionRequest select(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
return (TimeOffCollectionRequest)this;
>>>>>>>
@Nonnull
public TimeOffCollectionRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public TimeOffCollectionRequest skipToken(final String skipToken) {
addSkipTokenOption(skipToken);
return this;
=======
@Nonnull
public TimeOffCollectionRequest skipToken(@Nonnull final String skipToken) {
addQueryOption(new QueryOption("$skiptoken", skipToken));
return (TimeOffCollectionRequest)this;
}
@Nonnull
public TimeOffCollectionPage buildFromResponse(@Nonnull final TimeOffCollectionResponse response) {
final TimeOffCollectionRequestBuilder builder;
if (response.nextLink != null) {
builder = new TimeOffCollectionRequestBuilder(response.nextLink, getBaseRequest().getClient(), /* options */ null);
} else {
builder = null;
}
final TimeOffCollectionPage page = new TimeOffCollectionPage(response, builder);
page.setRawObject(response.getSerializer(), response.getRawObject());
return page;
>>>>>>>
@Nonnull
public TimeOffCollectionRequest skipToken(@Nonnull final String skipToken) {
addSkipTokenOption(skipToken);
return this; |
<<<<<<<
public GroupRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public GroupRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (GroupRequest)this;
>>>>>>>
@Nonnull
public GroupRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public GroupRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public GroupRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (GroupRequest)this;
>>>>>>>
@Nonnull
public GroupRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
=======
public void post(@Nonnull final Session newSession, @Nullable final IJsonBackedObject payload, @Nonnull final ICallback<? super Session> callback) {
send(HttpMethod.POST, callback, payload);
}
@Nullable
public Session post(@Nonnull final Session newSession, @Nullable final IJsonBackedObject payload) throws ClientException {
IJsonBackedObject response = send(HttpMethod.POST, payload);
if (response != null){
return newSession;
}
return null;
}
public void get(@Nonnull final ICallback<? super Session> callback) {
send(HttpMethod.GET, callback, null);
}
@Nullable
public Session get() throws ClientException {
return send(HttpMethod.GET, null);
}
public void delete(@Nonnull final ICallback<? super Session> callback) {
send(HttpMethod.DELETE, callback, null);
}
public void delete() throws ClientException {
send(HttpMethod.DELETE, null);
}
public void patch(@Nonnull final Session sourceSession, @Nonnull final ICallback<? super Session> callback) {
send(HttpMethod.PATCH, callback, sourceSession);
}
@Nullable
public Session patch(@Nonnull final Session sourceSession) throws ClientException {
return send(HttpMethod.PATCH, sourceSession);
}
>>>>>>>
<<<<<<<
public SessionWithReferenceRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public SessionWithReferenceRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (SessionWithReferenceRequest)this;
>>>>>>>
@Nonnull
public SessionWithReferenceRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public SessionWithReferenceRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public SessionWithReferenceRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (SessionWithReferenceRequest)this;
>>>>>>>
@Nonnull
public SessionWithReferenceRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
=======
import java.lang.ref.WeakReference;
import java.util.concurrent.TimeUnit;
>>>>>>>
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
<<<<<<<
resultRef.set(weakProperty.addChangeListener(listenerCallCount::incrementAndGet));
=======
Runnable listener = new Runnable() {
@Override
public void run() {
listenerCallCount.incrementAndGet();
}
};
WeakReference<?> testRef = new WeakReference<>(listener);
resultRef.set(weakProperty.addChangeListener(listener));
return testRef;
>>>>>>>
Runnable listener = listenerCallCount::incrementAndGet;
WeakReference<?> testRef = new WeakReference<>(listener);
resultRef.set(weakProperty.addChangeListener(listener));
return testRef;
<<<<<<<
for (int i = 0; i < 50; i++) {
runGC();
if (property.tryWaitForNoListeners(100)) {
break;
}
}
=======
runGC(testRef);
>>>>>>>
runGC(testRef); |
<<<<<<<
/**
* Gets a request builder for the Call collection
*
* @return the collection request builder
*/
=======
@Nonnull
>>>>>>>
/**
* Gets a request builder for the Call collection
*
* @return the collection request builder
*/
@Nonnull
<<<<<<<
/**
* Gets a request builder for the Call item
*
* @return the request builder
* @param id the item identifier
*/
public CallRequestBuilder calls(final String id) {
=======
@Nonnull
public CallRequestBuilder calls(@Nonnull final String id) {
>>>>>>>
/**
* Gets a request builder for the Call item
*
* @return the request builder
* @param id the item identifier
*/
@Nonnull
public CallRequestBuilder calls(@Nonnull final String id) {
<<<<<<<
/**
* Gets a request builder for the CallRecord collection
*
* @return the collection request builder
*/
=======
@Nonnull
>>>>>>>
/**
* Gets a request builder for the CallRecord collection
*
* @return the collection request builder
*/
@Nonnull
<<<<<<<
/**
* Gets a request builder for the CallRecord item
*
* @return the request builder
* @param id the item identifier
*/
public CallRecordRequestBuilder callRecords(final String id) {
=======
@Nonnull
public CallRecordRequestBuilder callRecords(@Nonnull final String id) {
>>>>>>>
/**
* Gets a request builder for the CallRecord item
*
* @return the request builder
* @param id the item identifier
*/
@Nonnull
public CallRecordRequestBuilder callRecords(@Nonnull final String id) { |
<<<<<<<
/**
* Gets a request builder for the Session collection
*
* @return the collection request builder
*/
=======
@Nonnull
>>>>>>>
/**
* Gets a request builder for the Session collection
*
* @return the collection request builder
*/
@Nonnull
<<<<<<<
/**
* Gets a request builder for the Session item
*
* @return the request builder
* @param id the item identifier
*/
public SessionRequestBuilder sessions(final String id) {
=======
@Nonnull
public SessionRequestBuilder sessions(@Nonnull final String id) {
>>>>>>>
/**
* Gets a request builder for the Session item
*
* @return the request builder
* @param id the item identifier
*/
@Nonnull
public SessionRequestBuilder sessions(@Nonnull final String id) {
<<<<<<<
/**
* Gets a request builder for the EntityType2 collection
*
* @return the collection request builder
*/
=======
@Nonnull
>>>>>>>
/**
* Gets a request builder for the EntityType2 collection
*
* @return the collection request builder
*/
@Nonnull
<<<<<<<
/**
* Gets a request builder for the EntityType2 item
*
* @return the request builder
* @param id the item identifier
*/
public EntityType2RequestBuilder recipients(final String id) {
=======
@Nonnull
public EntityType2RequestBuilder recipients(@Nonnull final String id) {
>>>>>>>
/**
* Gets a request builder for the EntityType2 item
*
* @return the request builder
* @param id the item identifier
*/
@Nonnull
public EntityType2RequestBuilder recipients(@Nonnull final String id) { |
<<<<<<<
=======
public void post(@Nonnull final EntityType3 newEntityType3, @Nullable final IJsonBackedObject payload, @Nonnull final ICallback<? super EntityType3> callback) {
send(HttpMethod.POST, callback, payload);
}
@Nullable
public EntityType3 post(@Nonnull final EntityType3 newEntityType3, @Nullable final IJsonBackedObject payload) throws ClientException {
IJsonBackedObject response = send(HttpMethod.POST, payload);
if (response != null){
return newEntityType3;
}
return null;
}
public void get(@Nonnull final ICallback<? super EntityType3> callback) {
send(HttpMethod.GET, callback, null);
}
@Nullable
public EntityType3 get() throws ClientException {
return send(HttpMethod.GET, null);
}
public void delete(@Nonnull final ICallback<? super EntityType3> callback) {
send(HttpMethod.DELETE, callback, null);
}
public void delete() throws ClientException {
send(HttpMethod.DELETE, null);
}
public void patch(@Nonnull final EntityType3 sourceEntityType3, @Nonnull final ICallback<? super EntityType3> callback) {
send(HttpMethod.PATCH, callback, sourceEntityType3);
}
@Nullable
public EntityType3 patch(@Nonnull final EntityType3 sourceEntityType3) throws ClientException {
return send(HttpMethod.PATCH, sourceEntityType3);
}
>>>>>>>
<<<<<<<
public EntityType3WithReferenceRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public EntityType3WithReferenceRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (EntityType3WithReferenceRequest)this;
>>>>>>>
@Nonnull
public EntityType3WithReferenceRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public EntityType3WithReferenceRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public EntityType3WithReferenceRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (EntityType3WithReferenceRequest)this;
>>>>>>>
@Nonnull
public EntityType3WithReferenceRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
=======
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
>>>>>>>
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
<<<<<<<
public ListenerRef addChangeListener(final Runnable listener) {
ExceptionHelper.checkNotNullArgument(listener, "listener");
final Preferences preferences = getPreferences();
final PreferenceChangeListener changeListener = new PreferenceChangeListener() {
@Override
public void preferenceChange(PreferenceChangeEvent evt) {
if (GlobalProperty.this.settingsName.equals(evt.getKey())) {
listener.run();
}
=======
public void addChangeListener(ChangeListener listener) {
changesLock.lock();
try {
boolean hasListeners = changes.hasListeners();
changes.addChangeListener(listener);
if (!hasListeners) {
PREFERENCE.addPreferenceChangeListener(changeForwarder);
>>>>>>>
public ListenerRef addChangeListener(final Runnable listener) {
ExceptionHelper.checkNotNullArgument(listener, "listener");
final PreferenceChangeListener changeListener = new PreferenceChangeListener() {
@Override
public void preferenceChange(PreferenceChangeEvent evt) {
if (GlobalProperty.this.settingsName.equals(evt.getKey())) {
listener.run();
}
<<<<<<<
return NbListenerRefs.fromRunnable(new Runnable() {
@Override
public void run() {
preferences.removePreferenceChangeListener(changeListener);
=======
@Override
public void removeChangeListener(ChangeListener listener) {
changesLock.lock();
try {
changes.removeChangeListener(listener);
boolean hasListeners = changes.hasListeners();
if (!hasListeners) {
PREFERENCE.removePreferenceChangeListener(changeForwarder);
>>>>>>>
return NbListenerRefs.fromRunnable(new Runnable() {
@Override
public void run() {
PREFERENCE.removePreferenceChangeListener(changeListener); |
<<<<<<<
=======
@Nonnull
public GroupCollectionWithReferencesPage buildFromResponse(@Nonnull final GroupCollectionResponse response) {
final GroupCollectionWithReferencesRequestBuilder builder;
if (response.nextLink != null) {
builder = new GroupCollectionWithReferencesRequestBuilder(response.nextLink, getBaseRequest().getClient(), /* options */ null);
} else {
builder = null;
}
final GroupCollectionWithReferencesPage page = new GroupCollectionWithReferencesPage(response, builder);
page.setRawObject(response.getSerializer(), response.getRawObject());
return page;
}
>>>>>>> |
<<<<<<<
public CallRecordCollectionRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, CallRecordRequestBuilder.class, CallRecordCollectionRequest.class);
=======
public CallRecordCollectionRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions);
>>>>>>>
public CallRecordCollectionRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, CallRecordRequestBuilder.class, CallRecordCollectionRequest.class);
<<<<<<<
=======
/**
* Creates the request
*
* @param requestOptions the options for this request
* @return the IUserRequest instance
*/
@Nonnull
public CallRecordCollectionRequest buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
return buildRequest(getOptions(requestOptions));
}
>>>>>>>
<<<<<<<
public CallRecordItemRequestBuilder item(final String name) {
=======
@Nonnull
public CallRecordCollectionRequest buildRequest(@Nonnull final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
return new CallRecordCollectionRequest(getRequestUrl(), getClient(), requestOptions);
}
@Nonnull
public CallRecordRequestBuilder byId(@Nonnull final String id) {
return new CallRecordRequestBuilder(getRequestUrlWithAdditionalSegment(id), getClient(), getOptions());
}
@Nonnull
public CallRecordItemRequestBuilder item(@Nullable final String name) {
>>>>>>>
@Nonnull
public CallRecordItemRequestBuilder item(@Nullable final String name) { |
<<<<<<<
/**
* Creates a new EntityType3
* @param newEntityType3 the EntityType3 to create
* @return the newly created object
*/
public EntityType3 post(final EntityType3 newEntityType3) throws ClientException {
=======
@Nonnull
public EntityType3 post(@Nonnull final EntityType3 newEntityType3) throws ClientException {
>>>>>>>
/**
* Creates a new EntityType3
* @param newEntityType3 the EntityType3 to create
* @return the newly created object
*/
@Nonnull
public EntityType3 post(@Nonnull final EntityType3 newEntityType3) throws ClientException {
<<<<<<<
public EntityType3CollectionReferenceRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public EntityType3CollectionReferenceRequest expand(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
return (EntityType3CollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public EntityType3CollectionReferenceRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public EntityType3CollectionReferenceRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public EntityType3CollectionReferenceRequest filter(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
return (EntityType3CollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public EntityType3CollectionReferenceRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public EntityType3CollectionReferenceRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public EntityType3CollectionReferenceRequest orderBy(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (EntityType3CollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public EntityType3CollectionReferenceRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this;
<<<<<<<
public EntityType3CollectionReferenceRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public EntityType3CollectionReferenceRequest select(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
return (EntityType3CollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public EntityType3CollectionReferenceRequest select(@Nonnull final String value) {
addSelectOption(value);
return this; |
<<<<<<<
/**
* Creates a new CallRecord
* @param newCallRecord the CallRecord to create
* @return the newly created object
*/
public CallRecord post(final CallRecord newCallRecord) throws ClientException {
=======
@Nonnull
public CallRecord post(@Nonnull final CallRecord newCallRecord) throws ClientException {
>>>>>>>
/**
* Creates a new CallRecord
* @param newCallRecord the CallRecord to create
* @return the newly created object
*/
@Nonnull
public CallRecord post(@Nonnull final CallRecord newCallRecord) throws ClientException {
<<<<<<<
public CallRecordCollectionRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public CallRecordCollectionRequest expand(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
return (CallRecordCollectionRequest)this;
>>>>>>>
@Nonnull
public CallRecordCollectionRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public CallRecordCollectionRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public CallRecordCollectionRequest filter(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
return (CallRecordCollectionRequest)this;
>>>>>>>
@Nonnull
public CallRecordCollectionRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public CallRecordCollectionRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public CallRecordCollectionRequest orderBy(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (CallRecordCollectionRequest)this;
>>>>>>>
@Nonnull
public CallRecordCollectionRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this;
<<<<<<<
public CallRecordCollectionRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public CallRecordCollectionRequest select(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
return (CallRecordCollectionRequest)this;
>>>>>>>
@Nonnull
public CallRecordCollectionRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public CallRecordCollectionRequest skipToken(final String skipToken) {
addSkipTokenOption(skipToken);
return this;
=======
@Nonnull
public CallRecordCollectionRequest skipToken(@Nonnull final String skipToken) {
addQueryOption(new QueryOption("$skiptoken", skipToken));
return (CallRecordCollectionRequest)this;
}
@Nonnull
public CallRecordCollectionPage buildFromResponse(@Nonnull final CallRecordCollectionResponse response) {
final CallRecordCollectionRequestBuilder builder;
if (response.nextLink != null) {
builder = new CallRecordCollectionRequestBuilder(response.nextLink, getBaseRequest().getClient(), /* options */ null);
} else {
builder = null;
}
final CallRecordCollectionPage page = new CallRecordCollectionPage(response, builder);
page.setRawObject(response.getSerializer(), response.getRawObject());
return page;
>>>>>>>
@Nonnull
public CallRecordCollectionRequest skipToken(@Nonnull final String skipToken) {
addSkipTokenOption(skipToken);
return this; |
<<<<<<<
/**
* Gets a request builder for the Segment collection
*
* @return the collection request builder
*/
=======
@Nonnull
>>>>>>>
/**
* Gets a request builder for the Segment collection
*
* @return the collection request builder
*/
@Nonnull
<<<<<<<
/**
* Gets a request builder for the Segment item
*
* @return the request builder
* @param id the item identifier
*/
public SegmentRequestBuilder segments(final String id) {
=======
@Nonnull
public SegmentRequestBuilder segments(@Nonnull final String id) {
>>>>>>>
/**
* Gets a request builder for the Segment item
*
* @return the request builder
* @param id the item identifier
*/
@Nonnull
public SegmentRequestBuilder segments(@Nonnull final String id) { |
<<<<<<<
public TestTypeQueryCollectionRequest(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, TestTypeQueryCollectionResponse.class, TestTypeQueryCollectionPage.class, TestTypeQueryCollectionRequestBuilder.class);
=======
public TestTypeQueryCollectionRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, TestTypeQueryCollectionResponse.class, TestTypeQueryCollectionPage.class);
>>>>>>>
public TestTypeQueryCollectionRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, TestTypeQueryCollectionResponse.class, TestTypeQueryCollectionPage.class, TestTypeQueryCollectionRequestBuilder.class);
<<<<<<<
/**
* Invokes the method and calls the callback with the resulting collection of objects
* @param callback a callback to be invoked with the resulting collection of objects
*/
public void post(final ICallback<? super TestTypeQueryCollectionPage> callback) {
=======
public void post(@Nonnull final ICallback<? super TestTypeQueryCollectionPage> callback) {
>>>>>>>
/**
* Invokes the method and calls the callback with the resulting collection of objects
* @param callback a callback to be invoked with the resulting collection of objects
*/
public void post(@Nonnull final ICallback<? super TestTypeQueryCollectionPage> callback) {
<<<<<<<
/**
* Invokes the method and returns the resulting collection of objects
* @return a collection of objects returned by the method
*/
=======
@Nullable
>>>>>>>
/**
* Invokes the method and returns the resulting collection of objects
* @return a collection of objects returned by the method
*/
@Nullable
<<<<<<<
=======
@Nonnull
public TestTypeQueryCollectionPage buildFromResponse(@Nonnull final TestTypeQueryCollectionResponse response) {
final TestTypeQueryCollectionRequestBuilder builder;
if (response.nextLink != null) {
builder = new TestTypeQueryCollectionRequestBuilder(response.nextLink, getBaseRequest().getClient(), /* options */ null, (java.util.List<DerivedComplexTypeRequest>) null);
} else {
builder = null;
}
final TestTypeQueryCollectionPage page = new TestTypeQueryCollectionPage(response, builder);
page.setRawObject(response.getSerializer(), response.getRawObject());
return page;
}
>>>>>>>
<<<<<<<
public TestTypeQueryCollectionRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public TestTypeQueryCollectionRequest select(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
return (TestTypeQueryCollectionRequest)this;
>>>>>>>
@Nonnull
public TestTypeQueryCollectionRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public TestTypeQueryCollectionRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public TestTypeQueryCollectionRequest expand(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
return (TestTypeQueryCollectionRequest)this;
>>>>>>>
@Nonnull
public TestTypeQueryCollectionRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public TestTypeQueryCollectionRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public TestTypeQueryCollectionRequest filter(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
return (TestTypeQueryCollectionRequest)this;
>>>>>>>
@Nonnull
public TestTypeQueryCollectionRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public TestTypeQueryCollectionRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public TestTypeQueryCollectionRequest orderBy(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (TestTypeQueryCollectionRequest)this;
>>>>>>>
@Nonnull
public TestTypeQueryCollectionRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this; |
<<<<<<<
public SegmentTestActionCollectionRequest(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, SegmentTestActionCollectionResponse.class, SegmentTestActionCollectionPage.class, SegmentTestActionCollectionRequestBuilder.class);
=======
public SegmentTestActionCollectionRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, SegmentTestActionCollectionResponse.class, SegmentTestActionCollectionPage.class);
>>>>>>>
public SegmentTestActionCollectionRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, SegmentTestActionCollectionResponse.class, SegmentTestActionCollectionPage.class, SegmentTestActionCollectionRequestBuilder.class);
<<<<<<<
/**
* Invokes the method and calls the callback with the resulting collection of objects
* @param callback a callback to be invoked with the resulting collection of objects
*/
public void post(final ICallback<? super SegmentTestActionCollectionPage> callback) {
=======
public void post(@Nonnull final ICallback<? super SegmentTestActionCollectionPage> callback) {
>>>>>>>
/**
* Invokes the method and calls the callback with the resulting collection of objects
* @param callback a callback to be invoked with the resulting collection of objects
*/
public void post(@Nonnull final ICallback<? super SegmentTestActionCollectionPage> callback) {
<<<<<<<
/**
* Invokes the method and returns the resulting collection of objects
* @return a collection of objects returned by the method
*/
=======
@Nullable
>>>>>>>
/**
* Invokes the method and returns the resulting collection of objects
* @return a collection of objects returned by the method
*/
@Nullable
<<<<<<<
=======
@Nonnull
public SegmentTestActionCollectionPage buildFromResponse(@Nonnull final SegmentTestActionCollectionResponse response) {
final SegmentTestActionCollectionRequestBuilder builder;
if (response.nextLink != null) {
builder = new SegmentTestActionCollectionRequestBuilder(response.nextLink, getBaseRequest().getClient(), /* options */ null, (IdentitySet) null);
} else {
builder = null;
}
final SegmentTestActionCollectionPage page = new SegmentTestActionCollectionPage(response, builder);
page.setRawObject(response.getSerializer(), response.getRawObject());
return page;
}
>>>>>>>
<<<<<<<
public SegmentTestActionCollectionRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public SegmentTestActionCollectionRequest select(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
return (SegmentTestActionCollectionRequest)this;
>>>>>>>
@Nonnull
public SegmentTestActionCollectionRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public SegmentTestActionCollectionRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public SegmentTestActionCollectionRequest expand(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
return (SegmentTestActionCollectionRequest)this;
>>>>>>>
@Nonnull
public SegmentTestActionCollectionRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public SegmentTestActionCollectionRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public SegmentTestActionCollectionRequest filter(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
return (SegmentTestActionCollectionRequest)this;
>>>>>>>
@Nonnull
public SegmentTestActionCollectionRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public SegmentTestActionCollectionRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public SegmentTestActionCollectionRequest orderBy(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (SegmentTestActionCollectionRequest)this;
>>>>>>>
@Nonnull
public SegmentTestActionCollectionRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this; |
<<<<<<<
public ISerializer getSerializer() {
=======
@Nullable
protected ISerializer getSerializer() {
>>>>>>>
@Nullable
public ISerializer getSerializer() { |
<<<<<<<
GlobalSettingsPanelTestUtils.testGlobalInitAndReadBack(settingsPageFactory(), (input) -> {
input.selfMaintainedTasks().setValue(SelfMaintainedTasks.TRUE);
input.alwaysClearOutput().setValue(true);
input.skipTests().setValue(true);
input.skipCheck().setValue(false);
input.replaceLfOnStdIn().setValue(false);
=======
GlobalSettingsPanelTestUtils.testGlobalInitAndReadBack(settingsPageFactory(), new NbConsumer<CommonGlobalSettings>() {
@Override
public void accept(CommonGlobalSettings input) {
input.selfMaintainedTasks().setValue(SelfMaintainedTasks.TRUE);
input.alwaysClearOutput().setValue(true);
input.skipTests().setValue(true);
input.skipCheck().setValue(false);
input.replaceLfOnStdIn().setValue(false);
input.askBeforeCancelExec().setValue(false);
}
>>>>>>>
GlobalSettingsPanelTestUtils.testGlobalInitAndReadBack(settingsPageFactory(), (input) -> {
input.selfMaintainedTasks().setValue(SelfMaintainedTasks.TRUE);
input.alwaysClearOutput().setValue(true);
input.skipTests().setValue(true);
input.skipCheck().setValue(false);
input.replaceLfOnStdIn().setValue(false);
input.askBeforeCancelExec().setValue(false);
<<<<<<<
GlobalSettingsPanelTestUtils.testGlobalInitAndReadBack(settingsPageFactory(), (input) -> {
input.selfMaintainedTasks().setValue(SelfMaintainedTasks.FALSE);
input.alwaysClearOutput().setValue(false);
input.skipTests().setValue(false);
input.skipCheck().setValue(true);
input.replaceLfOnStdIn().setValue(true);
=======
GlobalSettingsPanelTestUtils.testGlobalInitAndReadBack(settingsPageFactory(), new NbConsumer<CommonGlobalSettings>() {
@Override
public void accept(CommonGlobalSettings input) {
input.selfMaintainedTasks().setValue(SelfMaintainedTasks.FALSE);
input.alwaysClearOutput().setValue(false);
input.skipTests().setValue(false);
input.skipCheck().setValue(true);
input.replaceLfOnStdIn().setValue(true);
input.askBeforeCancelExec().setValue(true);
}
>>>>>>>
GlobalSettingsPanelTestUtils.testGlobalInitAndReadBack(settingsPageFactory(), (input) -> {
input.selfMaintainedTasks().setValue(SelfMaintainedTasks.FALSE);
input.alwaysClearOutput().setValue(false);
input.skipTests().setValue(false);
input.skipCheck().setValue(true);
input.replaceLfOnStdIn().setValue(true);
input.askBeforeCancelExec().setValue(false);
<<<<<<<
GlobalSettingsPanelTestUtils.testGlobalInitAndReadBack(settingsPageFactory(), (input) -> {
input.selfMaintainedTasks().setValue(SelfMaintainedTasks.MANUAL);
input.alwaysClearOutput().setValue(true);
input.skipTests().setValue(false);
input.skipCheck().setValue(true);
input.replaceLfOnStdIn().setValue(false);
=======
GlobalSettingsPanelTestUtils.testGlobalInitAndReadBack(settingsPageFactory(), new NbConsumer<CommonGlobalSettings>() {
@Override
public void accept(CommonGlobalSettings input) {
input.selfMaintainedTasks().setValue(SelfMaintainedTasks.MANUAL);
input.alwaysClearOutput().setValue(true);
input.skipTests().setValue(false);
input.skipCheck().setValue(true);
input.replaceLfOnStdIn().setValue(false);
input.askBeforeCancelExec().setValue(false);
}
>>>>>>>
GlobalSettingsPanelTestUtils.testGlobalInitAndReadBack(settingsPageFactory(), (input) -> {
input.selfMaintainedTasks().setValue(SelfMaintainedTasks.MANUAL);
input.alwaysClearOutput().setValue(true);
input.skipTests().setValue(false);
input.skipCheck().setValue(true);
input.replaceLfOnStdIn().setValue(false);
input.askBeforeCancelExec().setValue(false); |
<<<<<<<
@Override
public ISerializer getSerializer() {
=======
@Nullable
protected ISerializer getSerializer() {
>>>>>>>
@Override
@Nullable
public ISerializer getSerializer() { |
<<<<<<<
@Override
public ISerializer getSerializer() {
=======
@Nullable
protected ISerializer getSerializer() {
>>>>>>>
@Override
@Nullable
public ISerializer getSerializer() { |
<<<<<<<
=======
public void post(@Nonnull final DirectoryObject newDirectoryObject, @Nullable final IJsonBackedObject payload, @Nonnull final ICallback<? super DirectoryObject> callback) {
send(HttpMethod.POST, callback, payload);
}
@Nullable
public DirectoryObject post(@Nonnull final DirectoryObject newDirectoryObject, @Nullable final IJsonBackedObject payload) throws ClientException {
IJsonBackedObject response = send(HttpMethod.POST, payload);
if (response != null){
return newDirectoryObject;
}
return null;
}
public void get(@Nonnull final ICallback<? super DirectoryObject> callback) {
send(HttpMethod.GET, callback, null);
}
@Nullable
public DirectoryObject get() throws ClientException {
return send(HttpMethod.GET, null);
}
public void delete(@Nonnull final ICallback<? super DirectoryObject> callback) {
send(HttpMethod.DELETE, callback, null);
}
public void delete() throws ClientException {
send(HttpMethod.DELETE, null);
}
public void patch(@Nonnull final DirectoryObject sourceDirectoryObject, @Nonnull final ICallback<? super DirectoryObject> callback) {
send(HttpMethod.PATCH, callback, sourceDirectoryObject);
}
@Nullable
public DirectoryObject patch(@Nonnull final DirectoryObject sourceDirectoryObject) throws ClientException {
return send(HttpMethod.PATCH, sourceDirectoryObject);
}
>>>>>>>
<<<<<<<
public DirectoryObjectWithReferenceRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public DirectoryObjectWithReferenceRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (DirectoryObjectWithReferenceRequest)this;
>>>>>>>
@Nonnull
public DirectoryObjectWithReferenceRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public DirectoryObjectWithReferenceRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public DirectoryObjectWithReferenceRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (DirectoryObjectWithReferenceRequest)this;
>>>>>>>
@Nonnull
public DirectoryObjectWithReferenceRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
public EntityType2ReferenceRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, EntityType2ReferenceRequest.class);
=======
public EntityType2ReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions);
}
/**
* Creates the request
*
* @param requestOptions the options for this request
* @return The EntityType2ReferenceRequest instance
*/
@Nonnull
public EntityType2ReferenceRequest buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
return buildRequest(getOptions(requestOptions));
}
/**
* Creates the request with specific requestOptions instead of the existing requestOptions
*
* @param requestOptions the options for this request
* @return the EntityType2ReferenceRequest instance
*/
@Nonnull
public EntityType2ReferenceRequest buildRequest(@Nonnull final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
return new EntityType2ReferenceRequest(getRequestUrl(), getClient(), requestOptions);
>>>>>>>
public EntityType2ReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, EntityType2ReferenceRequest.class); |
<<<<<<<
public OnenotePageRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public OnenotePageRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (OnenotePageRequest)this;
>>>>>>>
@Nonnull
public OnenotePageRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public OnenotePageRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public OnenotePageRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (OnenotePageRequest)this;
>>>>>>>
@Nonnull
public OnenotePageRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
public DirectoryObjectCollectionReferenceRequest(final String requestUrl, IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, DirectoryObjectCollectionResponse.class, DirectoryObjectCollectionWithReferencesPage.class, DirectoryObjectCollectionWithReferencesRequestBuilder.class);
=======
public DirectoryObjectCollectionReferenceRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, DirectoryObjectCollectionResponse.class, DirectoryObjectCollectionPage.class);
>>>>>>>
public DirectoryObjectCollectionReferenceRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, DirectoryObjectCollectionResponse.class, DirectoryObjectCollectionWithReferencesPage.class, DirectoryObjectCollectionWithReferencesRequestBuilder.class);
<<<<<<<
public DirectoryObjectCollectionReferenceRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public DirectoryObjectCollectionReferenceRequest expand(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
return (DirectoryObjectCollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public DirectoryObjectCollectionReferenceRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public DirectoryObjectCollectionReferenceRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public DirectoryObjectCollectionReferenceRequest filter(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
return (DirectoryObjectCollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public DirectoryObjectCollectionReferenceRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public DirectoryObjectCollectionReferenceRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public DirectoryObjectCollectionReferenceRequest orderBy(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (DirectoryObjectCollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public DirectoryObjectCollectionReferenceRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this;
<<<<<<<
public DirectoryObjectCollectionReferenceRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public DirectoryObjectCollectionReferenceRequest select(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
return (DirectoryObjectCollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public DirectoryObjectCollectionReferenceRequest select(@Nonnull final String value) {
addSelectOption(value);
return this; |
<<<<<<<
=======
public void delete(@Nonnull final ICallback<? super TestType> callback) {
send(HttpMethod.DELETE, callback, null);
}
@Nullable
public TestType delete() throws ClientException {
return send(HttpMethod.DELETE, null);
}
>>>>>>>
<<<<<<<
public TestTypeReferenceRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public TestTypeReferenceRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (TestTypeReferenceRequest)this;
>>>>>>>
@Nonnull
public TestTypeReferenceRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public TestTypeReferenceRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public TestTypeReferenceRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (TestTypeReferenceRequest)this;
>>>>>>>
@Nonnull
public TestTypeReferenceRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
@Override
public ISerializer getSerializer() {
=======
@Nullable
protected ISerializer getSerializer() {
>>>>>>>
@Override
@Nullable
public ISerializer getSerializer() { |
<<<<<<<
=======
import javax.annotation.Nullable;
import javax.annotation.Nonnull;
import com.microsoft.graph.http.BaseCollectionPage;
import com.microsoft.graph.requests.extensions.EntityType3CollectionPage;
>>>>>>>
import javax.annotation.Nullable;
import javax.annotation.Nonnull;
<<<<<<<
public EntityType3CollectionPage(final EntityType3CollectionResponse response, final EntityType3CollectionRequestBuilder builder) {
super(response, builder);
}
/**
* Creates the collection page for EntityType3
*
* @param pageContents the contents of this page
* @param nextRequestBuilder the request builder for the next page
*/
public EntityType3CollectionPage(final java.util.List<EntityType3> pageContents, final EntityType3CollectionRequestBuilder nextRequestBuilder) {
super(pageContents, nextRequestBuilder);
=======
public EntityType3CollectionPage(@Nonnull final EntityType3CollectionResponse response, @Nonnull final EntityType3CollectionRequestBuilder builder) {
super(response.value, builder, response.additionalDataManager());
>>>>>>>
public EntityType3CollectionPage(@Nonnull final EntityType3CollectionResponse response, @Nonnull final EntityType3CollectionRequestBuilder builder) {
super(response, builder);
}
/**
* Creates the collection page for EntityType3
*
* @param pageContents the contents of this page
* @param nextRequestBuilder the request builder for the next page
*/
public EntityType3CollectionPage(@Nonnull final java.util.List<EntityType3> pageContents, @Nullable final EntityType3CollectionRequestBuilder nextRequestBuilder) {
super(pageContents, nextRequestBuilder); |
<<<<<<<
/**
* Creates a new Session
* @param newSession the Session to create
* @return the newly created object
*/
public Session post(final Session newSession) throws ClientException {
=======
@Nonnull
public Session post(@Nonnull final Session newSession) throws ClientException {
>>>>>>>
/**
* Creates a new Session
* @param newSession the Session to create
* @return the newly created object
*/
@Nonnull
public Session post(@Nonnull final Session newSession) throws ClientException {
<<<<<<<
public SessionCollectionRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public SessionCollectionRequest expand(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
return (SessionCollectionRequest)this;
>>>>>>>
@Nonnull
public SessionCollectionRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public SessionCollectionRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public SessionCollectionRequest filter(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
return (SessionCollectionRequest)this;
>>>>>>>
@Nonnull
public SessionCollectionRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public SessionCollectionRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public SessionCollectionRequest orderBy(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (SessionCollectionRequest)this;
>>>>>>>
@Nonnull
public SessionCollectionRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this;
<<<<<<<
public SessionCollectionRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public SessionCollectionRequest select(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
return (SessionCollectionRequest)this;
>>>>>>>
@Nonnull
public SessionCollectionRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public SessionCollectionRequest skipToken(final String skipToken) {
addSkipTokenOption(skipToken);
return this;
=======
@Nonnull
public SessionCollectionRequest skipToken(@Nonnull final String skipToken) {
addQueryOption(new QueryOption("$skiptoken", skipToken));
return (SessionCollectionRequest)this;
}
@Nonnull
public SessionCollectionPage buildFromResponse(@Nonnull final SessionCollectionResponse response) {
final SessionCollectionRequestBuilder builder;
if (response.nextLink != null) {
builder = new SessionCollectionRequestBuilder(response.nextLink, getBaseRequest().getClient(), /* options */ null);
} else {
builder = null;
}
final SessionCollectionPage page = new SessionCollectionPage(response, builder);
page.setRawObject(response.getSerializer(), response.getRawObject());
return page;
>>>>>>>
@Nonnull
public SessionCollectionRequest skipToken(@Nonnull final String skipToken) {
addSkipTokenOption(skipToken);
return this; |
<<<<<<<
public TestTypeRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public TestTypeRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (TestTypeRequest)this;
>>>>>>>
@Nonnull
public TestTypeRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public TestTypeRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public TestTypeRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (TestTypeRequest)this;
>>>>>>>
@Nonnull
public TestTypeRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
/**
* Invokes the method and invokes the callback with the result
* @param callback callback to be invoked after executing the request
*/
public void post(final ICallback<? super Void> callback) {
=======
public void post(@Nonnull final ICallback<? super Void> callback) {
>>>>>>>
/**
* Invokes the method and invokes the callback with the result
* @param callback callback to be invoked after executing the request
*/
public void post(@Nonnull final ICallback<? super Void> callback) {
<<<<<<<
/**
* Invokes the method and returns the result
* @return result of the method invocation
*/
=======
@Nullable
>>>>>>>
/**
* Invokes the method and returns the result
* @return result of the method invocation
*/
@Nullable
<<<<<<<
public EntityType3ForwardRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public EntityType3ForwardRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (EntityType3ForwardRequest)this;
>>>>>>>
@Nonnull
public EntityType3ForwardRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public EntityType3ForwardRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public EntityType3ForwardRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (EntityType3ForwardRequest)this;
>>>>>>>
@Nonnull
public EntityType3ForwardRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
import java.util.HashSet;
import java.util.Set;
=======
>>>>>>>
import java.util.HashSet;
import java.util.Set;
<<<<<<<
String theName = value.substring(0, equalPos).trim().toLowerCase();
if (requestedCookies.contains(theName)) {
String theValue = value.substring(equalPos + 1, value.length()).trim();
parsable.addDisection(inputname, getDisectionType(inputname, theName), theName,
Utils.resilientUrlDecode(theValue));
=======
String theName = value.substring(0, equalPos).trim().toLowerCase();
String theValue = value.substring(equalPos + 1, value.length()).trim();
try {
parsable.addDisection(inputname, getDisectionType(inputname, theName), theName,
Utils.resilientUrlDecode(theValue));
}
catch (IllegalArgumentException e) {
// This usually means that there was invalid encoding in the line
throw new DisectionFailure(e.getMessage());
>>>>>>>
String theName = value.substring(0, equalPos).trim().toLowerCase();
if (requestedCookies.contains(theName)) {
String theValue = value.substring(equalPos + 1, value.length()).trim();
try {
parsable.addDisection(inputname, getDisectionType(inputname, theName), theName,
Utils.resilientUrlDecode(theValue));
} catch (IllegalArgumentException e) {
// This usually means that there was invalid encoding in the line
throw new DisectionFailure(e.getMessage());
} |
<<<<<<<
public UserReferenceRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, UserReferenceRequest.class);
=======
public UserReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions);
}
/**
* Creates the request
*
* @param requestOptions the options for this request
* @return The UserReferenceRequest instance
*/
@Nonnull
public UserReferenceRequest buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
return buildRequest(getOptions(requestOptions));
}
/**
* Creates the request with specific requestOptions instead of the existing requestOptions
*
* @param requestOptions the options for this request
* @return the UserReferenceRequest instance
*/
@Nonnull
public UserReferenceRequest buildRequest(@Nonnull final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
return new UserReferenceRequest(getRequestUrl(), getClient(), requestOptions);
>>>>>>>
public UserReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, UserReferenceRequest.class); |
<<<<<<<
@Override
public ISerializer getSerializer() {
=======
@Nullable
protected ISerializer getSerializer() {
>>>>>>>
@Override
@Nullable
public ISerializer getSerializer() { |
<<<<<<<
public EntityType3WithReferenceRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, EntityType3WithReferenceRequest.class, EntityType3ReferenceRequestBuilder.class);
=======
public EntityType3WithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions);
>>>>>>>
public EntityType3WithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, EntityType3WithReferenceRequest.class, EntityType3ReferenceRequestBuilder.class);
<<<<<<<
=======
/**
* Creates the request
*
* @param requestOptions the options for this request
* @return the EntityType3WithReferenceRequest instance
*/
@Nonnull
public EntityType3WithReferenceRequest buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
return buildRequest(getOptions(requestOptions));
}
/**
* Creates the request with specific options instead of the existing options
*
* @param requestOptions the options for this request
* @return the EntityType3WithReferenceRequest instance
*/
@Nonnull
public EntityType3WithReferenceRequest buildRequest(@Nonnull final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
return new EntityType3WithReferenceRequest(getRequestUrl(), getClient(), requestOptions);
}
@Nonnull
public EntityType3ReferenceRequestBuilder reference(){
return new EntityType3ReferenceRequestBuilder(getRequestUrl() + "/$ref", getClient(), getOptions());
}
>>>>>>> |
<<<<<<<
public GroupCollectionReferenceRequest(final String requestUrl, IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, GroupCollectionResponse.class, GroupCollectionWithReferencesPage.class, GroupCollectionWithReferencesRequestBuilder.class);
=======
public GroupCollectionReferenceRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, GroupCollectionResponse.class, GroupCollectionPage.class);
>>>>>>>
public GroupCollectionReferenceRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, GroupCollectionResponse.class, GroupCollectionWithReferencesPage.class, GroupCollectionWithReferencesRequestBuilder.class);
<<<<<<<
public GroupCollectionReferenceRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public GroupCollectionReferenceRequest expand(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
return (GroupCollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public GroupCollectionReferenceRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public GroupCollectionReferenceRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public GroupCollectionReferenceRequest filter(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
return (GroupCollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public GroupCollectionReferenceRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public GroupCollectionReferenceRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public GroupCollectionReferenceRequest orderBy(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (GroupCollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public GroupCollectionReferenceRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this;
<<<<<<<
public GroupCollectionReferenceRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public GroupCollectionReferenceRequest select(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
return (GroupCollectionReferenceRequest)this;
>>>>>>>
@Nonnull
public GroupCollectionReferenceRequest select(@Nonnull final String value) {
addSelectOption(value);
return this; |
<<<<<<<
public ScheduleRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public ScheduleRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (ScheduleRequest)this;
>>>>>>>
@Nonnull
public ScheduleRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public ScheduleRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public ScheduleRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (ScheduleRequest)this;
>>>>>>>
@Nonnull
public ScheduleRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
/**
* Gets a request builder for the DirectoryObject collection
*
* @return the collection request builder
*/
=======
@Nonnull
>>>>>>>
/**
* Gets a request builder for the DirectoryObject collection
*
* @return the collection request builder
*/
@Nonnull
<<<<<<<
/**
* Gets a request builder for the DirectoryObject item
*
* @return the request builder
* @param id the item identifier
*/
public DirectoryObjectWithReferenceRequestBuilder members(final String id) {
=======
@Nonnull
public DirectoryObjectWithReferenceRequestBuilder members(@Nonnull final String id) {
>>>>>>>
/**
* Gets a request builder for the DirectoryObject item
*
* @return the request builder
* @param id the item identifier
*/
@Nonnull
public DirectoryObjectWithReferenceRequestBuilder members(@Nonnull final String id) {
<<<<<<<
/**
* Gets a request builder for the User collection
*
* @return the collection request builder
*/
=======
@Nonnull
>>>>>>>
/**
* Gets a request builder for the User collection
*
* @return the collection request builder
*/
@Nonnull
<<<<<<<
/**
* Gets a request builder for the User item
*
* @return the request builder
* @param id the item identifier
*/
public UserWithReferenceRequestBuilder membersAsUser(final String id) {
=======
@Nonnull
public UserWithReferenceRequestBuilder membersAsUser(@Nonnull final String id) {
>>>>>>>
/**
* Gets a request builder for the User item
*
* @return the request builder
* @param id the item identifier
*/
@Nonnull
public UserWithReferenceRequestBuilder membersAsUser(@Nonnull final String id) {
<<<<<<<
/**
* Gets a request builder for the Group collection
*
* @return the collection request builder
*/
=======
@Nonnull
>>>>>>>
/**
* Gets a request builder for the Group collection
*
* @return the collection request builder
*/
@Nonnull
<<<<<<<
/**
* Gets a request builder for the Group item
*
* @return the request builder
* @param id the item identifier
*/
public GroupWithReferenceRequestBuilder membersAsGroup(final String id) {
=======
@Nonnull
public GroupWithReferenceRequestBuilder membersAsGroup(@Nonnull final String id) {
>>>>>>>
/**
* Gets a request builder for the Group item
*
* @return the request builder
* @param id the item identifier
*/
@Nonnull
public GroupWithReferenceRequestBuilder membersAsGroup(@Nonnull final String id) { |
<<<<<<<
public SessionWithReferenceRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, SessionWithReferenceRequest.class, SessionReferenceRequestBuilder.class);
=======
public SessionWithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions);
>>>>>>>
public SessionWithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, SessionWithReferenceRequest.class, SessionReferenceRequestBuilder.class);
<<<<<<<
=======
/**
* Creates the request
*
* @param requestOptions the options for this request
* @return the SessionWithReferenceRequest instance
*/
@Nonnull
public SessionWithReferenceRequest buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
return buildRequest(getOptions(requestOptions));
}
/**
* Creates the request with specific options instead of the existing options
*
* @param requestOptions the options for this request
* @return the SessionWithReferenceRequest instance
*/
@Nonnull
public SessionWithReferenceRequest buildRequest(@Nonnull final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
return new SessionWithReferenceRequest(getRequestUrl(), getClient(), requestOptions);
}
@Nonnull
public SessionReferenceRequestBuilder reference(){
return new SessionReferenceRequestBuilder(getRequestUrl() + "/$ref", getClient(), getOptions());
}
>>>>>>> |
<<<<<<<
=======
public void delete(@Nonnull final ICallback<? super EntityType3> callback) {
send(HttpMethod.DELETE, callback, null);
}
@Nullable
public EntityType3 delete() throws ClientException {
return send(HttpMethod.DELETE, null);
}
>>>>>>>
<<<<<<<
public EntityType3ReferenceRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public EntityType3ReferenceRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (EntityType3ReferenceRequest)this;
>>>>>>>
@Nonnull
public EntityType3ReferenceRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public EntityType3ReferenceRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public EntityType3ReferenceRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (EntityType3ReferenceRequest)this;
>>>>>>>
@Nonnull
public EntityType3ReferenceRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
public UserWithReferenceRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, UserWithReferenceRequest.class, UserReferenceRequestBuilder.class);
=======
public UserWithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions);
>>>>>>>
public UserWithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, UserWithReferenceRequest.class, UserReferenceRequestBuilder.class);
<<<<<<<
=======
/**
* Creates the request
*
* @param requestOptions the options for this request
* @return the UserWithReferenceRequest instance
*/
@Nonnull
public UserWithReferenceRequest buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
return buildRequest(getOptions(requestOptions));
}
/**
* Creates the request with specific options instead of the existing options
*
* @param requestOptions the options for this request
* @return the UserWithReferenceRequest instance
*/
@Nonnull
public UserWithReferenceRequest buildRequest(@Nonnull final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
return new UserWithReferenceRequest(getRequestUrl(), getClient(), requestOptions);
}
@Nonnull
public UserReferenceRequestBuilder reference(){
return new UserReferenceRequestBuilder(getRequestUrl() + "/$ref", getClient(), getOptions());
}
>>>>>>> |
<<<<<<<
@Override
public ISerializer getSerializer() {
=======
@Nullable
protected ISerializer getSerializer() {
>>>>>>>
@Override
@Nullable
public ISerializer getSerializer() { |
<<<<<<<
/**
* Creates a new EntityType2
* @param newEntityType2 the EntityType2 to create
* @return the newly created object
*/
public EntityType2 post(final EntityType2 newEntityType2) throws ClientException {
=======
@Nonnull
public EntityType2 post(@Nonnull final EntityType2 newEntityType2) throws ClientException {
>>>>>>>
/**
* Creates a new EntityType2
* @param newEntityType2 the EntityType2 to create
* @return the newly created object
*/
@Nonnull
public EntityType2 post(@Nonnull final EntityType2 newEntityType2) throws ClientException {
<<<<<<<
public EntityType2CollectionRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public EntityType2CollectionRequest expand(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$expand", value));
return (EntityType2CollectionRequest)this;
>>>>>>>
@Nonnull
public EntityType2CollectionRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this;
<<<<<<<
public EntityType2CollectionRequest filter(final String value) {
addFilterOption(value);
return this;
=======
@Nonnull
public EntityType2CollectionRequest filter(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$filter", value));
return (EntityType2CollectionRequest)this;
>>>>>>>
@Nonnull
public EntityType2CollectionRequest filter(@Nonnull final String value) {
addFilterOption(value);
return this;
<<<<<<<
public EntityType2CollectionRequest orderBy(final String value) {
addOrderByOption(value);
return this;
=======
@Nonnull
public EntityType2CollectionRequest orderBy(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$orderby", value));
return (EntityType2CollectionRequest)this;
>>>>>>>
@Nonnull
public EntityType2CollectionRequest orderBy(@Nonnull final String value) {
addOrderByOption(value);
return this;
<<<<<<<
public EntityType2CollectionRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public EntityType2CollectionRequest select(@Nonnull final String value) {
addQueryOption(new com.microsoft.graph.options.QueryOption("$select", value));
return (EntityType2CollectionRequest)this;
>>>>>>>
@Nonnull
public EntityType2CollectionRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public EntityType2CollectionRequest skipToken(final String skipToken) {
addSkipTokenOption(skipToken);
return this;
=======
@Nonnull
public EntityType2CollectionRequest skipToken(@Nonnull final String skipToken) {
addQueryOption(new QueryOption("$skiptoken", skipToken));
return (EntityType2CollectionRequest)this;
}
@Nonnull
public EntityType2CollectionPage buildFromResponse(@Nonnull final EntityType2CollectionResponse response) {
final EntityType2CollectionRequestBuilder builder;
if (response.nextLink != null) {
builder = new EntityType2CollectionRequestBuilder(response.nextLink, getBaseRequest().getClient(), /* options */ null);
} else {
builder = null;
}
final EntityType2CollectionPage page = new EntityType2CollectionPage(response, builder);
page.setRawObject(response.getSerializer(), response.getRawObject());
return page;
>>>>>>>
@Nonnull
public EntityType2CollectionRequest skipToken(@Nonnull final String skipToken) {
addSkipTokenOption(skipToken);
return this; |
<<<<<<<
public GroupWithReferenceRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, GroupWithReferenceRequest.class, GroupReferenceRequestBuilder.class);
=======
public GroupWithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions);
>>>>>>>
public GroupWithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, GroupWithReferenceRequest.class, GroupReferenceRequestBuilder.class);
<<<<<<<
=======
/**
* Creates the request
*
* @param requestOptions the options for this request
* @return the GroupWithReferenceRequest instance
*/
@Nonnull
public GroupWithReferenceRequest buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
return buildRequest(getOptions(requestOptions));
}
/**
* Creates the request with specific options instead of the existing options
*
* @param requestOptions the options for this request
* @return the GroupWithReferenceRequest instance
*/
@Nonnull
public GroupWithReferenceRequest buildRequest(@Nonnull final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
return new GroupWithReferenceRequest(getRequestUrl(), getClient(), requestOptions);
}
@Nonnull
public GroupReferenceRequestBuilder reference(){
return new GroupReferenceRequestBuilder(getRequestUrl() + "/$ref", getClient(), getOptions());
}
>>>>>>> |
<<<<<<<
/**
* Invokes the method and invokes the callback with the result
* @param callback callback to be invoked after executing the request
*/
public void post(final ICallback<? super Void> callback) {
=======
public void post(@Nonnull final ICallback<? super Void> callback) {
>>>>>>>
/**
* Invokes the method and invokes the callback with the result
* @param callback callback to be invoked after executing the request
*/
public void post(@Nonnull final ICallback<? super Void> callback) {
<<<<<<<
/**
* Invokes the method and returns the result
* @return result of the method invocation
*/
=======
@Nullable
>>>>>>>
/**
* Invokes the method and returns the result
* @return result of the method invocation
*/
@Nullable
<<<<<<<
public OnenotePageForwardRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public OnenotePageForwardRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (OnenotePageForwardRequest)this;
>>>>>>>
@Nonnull
public OnenotePageForwardRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public OnenotePageForwardRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public OnenotePageForwardRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (OnenotePageForwardRequest)this;
>>>>>>>
@Nonnull
public OnenotePageForwardRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
<<<<<<<
=======
public void delete(@Nonnull final ICallback<? super Call> callback) {
send(HttpMethod.DELETE, callback, null);
}
@Nullable
public Call delete() throws ClientException {
return send(HttpMethod.DELETE, null);
}
>>>>>>>
<<<<<<<
public CallReferenceRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public CallReferenceRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (CallReferenceRequest)this;
>>>>>>>
@Nonnull
public CallReferenceRequest select(@Nonnull final String value) {
addSelectOption(value);
return this;
<<<<<<<
public CallReferenceRequest expand(final String value) {
addExpandOption(value);
return this;
=======
@Nonnull
public CallReferenceRequest expand(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$expand", value));
return (CallReferenceRequest)this;
>>>>>>>
@Nonnull
public CallReferenceRequest expand(@Nonnull final String value) {
addExpandOption(value);
return this; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.