conflict_resolution
stringlengths
27
16k
<<<<<<< ======= import android.database.Cursor; import android.os.Environment; >>>>>>> import android.os.Environment; <<<<<<< mExecutor = factory.createExecutor(); this.downloadsRepository = new DownloadsRepository(getContentResolver(), new DownloadsRepository.DownloadInfoCreator() { @O...
<<<<<<< locationTextView.setText(download.getDownloadStatusText() + " : " + download.getFileName()); deleteButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(@NonNull View v) { listener.onDelete(download); } })...
<<<<<<< // TODO: move towards these in-memory objects being sources of truth, and // periodically pushing to provider. public static class Reader { private ContentResolver mResolver; private Cursor mCursor; public Reader(ContentResolver resolver, Cursor cursor) { mReso...
<<<<<<< // @GuardedBy("activeNotifications") private final HashMap<String, Long> activeNotifications = new HashMap<>(); ======= // @GuardedBy("mActiveNotifs") private final SimpleArrayMap<String, Long> activeNotifs = new SimpleArrayMap<>(); >>>>>>> // @GuardedBy("mActiveNotifs") private final Si...
<<<<<<< /** * columns to request from DownloadProvider. */ public static final String[] DOWNLOAD_BY_BATCH_VIEW_COLUMNS = new String[]{ DownloadContract.Downloads.DOWNLOADS_TABLE_NAME + "." + DownloadContract.Downloads._ID + " AS _id ", DownloadContract.Downloads.COLUMN_DATA, ...
<<<<<<< request.setBigPictureUrl(BBC_COMEDY_IMAGE); request.setTitle("BBC Innuendo Bingo"); request.setDescription("Nothing to do with beards."); request.setMimeType("audio/mp3"); request.setExtra("req_1"); ======= >>>>>>> request.setExtra("req_1");
<<<<<<< private final Context mContext; private final Downloads downloads; public StorageManager(Context context, Downloads downloads) { mContext = context; this.downloads = downloads; mDownloadDataDir = getDownloadDataDirectory(context); mExternalStorageDir = Environment.ge...
<<<<<<< private static final String EXTRA_EXTRA = "com.novoda.download.lib.KEY_INTENT_EXTRA"; ======= public static final String EXTRA_EXTRA = "com.novoda.download.lib.KEY_INTENT_EXTRA"; >>>>>>> public static final String EXTRA_EXTRA = "com.novoda.download.lib.KEY_INTENT_EXTRA"; <<<<<<< private lo...
<<<<<<< public void updateWith(List<DownloadBatch> batches) { synchronized (activeNotifications) { Map<String, List<DownloadBatch>> clusters = getClustersByNotificationTag(batches); ======= public void updateWith(Collection<DownloadBatch> batches) { synchronized (mActiveNotifs) { ...
<<<<<<< import android.os.Handler; ======= import android.os.IBinder; >>>>>>> <<<<<<< ======= private final ServiceConnection migrationServiceConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName componentName, IBinder iBinder) { ((LiteDownlo...
<<<<<<< callbackHandler, new HashMap<DownloadBatchId, DownloadBatch>(), ======= new HashMap<>(), >>>>>>> callbackHandler, new HashMap<>(),
<<<<<<< Logger.v("start download " + rawBatchId + ", status: " + downloadBatchStatus.status()); ======= Log.v("start sync download " + rawBatchId + ", " + STATUS + " " + downloadBatchStatus.status()); >>>>>>> Logger.v("start sync download " + rawBatchId + ", " + STATUS + " " + downloadBatchSt...
<<<<<<< private final Context context; private final DownloadInfo downloadInfo; private final SystemFacade systemFacade; private final StorageManager storageManager; private final DownloadNotifier downloadNotifier; ======= private final Context mContext; private final DownloadInfo mInfo; ...
<<<<<<< ======= /** * The Service's view of the list of downloads, mapping download IDs to the corresponding info * object. This is kept independently from the content provider, and the Service only initiates * downloads based on this data, so that it can deal with situation where the data in the ...
<<<<<<< if (systemFacade == null) { systemFacade = new RealSystemFacade(this); ======= this.downloadDeleter = new DownloadDeleter(getContentResolver()); this.batchRepository = new BatchRepository(getContentResolver(), downloadDeleter); if (mSystemFacade == null) { ...
<<<<<<< String result = runS(cmdl); ======= result = runS(cmdl, getFailOnErr()); // System.out.println( "lsCheckout: " + result ); >>>>>>> String result = runS(cmdl, getFailOnErr());
<<<<<<< import static com.novoda.downloadmanager.lib.DownloadsStatus.STATUS_HTTP_DATA_ERROR; import static com.novoda.downloadmanager.lib.FileDownloadInfo.NetworkState; ======= import static com.novoda.downloadmanager.lib.Downloads.Impl.*; import static com.novoda.downloadmanager.lib.FileDownloadInfo.NetworkState; >...
<<<<<<< public DownloadThread(Context context, SystemFacade systemFacade, FileDownloadInfo originalDownloadInfo, StorageManager storageManager, DownloadNotifier downloadNotifier, BatchCompletionBroadcaster batchCompletionBroadcaster, BatchRepository batchRepositor...
<<<<<<< /* * Copyright (c) 2016 Network New Technologies Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required ...
<<<<<<< import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; ======= import org.springframework.util.ClassUtils; >>>>>>> import org.springframework.util.ClassUtils; import org.springframework.expression.Expression; import org.springframework.expr...
<<<<<<< public boolean isClientParameter() { return !isSupportedParameter() && !hasRequestHeaderAnnotation() && !hasCookieValueAnnotation() && !hasAuthenticationPrincipalAnnotation(); } ======= public boolean isJavaUtilOptional() { return javaUtilOptional; } >>>>>>> public boolean isClientParameter() ...
<<<<<<< import java.lang.ref.WeakReference; import java.util.ArrayList; ======= import java.lang.reflect.Method; >>>>>>> import java.lang.ref.WeakReference; import java.util.ArrayList; <<<<<<< import android.app.Activity; import android.app.Application; ======= >>>>>>> import android.app.Activity; import android...
<<<<<<< import io.reactivex.Observable; ======= >>>>>>> import javafx.animation.Animation; import javafx.animation.KeyFrame; import javafx.animation.Timeline; <<<<<<< ======= import rx.Observable; import rx.functions.Func1; >>>>>>> import rx.Observable; import rx.functions.Func1; import java.util.concurrent.ato...
<<<<<<< fail(); } catch (MismatchedInputException e) { verifyException(e, "expected JSON String"); ======= fail("Should not pass"); } catch (JsonMappingException e) { verifyException(e, "Cannot deserialize value of type "); verifyException(e,...
<<<<<<< public void testDateTimeKeyDeserialize() throws IOException { final String json = "{" + quote("1970-01-01T00:00:00.000Z") + ":0}"; final Map<DateTime, Long> map = MAPPER.readValue(json, new TypeReference<Map<DateTime, String>>() { }); assertNotNull(map); assertTrue(map.cont...
<<<<<<< private final ObjectMapper MAPPER = mapperWithModule(); ======= private final ObjectMapper MAPPER = jodaMapper(); private final ObjectReader READER = MAPPER.readerFor(DateTimeZone.class); >>>>>>> private final ObjectMapper MAPPER = mapperWithModule(); private final ObjectReader READER = M...
<<<<<<< import com.fasterxml.jackson.databind.exc.MismatchedInputException; ======= import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.exc.InvalidFormatException; >>>>>>> import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.exc.InvalidFormat...
<<<<<<< ClassUtil.getTypeDescription(type), periodName); rp = null; // never gets here ======= handledType().getName(), periodName); return null; // never gets here >>>>>>> ClassUtil.getTypeDescription(type), periodName); ...
<<<<<<< import com.badlogic.gdx.utils.Scaling; ======= >>>>>>> import com.badlogic.gdx.utils.Scaling; <<<<<<< ======= stage.act(Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f)); stage.draw(); Table.drawDebug(stage); >>>>>>>
<<<<<<< ======= import co.paralleluniverse.fibers.Fiber; import co.paralleluniverse.fibers.FiberControl; import java.util.Iterator; >>>>>>> import co.paralleluniverse.fibers.Fiber; import co.paralleluniverse.fibers.FiberControl; <<<<<<< for (Strand s : waiters) { ======= for (final Strand s : wai...
<<<<<<< import java.util.ArrayList; import java.util.Date; ======= import java.util.WeakHashMap; >>>>>>> import java.util.Date; import java.util.WeakHashMap; <<<<<<< byte[] cb = toByteArray(is); if (className != null) { ======= MethodDatabase db = getMethodDatabase(loader); if (c...
<<<<<<< /** * Resize an image to the given width and height. Leave one dimension 0 to * perform an aspect-ratio scale on the provided dimension. * @param bitmap * @param width * @param height * @return a new, scaled Bitmap */ public static Bitmap resize(Bitmap bitmap, final in...
<<<<<<< ======= import java.text.SimpleDateFormat; >>>>>>> import java.text.SimpleDateFormat;
<<<<<<< private void showPrompt(final PluginCall call) { // We have all necessary permissions, open the camera String promptLabelPhoto = call.getString("promptLabelPhoto", "From Photos"); String promptLabelPicture = call.getString("promptLabelPicture", "Take Picture"); JSObject from...
<<<<<<< //instantiate the sail HBaseSail sail = new HBaseSail(HBaseConfiguration.create(), hconfig.getTablespace(), hconfig.isCreate(), hconfig.getSplitBits(), hconfig.isPush(), hconfig.getEvaluationTimeout(), null); ======= HBaseSail sail = new HBaseSail(HBaseConfiguration.create(...
<<<<<<< protected double getCardinality(StatementPattern sp) { //get the cardinality of the Statement form VOID statistics ======= protected double getCardinality(StatementPattern sp) { Var objectVar = sp.getObjectVar(); //always ...
<<<<<<< case DemoUtil.TYPE_DASH_VOD: return new DashVodRendererBuilder(this, userAgent, contentUri.toString(), contentId); case DemoUtil.TYPE_HLS: return new HlsRendererBuilder(this, userAgent, contentUri.toString(), contentId); ======= case DemoUtil.TYPE_DASH: return new Das...
<<<<<<< float pixelWidthHeightRatio, byte[] projectionData, @C.StereoMode int stereoMode, int channelCount, int sampleRate, @C.PcmEncoding int pcmEncoding, int encoderDelay, int encoderPadding, @C.SelectionFlags int selectionFlags, String language, long subsampleOffsetUs, List<byte[]> initializa...
<<<<<<< * @since Ant 1.10.6 ======= * @param other the argument to copy setting from * * @since Ant 1.9.14 >>>>>>> * @param other the argument to copy setting from * * @since Ant 1.10.6
<<<<<<< this(uri, 0, null, -1, C.TIME_UNSET, null, null, byterangeOffset, byterangeLength); ======= this(uri, 0, -1, C.TIME_UNSET, null, null, byterangeOffset, byterangeLength, false); >>>>>>> this(uri, 0, null, -1, C.TIME_UNSET, null, null, byterangeOffset, byterangeLength, false); <<<<<<< pu...
<<<<<<< * See {@link TrackSelectionParameters#preferredRoleFlags}. * * @param preferredRoleFlags Preferred role flags. * @return This builder. */ public Builder setPreferredRoleFlags(int preferredRoleFlags) { this.preferredRoleFlags = preferredRoleFlags; return this; } ...
<<<<<<< /** Track selection flags. */ @C.SelectionFlags public final int selectionFlags; ======= /** Track selection flags. **/ @C.SelectionFlags public final int selectionFlags; /** Track role flags. **/ @C.RoleFlags public final int roleFlags; >>>>>>> /** Track selection flags. */ @C.SelectionF...
<<<<<<< private List<NameEntry> includeList = new ArrayList<>(); private List<NameEntry> excludeList = new ArrayList<>(); private List<NameEntry> includesFileList = new ArrayList<>(); private List<NameEntry> excludesFileList = new ArrayList<>(); ======= private List<NameEntry> includeList = new Ar...
<<<<<<< private static final String PLAYLIST_WITH_TTML_SUBTITLE = " #EXTM3U\n" + "\n" + "#EXT-X-VERSION:6\n" + "\n" + "#EXT-X-INDEPENDENT-SEGMENTS\n" + "\n" + "#EXT-X-STREAM-INF:BANDWIDTH=1280000,CODECS=\"stpp.ttml.im1t,mp4a.40.2,avc1.66.30\",RESOLUTIO...
<<<<<<< private MediaCodecInfo codecInfo; private float codecOperatingRate = 1; ======= private @Nullable ArrayDeque<MediaCodecInfo> availableCodecInfos; private @Nullable DecoderInitializationException preferredDecoderInitializationException; private @Nullable MediaCodecInfo codecInfo; >>>>>>> private f...
<<<<<<< private boolean focusSkipButtonWhenAvailable; ======= private int mediaBitrate; >>>>>>> private int mediaBitrate; private boolean focusSkipButtonWhenAvailable; <<<<<<< focusSkipButtonWhenAvailable = true; ======= mediaBitrate = BITRATE_UNSET; >>>>>>> mediaBitrate = BITRA...
<<<<<<< ======= @Test public void testDecodeNoEndTimecodes() throws IOException { SsaDecoder decoder = new SsaDecoder(); byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), NO_END_TIMECODES); Subtitle subtitle = decoder.decode(bytes, bytes.length, false); ass...
<<<<<<< ======= public int calculatePreferredAlignment() { finalCueString = new SpannableStringBuilder(); // Add any rolled up captions, separated by new lines. for (int i = 0; i < rolledUpCaptions.size(); i++) { finalCueString.append(rolledUpCaptions.get(i)); finalCueString.app...
<<<<<<< import com.google.android.exoplayer2.util.ColorParser; ======= import com.google.android.exoplayer2.text.span.HorizontalTextInVerticalContextSpan; import com.google.android.exoplayer2.text.span.RubySpan; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Log; >>>>...
<<<<<<< import com.google.android.exoplayer.demo.full.player.UnsupportedDrmException; ======= import com.google.android.exoplayer.metadata.TxxxMetadata; >>>>>>> import com.google.android.exoplayer.demo.full.player.UnsupportedDrmException; import com.google.android.exoplayer.metadata.TxxxMetadata; <<<<<<< DemoPl...
<<<<<<< AudioRendererEventListener, TextRenderer.Output, MetadataRenderer.Output<List<Id3Frame>>, SurfaceHolder.Callback, TextureView.SurfaceTextureListener, TrackSelector.EventListener<Object> { ======= AudioRendererEventListener, TextRenderer.Output, MetadataRenderer.Output<Metadata>, ...
<<<<<<< import androidx.annotation.Nullable; ======= import android.os.Handler; import android.support.annotation.Nullable; >>>>>>> import android.os.Handler; import androidx.annotation.Nullable;
<<<<<<< import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Bean; ======= import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.openfeign.E...
<<<<<<< switch (transactions.getStatusCode()) { case OK: return new ResponseEntity<>(ManualMapper.fromTppToFintech(transactions.getBody()), HttpStatus.OK); case ACCEPTED: log.info("create redirect entity for lot for redirectcode {}", fintechRedirectCode); ...
<<<<<<< public static final String SELECT_DATE = "SELECT DATE"; public static final String SI_ID = "standing_instruction_id"; ======= public static final String UNAUTHORIZED_ERROR = "401 Unauthorized"; >>>>>>> public static final String SELECT_DATE = "SELECT DATE"; public static final String S...
<<<<<<< if (t.isSuccessToken()) { synchronized ((Object) successSourceCount) { successSourceCount++; } log.debug(String.format("Success count of %s: %d", node.toString(), successSourceCount)); } else { return false; ======= if (t....
<<<<<<< import java.util.ArrayList; import java.util.List; ======= import com.google.common.base.Optional; >>>>>>> import java.util.ArrayList; import java.util.List; import com.google.common.base.Optional;
<<<<<<< @Override public String getApproximateCountDistinct(String column) { return String.format("ndv(%s)", column); } ======= @Override public String getGenericStringDataTypeName() { return "STRING"; } >>>>>>> @Override public String getGenericStringDataTypeName() { return "STRING"...
<<<<<<< import org.verdictdb.commons.DBTablePrinter; ======= import org.verdictdb.commons.DataTypeConverter; >>>>>>> import org.verdictdb.commons.DBTablePrinter; import org.verdictdb.commons.DataTypeConverter; <<<<<<< // Print in database form public void print() { VerdictResultSet vrs = new VerdictResultSe...
<<<<<<< File cmdFile = createCommandFile(cmd, env); Process p = super.exec(project, new String[] {cmdFile.getPath()}, env); ======= File cmdFile = createCommandFile(project, cmd, env); Process p = super.exec(project, new String[] {cmdFile.getPath()}, env); >>>>>>> ...
<<<<<<< SIGN, STRTOL, RAND, RANDOM , FNV_HASH, ABS, STDDEV, SQRT, MOD, PMOD, ======= SIGN, RAND, RANDOM , FNV_HASH, ABS, STDDEV, SQRT, MOD, PMOD, YEAR, >>>>>>> SIGN, STRTOL, RAND, RANDOM , FNV_HASH, ABS, STDDEV, SQRT, MOD, PMOD, YEAR,
<<<<<<< import java.sql.Connection; import java.sql.SQLException; import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Properties; ======= >>>>>>> import java.sql.Connection; import java.sql.SQLException; import java.util.Collection; import java.util.LinkedList; import j...
<<<<<<< ======= import org.apache.commons.lang3.tuple.Pair; import org.verdictdb.sql.syntax.SyntaxAbstract; >>>>>>>
<<<<<<< import com.google.common.base.Joiner; ======= import java.util.ArrayList; import java.util.List; import java.util.concurrent.ThreadLocalRandom; >>>>>>> import com.google.common.base.Joiner; <<<<<<< import org.verdictdb.core.sqlobject.*; ======= import org.verdictdb.core.sqlobject.AsteriskColumn; import o...
<<<<<<< ======= public static ColumnOp notgreaterthan(UnnamedColumn column1, UnnamedColumn column2) { return new ColumnOp("notgreaterthan", Arrays.asList(column1, column2)); } public static ColumnOp notlessthan(UnnamedColumn column1, UnnamedColumn column2) { return new ColumnOp("notle...
<<<<<<< ExecutionInfoToken result = super.executeNode(conn, downstreamResults); // This node is one of the individual aggregate nodes inside an AsyncAggExecutionNode if (parents.get(0) instanceof AsyncAggScaleExecutionNode) { QueryExecutionNode asyncNode = parents.get(0); int index = -1; ...
<<<<<<< import org.verdictdb.sqlsyntax.HiveSyntax; import org.verdictdb.sqlsyntax.SparkSyntax; ======= import org.verdictdb.exception.VerdictDBTypeException; >>>>>>> import org.verdictdb.exception.VerdictDBTypeException; import org.verdictdb.sqlsyntax.HiveSyntax; import org.verdictdb.sqlsyntax.SparkSyntax;
<<<<<<< import com.rits.cloning.Cloner; ======= import com.google.common.base.Optional; >>>>>>> import com.google.common.base.Optional; import com.rits.cloning.Cloner; <<<<<<< return new Cloner().deepClone(result); // try { // ByteArrayOutputStream bos = new ByteArrayOutputStream(); // ObjectOutput...
<<<<<<< @Override public String getApproximateCountDistinct(String column) { return String.format("approx_count_distinct(%s)", column); } ======= @Override public String getGenericStringDataTypeName() { return "STRING"; } >>>>>>> @Override public String getGenericStringDataTypeName() { ...
<<<<<<< ======= // private Map<String, Integer> aggColumnIdentifierMap = new HashMap<>(); >>>>>>> <<<<<<< * @param aggNodeBlock A set of the links to the nodes that will be processed in the asynchronous * manner. * @return Returns The root of the multiple aggregation nodes (e...
<<<<<<< public FieldTermsResponse fieldTerms(String field) throws IOException, APIException { return ApiClient.get(FieldTermsResponse.class) .path("/search/universal/{0}/terms", timeRange.getType().toString().toLowerCase()) .queryParam("field", field) .queryPa...
<<<<<<< TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000); ======= TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, false, 900000, false); >>>>>>> TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, false); <<<<<<< TripsConfig tri...
<<<<<<< import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import java.io.BufferedReader; import java.io.BufferedWriter; ======= import org.apache.tools.ant.DummyMailServer; import org.junit.AssumptionViolatedException; import org.junit.Before; import org.junit.Test; >>>>>>> i...
<<<<<<< import org.dynmap.web.Json; ======= import org.dynmap.web.handlers.SendMessageHandler; import org.dynmap.web.handlers.SendMessageHandler.Message; >>>>>>> import org.dynmap.web.handlers.SendMessageHandler; import org.dynmap.web.handlers.SendMessageHandler.Message; import org.dynmap.web.Json; <<<<<<< private...
<<<<<<< double getPriceForDisk(List<InstanceOffer> offers, int instanceDisk, String instanceType, T region); List<InstanceType> getAllInstanceTypes(Long regionId, boolean spot); @Getter @AllArgsConstructor enum TermType { ON_DEMAND("OnDemand"), SPOT("Spot"), LOW_PRIORITY("Lo...
<<<<<<< final String command = instanceService.buildTerminateNodeCommand(internalIp, nodeName, CloudProvider.AWS.name(), nodeTerminateScript); ======= final String command = instanceService.buildTerminateNodeCommand(internalIp, nodeName); >>>>>>> final String command = instanc...
<<<<<<< GS("GS"), ======= AZ("AZ"), >>>>>>> AZ("AZ"), GS("GS"),
<<<<<<< final String command = buildNodeReassignCommand(reassignScript, oldId, newId, cloud); ======= final String command = buildNodeReassignCommand(oldId, newId); >>>>>>> final String command = buildNodeReassignCommand(oldId, newId, cloud); <<<<<<< public String buildTerminateNodeComma...
<<<<<<< import com.google.common.base.Preconditions; import com.google.common.base.Strings; import io.divolte.server.ServerTestUtils.EventPayload; ======= import static io.divolte.server.IncomingRequestProcessor.*; import static io.divolte.server.SeleniumTestBase.TEST_PAGES.*; import static org.hamcrest.Matchers.*; i...
<<<<<<< import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.concurrent.NotThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.divolte.server.AvroRecordBuffer; import io.divolte.server.config.ValidatedConfiguration; import io.divolte.server.processing.Item; import ...
<<<<<<< import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.WebDriverWait; import org.slf4j.Logger; import org.slf4j.LoggerFactory; ======= import org.openqa.selenium.safari.SafariDriver; >>>>>>> import org.openqa.selenium.safari.SafariDriver; import org.openqa.selenium.sup...
<<<<<<< import io.divolte.server.IncomingRequestProcessingPool.HttpServerExchangeWithPartyId; import io.divolte.server.geo2ip.ExternalDatabaseLookupService; import io.divolte.server.geo2ip.LookupService; ======= import io.divolte.server.CookieValues.CookieValue; >>>>>>> import io.divolte.server.CookieValues.CookieVa...
<<<<<<< } try { // How to handle non-file-Resources? I copy temporarily the // resource to a file and use the file-implementation. FileUtils fu = FileUtils.getFileUtils(); File tmpFile = fu.createTempFile("modified-", ".tmp", null, true, false); ...
<<<<<<< import com.epam.healenium.treecomparing.Scored; ======= import com.epam.healenium.utils.ProxyFactory; >>>>>>> import com.epam.healenium.treecomparing.Scored; import com.epam.healenium.utils.ProxyFactory;
<<<<<<< import clojuredev.lexers.ClojureLexer; ======= import clojuredev.util.DisplayUtil; >>>>>>> import clojuredev.lexers.ClojureLexer; import clojuredev.util.DisplayUtil; <<<<<<< colorRegistry = new ColorRegistry(getWorkbench().getDisplay()); ======= DisplayUtil.syncExec(new Runnable() { public...
<<<<<<< import cemerick.nrepl.Connection; import clojure.lang.Compiler; import clojure.lang.Symbol; import clojure.lang.Var; ======= import clojure.osgi.ClojureOSGi; >>>>>>> import cemerick.nrepl.Connection; import clojure.osgi.ClojureOSGi;
<<<<<<< } if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_9)) { ======= } else if (JavaEnvUtils.isAtLeastJavaVersion("10")) { return JAVAC10_PLUS; } else if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_9)) { >>>>>>> } if (JavaEnvUtils.isAtLeastJavaVersion...
<<<<<<< .optionalHeader("X-Vault-Token", config.getToken()) .body(requestJson.getBytes(StandardCharsets.UTF_8)) ======= .header("X-Vault-Token", config.getToken()) .body(requestJson.getBytes("UTF-8")) >>>>>>> ...
<<<<<<< public static final String SCHEMAREGISTRY_RESOURCE_EXTENSION_CONFIG = "schema.registry.resource.extension.class"; ======= protected static final String SCHEMAREGISTRY_CONNECTION_URL_DOC = "Zookeeper URL used by the schema registry instances to coordinate. If not specified, it " + "will...
<<<<<<< ClientDnsLookup.DEFAULT.name()); this.metadata.bootstrap(addresses, time.milliseconds()); ======= clientConfig.getString(CommonClientConfigs.CLIENT_DNS_LOOKUP_CONFIG)); this.metadata.update(Cluster.bootstrap(addresses), Collections.<String>emptySet(), 0); >>>>>>> cli...
<<<<<<< private final String kafkaClusterZkUrl; private String schemaRegistryZkUrl; private ZkClient zkClient; private final int zkSessionTimeoutMs; private final String clusterName; ======= private final ZkClient zkClient; private final Metrics metrics; >>>>>>> private final String kafkaClusterZkUrl...
<<<<<<< import org.apache.kafka.common.cache.Cache; import org.apache.kafka.common.cache.LRUCache; ======= import org.apache.kafka.copycat.data.Date; import org.apache.kafka.copycat.data.Decimal; >>>>>>> import org.apache.kafka.common.cache.Cache; import org.apache.kafka.common.cache.LRUCache; import org.apache.kafk...
<<<<<<< import org.slf4j.Logger; import org.slf4j.LoggerFactory; ======= import java.util.concurrent.atomic.AtomicInteger; >>>>>>> import java.util.concurrent.atomic.AtomicInteger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; <<<<<<< Logger log = LoggerFactory.getLogger(IncrementalIdGenerator.class); ...
<<<<<<< private void handleSchemaUpdate(SchemaKey schemaKey, SchemaValue schemaValue, SchemaValue oldSchemaValue) { if (schemaValue != null) { ======= private void handleSchemaUpdate(SchemaKey schemaKey, SchemaValue schemaObj) { if (schem...
<<<<<<< import org.apache.avro.Schema; import org.easymock.EasyMock; import org.junit.Test; import java.util.HashMap; import java.util.Arrays; import java.util.Map; import io.confluent.kafka.schemaregistry.client.rest.RestService; import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaString; import io.c...
<<<<<<< import org.apache.kafka.common.cache.Cache; ======= import org.apache.kafka.copycat.data.Date; import org.apache.kafka.copycat.data.Decimal; >>>>>>> import org.apache.kafka.common.cache.Cache; import org.apache.kafka.copycat.data.Date; import org.apache.kafka.copycat.data.Decimal;
<<<<<<< private int forwardRegisterRequestToLeader(String subject, Schema schema, ======= public void checkIfSchemaWithIdExist(int id, Schema schema) throws SchemaRegistryException, StoreException { SchemaKey existingKey = this.lookupCache.schemaKeyById(id); if (existingKey != null) { SchemaRe...
<<<<<<< private final String TAG = "CameraPreview"; private final String setOnPictureTakenHandlerAction = "setOnPictureTakenHandler"; private final String setColorEffectAction = "setColorEffect"; private final String startCameraAction = "startCamera"; private final String stopCameraAction = "stopCam...
<<<<<<< import cn.vbill.middleware.porter.common.task.config.PublicSourceConfig; ======= >>>>>>> import cn.vbill.middleware.porter.common.task.config.PublicSourceConfig; <<<<<<< import cn.vbill.middleware.porter.common.plugin.config.PluginServiceConfig; ======= import cn.vbill.middleware.porter.common.config.Publ...
<<<<<<< private int batchSize = 50; private int totalRecordsWritten = 0; private boolean veryLargeBulk = false; // by default this setting is set to false ======= private long batchSize; private boolean veryLargeBulk; // by default this setting is set to false >>>>>>> private long batchSi...