conflict_resolution
stringlengths
27
16k
<<<<<<< import org.qi4j.api.query.grammar.ContainsAllPredicate; import org.qi4j.api.query.grammar.ContainsPredicate; import java.util.Collection; ======= >>>>>>> import org.qi4j.api.query.grammar.ContainsAllPredicate; import org.qi4j.api.query.grammar.ContainsPredicate; import java.util.Collection;
<<<<<<< import java.lang.reflect.Type; ======= >>>>>>> import java.lang.reflect.Type; <<<<<<< import static org.qi4j.api.common.TypeName.*; import org.qi4j.api.structure.Module; ======= import static org.qi4j.api.common.TypeName.*; import org.qi4j.api.structure.Module; import java.lang.reflect.Type; >>>>>>> imp...
<<<<<<< ======= import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.embulk.EmbulkSystemProperties; >>>>>>> import java.util.Set; import org.embulk.EmbulkSystemProperties; <<<<<<< import org.embulk.spi.time.Instants; ======= import org.embulk.plugin.maven.MavenPluginSou...
<<<<<<< import org.embulk.config.TaskReport; import org.embulk.plugin.PluginType; ======= import org.embulk.config.CommitReport; >>>>>>> import org.embulk.config.TaskReport;
<<<<<<< import org.unidal.cat.plugin.transaction.filter.TransactionHolder; import org.unidal.cat.plugin.transaction.filter.TransactionReportHelper; import org.unidal.lookup.annotation.Named; import com.dianping.cat.consumer.transaction.model.entity.Machine; import com.dianping.cat.consumer.transaction.model.entity.Tra...
<<<<<<< import org.incode.module.base.dom.valuetypes.LocalDateInterval; ======= import org.incode.module.base.dom.managed.ManagedIn; >>>>>>> import org.incode.module.base.dom.managed.ManagedIn; import org.incode.module.base.dom.valuetypes.LocalDateInterval; <<<<<<< import org.estatio.module.lease.dom.Lease; import...
<<<<<<< import org.apache.isis.applib.services.eventbus.EventBusService; ======= >>>>>>>
<<<<<<< import org.incode.module.base.dom.managed.ManagedIn; ======= import org.incode.module.country.dom.impl.Country; >>>>>>> import org.incode.module.base.dom.managed.ManagedIn; import org.incode.module.country.dom.impl.Country; <<<<<<< import org.estatio.module.lease.dom.Lease; import org.estatio.module.lease....
<<<<<<< @Indices({ @Index(name = "CodaDocLine_accountCodeValidation_IDX", members = { "handling", "accountCodeValidationStatus", "accountCode" }), @Index(name = "CodaDocLine_accountCodeEl3Validation_IDX", members = { "handling", "accountCodeValidationStatus", "accountCode...
<<<<<<< ======= import org.apache.isis.applib.services.eventbus.EventBusService; >>>>>>> <<<<<<< final String atPath) throws IllegalArgumentException { ======= final String atPath) throws IllegalArgumentException { >>>>>>> final String atPath) throws IllegalArgumentException ...
<<<<<<< import com.google.gwt.event.dom.client.*; import com.google.gwt.event.shared.HandlerRegistration; import gwt.material.design.client.base.ComplexWidget; ======= >>>>>>> import com.google.gwt.event.dom.client.*; import com.google.gwt.event.shared.HandlerRegistration; <<<<<<< public class MaterialColumn extend...
<<<<<<< public void testAllowBlanks() { // given MaterialListValueBox<Integer> valueBox = (MaterialListValueBox<Integer>) getWidget(); assertFalse(valueBox.isAllowBlank()); assertEquals(0, valueBox.getItemCount()); // when / then valueBox.setAllowBlank(true); ...
<<<<<<< if (valueBoxBase.getText() != null && !valueBoxBase.getText().isEmpty()) { label.addStyleName("active"); ======= if (this.valueBoxBase.getText() != null && !this.valueBoxBase.getText().isEmpty()) { label.addStyleName(CssName.ACTIVE); >>>>>>> ...
<<<<<<< import org.wso2.msf4j.service.TestMicroServiceWithDynamicPath; ======= import org.wso2.msf4j.service.SecondService; >>>>>>> import org.wso2.msf4j.service.SecondService; import org.wso2.msf4j.service.TestMicroServiceWithDynamicPath; <<<<<<< microservicesRunner.deploy(new TestMicroServiceWithDynamicPa...
<<<<<<< pipeline.addLast(eventExecutorGroup, "router", new RequestRouter(MicroservicesRegistry.getInstance() .getHttpResourceHandler(), 0)); pipeline.addLast(eventExecutorGroup, "dispatcher", new HttpDispatcher()); ======= pipeline.addLast("compressor", ...
<<<<<<< import org.wso2.msf4j.service.TestMicroServiceWithDynamicPath; ======= import org.wso2.msf4j.service.SecondService; >>>>>>> import org.wso2.msf4j.service.SecondService; import org.wso2.msf4j.service.TestMicroServiceWithDynamicPath; <<<<<<< microservicesRunner .addExceptionMapper(new ...
<<<<<<< @Override public boolean isVisibleForModeratorAnd(User user) { return !this.isVisible() && !user.isAuthorOf(this); } ======= @Override public boolean hasPendingEdits() { for (QuestionInformation information : history) { if(information.isPending()) return true; } return false; } >>>>>>> ...
<<<<<<< public int getAnswersCount() { return getAnswers().size(); } ======= public boolean hasSolution() { return solution != null; } >>>>>>> public int getAnswersCount() { return getAnswers().size(); } public boolean hasSolution() { return solution != null; }
<<<<<<< public UpdateStatus updateWith(QuestionInformation information) { UpdateStatus status = information.getAuthor().canUpdate(this); if (status == UpdateStatus.REFUSED) return status; this.enqueueChange(information, status); return status; } public void enque...
<<<<<<< public AnswerInformation(String description, LoggedUser currentUser) { if (currentUser == null) { ======= public AnswerInformation(String description, CurrentUser currentUser, String comment) { if (currentUser == null) { >>>>>>> public AnswerInformation(String description, LoggedUser currentUse...
<<<<<<< import org.joda.time.LocalDate; ======= >>>>>>> import org.joda.time.LocalDate; <<<<<<< ======= import br.com.caelum.brutal.dao.QuestionDAO; >>>>>>> import br.com.caelum.brutal.dao.QuestionDAO; <<<<<<< private Validator validator; ======= private final QuestionDAO questions; >>>>>>> private Valida...
<<<<<<< Information approved = new AnswerInformation("blablabalblab", new LoggedUser(editUser, null), answer); ======= Information approved = new AnswerInformation("blablabalblab", new CurrentUser(editUser, null), answer, ""); >>>>>>> Information approved = new AnswerInformation("blablabalbla...
<<<<<<< void setKarma(long karma) { this.karma = karma; } ======= public String getEmail() { return email; } >>>>>>> void setKarma(long karma) { this.karma = karma; } public String getEmail() { return email; } <<<<<<< public UpdateStatus canUpdate(Updatable updatable) { ...
<<<<<<< import java.util.List; ======= >>>>>>> import java.util.List;
<<<<<<< import querqy.lucene.rewrite.*; ======= import querqy.ComparableCharSequence; import querqy.lucene.rewrite.*; >>>>>>> import querqy.ComparableCharSequence; import querqy.lucene.rewrite.*; <<<<<<< public static final String QBOOST_METHOD = "qboost.method"; ======= public static final String QBOOST_...
<<<<<<< /* * Copyright (C) 2012-2019 52°North Initiative for Geospatial Open Source ======= /** * Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source >>>>>>> /* * Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source
<<<<<<< import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexReaderContext; ======= >>>>>>> <<<<<<< TermQuery makeTermQuery(int dfToSet) throws IOException { IndexReaderContext context = indexSearcher.getTopReaderContext(); // ...
<<<<<<< "//str[@name='parsedquery'][contains(.,'PhraseQuery(f1:\"a b\")^2.0')]", "//str[@name='parsedquery'][contains(.,'PhraseQuery(f1:\"b c\")^2.0')]", "//str[@name='parsedquery'][contains(.,'PhraseQuery(f1:\"c d\")^2.0')]", "//str[@name='parsedquery'][not(contains(.,'P...
<<<<<<< mMainPresenter.loadWeather(); View decorView = getWindow().getDecorView(); int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN; decorView.setSystemUiVisibility(uiOptions); ======= mMainPresenter.loadWeather(location); >...
<<<<<<< import com.itextpdf.licensekey.LicenseKey; ======= import com.itextpdf.samples.GenericTest; import com.itextpdf.test.annotations.type.SampleTest; import org.junit.experimental.categories.Category; >>>>>>> <<<<<<< ======= >>>>>>>
<<<<<<< private final BranchRepository branchRepository; ======= private final CommitBaseDataMapper commitBaseDataMapper = new CommitBaseDataMapper(); private final FileBaseDataMapper fileBaseDataMapper = new FileBaseDataMapper(); >>>>>>> private final BranchRepository branchRepository; private final Commi...
<<<<<<< import com.itextpdf.kernel.colors.Color; ======= import com.itextpdf.kernel.color.ColorConstants; >>>>>>> import com.itextpdf.kernel.colors.ColorConstants; <<<<<<< Table table = new Table(UnitValue.createPercentArray(5)).useAllAvailableWidth(); Cell sn = new Cell(2, 1).add(new Paragraph("S/N...
<<<<<<< import com.itextpdf.licensekey.LicenseKey; ======= import com.itextpdf.samples.GenericTest; import com.itextpdf.test.annotations.type.SampleTest; import org.junit.experimental.categories.Category; >>>>>>> <<<<<<< ======= >>>>>>>
<<<<<<< import com.itextpdf.kernel.colors.Color; ======= import com.itextpdf.kernel.color.ColorConstants; >>>>>>> import com.itextpdf.kernel.colors.ColorConstants; <<<<<<< table2.addCell(new Cell().setBorder(new SolidBorder(Color.RED, 1)).add(new Paragraph("Goodbye World"))); ======= table2.addCel...
<<<<<<< IIngredientManager getIngredientManager(); ======= /** * @since JEI 4.15.0 */ IBookmarkOverlay getBookmarkOverlay(); /** * @deprecated since JEI 4.5.0. Use {@link #getIngredientListOverlay()} */ @Deprecated IItemListOverlay getItemListOverlay(); >>>>>>> IBookmarkOverlay getBookmarkOverlay(); ...
<<<<<<< public void drawOnForeground(ContainerScreen gui, int mouseX, int mouseY) { ======= public void drawOnForeground(Minecraft minecraft, GuiContainer gui, int mouseX, int mouseY) { >>>>>>> public void drawOnForeground(Minecraft minecraft, ContainerScreen gui, int mouseX, int mouseY) { <<<<<<< GlStateMana...
<<<<<<< import mezz.jei.api.IIngredientFilter; ======= import mezz.jei.api.IBookmarkOverlay; >>>>>>> import mezz.jei.api.IIngredientFilter; import mezz.jei.api.IBookmarkOverlay; <<<<<<< ======= private final IBookmarkOverlay bookmarkOverlay; private final ItemListOverlay itemListOverlay; >>>>>>> private final...
<<<<<<< import java.util.Collections; import java.util.List; ======= import mezz.jei.util.LimitedLogger; import mezz.jei.util.Log; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; >>>>>>> import java.time.Duration; import java.util.Collections; import java.util.List; <<<<<<< ======= private fi...
<<<<<<< import io.reflectoring.coderadar.projectadministration.service.filepattern.FilePatternMatcher; ======= >>>>>>> import io.reflectoring.coderadar.projectadministration.service.filepattern.FilePatternMatcher; <<<<<<< List<MetricValue> analyzeCommit(Commit commit, Project project, List<SourceCodeFileAnalyze...
<<<<<<< ======= import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.springframework.hateoas.ResourceSupport; >>>>>>> import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; <<<<<<< public class CommitProfileRatingsOutputResource { ======= ...
<<<<<<< import java.util.stream.Collector; ======= import java.util.stream.Stream; >>>>>>> import java.util.stream.Collector; import java.util.stream.Stream;
<<<<<<< public Object invoke(HandleDing h, final Object target, Object[] args, MethodProxy mp) throws Exception ======= public Object invoke(Supplier<Handle> handle, final Object target, Object[] args, MethodProxy mp) >>>>>>> public Object invoke(Supplier<Handle> handle, final Object target, Object[] arg...
<<<<<<< public static class FooProperty { private final Object foo; FooProperty(Object foo) { this.foo = foo; } @SuppressWarnings("unused") public Object getFoo() { return foo; } } public static class IdProperty { private fi...
<<<<<<< final int columnIndex = findColumnIndex(paramName, columnNames, columnNameMatchers, () -> debugName(parameter)) .orElseThrow(() -> new IllegalArgumentException(String.format( "Constructor '%s' parameter '%s' has no column in the res...
<<<<<<< ======= import io.reflectoring.coderadar.core.vcs.port.driver.CloneRepositoryUseCase; >>>>>>> import io.reflectoring.coderadar.core.vcs.port.driver.CloneRepositoryUseCase; <<<<<<< import java.util.Optional; ======= >>>>>>> import java.util.Optional; <<<<<<< import org.junit.jupiter.api.extension.ExtendW...
<<<<<<< private final List<JdbiPlugin> plugins = new ArrayList<>(); ======= private String[] migrationScriptPaths; private List<JdbiPlugin> plugins = new ArrayList<>(); >>>>>>> private String[] migrationScriptPaths; private final List<JdbiPlugin> plugins = new ArrayList<>();
<<<<<<< import static org.jdbi.v3.Types.findGenericParameter; import static org.jdbi.v3.Types.getErasedType; import java.lang.reflect.Constructor; import java.lang.reflect.Type; ======= >>>>>>> import static org.jdbi.v3.Types.findGenericParameter; import static org.jdbi.v3.Types.getErasedType; import java.lang.ref...
<<<<<<< Object invoke(HandleDing h, Object target, Object[] args, MethodProxy mp) throws Exception; ======= Object invoke(Supplier<Handle> handle, Object target, Object[] args, MethodProxy mp); >>>>>>> Object invoke(Supplier<Handle> handle, Object target, Object[] args, MethodProxy mp) throws Exception;
<<<<<<< LazyHandle(DBI dbi) { ======= public LazyHandle(Jdbi dbi) { >>>>>>> LazyHandle(Jdbi dbi) {
<<<<<<< import static java.util.Collections.synchronizedMap; ======= import org.jdbi.v3.core.config.ConfigRegistry; import org.jdbi.v3.core.extension.ExtensionFactory; import org.jdbi.v3.core.extension.ExtensionMethod; import org.jdbi.v3.core.extension.HandleSupplier; import org.jdbi.v3.sqlobject.config.Configurer; i...
<<<<<<< * @return an {@link NVarchar} qualifying annotation instance. */ public static NVarchar nVarchar() { return AnnotationFactory.create(NVarchar.class); } /** ======= >>>>>>>
<<<<<<< import org.skife.jdbi.v2.Query; import org.skife.jdbi.v2.ResultIterator; ======= import org.skife.jdbi.v2.StatementContext; >>>>>>> import org.skife.jdbi.v2.StatementContext; <<<<<<< ======= import org.skife.jdbi.v2.sqlobject.mixins.CloseMe; import org.skife.jdbi.v2.tweak.HandleCallback; >>>>>>> import o...
<<<<<<< final TransactionIsolationLevel initial = getTransactionIsolationLevel(); boolean failed = true; try { setTransactionIsolation(level); ReturnType result = inTransaction(callback); failed = false; return result; } finally {...
<<<<<<< private static final String BASE_VOCAB_NS = "neo4j://com.neo4j/voc#"; private static final String BASE_INDIV_NS = "neo4j://com.neo4j/indiv#"; ======= public static final String BASE_VOCAB_NS = "neo4j://vocabulary#"; public static final String BASE_INDIV_NS = "neo4j://individuals#"; >>>>>>> private ...
<<<<<<< public static final Label RESOURCE = Label.label("Resource"); public static final String[] EMPTY_ARRAY = new String[0]; Cache<String, Node> nodeCache; public DirectStatementLoader(GraphDatabaseService db, long batchSize, long nodeCacheSize, int handleUrls, int handleMultivals, Set<String> multiva...
<<<<<<< ======= import java.io.BufferedWriter; >>>>>>> import java.io.BufferedWriter; <<<<<<< * Created by jbarrasa on 21/03/2016. * <p> * RDF importer based on: 1. DatatypeProperties become node attributes 2. rdf:type relationships are * transformed into labels on the subject node 3. rdf:type relationships gen...
<<<<<<< private static final String ARCHIVA_TEST_ARTIFACT_ID = "archiva-xmlrpc-test"; private static final String ARCHIVA_TEST_GROUP_ID = "org.apache.archiva"; private MockControl metadataResolverControl; private MetadataResolver metadataResolver; ======= private MockControl repoBrowsing...
<<<<<<< import cn.annoreg.core.RegistrationClass; import cn.annoreg.mc.RegCommand; import cn.liutils.api.command.LICommandBase; ======= import cn.liutils.template.command.LICommandBase; >>>>>>> import cn.annoreg.core.RegistrationClass; import cn.annoreg.mc.RegCommand; import cn.liutils.template.command.LICommandBase...
<<<<<<< ======= import cn.academy.misc.tutorial.ACTutorial; import cn.academy.misc.tutorial.Condition; import cn.academy.support.BlockConverterBase; >>>>>>> import cn.academy.support.BlockConverterBase;
<<<<<<< @Override public void preInit() { EventHandlerClient.init(); EventHandlerServer.init(); } ======= >>>>>>> @Override public void preInit() { EventHandlerClient.init(); EventHandlerServer.init(); }
<<<<<<< import java.util.IdentityHashMap; ======= import java.util.HashSet; >>>>>>> import java.util.IdentityHashMap; import java.util.HashSet;
<<<<<<< import io.realm.log.RealmLogger; ======= import io.realm.log.LogLevel; >>>>>>> <<<<<<< ======= public void weakReferenceListener() throws InterruptedException { final AtomicInteger weakCounter = new AtomicInteger(0); final AtomicInteger strongCounter = new AtomicInteger(0); fi...
<<<<<<< ======= import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.hateoas.ResourceSupport; >>>>>>> import lombok.Data; import lombok.EqualsAndHashCode; <<<<<<< public class QualityProfileResource { private Long id; ======= @EqualsAndHashCode(callSuper = true) @Data public class Qu...
<<<<<<< private static RealmConfiguration defaultConfiguration; private static final String INCORRECT_THREAD_MESSAGE = "Realm access from incorrect thread. Realm objects can only be accessed on the thread they where created."; ======= // Maps ids to a boolean set to true if the Realm is open. This is onl...
<<<<<<< public static Simple copyOrUpdate(Realm realm, Simple object, boolean update, Map<RealmObject,RealmObjectProxy> cache) { ======= public static Simple copyOrUpdate(Realm realm, Simple object, boolean update, Map<RealmObject,RealmObject> cache) { if (object.realm != null && object.realm.getId() ...
<<<<<<< ======= public Query is(long value) { return query(getQuery().equal(columnIndex, value)); } public long minimum() { return 0; } >>>>>>> public long minimum() { return 0; }
<<<<<<< public void insertBinaryByteBuffer(long columnIndex, long rowIndex, ByteBuffer data){ ======= public void insertBinaryByteBuffer(long columnIndex, long rowIndex, ByteBuffer data) { >>>>>>> public void insertBinaryByteBuffer(long columnIndex, long rowIndex, ByteBuffer data) { <<<<<<< public void insertB...
<<<<<<< ======= import java.util.HashSet; import java.util.Iterator; >>>>>>> import java.util.Iterator; <<<<<<< private static RealmConfiguration defaultConfiguration; private static final String APT_NOT_EXECUTED_MESSAGE = "Annotation processor may not have been executed."; ======= // Maps ids to a b...
<<<<<<< public long getNativePointer () { return nativePtr; } private native long createNativeWithImplicitTransactions(long nativeReplicationPtr, byte[] key); ======= private native long createNativeWithImplicitTransactions(long nativeReplicationPtr, int durability, byte[] key); >>>>>>> ...
<<<<<<< import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.ListIterator; import java.util.Map; import java.lang.String; ======= >>>>>>> <<<<<<< ======= import java.util.EnumSet; import java.util.HashMap; >>>>>>>
<<<<<<< void validateQuery() { if (! queryValidated) { // If not yet validated, check if syntax is valid ======= private void validateQuery() { if (!queryValidated) { // If not yet validated, checks if syntax is valid >>>>>>> void validateQuery() { if (! queryValidated) { // If no...
<<<<<<< TableSpec tableSpec = new TableSpec(); tableSpec.addColumn(ColumnType.STRING, "name"); tableSpec.addColumn(ColumnType.LONG, "number"); tbl.updateFromSpec(tableSpec); ======= tbl.addColumn(ColumnType.ColumnTypeString, "name"); tbl.addColumn(ColumnType.ColumnTypeI...
<<<<<<< this.nativePtr = nativeCreatePersistedProperty(name, type.getNativeValue(), isPrimary, isIndexed, !isRequired); ======= this.nativePtr = nativeCreateProperty(name, convertFromRealmFieldType(type, isRequired), isPrimary, isIndexed); >>>>>>> this.nativePtr = nativeCreatePersistedPropert...
<<<<<<< import io.realm.entities.CyclicType; import io.realm.entities.CyclicTypePrimaryKey; ======= import io.realm.entities.Cat; >>>>>>> import io.realm.entities.CyclicType; import io.realm.entities.CyclicTypePrimaryKey; import io.realm.entities.Cat;
<<<<<<< import com.tightdb.ColumnType; ======= import com.tightdb.Group; >>>>>>> import com.tightdb.ColumnType; import com.tightdb.Group;
<<<<<<< import com.google.common.base.Splitter; import com.google.common.collect.Iterables; ======= import com.google.common.base.Throwables; >>>>>>> import com.google.common.base.Splitter; import com.google.common.collect.Iterables; import com.google.common.base.Throwables;
<<<<<<< public void testRealmFileDeletion() { final String otherRealmName = "yetAnotherRealm.realm"; try { Realm.deleteRealmFile(getContext()); fail(); } catch (Exception ignored) { } Realm yetAnotherRealm = Realm.getInstance(getContext(), otherRealm...
<<<<<<< // Verify that the logic for waiting for the users file dir to be come available isn't totally broken // This is pretty hard to test, so forced to break encapsulation in this case. @Test public void init_waitForFilesDir() throws NoSuchMethodException, InvocationTargetException, IllegalAccessExc...
<<<<<<< import io.realm.RealmFieldType; import io.realm.RealmObjectSchema; import io.realm.RealmSchema; ======= >>>>>>> import io.realm.RealmObjectSchema; import io.realm.RealmSchema;
<<<<<<< @Deprecated public RealmResults<E> findAll(String fieldName, boolean sortAscending) { TableView tableView = query.findAll(); TableView.Order order = sortAscending ? TableView.Order.ascending : TableView.Order.descending; Long columnIndex = columns.get(fieldName); if (colu...
<<<<<<< table.addColumn(ColumnType.BINARY, "binary"); // 0 table.addColumn(ColumnType.BOOLEAN, "boolean"); // 1 table.addColumn(ColumnType.DATE, "date"); // 2 table.addColumn(ColumnType.DOUBLE, "double"); // 3 table.addColumn(ColumnType.FLOAT, "float"); /...
<<<<<<< /* ======= @Override >>>>>>> /* @Override <<<<<<< */ ======= @Override >>>>>>> */ @Override <<<<<<< /* ======= @Override >>>>>>> /* @Override <<<<<<< public void adjust(long columnIndex, long value) { ======= @Override public void addLong(long ...
<<<<<<< public void testSortOnNonExistingColumn() { try { RealmResults<AllTypes> resultList = testRealm.where(AllTypes.class).findAll(); RealmResults<AllTypes> sortedList = resultList.sort("Non-existing"); fail("Column should not exist"); } catch (ArrayIndexOutOfB...
<<<<<<< import java.util.List; import org.junit.Test; import org.junit.experimental.categories.Category; ======= import org.junit.jupiter.api.Test; import org.springframework.hateoas.Resources; >>>>>>> import java.util.List; import org.junit.jupiter.api.Test;
<<<<<<< private native String nativeValidateQuery(long nativeQueryPtr); ======= >>>>>>> <<<<<<< private native void nativeTableview(long nativeQueryPtr, long nativeTableViewPtr); ======= >>>>>>> <<<<<<< private native void nativeGroup(long nativeQueryPtr); ======= >>>>>>> <<<<<<< private na...
<<<<<<< Class syncFacadeClass = Class.forName("io.realm.internal.objectserver.SyncObjectServerFacade"); //noinspection unchecked syncFacade = (ObjectServerFacade) syncFacadeClass.getDeclaredConstructor().newInstance(); ======= Class syncFacadeClass = Class.forName("io.r...
<<<<<<< RealmConfiguration configuration = new RealmConfiguration .Builder(context) .schema(Owner.class, Cat.class) .assetFile(context, "asset_file.realm") ======= RealmConfiguration configuration = new RealmConfiguration.Builder(context).assetFile(conte...
<<<<<<< @Test public void setAndGetNumbers() { // Double column s view.get(0).doubleNum.set(400d); assertEquals(400d, view.get(0).doubleNum.get()); view.get(1).doubleNum.set(-0.01d); assertEquals(-0.01d, view.get(1).doubleNum.get()); //...
<<<<<<< public void testHasPrimaryKey() { Table table = testRealm.getTable(AnnotationTypes.class); assertTrue(table.hasPrimaryKey()); } // Test migrating primary key from string to long with existing data public void testPrimaryKeyMigration_long() { testRealm.beginTransaction()...
<<<<<<< public static RealmConfiguration createConfiguration(File dir, String name, byte[] key) { RealmConfiguration.Builder config = new RealmConfiguration.Builder(InstrumentationRegistry.getInstrumentation().getTargetContext()) ======= public static RealmConfiguration createConfiguration(File dir, S...
<<<<<<< if (!syncAvailable) { if (commitNeeded) { realm.commitTransaction(); } else { realm.cancelTransaction(); } ======= if (commitChanges) { realm.commitTransaction(false); } ...
<<<<<<< ======= import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; >>>>>>> import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util...
<<<<<<< void checkLegalName(String fieldName) { //noinspection ConstantConditions ======= static void checkLegalName(String fieldName) { >>>>>>> static void checkLegalName(String fieldName) { //noinspection ConstantConditions
<<<<<<< public void removeColumn(long columnIndex) { ======= @Override public void removeColumn(long columnIndex) { >>>>>>> @Override public void removeColumn(long columnIndex) { <<<<<<< /* ======= @Override >>>>>>> /* @Override <<<<<<< /* ======= @Override >>>>>>...
<<<<<<< ======= import java.io.BufferedWriter; import java.io.IOException; import java.util.*; >>>>>>> import java.io.BufferedWriter; import java.io.IOException; import java.util.*; <<<<<<< private Elements elementUtils; private Types typeUtils; private TypeMirror realmObject; private DeclaredType r...
<<<<<<< table.addAt(0, false); assertTrue(false); ======= table.insert(0, false); fail("expected exception."); >>>>>>> table.addAt(0, false); fail("expected exception."); <<<<<<< table.addAt(1, false, 1, "hi", buf, new Date(), mix, ...
<<<<<<< public TableQuery equalTo(long columnIndex, Date value){ nativeEqualDate(nativePtr, columnIndex, value.getTime()/1000); ======= public TableQuery equal(long columnIndex, Date value){ nativeEqualDateTime(nativePtr, columnIndex, value.getTime()/1000); return this; } publi...
<<<<<<< import io.realm.entities.Dog; import io.realm.entities.FieldOrder; ======= import io.realm.entities.AnnotationTypes; >>>>>>> import io.realm.entities.FieldOrder; import io.realm.entities.AnnotationTypes; <<<<<<< @Override protected void tearDown() throws Exception { super.tearDown(); ...
<<<<<<< import android.os.Handler; import android.os.Looper; import android.os.Message; ======= import android.util.Log; >>>>>>> import android.os.Handler; import android.os.Looper; import android.os.Message; import android.util.Log; <<<<<<< ======= private static final Map<String, ThreadRealm> realms = new H...
<<<<<<< import android.content.Context; import android.os.Looper; ======= >>>>>>> import android.os.Looper;