conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
=======
import java.io.*;
import java.net.URI;
>>>>>>>
import java.io.*; |
<<<<<<<
import com.stormpath.sdk.servlet.filter.ChangePasswordConfigResolver;
import com.stormpath.sdk.servlet.filter.ChangePasswordServletControllerConfigResolver;
=======
import com.stormpath.sdk.servlet.event.RequestEvent;
import com.stormpath.sdk.servlet.event.impl.Publisher;
>>>>>>>
import com.stormpath.sdk.ser... |
<<<<<<<
import com.github.dockerjava.api.model.Frame;
import com.github.dockerjava.core.async.FrameStreamProcessor;
import com.github.dockerjava.core.async.JsonStreamProcessor;
import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
public class... |
<<<<<<<
import com.android.build.gradle.internal.incremental.InstantRunBuildContext;
=======
import com.android.build.gradle.internal.dsl.AbiSplitOptions;
>>>>>>>
import com.android.build.gradle.internal.incremental.InstantRunBuildContext;
import com.android.build.gradle.internal.dsl.AbiSplitOptions; |
<<<<<<<
/**
* Whether this build type is configured to generate an APK with debuggable native code.
*/
=======
public void setTestCoverageEnabled(boolean testCoverageEnabled) {
mTestCoverageEnabled = testCoverageEnabled;
}
@Override
public boolean isTestCoverageEnabled() {
... |
<<<<<<<
=======
import com.google.common.base.Optional;
import com.google.common.base.Objects;
>>>>>>>
import com.google.common.base.Optional;
import com.google.common.base.Objects;
<<<<<<<
=======
public void createPreprocessResourcesTask(
@NonNull TaskFactory tasks,
@NonNull final Va... |
<<<<<<<
String endpoint;
if (logout) {
endpoint = SSO_LOGOUT_ENDPOINT;
} else {
endpoint = SSO_ENDPOINT;
}
StringBuilder urlBuilder = new StringBuilder(endpoint).append('?').append(queryString.toString());
=======
... |
<<<<<<<
/**
* Returns all {@link ApiKey}s that belong to this account.
*
* @return all {@link ApiKey}s that belong to this account.
*
* @since 1.1.beta
*/
ApiKeyList getApiKeys();
/**
* Returns a paginated list of the account's api keys that match the specified query crit... |
<<<<<<<
import com.stormpath.sdk.account.Account;
import com.stormpath.sdk.account.AccountCriteria;
import com.stormpath.sdk.account.AccountList;
import com.stormpath.sdk.account.Accounts;
import com.stormpath.sdk.account.CreateAccountRequest;
import com.stormpath.sdk.account.PasswordResetToken;
import com.stormpath.sd... |
<<<<<<<
import com.android.build.gradle.internal.transforms.InstantRunVerifierTransform;
=======
import com.android.build.gradle.internal.tasks.databinding.DataBindingExportBuildInfoTask;
import com.android.build.gradle.internal.tasks.databinding.DataBindingProcessLayoutsTask;
>>>>>>>
import com.android.build.gradle... |
<<<<<<<
@Value("#{ @environment['stormpath.spring.security.enabled'] ?: true }")
protected boolean stormpathSecurityEnabled;
public SecurityConfigurerAdapter stormpathSecurityConfigurerAdapter() {
return new StormpathSecurityConfigurerAdapter();
=======
public StormpathWebSecurityConfigurer s... |
<<<<<<<
import com.android.build.gradle.tasks.BinaryFileProviderTask;
import com.android.build.gradle.tasks.IncrementalBuildType;
=======
>>>>>>>
import com.android.build.gradle.tasks.BinaryFileProviderTask;
import com.android.build.gradle.tasks.IncrementalBuildType;
<<<<<<<
import com.android.build.gradle.tasks.So... |
<<<<<<<
import com.android.build.gradle.internal.transforms.InstantRunVerifierTransform;
import com.android.build.gradle.internal.variant.ApkVariantData;
=======
>>>>>>>
import com.android.build.gradle.internal.transforms.InstantRunVerifierTransform;
<<<<<<<
@NonNull
@Override
public File getDexOutputFo... |
<<<<<<<
import com.stormpath.sdk.impl.resource.*;
import com.stormpath.sdk.impl.util.SoftHashMap;
=======
import com.stormpath.sdk.impl.resource.AbstractResource;
import com.stormpath.sdk.impl.resource.ArrayProperty;
import com.stormpath.sdk.impl.resource.CollectionProperties;
import com.stormpath.sdk.impl.resource.P... |
<<<<<<<
public boolean isActive(OptionalCompilationStep step) {
return optionalCompilationSteps.contains(step);
}
=======
@NonNull
public String getArchivesBaseName() {
return (String)getProject().getProperties().get("archivesBaseName");
}
>>>>>>>
public boolean isActive(Op... |
<<<<<<<
import com.android.build.gradle.tasks.fd.FastDeployRuntimeExtractorTask;
import com.android.build.gradle.tasks.fd.GenerateInstantRunAppInfoTask;
import com.android.build.api.transform.QualifiedContent.Scope;
=======
>>>>>>>
import com.android.build.gradle.tasks.fd.FastDeployRuntimeExtractorTask;
import com.a... |
<<<<<<<
File getReloadDexOutputFolder();
@NonNull
File getRestartDexOutputFolder();
@NonNull
=======
>>>>>>>
File getReloadDexOutputFolder();
@NonNull
File getRestartDexOutputFolder();
@NonNull
<<<<<<<
@Nullable
AndroidTask<Dex> getIncrementalDexTask();
void setIncre... |
<<<<<<<
public String getParameter(String parameterName);
public Enumeration<String> getParameterNames();
=======
public String getMethod();
public Map<String, String[]> getParameterMap();
>>>>>>>
public String getMethod();
public Map<String, String[]> getParameterMap();
public St... |
<<<<<<<
import com.android.build.gradle.internal.transforms.InstantRunVerifierTransform;
=======
import com.android.build.gradle.internal.tasks.databinding.DataBindingExportBuildInfoTask;
import com.android.build.gradle.internal.tasks.databinding.DataBindingProcessLayoutsTask;
>>>>>>>
import com.android.build.gradle... |
<<<<<<<
import com.stormpath.sdk.impl.resource.AbstractResource;
import com.stormpath.sdk.impl.resource.ArrayProperty;
import com.stormpath.sdk.impl.resource.CollectionProperties;
import com.stormpath.sdk.impl.resource.Property;
import com.stormpath.sdk.impl.resource.ReferenceFactory;
import com.stormpath.sdk.impl.reso... |
<<<<<<<
UColor fgColor, bgColor;
=======
Font font;
UColor fgColor, bgColor, borderColor;
>>>>>>>
UColor fgColor, bgColor, borderColor; |
<<<<<<<
void inject(Shapemask shape);
void inject(Icon icon);
void inject(RexFile rexfile);
=======
void inject(Shape shape);
>>>>>>>
void inject(Icon icon);
void inject(RexFile rexfile);
void inject(Shape shape); |
<<<<<<<
import com.onesignal.FCMBroadcastReceiver;
import com.onesignal.FCMIntentService;
=======
import com.onesignal.GcmBroadcastReceiver;
import com.onesignal.GcmIntentService;
import com.onesignal.MockOneSignalDBHelper;
>>>>>>>
import com.onesignal.FCMBroadcastReceiver;
import com.onesignal.FCMIntentService;
imp... |
<<<<<<<
private static final String VERSION = "031505";
public static String getSdkVersionRaw() {
return VERSION;
}
=======
public static final String VERSION = "031506";
>>>>>>>
private static final String VERSION = "031506";
public static String getSdkVersionRaw() {
return VERSION;
... |
<<<<<<<
import static com.onesignal.OneSignalPackagePrivateHelper.NotificationBundleProcessor_ProcessFromFCMIntentService;
import static com.onesignal.OneSignalPackagePrivateHelper.NotificationBundleProcessor_ProcessFromFCMIntentService_NoWrap;
=======
import static com.onesignal.OneSignalPackagePrivateHelper.Generat... |
<<<<<<<
OneSignalStateSynchronizer.setNewSession();
if (inForeground) {
=======
OneSignal.onesignalLog(LOG_LEVEL.DEBUG, "Starting new session");
OneSignalStateSynchronizer.setNewSession();
if (foreground) {
>>>>>>>
OneSignal.onesignalLog(LOG_LEVEL.DEBUG, "Starti... |
<<<<<<<
import static com.onesignal.OneSignalPackagePrivateHelper.FCMBroadcastReceiver_onReceived;
import static com.onesignal.OneSignalPackagePrivateHelper.OneSignal_getSessionDirectNotification;
import static com.onesignal.OneSignalPackagePrivateHelper.OneSignal_getSessionIndirectNotificationIds;
import static com.on... |
<<<<<<<
public static final String LOGIN_URL = "stormpath.web.login.uri";
public static final String LOGIN_NEXT_URL = "stormpath.web.login.nextUri";
public static final String LOGOUT_URL = "stormpath.web.logout.uri";
public static final String LOGOUT_NEXT_URL = "stormpath.web.logout.nextUri";
publi... |
<<<<<<<
=======
import com.onesignal.ShadowHMSFusedLocationProviderClient;
import com.onesignal.ShadowGcmBroadcastReceiver;
>>>>>>>
import com.onesignal.ShadowHMSFusedLocationProviderClient;
<<<<<<<
import com.onesignal.ShadowPushRegistratorFCM;
=======
import com.onesignal.ShadowPushRegistratorGCM;
import com.on... |
<<<<<<<
private static OSTime time = new OSTimeImpl();
=======
private static OSInAppMessageControllerFactory inAppMessageControllerFactory = new OSInAppMessageControllerFactory();
static OSInAppMessageController getInAppMessageController() {
return inAppMessageControllerFactory.getController(getDBHelp... |
<<<<<<<
boolean receiveReceiptEnabled;
=======
OutcomesParams outcomesParams;
>>>>>>>
boolean receiveReceiptEnabled;
OutcomesParams outcomesParams;
<<<<<<<
receiveReceiptEnabled = responseJson.optBoolean("receive_receipts_enable", false);
=======
outcomesParams = new Outc... |
<<<<<<<
=======
public static final String IN_APP_MESSAGES_JSON_KEY = "in_app_messages";
private static final String OS_SAVE_IN_APP_MESSAGE = "OS_SAVE_IN_APP_MESSAGE";
private static final Object LOCK = new Object();
>>>>>>>
<<<<<<<
for (OSInAppMessage message : redisplayedInAppMessages) {
... |
<<<<<<<
/*
* 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 |
<<<<<<<
=======
/**
* An interface used to handle notifications that are received.
* <br/>
* Set this during OneSignal init in
* {@link OneSignal.Builder#setNotificationReceivedHandler(NotificationReceivedHandler) setNotificationReceivedHandler}
*<br/><br/>
* @see <a href="https://documenta... |
<<<<<<<
public static final String PREFS_OS_RECEIVE_RECEIPTS_ENABLED = "PREFS_OS_RECEIVE_RECEIPTS_ENABLED";
=======
public static final String PREFS_OS_LAST_ATTRIBUTED_NOTIFICATION_OPEN = "PREFS_OS_LAST_ATTRIBUTED_NOTIFICATION_OPEN";
public static final String PREFS_OS_LAST_NOTIFICATIONS_RECEIVED = "PREFS... |
<<<<<<<
=======
private static boolean didEmailUpdateSucceed;
private static OneSignal.EmailUpdateError lastEmailUpdateFailure;
private static OneSignal.EmailUpdateHandler getEmailUpdateHandler() {
return new OneSignal.EmailUpdateHandler() {
@Override
public void onSuccess() {
... |
<<<<<<<
/**
* Prompts the user to update/enable Google Play Services if it's disabled on the device.
*
* @param disable if {@code false}, prompt users. if {@code true}, never show the out of date prompt.
* Default is {@code false}
* @return
*/
public static void disableGmsMi... |
<<<<<<<
private static final String NOTIFICATION_ID = "notificationId";
private static final String DISMISSED = "dismissed";
private static final Class<?> NOTIFICATION_OPENED_ACTIVITY_CLASS = NotificationOpenedActivity.class;
=======
public static final String BUNDLE_KEY_ANDROID_NOTIFICATION_ID = "andr... |
<<<<<<<
AlbumListDetailsFragment fragment = (AlbumListDetailsFragment) getChildFragmentManager().findFragmentById(R.id.details_frag_content);
if (fragment == null) {
mLlAddNewPlayList.setVisibility(View.GONE);
fragment = AlbumListDetailsFragment.ne... |
<<<<<<<
import android.annotation.SuppressLint;
=======
>>>>>>>
<<<<<<<
import com.yibao.music.fragment.AlbumFragment;
import com.yibao.music.fragment.AlbumListDetailsFragment;
import com.yibao.music.fragment.ArtistanListFragment;
import com.yibao.music.fragment.PlayListFragment;
import com.yibao.music.fragment.S... |
<<<<<<<
=======
import android.annotation.SuppressLint;
>>>>>>>
import android.annotation.SuppressLint; |
<<<<<<<
import io.eventuate.tram.commands.producer.CommandProducer;
import io.eventuate.tram.commands.spring.producer.TramCommandProducerConfiguration;
import io.eventuate.tram.inmemory.spring.TramInMemoryConfiguration;
=======
import io.eventuate.tram.commands.producer.TramCommandProducerConfiguration;
import io.eve... |
<<<<<<<
import io.eventuate.messaging.kafka.consumer.spring.MessageConsumerKafkaConfiguration;
import io.eventuate.tram.consumer.common.spring.TramConsumerCommonConfiguration;
import io.eventuate.tram.consumer.kafka.spring.EventuateTramKafkaMessageConsumerConfiguration;
=======
import io.eventuate.tram.consumer.commo... |
<<<<<<<
import io.eventuate.tram.commands.spring.producer.TramCommandProducerConfiguration;
import io.eventuate.tram.inmemory.spring.TramInMemoryConfiguration;
=======
import io.eventuate.tram.commands.producer.TramCommandProducerConfiguration;
>>>>>>>
import io.eventuate.tram.commands.spring.producer.TramCommandPro... |
<<<<<<<
//TODO: ApiKeyCachePropertiesFilter here?
this.filters.add(new ReadCacheFilter(this.baseUrl, this.cacheResolver, COLLECTION_CACHING_ENABLED));
this.filters.add(new WriteCacheFilter(this.cacheResolver, COLLECTION_CACHING_ENABLED, referenceFactory));
=======
this.... |
<<<<<<<
import org.vaadin.spring.VaadinUIScope;
import org.vaadin.spring.stuff.sidebar.SideBarItem;
import org.vaadin.spring.stuff.sidebar.ThemeIcon;
=======
import org.vaadin.spring.UIScope;
import org.vaadin.spring.sidebar.SideBarItem;
import org.vaadin.spring.sidebar.ThemeIcon;
>>>>>>>
import org.vaadin.spring.Va... |
<<<<<<<
* Pratheek Rai - changes for BERT
=======
* Achim Kraus (Bosch Software Innovations GmbH) - keep original response, if
* current request is the original
>>>>>>>
* Achim Kraus (Bosch Software Innovations GmbH) - keep original response, if
* ... |
<<<<<<<
* Pratheek Rai - changes for BERT
=======
* Achim Kraus (Bosch Software Innovations GmbH) - use uniformly the response
* source endpoint context
* for next block requests
* Achim Kraus (Bosch ... |
<<<<<<<
* Pratheek Rai - changes for BERT
=======
* Achim Kraus (Bosch Software Innovations GmbH) - disable transparent blockwise for multicast.
>>>>>>>
* Achim Kraus (Bosch Software Innovations GmbH) - disable transparent blockwise for multicast.
* Pratheek Rai - changes for BERT
<<<<<<<
// ... |
<<<<<<<
private Request startBlockwiseUpload(final Exchange exchange, final Request request, int blocksize) {
=======
protected Request startBlockwiseUpload(final Exchange exchange, final Request request) {
>>>>>>>
protected Request startBlockwiseUpload(final Exchange exchange, final Request request, int blocksiz... |
<<<<<<<
private static long longestTestDuration = 0;
private long currentTestStartTime = 0;
=======
>>>>>>>
<<<<<<<
currentTestStartTime = System.currentTimeMillis();
=======
>>>>>>> |
<<<<<<<
=======
private PageResult listToPageList(int currentPage, int rows, List list){
// TODO FROM 芋艿 to 鱿鱼须：可以直接使用数据库分页哇
currentPage = currentPage * rows;
Integer sum = list.size(); // TODO FROM 芋艿 to 鱿鱼须：这里 int 就可以啦。一般情况下，如果 IDEA 提示警告，要尽量去掉噢。
if (currentPage + rows > sum){
... |
<<<<<<<
//private static final String DEFAULT_HOST = "127.0.0.1";
private static final String DEFAULT_HOST = "dev.rapidftr.com";
=======
//private static final String DEFAULT_HOST = "10.14.3.44";
private static final String DEFAULT_HOST = "dev.rapidftr.com";
>>>>>>>
private static final String DEFAULT_HOST = "d... |
<<<<<<<
package com.rapidftr.controllers;
import com.rapidftr.controllers.internal.Controller;
import com.rapidftr.controllers.internal.Dispatcher;
import com.rapidftr.datastore.Children;
import com.rapidftr.datastore.ChildrenRecordStore;
import com.rapidftr.screens.SearchChildScreen;
import com.rapidftr.screens.inter... |
<<<<<<<
public String getParameter(String parameterName) {
return httpServletRequest.getParameter(parameterName);
}
@Override
public Enumeration<String> getParameterNames() {
return httpServletRequest.getParameterNames();
=======
public String getMethod() {
return httpServ... |
<<<<<<<
import com.rapidftr.controllers.ChildHistoryController;
import com.rapidftr.controllers.ContactInformationController;
import com.rapidftr.controllers.HomeController;
import com.rapidftr.controllers.LoginController;
import com.rapidftr.controllers.ManageChildController;
import com.rapidftr.controllers.ResetDevic... |
<<<<<<<
=======
add(new LabelField(key + ": " + value, LabelField.FOCUSABLE));
>>>>>>>
add(new LabelField(key + ": " + value, LabelField.FOCUSABLE)); |
<<<<<<<
package com.rapidftr.controllers;
import com.rapidftr.controllers.internal.Controller;
import com.rapidftr.controllers.internal.Dispatcher;
import com.rapidftr.datastore.Children;
import com.rapidftr.datastore.ChildrenRecordStore;
import com.rapidftr.model.Child;
import com.rapidftr.screens.ViewChildrenScreen;... |
<<<<<<<
package com.rapidftr.datastore;
import com.rapidftr.model.Child;
import com.rapidftr.utilities.ImageHelper;
import java.util.Enumeration;
import java.util.Vector;
public class Children {
private final Vector vector;
public Children(Vector vector) {
this.vector = vector;
}
public Ch... |
<<<<<<<
package com.rapidftr.controllers;
import com.rapidftr.controllers.internal.Controller;
import com.rapidftr.datastore.Children;
import com.rapidftr.datastore.ChildrenRecordStore;
import com.rapidftr.datastore.DateField;
import com.rapidftr.datastore.StringField;
import com.rapidftr.model.Child;
import com.rapid... |
<<<<<<<
/**
* @since 1.2.0
*/
List<String> getAllowedCorsOrigins();
/**
* @since 1.2.0
*/
boolean isCorsEnabled();
/**
* @since 1.2.0
*/
List<String> getAllowedCorsHaders();
/**
* @since 1.2.0
*/
List<String> getAllowedCorsMethods();
=======
... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
=======
import java.io.InputStream;
import java.io.Reader;
import java.util.Properties;
>>>>>>>
<<<<<<<
* @see ApiKeyBuilder
* @since 0.9.4
=======
* You may load files from the filesystem, classpath, or URLs by prefixing the path with
* {@code file:}, {@code classpath:}, or {@code url:} respectively... |
<<<<<<<
* retaining all precursor values
*
=======
* retaining all precursor values
*
* @param <N>
* type to convert to
*
>>>>>>>
* retaining all precursor values |
<<<<<<<
import github.scarsz.discordsrv.util.LangUtil;
=======
import github.scarsz.discordsrv.util.PlayerUtil;
>>>>>>>
import github.scarsz.discordsrv.util.LangUtil;
import github.scarsz.discordsrv.util.PlayerUtil; |
<<<<<<<
import java.util.function.Function;
=======
import java.util.UUID;
>>>>>>>
import java.util.function.Function;
<<<<<<<
Bukkit.getScheduler().scheduleSyncDelayedTask(DiscordSRV.getPlugin(), () -> {
String avatarUrl = DiscordSRV.getPlugin().getEmbedAvatarUrl(event.getPlayer());
... |
<<<<<<<
// -- Helper methods --
/** Creates a copy of the core metadata instantiated using the provided CoreMetadata type,
* matching the state of the given reader. */
protected <T extends CoreMetadata> List<CoreMetadata> copyCoreMetadata(Class<T> c, IFormatReader r) {
int count = 0;
int currentSerie... |
<<<<<<<
OME Bio-Formats package for reading and converting biological file formats.
Copyright (C) 2005-@year@ UW-Madison LOCI and Glencoe Software, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation... |
<<<<<<<
String experimenterID = MetadataTools.createLSID("Experimenter", 0);
store.setExperimenterID(experimenterID, 0);
store.setExperimenterEmail(userEmail, 0);
store.setExperimenterFirstName(userFirstName, 0);
store.setExperimenterInstitution(userInstitution, 0);
store.setExperimenterLastName... |
<<<<<<<
savedCore.add(core.get(i + c));
levels.put(new Integer(savedCore.get(c).sizeX), new Integer(c));
=======
savedCore[c] = core[i + c];
savedIFDs[c] = getIFDIndex(i+c);
levels.put(new Integer(savedCore[c].sizeX), new Integer(c));
>>>>>>>
savedCore.add(... |
<<<<<<<
core = handler.getCoreMetadataList();
=======
textString = null;
core = handler.getCoreMetadata();
>>>>>>>
textString = null;
core = handler.getCoreMetadataList(); |
<<<<<<<
CoreMetadata ms = core.get(s);
if (s == i.imageNumStart && !hasFlattenedResolutions()) {
ms.resolutionCount = i.pixels.sizeR;
=======
if (s == i.imageNumStart) {
core[s].resolutionCount = i.pixels.sizeR;
>>>>>>>
CoreMetadata ms = core.get(s);
if (s == i.imageNumStart) {
... |
<<<<<<<
'r', new ItemStack(Items.redstone),
'c', findItemStack("Copper Cable"),
'C', dictAdvancedChip);
=======
Character.valueOf('r'), new ItemStack(Items.redstone),
Character.valueOf('c'), findItemStack("Copper Cable"),
Character.valueOf('C'), ... |
<<<<<<<
ArrayList<NodeBase> nodes = NodeManager.instance.getNodes();
if(nodes.isEmpty()) return false;
=======
List<NodeBase> nodes = NodeManager.instance.getNodes();
if(nodes.size() == 0) return false;
>>>>>>>
List<NodeBase> nodes = NodeManager.instance.getNodes();
if(nodes.isEmpty()) return false; |
<<<<<<<
import org.eclipse.aether.repository.ArtifactRepository;
=======
>>>>>>> |
<<<<<<<
=======
import org.slf4j.LoggerFactory;
import org.sonatype.aether.transfer.AbstractTransferListener;
import org.sonatype.aether.transfer.TransferCancelledException;
import org.sonatype.aether.transfer.TransferEvent;
import org.sonatype.aether.transfer.TransferResource;
>>>>>>>
import org.slf4j.LoggerFactory... |
<<<<<<<
=======
/**
* Returns the deployment policy to which the specified id is mapped or null
*
* @param id Id of the deployment policy
* @return
*/
public DeploymentPolicy getDeploymentPolicyById(String id) {
DeploymentPolicy deploymentPolicy = null;
for (Deployment... |
<<<<<<<
public String getLvsVirtualIP() {
return lvsVirtualIP;
}
public void setLvsVirtualIP(String lvsVirtualIP) {
this.lvsVirtualIP = lvsVirtualIP;
}
=======
public String getDeploymentPolicy() {
return deploymentPolicy;
}
public void setDeploymentPolicy(String deploymentPol... |
<<<<<<<
import org.apache.stratos.autoscaler.exception.InvalidPolicyException;
=======
import org.apache.stratos.autoscaler.exception.NonExistingLBException;
>>>>>>>
import org.apache.stratos.autoscaler.exception.InvalidPolicyException;
import org.apache.stratos.autoscaler.exception.NonExistingLBException; |
<<<<<<<
private Container container;
=======
private String[] exportingProperties;
>>>>>>>
private Container container;
private String[] exportingProperties;
<<<<<<<
public Container getContainer() {
return container;
}
public void setContainer(Container container) {
this.containe... |
<<<<<<<
String networkPartitionId,
int minMemberCount) throws SpawningException {
=======
String networkPartitionId, boolean isPrimary,
... |
<<<<<<<
setKubernetesCluster(cluster);
cluster.setStatus(ClusterStatus.Created);
=======
//cluster.setStatus(Status.Created);
>>>>>>>
//cluster.setStatus(Status.Created);
setKubernetesCluster(cluster);
cluster.setStatus(C... |
<<<<<<<
import org.apache.stratos.cloud.controller.pojo.CartridgeConfig;
import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
import org.apache.stratos.cloud.controller.pojo.Property;
=======
import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPartitionExceptionException;
import org.apache.str... |
<<<<<<<
import org.apache.stratos.autoscaler.applications.pojo.ApplicationClusterContext;
import org.apache.stratos.autoscaler.applications.pojo.ApplicationContext;
import org.apache.stratos.autoscaler.applications.pojo.ArtifactRepositoryContext;
import org.apache.stratos.autoscaler.applications.pojo.CartridgeContext;
... |
<<<<<<<
=======
import org.apache.stratos.cloud.controller.stub.domain.NetworkPartition;
import org.apache.stratos.common.client.CloudControllerServiceClient;
>>>>>>>
import org.apache.stratos.cloud.controller.stub.domain.NetworkPartition;
import org.apache.stratos.common.client.CloudControllerServiceClient;
<<<<<<... |
<<<<<<<
log.debug("Adding meta data details");
=======
>>>>>>>
log.debug("Adding meta data details");
<<<<<<<
if(log.isDebugEnabled())
log.debug(String.format("A resource added to: %s", resourcePath));
=======
if(log.isDebugEnabled()){
log.debug("A resource added to: " + resourc... |
<<<<<<<
=======
import org.apache.stratos.messaging.message.receiver.application.status.ApplicationStatusEventReceiver;
import org.apache.stratos.messaging.util.Constants;
>>>>>>>
import org.apache.stratos.messaging.message.receiver.application.status.ApplicationStatusEventReceiver;
import org.apache.stratos.messagi... |
<<<<<<<
=======
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
import org.apache.stratos.manager.client.AutoscalerServiceClient;
>>>>>>>
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; |
<<<<<<<
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
=======
import java.util.*;
>>>>>>>
import java.util.ArrayList;
import java.util.HashSet;
import java.ut... |
<<<<<<<
private Set<String> domains;
private Persistence persistence;
private Properties properties;
public SubscriptionData() {
this.domains = new HashSet<String>();
}
=======
private Set<String> domains;
private String serviceName;
public SubscriptionData() {
th... |
<<<<<<<
private PersistenceBean persistence;
private List<PropertyBean> property;
public CartridgeInfoBean() {
}
=======
private List<String> domains;
public CartridgeInfoBean() {
this.domains = new ArrayList<String>();
}
>>>>>>>
private PersistenceBean persistence;
p... |
<<<<<<<
public static final String VMService_Cluster_MONITOR_INTERVAL = "autoscaler.monitorInterval.vm.service";
public static final String VMLb_Cluster_MONITOR_INTERVAL = "autoscaler.monitorInterval.vm.lb";
public static final String KubernetesService_Cluster_MONITOR_INTERVAL = "autoscaler.monitorInterval.... |
<<<<<<<
import org.apache.stratos.autoscaler.stub.*;
import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy;
import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesGroup;
import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesHost;
import org.apache.stratos.autoscaler.stub.kubernet... |
<<<<<<<
if (!ctxt.getListOfVolumes().isEmpty()) {
for (Volume volume : ctxt.getListOfVolumes()) {
iaas.attachVolume(instanceId, volume.getId(), volume.getDevice());
}
}
=======
try {
iaas.attachVolume(instanceId, ctxt.getVolumeId(),
ct... |
<<<<<<<
import org.apache.stratos.autoscaler.exception.NonExistingKubernetesGroupException;
=======
import org.apache.stratos.autoscaler.exception.CartridgeInformationException;
>>>>>>>
import org.apache.stratos.autoscaler.exception.NonExistingKubernetesGroupException;
import org.apache.stratos.autoscaler.exception.... |
<<<<<<<
=======
import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
import org.apache.stratos.messaging.util.Constants;
>>>>>>>
import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
import org.apache.stratos.messaging.util.Constants;
<<<<<<<
Repository... |
<<<<<<<
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import java.rmi.RemoteException;
import java.util.*;
import java.util.regex.Pattern;
=======
>>>>>>>
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import java.rmi.RemoteException;
import java.util.*;
imp... |
<<<<<<<
import org.apache.stratos.rest.endpoint.ServiceHolder;
import org.apache.stratos.rest.endpoint.Utils;
import org.apache.stratos.tenant.mgt.core.TenantPersistor;
import org.apache.stratos.tenant.mgt.util.TenantMgtUtil;
=======
import org.wso2.carbon.tenant.mgt.core.TenantPersistor;
import org.wso2.carbon.tenan... |
<<<<<<<
//has scaling dependents
protected boolean hasScalingDependents;
=======
protected boolean isGroupScalingEnabled;
>>>>>>>
//has scaling dependents
protected boolean isGroupScalingEnabled;
<<<<<<<
/**
* Return whether this monitor has scaling dependencies
*
* @return s... |
<<<<<<<
/** package */
CharDifference.Builder newCharDifference(
int leftIndex, int rightIndex, char difference, DifferenceType type) {
return CharDifference.newBuilder()
.setFirstStringIndex(leftIndex)
.setSecondStringIndex(rightIndex)
=======
TextChange.Builder newTextChange(int inde... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.