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 sta...
<<<<<<< else if (qName.equalsIgnoreCase("appearance")) { /* This gives the X3D-only Shader */ if (!UNIVERSAL_LIGHTS) attributeValue = attributes.getValue("USE"); if (attributeValue != null) { // shared Appearance node, GVRMateri...
<<<<<<< material.setMainTexture(texture); generateSphereObject(gvrContext, stackNumber, sliceNumber, facingOut, material); ======= material.setMainTexture(futureTexture); generateSphereObject(gvrContext, stackNumber, sliceNumber, facingOut, material, 1); >>>>>>> material.setMa...
<<<<<<< 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...
<<<<<<< /** * @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 ru...
<<<<<<< @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", ...
<<<<<<< inputStream.close(); ======= // Close all the input streams in sparseInputStreams if(sparseInputStreams != null) { for (InputStream inputStream : sparseInputStreams) { inputStream.close(); } } is.close(); >>>>>>> // Clos...
<<<<<<< int slot = InventoryUtils.inventoryHasItem( container.getInventory(), getItem().getTypeId(), (byte)getItem().getDurability()); ======= int slot = ItemUtils.inventoryHasItem( container.getInventory(), getItem().getTypeId(), getItem().getDurability()); >>>>>>> int slot = InventoryUtils.invent...
<<<<<<< // 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(...
<<<<<<< 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...
<<<<<<< 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.im...
<<<<<<< @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 Me...
<<<<<<< return (T) destGeometry; ======= // preserve the SRID if (destGeometry != null) { destGeometry.setSRID(sourceGeometry.getSRID()); } return 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; vola...
<<<<<<< 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 = n...
<<<<<<< ======= /** * 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 su...
<<<<<<< ======= 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.Layer...
<<<<<<< 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.u...
<<<<<<< ======= 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 = ...
<<<<<<< * (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 config...
<<<<<<< ======= 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 = StringUtil...
<<<<<<< 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 ...
<<<<<<< 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.Submi...
<<<<<<< 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; i...
<<<<<<< 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.u...
<<<<<<< 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("locatio...
<<<<<<< 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_ptrHeaderSubText...
<<<<<<< import android.os.SystemClock; ======= >>>>>>> <<<<<<< ======= private Drawable mBoxSelected; private Drawable mBoxPressed; private Drawable mBoxLongPressed; >>>>>>> <<<<<<< ======= mBoxSelected = mResources.getDrawable(R.drawable.month_view_selected); mBoxPressed = mResour...
<<<<<<< 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...
<<<<<<< mCalendarOwnerAccount = mCalendarsCursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT); mOrganizerCanRespond = mCalendarsCursor.getInt(CALENDARS_INDEX_OWNER_CAN_RESPOND) != 0; String displayName = mCalendarsCursor.getString(CALENDARS_INDEX_DISPLAY_NAME); mIsDuplicateN...
<<<<<<< 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() { ...
<<<<<<< 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(), st...
<<<<<<< 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 = AppstoreServi...
<<<<<<< new Options.Builder() .addStoreKeys(storeKeys) .addPreferredStoreName(prefferedStores) .addAvailableStores(availableStores) .build() ======= new Options.Builder() ...
<<<<<<< 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...
<<<<<<< /** * 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 setE...
<<<<<<< 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.ParentNod...
<<<<<<< ======= 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; >>>>>>> im...
<<<<<<< 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> mDrawerIt...
<<<<<<< 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()); >>>>>>> ...
<<<<<<< * 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 fea...
<<<<<<< ++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 ...
<<<<<<< if (!initialized) { mainWatch.watchDirectoryPath(soundFilePath); } ======= if (!soundFilePath.toFile().exists()) { System.out.println("creating directory: " + soundFilePath.toFile().toString()); boolean result = false; ...
<<<<<<< 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...
<<<<<<< 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); >>>...
<<<<<<< /** * 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 { >>>>>>> /** * C...
<<<<<<< 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)); r...
<<<<<<< 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 (...
<<<<<<< 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, DirectoryObject...
<<<<<<< /** * 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 ...
<<<<<<< /** * 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 ...
<<<<<<< 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 (Grou...
<<<<<<< ======= 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 IJs...
<<<<<<< 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; <<<<...
<<<<<<< /** * 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 Session collection * * @return the collection request builder */ ======= @Nonnull >>>>>>> /** * Gets a request builder for the Session collection * * @return the collection request builder */ @Nonnull <<<<<<< ...
<<<<<<< ======= 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 newEntityTy...
<<<<<<< ======= 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.concurren...
<<<<<<< ======= @Nonnull public GroupCollectionWithReferencesPage buildFromResponse(@Nonnull final GroupCollectionResponse response) { final GroupCollectionWithReferencesRequestBuilder builder; if (response.nextLink != null) { builder = new GroupCollectionWithReferencesRequestBuild...
<<<<<<< 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); ======= ...
<<<<<<< /** * 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 new...
<<<<<<< /** * 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 newCallReco...
<<<<<<< /** * 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 <<<<<<< ...
<<<<<<< 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, TestTypeQu...
<<<<<<< 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...
<<<<<<< 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().setValu...
<<<<<<< @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 Directo...
<<<<<<< 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 EntityType2ReferenceReq...
<<<<<<< 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)); ...
<<<<<<< public DirectoryObjectCollectionReferenceRequest(final String requestUrl, IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) { super(requestUrl, client, requestOptions, DirectoryObjectCollectionResponse.class, DirectoryObjectCollectionWithReference...
<<<<<<< ======= 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 TestTypeReferenceRe...
<<<<<<< @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 EntityType3Co...
<<<<<<< /** * 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 ...
<<<<<<< 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...
<<<<<<< /** * 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) { >>>>>>> ...
<<<<<<< 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.su...
<<<<<<< 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 ...
<<<<<<< @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.cl...
<<<<<<< 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, GroupCollectionWi...
<<<<<<< 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...
<<<<<<< /** * 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 */ @Nonnu...
<<<<<<< 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 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 EntityType3Re...
<<<<<<< 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); ======= p...
<<<<<<< @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 new...
<<<<<<< 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); ======= ...
<<<<<<< /** * 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) { >>>>>>> ...
<<<<<<< ======= 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...