conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
=======
import java.util.UUID;
import com.google.common.base.Optional;
>>>>>>>
import java.util.UUID;
import com.google.common.base.Optional; |
<<<<<<<
import java.util.ArrayList;
import java.util.List;
import cam72cam.immersiverailroading.library.*;
import org.apache.commons.lang3.ArrayUtils;
=======
>>>>>>>
<<<<<<<
import cam72cam.immersiverailroading.entity.EntityMoveableRollingStock;
import cam72cam.immersiverailroading.entity.EntityRollingStock;
imp... |
<<<<<<<
=======
// @since 2.8
>>>>>>>
<<<<<<<
=======
/**
* @param m ObjectMapper to use for newly constructed module
*
* @since 2.8
*/
>>>>>>>
/**
* @param m ObjectMapper to use for newly constructed module
*/ |
<<<<<<<
verifyException(e, "Cannot map `null` into type byte");
// 17-Dec-2020, tatu: Path doubled for some reason
// verifyPath(e, "byteValue");
=======
verifyException(e, "Cannot map `null` into type `byte`");
verifyPath(e, "byteValue");
>>>>>>>
... |
<<<<<<<
private final ObjectMapper MAPPER = newAfterburnerMapper();
=======
// [databind#2101]
static class PrimitiveCreatorBean
{
@JsonCreator
public PrimitiveCreatorBean(@JsonProperty(value="a",required=true) int a,
@JsonProperty(value="b",required=true) int b) { }
... |
<<<<<<<
ObjectMapper mapper = newMrBeanMapper();
Bean bean = mapper.readValue("{ \"x\" : \"abc\", \"y\" : 13 }", CoffeeBean.class);
=======
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new MrBeanModule());
Bean bean = mapper.readValue("{ \"x\" : \"abc\", \"y... |
<<<<<<<
import java.io.IOException;
=======
>>>>>>>
import java.io.IOException;
<<<<<<<
public class XhtmlSelectorView extends AbstractXmlYogaView
{
@Override
public void render(Selector selector, Object value, YogaRequestContext context) throws IOException
{
Element rootElement = new DOMEle... |
<<<<<<<
public abstract class AbstractHierarchicalModel<T> implements HierarchicalModel<T>
=======
public abstract class AbstractHierarchicalModel implements HierarchicalModel
>>>>>>>
public abstract class AbstractHierarchicalModel<T> implements HierarchicalModel<T>
<<<<<<<
public HierarchicalModel<?> createCh... |
<<<<<<<
* Copyright (c) 2012 Pivotal Software, Inc.
=======
* Copyright (c) 2012, 2014 GoPivotal, Inc.
>>>>>>>
* Copyright (c) 2012, 2014 Pivotal Software, Inc. |
<<<<<<<
ClassPathModel.getClassPathModel(project, monitor); // Forces initialisation of the model.
notifyJDT();
=======
project.getGradleModel(monitor); // Forces initialisation of the model.
JobUtil.withRule(JobUtil.buildRule(), monitor, 1, new GradleRunnable("Set classpath "+project.getDisplayNa... |
<<<<<<<
import java.util.function.Predicate;
import java.util.function.Supplier;
=======
>>>>>>>
import java.util.function.Predicate;
import java.util.function.Supplier;
<<<<<<<
* Gets the value on Success or throws a checked exception.
*
* @return new composed Try
* @throws Throwable produced b... |
<<<<<<<
import pl.baczkowicz.spy.utils.ConversionUtils;
=======
import pl.baczkowicz.mqttspy.ui.scripts.InteractiveScriptManager;
import pl.baczkowicz.mqttspy.utils.ConversionUtils;
>>>>>>>
import pl.baczkowicz.mqttspy.ui.scripts.InteractiveScriptManager;
import pl.baczkowicz.spy.utils.ConversionUtils; |
<<<<<<<
=======
import pl.baczkowicz.mqttspy.ui.panes.PaneVisibilityStatus;
import pl.baczkowicz.mqttspy.ui.panes.TabStatus;
import pl.baczkowicz.mqttspy.ui.scripts.InteractiveScriptManager;
>>>>>>>
import pl.baczkowicz.mqttspy.ui.scripts.InteractiveScriptManager; |
<<<<<<<
if (PrefStore.showUpgradeMessage(this)) show(Dialogs.UPGRADE);
=======
setPreferenceListeners(getPreferenceManager(), version >= MIN_VERSION_BACKUP);
if (PrefStore.showUpgradeMessage(this)) {
show(Dialogs.UPGRADE);
}
>>>>>>>
if (PrefStore.showUpgradeMessage... |
<<<<<<<
=======
VideoContainer videoContainer = VideoContainer.empty();
PlayerListenersHolder listenersHolder = new PlayerListenersHolder();
>>>>>>>
PlayerListenersHolder listenersHolder = new PlayerListenersHolder();
<<<<<<<
surfaceHolderRequester.requestSurfaceHolder(new SurfaceHo... |
<<<<<<<
verify(exoPlayerFacade).loadVideo(surfaceHolder, drmSessionCreator, uri, OPTIONS, forwarder, mediaCodecSelector);
=======
verify(exoPlayerFacade).loadVideo(surface, drmSessionCreator, uri, ANY_CONTENT_TYPE, forwarder, mediaCodecSelector);
>>>>>>>
verify(exoPlayerFacade).lo... |
<<<<<<<
private boolean seekingWithIntentToPlay;
private VideoContainer videoContainer;
=======
>>>>>>>
private boolean seekingWithIntentToPlay;
<<<<<<<
videoContainer.show();
=======
>>>>>>>
<<<<<<<
=======
public void play() {
startBeatingHeart();
mediaPlayer.start()... |
<<<<<<<
LogHelper.info("Tile Entities registered");
=======
*/
LogHelper.debug("Tile Entities registered");
>>>>>>>
LogHelper.debug("Tile Entities registered"); |
<<<<<<<
return noPlayerExoPlayerCreator.createExoPlayer(context, drmSessionCreator, useSecureCodec);
=======
return exoPlayerCreator.createExoPlayer(context, drmSessionCreator, downgradeSecureDecoder);
>>>>>>>
return noPlayerExoPlayerCreator.createExoPlayer(context, dr... |
<<<<<<<
import com.mrcrayfish.device.api.app.Dialog;
import com.mrcrayfish.device.api.io.Folder;
=======
>>>>>>>
import com.mrcrayfish.device.api.app.Dialog;
import com.mrcrayfish.device.api.io.Folder; |
<<<<<<<
private static final String UNFORMATTED_SPLIT = "(?<=%1$s)|(?=%1$s)";
private static final String[] DELIMITERS = {"(\\s|$)(?=(([^\"]*\"){2})*[^\"]*$)", "[\\p{Punct}&&[^@\"]]", "\\p{Digit}+"};
private static final String SPLIT_REGEX;
static
{
StringJoiner joiner = new StringJoiner("|");
for(String s : D... |
<<<<<<<
protected List<E> items = NonNullList.create();
=======
protected boolean showAll = true;
protected boolean resized = false;
protected boolean initialized = false;
protected List<E> items = new ArrayList<>();
>>>>>>>
protected boolean showAll = true;
protected boolean resized = false;
protected ... |
<<<<<<<
=======
import com.mrcrayfish.device.api.print.PrintingManager;
>>>>>>>
import com.mrcrayfish.device.api.print.PrintingManager;
<<<<<<<
ApplicationManager.registerApplication(new ResourceLocation(Reference.MOD_ID, "text_area"), ApplicationTextArea.class);
=======
ApplicationManager.registerApplicati... |
<<<<<<<
=======
import com.mrcrayfish.device.api.io.Folder;
import com.mrcrayfish.device.api.task.Callback;
import com.mrcrayfish.device.core.io.FileSystem;
>>>>>>>
import com.mrcrayfish.device.core.io.FileSystem;
<<<<<<<
folder.search(file -> file.isForApplication(this)).stream().forEach(file ->
{
not... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
//resource crop seeds
if(ConfigurationHandler.resourcePlants) {
//vanilla resources
=======
//register natura seeds to the ore dictionary if natura is installed
if(ModIntegration.LoadedMods.natura) {
OreDictionary.reg... |
<<<<<<<
=======
import com.mrcrayfish.device.api.app.Layout;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
>>>>>>>
<<<<<<<
=======
private int draggingWindow;
>>>>>>>
private int draggingWindow;
<<<<<<<
=======
private boolean dirty = false;
private Layou... |
<<<<<<<
import java.awt.Color;
import java.util.Arrays;
=======
>>>>>>>
import java.awt.Color;
import java.util.List;
<<<<<<<
=======
>>>>>>>
<<<<<<<
Info info = ApplicationManager.getApps().get(i + offset);
if(info.getIcon() != null)
{
mc.getTextureManager().bindTexture(info.getIcon().getResou... |
<<<<<<<
import org.n52.iceland.component.SingleTypeComponentFactory;
import org.n52.iceland.encode.ResponseWriter;
import org.n52.iceland.encode.ResponseWriterFactory;
import org.n52.iceland.encode.ResponseWriterKey;
=======
import org.n52.iceland.coding.encode.ResponseWriterFactory;
>>>>>>>
import javax.inject.Inje... |
<<<<<<<
import com.mrcrayfish.device.Reference;
import com.mrcrayfish.device.api.app.*;
=======
import com.mrcrayfish.device.api.app.Application;
>>>>>>>
import com.mrcrayfish.device.Reference;
import com.mrcrayfish.device.api.app.*;
<<<<<<<
import com.mrcrayfish.device.api.print.IPrint;
=======
>>>>>>>
import c... |
<<<<<<<
import com.mrcrayfish.device.block.BlockRouter;
=======
import com.mrcrayfish.device.item.ItemLaptop;
>>>>>>>
import com.mrcrayfish.device.block.BlockRouter;
import com.mrcrayfish.device.item.ItemLaptop; |
<<<<<<<
if (config.getControlPort() > 0) {
controlServer.startServer();
}
=======
circuitManager.startBuildingCircuits();
>>>>>>>
circuitManager.startBuildingCircuits();
if (config.getControlPort() > 0) {
controlServer.startServer();
} |
<<<<<<<
return signRawTransaction(hex, null, null, "ALL");
}
@Override
public String signRawTransaction(String hex, List<ExtendedTxInput> inputs, List<String> privateKeys) {
return signRawTransaction(hex, inputs, privateKeys, "ALL");
}
public String signRawTransaction(String hex, List<ExtendedTxInpu... |
<<<<<<<
=======
import static android.R.layout.simple_dropdown_item_1line;
import static android.accounts.AccountManager.KEY_ACCOUNT_NAME;
import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE;
import static android.accounts.AccountManager.KEY_AUTHTOKEN;
import static android.accounts.AccountManager.KEY_BOOL... |
<<<<<<<
=======
import com.donnfelker.android.bootstrap.util.Ln;
import com.donnfelker.android.bootstrap.util.Strings;
>>>>>>>
import com.donnfelker.android.bootstrap.util.Ln; |
<<<<<<<
=======
import org.eclipse.buildship.core.gradle.Specs;
import org.eclipse.buildship.core.projectimport.internal.DefaultProjectCreatedEvent;
>>>>>>>
import org.eclipse.buildship.core.projectimport.internal.DefaultProjectCreatedEvent;
<<<<<<<
workspaceProject = workspaceOperations.includeProj... |
<<<<<<<
import java.security.PrivateKey;
import java.security.Signature;
=======
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
>>>>>>>
import java.security.PrivateKey;
import java.security.Signature;
import java.security.cert.CertificateException;
import java.security.... |
<<<<<<<
@Test
public void whenExistingContainer_hasWrongMimeSlash_weShouldNotThrowException() {
ValidationResult result = ContainerBuilder.aContainer()
.fromExistingFile("src/test/resources/testFiles/invalid-containers/INC166120_wrong_mime_slash.bdoc")
.withConfiguration(new Configuration(Config... |
<<<<<<<
logger.debug("");
ConfigManager.init("jdigidoc.cfg");
=======
//ConfigManager.init("jdigidoc.cfg");
Configuration configuration = new Configuration();
configuration.addConfiguration("digidoc4j.yaml");
ConfigManager.init(configuration.getJDigiDocConf());
>>>>>>>
logger.debug("");
... |
<<<<<<<
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
import org.digidoc4j.api.Configuration;
>>>>>>>
import org.digidoc4j.api.Configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<<
logger.debug("");
String location = "http://www.openxades.org/cgi-bin/ocsp.cgi";
... |
<<<<<<<
import com.hubspot.slack.client.methods.params.channels.ChannelsInfoParams;
=======
import com.hubspot.slack.client.methods.params.channels.ChannelsKickParams;
>>>>>>>
import com.hubspot.slack.client.methods.params.channels.ChannelsInfoParams;
import com.hubspot.slack.client.methods.params.channels.ChannelsK... |
<<<<<<<
import com.hubspot.slack.client.models.events.user.SlackMemberJoinedChannelEvent;
=======
import com.hubspot.slack.client.models.events.user.SlackUserChangeEvent;
>>>>>>>
import com.hubspot.slack.client.models.events.user.SlackMemberJoinedChannelEvent;
import com.hubspot.slack.client.models.events.user.Slack... |
<<<<<<<
@Parameter(description = "port the server will listen on.", names = "-port")
private int port = 5555;
@Parameter(description = "timeout that will be used to start Android emulators", names = "-timeoutEmulatorStart")
private long timeoutEmulatorStart = 300000;
@Parameter(description = "if true, adb will b... |
<<<<<<<
public static final String DEFAULT_HOSTNAME = "http://www.android.com";
=======
public static final String DEFAULT_ENDPOINT = "http://www.google.com";
>>>>>>>
public static final String DEFAULT_ENDPOINT = "http://www.android.com"; |
<<<<<<<
import de.neuland.jade4j.filter.*;
=======
import de.neuland.jade4j.filter.CDATAFilter;
import de.neuland.jade4j.filter.CssFilter;
import de.neuland.jade4j.filter.CustomTestFilter;
import de.neuland.jade4j.filter.JsFilter;
import de.neuland.jade4j.filter.MarkdownFilter;
import de.neuland.jade4j.filter.PlainFi... |
<<<<<<<
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
=======
import javafx.scene.layout.Priority;
import javafx.scene.layout.Region;
import javafx.scene.layout.VBox;
>>>>>>>
import javafx.scene.layout.Priority;
import javafx.scene.layout.Region;
import javafx.scene.layout.VBox;
<<<<<<<
... |
<<<<<<<
if (code.isLetterKey() || code.isDigitKey() || code == KeyCode.SPACE) {
String letter = code.getChar();
=======
if (code.isLetterKey() || code.isDigitKey() || code == KeyCode.SPACE || code == KeyCode.BACK_SPACE) {
if (event.getSource() instanceof PrefixS... |
<<<<<<<
Objects.requireNonNull(fixedCorner, "The specified fixed corner must not be null."); //$NON-NLS-1$
Objects.requireNonNull(diagonalCorner, "The specified diagonal corner must not be null."); //$NON-NLS-1$
if (ratio < 0)
throw new IllegalArgumentException("The specified ratio "... |
<<<<<<<
import javafx.scene.control.TableCell;
import javafx.scene.control.skin.TableCellSkin;
=======
import javafx.scene.control.MenuButton;
import javafx.scene.control.TableColumn;
>>>>>>>
import javafx.scene.control.MenuButton;
import javafx.scene.control.TableColumn;
import javafx.scene.control.skin.TableCellSk... |
<<<<<<<
=======
import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
import com.sun.javafx.scene.traversal.Algorithm;
>>>>>>>
import com.sun.javafx.scene.traversal.Algorithm;
<<<<<<<
=======
@Override protected void handleControlPropertyChanged(String p) {
super.handleControlPropertyChanged(p);
... |
<<<<<<<
if (!docker.getContainerStatus(element.getElementId()).isPresent() || element.isRebuild()) {
addTask(new ContainerTask(ADD, element));
=======
if (!docker.hasContainerWithElementId(element.getElementId()) || element.isRebuild()) {
addTask(new ContainerTask(ADD, element.getElementId(), null))... |
<<<<<<<
result = getJSON(controllerUrl + "instance/provision/key/" + key + "/fogtype/" + Constants.FOG_TYPE);
=======
result = getJSON(controllerUrl + "instance/provision/key/" + key + "/fabrictype/" + Configuration.getFogType().getCode());
>>>>>>>
result = getJSON(controllerUrl + "instance/provision/key/" ... |
<<<<<<<
if (SystemUtils.IS_OS_LINUX) {
String distrName = getDistributionName();
if (distrName.toLowerCase().contains("ubuntu")
|| distrName.toLowerCase().contains("debian")
|| distrName.toLowerCase().contains("raspbian")) {
GET_IOFOG_PACKAGE_INSTALLED_VERSION = "apt-cache policy " + PACKAGE_NAME ... |
<<<<<<<
public void sendUSBInfoFromHalToController() {
if (notProvisioned()) {
return;
}
Optional<StringBuilder> response = getResponse(USB_INFO_URL);
if (!response.isPresent()) {
return;
}
String usbInfo = response.get().toString();
StatusReporter.setResourceManagerStatus().setUsbConnectionsInfo(u... |
<<<<<<<
=======
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.NetworkInterface;
import java.util.Enumeration;
import java.u... |
<<<<<<<
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
=======
import java.util.stream.Collectors;
>>>>>>>
import java.util.stream.Collectors;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
<<<<<<<
* @param status - status of {@link ElementStat... |
<<<<<<<
GPS_MODE(GpsMode.AUTO.name().toLowerCase(), "", "gps_mode", "gpsmode"),
GPS_COORDINATES("", "gps", "gps_coordinates", "gpscoordinates"),
POST_DIAGNOSTICS_FREQ ("10", "df", "post_diagnostics_freq", "postdiagnosticsfreq");
=======
GPS_MODE("", "", "", "gpsmode"),
GPS_COORDINATES(GpsMode.AUTO.na... |
<<<<<<<
FormMappingService getFormMappingService();
=======
BusinessDataRepository getBusinessDataRepository();
BusinessDataService getBusinessDataService();
BusinessDataModelRepository getBusinessDataModelRepository();
RefBusinessDataService getRefBusinessDataService();
>>>>>>>
FormMapp... |
<<<<<<<
private final RefBusinessDataService refBusinessDataService;
=======
private FlowNodeStateManager stateManager;
>>>>>>>
private final RefBusinessDataService refBusinessDataService;
private FlowNodeStateManager stateManager;
<<<<<<<
final ExpressionResolverService expressionRe... |
<<<<<<<
List<SWaitingEvent> waitingEvents = searchWaitingEvents(SWaitingEvent.class, queryOptions);
do {
for (final SWaitingEvent sWaitingEvent : waitingEvents) {
deleteWaitingEvent(sWaitingEvent);
}
waitingEvents = searchWaitingEvents(SWaitingEvent.cl... |
<<<<<<<
.isEqualTo("SELECT testObj.* FROM test_object testObj WHERE (testObj.age < 25)");
}
=======
.isEqualTo("SELECT testObj.* FROM test_object testObj WHERE (testObj.age < :p1)");
assertThat(queryBuilder.getQueryParameters().get("p1")).isEqualTo(25);
}
>>>>>>>
... |
<<<<<<<
import java.lang.reflect.Method;
=======
import java.lang.reflect.UndeclaredThrowableException;
>>>>>>>
import java.lang.reflect.Method;
import java.lang.reflect.UndeclaredThrowableException;
<<<<<<<
private final boolean cleanSession;
=======
private TechnicalLoggerService technicalLogger;
>>>... |
<<<<<<<
=======
private final ServerAPIImpl apiImpl;
>>>>>>>
<<<<<<<
this.serverApi = serverApi;
// System.out.println(this.getClass().getSimpleName() + " - " + this.getName() + "starting...");
=======
this.apiImpl = apiImpl;
// System.out.println(this.getClass().getSimpleName... |
<<<<<<<
=======
@Test
public void getNumberOfSProcessInstanceFailed_should_return_number_of_distinct_process_instances() {
// Given
repository.add(buildFailedProcessInstance(1));
final SProcessInstanceImpl processInstanceWithFailedFlowNode = new SProcessInstanceImpl("process2", 10L);
... |
<<<<<<<
final TenantServiceAccessor tenantAccessor = getTenantAccessor();
final ActivityInstanceService activityInstanceService = tenantAccessor.getActivityInstanceService();
try {
final ProcessInstance processInstance = getProcessInstance(processInstanceId);
if (isUserP... |
<<<<<<<
import org.bonitasoft.engine.api.PageAPI;
import org.bonitasoft.engine.api.TenantAPIAccessor;
=======
import com.bonitasoft.engine.BPMTestSPUtil;
import com.bonitasoft.engine.CommonAPISPIT;
import com.bonitasoft.engine.api.ProcessConfigurationAPI;
>>>>>>>
import org.bonitasoft.engine.api.PageAPI;
import org.... |
<<<<<<<
=======
@Test(expected = RetrieveException.class)
public void getConnectorsImplementations_should_throw__exception() throws Exception {
//given
final SConnectorException sConnectorException = new SConnectorException("message");
doThrow(sConnectorException).when(connectorService... |
<<<<<<<
if(terminal.isCommandRequest()) {
=======
if (terminal.isCommandRequest()) {
>>>>>>>
if (terminal.isCommandRequest()) {
<<<<<<<
if(welcomeMessage != null) {
=======
if (welcomeMessage != null) {
>>>>>>>
if (welcom... |
<<<<<<<
=======
import com.bonitasoft.engine.api.APIClient;
import com.bonitasoft.engine.api.IdentityAPI;
import com.bonitasoft.engine.api.PlatformAPI;
import com.bonitasoft.engine.api.PlatformAPIAccessor;
import com.bonitasoft.engine.api.ProcessAPI;
import com.bonitasoft.engine.api.TenantAPIAccessor;
import com.boni... |
<<<<<<<
/*******************************************************************************
* Copyright (C) 2013 BonitaSoft S.A.
* BonitaSoft is a trademark of BonitaSoft SA.
* This software file is BONITASOFT CONFIDENTIAL. Not For Distribution.
* For commercial licensing information, contact:
* BonitaSoft, 32 rue Gu... |
<<<<<<<
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import java.lang.reflect.Method;
=======... |
<<<<<<<
public static ProcessConfigurationAPI getProcessConfigurationAPI(APISession session) throws BonitaHomeNotSetException, ServerAPIException, UnknownAPITypeException {
return getAPI(ProcessConfigurationAPI.class, session);
}
=======
public static TenantAdministrationAPI getTenantAdministratio... |
<<<<<<<
public void getJobLogs_should_call_searchJobLogs() throws Exception {
// Given
final long jobDescriptorId = 9L;
final int fromIndex = 0;
final int maxResults = 10;
// When
jobServiceImpl.getJobLogs(jobDescriptorId, fromIndex, maxResults);
// Then
... |
<<<<<<<
=======
private static final long FLOW_NODE_INSTANCE_ID = 100;
>>>>>>>
private static final long FLOW_NODE_INSTANCE_ID = 100;
<<<<<<<
=======
@Mock
private SFlowNodeInstance flowNodeInstance;
>>>>>>>
@Mock
private SFlowNodeInstance flowNodeInstance;
<<<<<<<
... |
<<<<<<<
final DefaultReportList reports = new DefaultReportList(
tenantAccessor.getTechnicalLoggerService(),
BonitaHomeServer.getInstance().getTenantReportFolder(tenantId));
=======
final DefaultReportList reports = new DefaultReportList(tenantAccessor.getTechnicalLogge... |
<<<<<<<
private boolean visitColumns(VisitContext context, VisitCallback callback, String rowKey, boolean visitNodes) {
String treeNodeType = null;
if (visitNodes) {
setRowKey(rowKey);
=======
private boolean visitColumns(VisitContext context, TreeNode root, VisitCallback callback,... |
<<<<<<<
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
=======
import java.nio.file.Files;
import java.nio.file.Path;
>>>>>>>
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.Files;
import java.nio.file.Path;
<<<<<<<
=======... |
<<<<<<<
import org.bonitasoft.engine.page.PageService;
=======
import org.bonitasoft.engine.parameter.ParameterService;
>>>>>>>
import org.bonitasoft.engine.parameter.ParameterService;
import org.bonitasoft.engine.page.PageService;
<<<<<<<
private PageService pageService;
private ApplicationService applica... |
<<<<<<<
new OperationBuilder().createSetDocument(documentName, getDocumentValueExpressionWithUrl(url)));
designProcessDefinition.addUserTask("step3", actorName);
=======
new OperationBuilder().createNewInstance().setRightOperand(getDocumentValueExpressionWithUrl(url)).setType(O... |
<<<<<<<
for (final PlatformLifecycleService serviceWithLifecycle : otherServicesToStart) {
logger.log(getClass(), TechnicalLogSeverity.INFO, "Start service of platform:" + serviceWithLifecycle.getClass().getName());
=======
for (final ServiceWithLifecycle serviceWit... |
<<<<<<<
import java.util.Map;
=======
>>>>>>>
import java.util.Map; |
<<<<<<<
final Expression employeeExpression = new ExpressionBuilder().createGroovyScriptExpression("createNewEmployee",
"import org.bonita.pojo.Employee; Employee e = new Employee(); e.firstName = 'Jane'; e.lastName = 'Doe'; return e;", EMPLOYEE_QUALIF_CLASSNAME);
=======
final Express... |
<<<<<<<
import org.bonitasoft.engine.exception.AlreadyExistsException;
import org.bonitasoft.engine.exception.BonitaException;
import org.bonitasoft.engine.exception.BonitaHomeNotSetException;
import org.bonitasoft.engine.exception.CreationException;
import org.bonitasoft.engine.exception.DeletionException;
import org.... |
<<<<<<<
@Column(name = "data_id")
=======
>>>>>>>
@Column(name = "data_id") |
<<<<<<<
repository.add(aUserTask().withName("normalTask1").withStateExecuting(false).withStable(true).withTerminal(false).withDeleted(false)
.withRootProcessInstanceId(ROOT_PROCESS_INSTANCE_ID_SUPERVISED_BY_JOHN).withAssigneeId(JACK_ID).withStateId(4).withProcessDefinition(PROCESS_DEFINITION_ID_... |
<<<<<<<
=======
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
>>>>>>>
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.asse... |
<<<<<<<
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
=======
import static org.assertj.core.api.Assertions.assertThat;
import static org.... |
<<<<<<<
public Object lookup(final String name) throws NamingException {
// System.out.println(toString() + " ~~~~ lookup " + name + " contains ? " + dictionary.containsKey(name));
=======
public Object lookup(String name) throws NamingException {
>>>>>>>
public Object lookup(final String name) t... |
<<<<<<<
// set input values of expression with connector result + provided input for this operation
final HashMap<String, Object> inputValues = new HashMap<String, Object>(operationInputValues);
inputValues.putAll(connectorResult.getResult());
expressionCo... |
<<<<<<<
@Test
public void testLegacyMainMethodTests() throws Exception {
MainRunner.callMainIfExists(IntArrayList.class, "test", /*num=*/"500", /*seed=*/"939384");
}
=======
@Test
public void testOf() {
final IntArrayList l = IntArrayList.of(0, 1, 2);
assertEquals(IntArrayList.wrap(new int[] { 0, 1, 2 }),... |
<<<<<<<
private final ThreadLocal<List<Callable<Void>>> beforeCommitCallables = new ThreadLocal<>();
private ThreadLocal<String> txLastBegin = new ThreadLocal<>();
=======
/**
* We maintain a list of Callables that must be executed just before the real commit (and before the beforeCompletion method ... |
<<<<<<<
private EntityManagerFactory entityManagerFactory;
@Override
public void start() {
final Map<String, Object> configOverrides = new HashMap<String, Object>();
configOverrides.put("hibernate.ejb.resource_scanner", InactiveScanner.class.getName());
entityManagerFactory = Persis... |
<<<<<<<
import org.bonitasoft.engine.execution.SIllegalStateTransition;
=======
import org.bonitasoft.engine.expression.exception.SExpressionEvaluationException;
>>>>>>>
import org.bonitasoft.engine.execution.SIllegalStateTransition;
import org.bonitasoft.engine.expression.exception.SExpressionEvaluationException;
... |
<<<<<<<
import org.bonitasoft.engine.bpm.flownode.ArchivedUserTaskInstance;
import org.bonitasoft.engine.core.process.instance.model.STaskPriority;
import org.bonitasoft.engine.core.process.instance.model.archive.impl.SAUserTaskInstanceImpl;
=======
import org.bonitasoft.engine.bpm.document.Document;
import org.bonit... |
<<<<<<<
public BPMServicesBuilder(final Long tenantId) {
=======
public BPMServicesBuilder(final Long tenantid) {
// What is the parameter tenantId useful for ?
>>>>>>>
public BPMServicesBuilder(final Long tenantId) {
// What is the parameter tenantId useful for ?
<<<<<<<
=======
>>... |
<<<<<<<
} catch (final InterruptedException e) {
loggerService.log(getClass(), TechnicalLogSeverity.WARNING, "Error while stopping the connector executor thread pool", e);
=======
} catch (InterruptedException e) {
loggerService.log(getClass(), TechnicalLogSever... |
<<<<<<<
import org.hibernate.annotations.Type;
=======
>>>>>>>
import org.hibernate.annotations.Type; |
<<<<<<<
return deployAndEnableWithActor(builder.done(), delivery, john);
=======
final ProcessDefinition processDefinition = deployAndEnableProcessWithActor(builder.done(), delivery, john);
return processDefinition;
>>>>>>>
return deployAndEnableProcessWithActor(builder.done(), deliv... |
<<<<<<<
final List<AbstractSMappedDocument> allDocumentOfTheList = documentHelper.getAllDocumentOfTheList(processInstanceId, documentName);
=======
final List<SMappedDocument> allDocumentOfTheList = documentHelper
.getAllDocumentOfTheList(processInstanceId, docu... |
<<<<<<<
import org.bonitasoft.engine.core.process.instance.model.STaskPriority;
import org.bonitasoft.engine.core.process.instance.model.SUserTaskInstance;
=======
>>>>>>>
import org.bonitasoft.engine.core.process.instance.model.SUserTaskInstance;
<<<<<<<
* Create manual user task in DB by given information. T... |
<<<<<<<
=======
final ProcessExecutor processExecutor = tenantAccessor.getProcessExecutor();
final ActivityInstanceService activityInstanceService = tenantAccessor.getActivityInstanceService();
final LockService lockService = tenantAccessor.getLockService();
final TechnicalLoggerServic... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.