conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
public abstract class AbstractAssociation extends Field<AbstractFeature> implements Serializable {
=======
public abstract class AbstractAssociation extends Field<Feature> implements FeatureAssociation, Cloneable, Serializable {
>>>>>>>
public abstract class AbstractAssociation extends Field<AbstractFeature>... |
<<<<<<<
* <div class="warning"><b>Upcoming API change — generalization</b><br>
* The element type may be changed to the {@code InternationalString} interface in GeoAPI 4.0.
* </div>
*
* @return Recognition of those who contributed to the resource(s).
=======
* @return recognition of thos... |
<<<<<<<
* Creates a data source for a Derby database at the given {@code $SIS_DATA/Databases/SpatialMetadata} location.
* If the database does not exist, it will be created.
*
* @param path The {@code $SIS_DATA/Databases/SpatialMetadata} directory.
* @return The data source.
* @throws Ex... |
<<<<<<<
* @since 0.4 (derived from geotk-2.0)
* @version 0.4
=======
* @since 0.4
* @version 0.5
>>>>>>>
* @since 0.4
* @version 0.4 |
<<<<<<<
private static void verifyFeatureType(final DefaultFeatureType type) {
final Iterator<? extends AbstractIdentifiedType> it = type.getProperties(true).iterator();
assertPropertyTypeEquals((DefaultAttributeType<?>) it.next(), "mfidref", String.class, 1);
assertPropertyTypeEqual... |
<<<<<<<
// Branch-specific imports
import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.sis.internal.jdk8.JDK8;
=======
>>>>>>>
// Branch-specific imports
import org.apache.sis.internal.jdk8.JDK8; |
<<<<<<<
if (type != null) {
if (WKTKeywords.GeodeticCRS.equals(type)) return new Geodetic(properties, (GeodeticCRS) baseCRS, conversion, (EllipsoidalCS) derivedCS);
if (WKTKeywords.VerticalCRS.equals(type)) return new Vertical(properties, (VerticalCRS) baseCRS, conversion, ... |
<<<<<<<
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.opengis.metadata.citation.Party;
import org.opengis.metadata.citation.Responsibility;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
<<<<<<<
/// @XmlElement(name = "role", required = true)
@UML(identi... |
<<<<<<<
import java.util.Spliterator;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import java.util.function.Consumer;
import org.apache.sis.feature.AbstractFeature;
import org.apache.sis.feature.DefaultFeatureType;
import org.apache.sis.feature.DefaultAttributeType;
import org.apache.sis.feat... |
<<<<<<<
import java.util.Objects;
=======
import org.apache.sis.internal.jdk7.Objects;
import org.opengis.feature.AttributeType;
>>>>>>>
import org.apache.sis.internal.jdk7.Objects; |
<<<<<<<
final List<OperationMethod> methods = new ArrayList<OperationMethod>(factory.getAvailableMethods(SingleOperation.class));
=======
final List<OperationMethod> methods = new ArrayList<>(factory.getAvailableMethods(SingleOperation.class));
JDK8.removeIf(methods, new org.apache.sis.interna... |
<<<<<<<
=======
* Returns a SIS metadata implementation with the values of the given arbitrary implementation.
* This method performs the first applicable action in the following choices:
*
* <ul>
* <li>If the given object is {@code null}, then this method returns {@code null}.</li>
* ... |
<<<<<<<
TypeBuilder(final AbstractIdentifiedType template, final Locale locale) {
=======
TypeBuilder(final IdentifiedType template, final Locale locale) {
identification = new HashMap<String,Object>(4);
>>>>>>>
TypeBuilder(final AbstractIdentifiedType template, final Locale locale) {
ide... |
<<<<<<<
public void setNumberType(final CodeList<?> newValue) {
checkWritePermission();
=======
public void setNumberType(final TelephoneType newValue) {
checkWritePermission(numberType);
>>>>>>>
public void setNumberType(final CodeList<?> newValue) {
checkWritePermission(numberTy... |
<<<<<<<
String visibilityJsonString = (String) propertyMetadata.get(VISIBILITY_JSON_PROPERTY);
JSONObject visibilityJson = updateVisibilityJson(visibilityJsonString, visibilitySource, workspaceId);
if (propertyMetadata != null) {
propertyMetadata.put(VISIBILITY_JSON_PROPERTY, visibil... |
<<<<<<<
final DefaultNameFactory f = decoder.nameFactory;
setBandIdentifier(f.createMemberName(null, name, f.createTypeName(null, variable.getDataTypeName())));
=======
final NameFactory f = decoder.nameFactory;
final StringBuilder buffer = new StringBuilder(20);
... |
<<<<<<<
=======
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.file.FileSystemException;
import java.nio.file.Files;
>>>>>>>
import java.io.PrintWriter;
import java.io.StringWriter; |
<<<<<<<
// Unconditionally create a new set, because the
// user may hold a reference to the previous one.
final Set<E> c = nonNullSet(null, type);
=======
/*
* Unconditionally create a new set, because the
* user may hold a reference to the previous one.
*/
... |
<<<<<<<
=======
import java.awt.image.RasterFormatException;
import org.opengis.coverage.grid.SequenceType;
>>>>>>>
import java.awt.image.RasterFormatException; |
<<<<<<<
* Creates the {@link IdentifierMapAdapter} instance to test for the given identifiers.
* This {@code IdentifierMapAdapterTest} class creates {@link IdentifierMapAdapter} instances.
* Subclasses will override this method in order to create instances of the class to test.
*
* @param iden... |
<<<<<<<
* <div class="warning"><b>Upcoming API change — generalization</b><br>
* As of ISO 19115:2014, {@code String} is replaced by the {@link InternationalString} interface.
* This change will be tentatively applied in GeoAPI 4.0.
* </div>
*
* @return Information identifying the issue of... |
<<<<<<<
import org.opengis.referencing.ReferenceIdentifier;
=======
import org.apache.sis.internal.simple.SimpleCitation;
>>>>>>>
import org.opengis.referencing.ReferenceIdentifier;
import org.apache.sis.internal.simple.SimpleCitation;
<<<<<<<
assertEquals("EPSG", builder.properties.get(ReferenceIdentifier.... |
<<<<<<<
// Related to JDK8
import org.apache.sis.internal.jdk8.Function;
=======
// Branch-dependent imports
import java.util.function.Function;
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk8.Function; |
<<<<<<<
public class SimpleIdentifier implements ReferenceIdentifier, Serializable {
=======
public class SimpleIdentifier implements Identifier, Deprecable, Serializable {
>>>>>>>
public class SimpleIdentifier implements ReferenceIdentifier, Deprecable, Serializable {
<<<<<<<
=======
* Returns a natural lan... |
<<<<<<<
transform = ((MathTransformProvider) method).createMathTransform(parameters);
} catch (IllegalArgumentException exception) {
=======
transform = ((MathTransformProvider) method).createMathTransform(this, parameters);
} catch (IllegalArgumentException |... |
<<<<<<<
* @return The wrapper for the code list value.
=======
* @param wrapper the wrapper.
* @return the wrapped value.
>>>>>>>
* @return the wrapper for the code list value.
<<<<<<<
* @return The code list class.
=======
* @param e the value to wrap.
* @return the wrapped... |
<<<<<<<
import static org.apache.sis.referencing.IdentifiedObjects.isHeuristicMatchForName;
// Branch-dependent imports
import org.apache.sis.internal.jdk8.JDK8;
=======
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk8.JDK8; |
<<<<<<<
} else if (element instanceof CodeList<?>) {
replacement = Types.getCodeTitle((CodeList<?>) element).toString(getLocale());
=======
} else if (element instanceof ControlledVocabulary) {
replacement = Types.getCodeTitle((ControlledVocabulary) element).toS... |
<<<<<<<
// Branch-dependent imports
import java.util.Objects;
import org.apache.sis.internal.jdk8.JDK8;
=======
>>>>>>>
import org.apache.sis.internal.jdk8.JDK8; |
<<<<<<<
final CheckedArrayList list = new CheckedArrayList<String>(String.class);
=======
final CheckedArrayList<String> list = new CheckedArrayList<>(String.class);
final String message = testAddWrongType(list);
assertTrue("element", message.contains("element"));
assertTrue("I... |
<<<<<<<
@Override
public Stream<AbstractFeature> features(boolean parallel) {
=======
public Stream<Feature> features(boolean parallel) {
>>>>>>>
public Stream<AbstractFeature> features(boolean parallel) { |
<<<<<<<
import org.opengis.annotation.UML;
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
<<<<<<<
import static org.opengis.annotation.Obligation.OPTIONAL;
import static org.opengis.annotation.Specification.ISO_19115;
====... |
<<<<<<<
final ParameterValue<Integer> nonExistent = new DefaultParameterDescriptor<Integer>(
singletonMap(NAME_KEY, "Optional 5"), Integer.class, null, null, null, false).createValue();
=======
final ParameterValue<Integer> nonExistent = new DefaultParameterDescriptor<>(
... |
<<<<<<<
final String name = getDisplayName();
mb.addResourceScope(ScopeCode.valueOf("COLLECTION"), Resources.formatInternational(Resources.Keys.DirectoryContent_1, name));
=======
mb.addResourceScope(ScopeCode.COLLECTION, Resources.formatInternational(Resources.Keys.DirectoryConten... |
<<<<<<<
// Branch-dependent imports
import org.apache.sis.internal.jdk7.Objects;
=======
import java.util.List;
import java.util.Objects;
>>>>>>>
import java.util.List;
import org.apache.sis.internal.jdk7.Objects; |
<<<<<<<
import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
=======
import org.opengis.metadata.citation.TelephoneType;
import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter;
>>>>>>>
import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter; |
<<<<<<<
// Related to JDK7.
import org.apache.sis.internal.jdk7.Objects;
=======
// Branch-dependent imports
import java.util.Objects;
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk7.Objects; |
<<<<<<<
=======
* Tests the {@link MetadataStandard#ISO_19123} constant. Getters shall
* be accessible even if there is no implementation on the classpath.
*/
@Test
@DependsOnMethod("testGetAccessor")
public void testWithoutImplementation() {
standard = MetadataStandard.ISO_19123;
... |
<<<<<<<
new DefaultParameterDescriptor<Integer>(name(properties, "Mandatory 1", "Ambiguity"), type, null, null, DEFAULT_VALUE, true),
new DefaultParameterDescriptor<Integer>(name(properties, "Mandatory 2", "Alias 2"), type, null, null, DEFAULT_VALUE, true),
new DefaultParameterDesc... |
<<<<<<<
// Related to JDK7 and JDK8
import org.apache.sis.internal.jdk7.Objects;
=======
// Branch-dependent imports
import java.util.Objects;
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk7.Objects; |
<<<<<<<
final Date lastWeek = new Date(now.getTime() - 7*day);
final Date other = new Date(lastWeek.getTime() + 2*day);
assertTrue(ranges.add(new Range<Date>(Date.class, lastWeek, true, other, false)));
=======
final Date lastWeek = new Date(now.getTime() - 7*MILLISECONDS_PER_DAY);
... |
<<<<<<<
import org.opengis.referencing.ReferenceIdentifier;
=======
import org.apache.sis.internal.referencing.NilReferencingObject;
>>>>>>>
import org.opengis.referencing.ReferenceIdentifier;
import org.apache.sis.internal.referencing.NilReferencingObject; |
<<<<<<<
Connection c = source.getConnection();
try {
for (Initializer init : ServiceLoader.load(Initializer.class)) {
=======
try (Connection c = source.getConnection()) {
for (Initializer init : DefaultFactories.createServiceLoad... |
<<<<<<<
public PropertyItem(String elementId, String name, String key, JsonNode oldData, JsonNode newData, SandboxStatus sandboxStatus, boolean deleted, String visibilityString) {
super("PropertyDiffItem", sandboxStatus, deleted);
=======
public PropertyItem(String elementType, String elem... |
<<<<<<<
import org.apache.sis.internal.jdk7.Objects;
=======
import java.util.Objects;
import org.opengis.feature.IdentifiedType;
>>>>>>>
import org.apache.sis.internal.jdk7.Objects;
import org.opengis.feature.IdentifiedType; |
<<<<<<<
import com.altamiracorp.securegraph.Visibility;
import org.json.JSONObject;
=======
>>>>>>>
import org.json.JSONObject;
<<<<<<<
Visibility toVisibility(JSONObject visibilityJson);
=======
LumifyVisibility toVisibility(String source, String... additionalRequiredVisibilities);
LumifyVisibilit... |
<<<<<<<
if (id != null && equalsFiltered(code, id.getCode(), LETTERS_AND_DIGITS, true)) {
if (identifier instanceof ReferenceIdentifier) {
final String codeSpace = ((ReferenceIdentifier) identifier).getCodeSpace();
if (codeSpace != null... |
<<<<<<<
public final void writeByte(final int v) throws IOException {
ensureBufferAccepts(Byte.SIZE / Byte.SIZE);
buffer.put((byte) v);
=======
public final void writeByte(final int value) throws IOException {
ensureBufferAccepts(Byte.BYTES);
buffer.put((byte) value);
>>>>>>>
... |
<<<<<<<
try (Stream<AbstractFeature> features = reader.features(false)) {
final Iterator<AbstractFeature> it = features.iterator();
=======
try (Stream<Feature> features = reader.features()) {
final Iterator<Feature> it = features.iterator();
>>>>>>>
... |
<<<<<<<
// Related to JDK7
import org.apache.sis.internal.jdk7.Objects;
=======
// Branch-dependent imports
import java.util.Objects;
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk7.Objects; |
<<<<<<<
// Related to JDK7
import org.apache.sis.internal.jdk7.Objects;
=======
// Branch-dependent imports
import java.util.Objects;
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk7.Objects; |
<<<<<<<
import com.altamiracorp.securegraph.Graph;
import com.google.inject.*;
import org.reflections.Reflections;
import org.reflections.scanners.SubTypesScanner;
import org.reflections.util.ClasspathHelper;
=======
import com.google.inject.*;
>>>>>>>
import com.altamiracorp.securegraph.Graph;
import com.google.i... |
<<<<<<<
final Resource resource = findResource(identifier, getRootResource(), new IdentityHashMap<Resource,Boolean>());
=======
final Resource resource = findResource(identifier, this, new IdentityHashMap<>());
>>>>>>>
final Resource resource = findResource(identifier, this, new IdentityHashM... |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.feature.Attribute;
import org.opengis.feature.AttributeType;
>>>>>>>
<<<<<<<
public DefaultAttributeType<V> getType() {
=======
@Override
public AttributeType<V> getType() {
>>>>>>>
public DefaultAttributeType<V> getType() { |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.coverage.grid.GridEnvelope;
import org.opengis.coverage.CannotEvaluateException;
import org.opengis.coverage.PointOutsideCoverageException;
>>>>>>> |
<<<<<<<
* @since 0.3 (derived from geotk-2.5)
* @version 0.3
=======
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
* @version 0.5
>>>>>>>
* @since 0.3
* @version 0.3 |
<<<<<<<
@DependsOn(AbstractMathTransformTest.class)
public strictfp class ProjectiveTransformTest extends TransformTestCase {
/**
* The factory to use for creating linear transforms.
*/
private final MathTransformFactory mtFactory;
/**
* The matrix for the tested transform.
*/
priva... |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.feature.PropertyType;
import org.opengis.feature.AttributeType;
import org.opengis.feature.FeatureType;
import org.opengis.feature.FeatureAssociationRole;
>>>>>>>
<<<<<<<
final String getTitleProperty() {
String p = titleProperty; // No syn... |
<<<<<<<
for (final ReferenceIdentifier identifier : identifiers) {
if (appendUnicodeIdentifier(id, '-', identifier.getCodeSpace(), ":", true) | // Really |, not ||
appendUnicodeIdentifier(id, '-', NameMeaning.toObjectType(object.getClass()), ":", false) |
... |
<<<<<<<
import com.altamiracorp.lumify.core.model.termMention.TermMention;
import com.altamiracorp.securegraph.Vertex;
import com.altamiracorp.securegraph.type.GeoPoint;
=======
import com.altamiracorp.lumify.core.model.termMention.TermMentionModel;
>>>>>>>
import com.altamiracorp.lumify.core.model.termMention.TermM... |
<<<<<<<
return new SpecializedIdentifier<UUID>(IdentifierSpace.UUID, UUID.fromString(code));
=======
return new SpecializedIdentifier<>(IdentifierSpace.UUID, converter.toUUID(context, code));
>>>>>>>
return new SpecializedIdentifier<UUID>(Identi... |
<<<<<<<
import org.opengis.util.CodeList;
=======
>>>>>>>
<<<<<<<
(CodeList.class.isAssignableFrom(type) ? "code" : "metadata") + '.' + identifier;
=======
(ControlledVocabulary.class.isAssignableFrom(type) ? "code" : "metadata") +
'.' + type.getAnnotation(UML.class).... |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureType;
import org.opengis.feature.FeatureAssociationRole;
import org.opengis.feature.MultiValuedPropertyException;
>>>>>>> |
<<<<<<<
import org.opengis.metadata.citation.Role;
import org.opengis.metadata.citation.OnLineFunction;
import org.opengis.metadata.citation.OnlineResource;
import org.opengis.metadata.citation.ResponsibleParty;
import org.opengis.metadata.identification.CharacterSet;
=======
import org.opengis.metadata.citation.*;
... |
<<<<<<<
import static org.apache.sis.internal.jaxb.gco.PropertyType.LEGACY_XML;
// Branch-specific imports
import org.opengis.annotation.UML;
import static org.opengis.annotation.Obligation.OPTIONAL;
import static org.opengis.annotation.Specification.ISO_19115;
=======
>>>>>>>
// Branch-specific imports
import org... |
<<<<<<<
if (id instanceof ReferenceIdentifier) {
final String cs = nonEmpty(((ReferenceIdentifier) id).getCodeSpace());
if (cs != null) {
identifier = cs + DefaultNameSpace.DEFAULT_SEPARATOR + identifier;
}
=======
... |
<<<<<<<
try (Stream<AbstractFeature> features = reader.features()) {
final Iterator<AbstractFeature> it = features.iterator();
=======
try (Stream<Feature> features = reader.features(false)) {
final Iterator<Feature> it = features.iterator();
>>>>>>>
... |
<<<<<<<
* @param object The metadata to copy values from, or {@code null} if none.
=======
* @param object the metadata to copy values from, or {@code null} if none.
*
* @see #castOrCopy(Individual)
>>>>>>>
* @param object the metadata to copy values from, or {@code null} if none.
<<<<<... |
<<<<<<<
import com.github.zafarkhaja.semver.Version;
=======
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.stream.Collectors.joining;
import static org.apache.commons.lang3.Validate.validState;
import static org.joda.time.Duration.standardMinutes;
>>>>>>>
import static java.util.... |
<<<<<<<
class CommandBuffer implements NavigatorHolder {
=======
/**
* Passes navigation command to an active {@link Navigator}
* or stores it in the pending commands queue to pass it later.
*/
public class CommandBuffer implements NavigatorHolder {
>>>>>>>
/**
* Passes navigation command to an active {@link Nav... |
<<<<<<<
import com.djrapitops.plan.database.Database;
=======
>>>>>>>
import com.djrapitops.plan.database.Database;
<<<<<<<
import com.djrapitops.plan.system.file.FileSystem;
import com.djrapitops.plan.system.processing.ProcessingQueue;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan... |
<<<<<<<
new NameProcessor(uuid, playerName, displayName)
=======
new NameProcessor(uuid, playerName, displayName), // TODO NameCache to DataCache
new DBCommitProcessor(plugin.getDB())
>>>>>>>
new NameProcessor(uuid, playerName, displayName) // TODO Name... |
<<<<<<<
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.tasks.server.BootAnalysisTask;
import com.djrapitops.plan.system.tasks.server.NetworkPageRefreshTask;
import com.djrapitops.plan.system.tasks.server.PeriodicAnalysisTask;
=======
import com.djrapitops.plan.system.s... |
<<<<<<<
putSupplier(serverNames, () -> database.fetch().getServerNames());
putSupplier(sessionAccordion, () -> accordions.serverSessionAccordion(
=======
putCachingSupplier(serverNames, () -> Database.getActive().fetch().getServerNames());
putCachingSupplier(sessionAccordion, () -> Ses... |
<<<<<<<
import com.djrapitops.plan.database.Database;
=======
>>>>>>>
import com.djrapitops.plan.database.Database;
<<<<<<<
=======
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.database.databases.Database;
>>>>>>>
import com.djrapitops.plan.system.database.DBSystem;
impo... |
<<<<<<<
if (args.length >= 1 && connectionSystem.isServerAvailable()) {
Map<UUID, Server> bukkitServers = database.fetch().getBukkitServers();
=======
if (args.length >= 1) {
Map<UUID, Server> bukkitServers = Database.getActive().fetch().getBukkitServers();
>>>>>>>
if ... |
<<<<<<<
import com.djrapitops.plan.system.settings.config.BungeeConfigSystem;
import com.djrapitops.plan.system.settings.config.ConfigSystem;
import com.djrapitops.plan.system.update.VersionCheckSystem;
import com.djrapitops.plan.system.webserver.WebServerSystem;
import com.djrapitops.plan.systems.file.database.DBSyste... |
<<<<<<<
JSONArray verticesJson = GraphUtil.toJson(graph.getVertices(path, authorizations));
=======
JSONArray verticesJson = GraphUtil.toJson(graph.getVerticesInOrder(path, user.getAuthorizations()));
>>>>>>>
JSONArray verticesJson = GraphUtil.toJson(graph.getVerticesInOrder(path,... |
<<<<<<<
import com.djrapitops.plan.system.locale.lang.Lang;
=======
import com.djrapitops.plan.system.locale.lang.*;
import com.djrapitops.plan.system.settings.Settings;
>>>>>>>
import com.djrapitops.plan.system.locale.lang.*;
<<<<<<<
import java.util.Map;
=======
import java.util.function.Function;
>>>>>>>
impo... |
<<<<<<<
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import dagger.Lazy;
=======
import com.djrapitops.plugin.StaticHolder;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.util... |
<<<<<<<
=======
import com.djrapitops.plan.system.info.server.ServerInfo;
>>>>>>>
import com.djrapitops.plan.system.info.server.ServerInfo;
<<<<<<<
NetworkContainer networkContainer = db.getNetworkContainerFactory().forBungeeContainer(getBungeeServerContainer());
networkContainer.putSupplier(Network... |
<<<<<<<
public UserInfoTable getUserInfoTable() {
return userInfoTable;
}
=======
public BasicDataSource getDataSource() {
return dataSource;
}
public abstract void commit(Connection connection) throws SQLException;
>>>>>>>
public UserInfoTable getUserInfoTable() {
... |
<<<<<<<
=======
@Override
public String getServerName() {
String name = getHeaderCaseInsensitive(HttpHeaders.HOST);
if (name == null || name.length() == 0) {
name = "lambda.amazonaws.com";
}
return name;
}
@Override
public int getServerPort() {
... |
<<<<<<<
private String statusDescription;
private Map<String, String> headers;
private MultiValuedTreeMap<String, String> multiValueHeaders;
=======
private Headers multiValueHeaders;
>>>>>>>
private String statusDescription;
private Map<String, String> headers;
private Headers multiValue... |
<<<<<<<
private static final String UNICODE_SPACES = "[" +
"\\u0009-\\u000d" + // # White_Space # Cc [5] <control-0009>..<control-000D>
"\\u0020" + // White_Space # Zs SPACE
"\\u0085" + // White_Space # Cc <control-0085>
"\\u00a0" + // White_Space... |
<<<<<<<
return new HttpClientDoOn(this, doOnRequest, null, null, null);
=======
return new HttpClientDoOn(this, doOnRequest, null, null, null, null, null);
>>>>>>>
return new HttpClientDoOn(this, doOnRequest, null, null, null, null);
<<<<<<<
return new HttpClientDoOn(this, null, doAfterRequest, null, null);... |
<<<<<<<
=======
* Create a {@link ConnectionProvider} to cache and grow on demand {@link Connection}.
* <p>An elastic {@link ConnectionProvider} will never wait before opening a new
* connection. The reuse window is limited but it cannot starve an undetermined volume
* of clients using it.
*
* @param name... |
<<<<<<<
=======
checkNotNull(artifactExtractedInfo.getConceptType(), "concept type cannot be null");
Concept concept = ontologyRepository.getConceptByVertexId(artifactExtractedInfo.getConceptType());
checkNotNull(concept, "Could not find concept " + artifactExtractedInfo.getConceptType());
... |
<<<<<<<
String poolName = "test";
PooledConnectionProvider fixed = (PooledConnectionProvider) ConnectionProvider.create(poolName, 1);
AtomicReference<String[]> tags = new AtomicReference<>();
=======
String namePrefix = CONNECTION_PROVIDER_PREFIX + ".test";
PooledConnectionProvider fixed = (PooledConnection... |
<<<<<<<
public boolean isDisposed() {
return !running.get();
}
@Override
public EventLoopGroup onClient(boolean useNative) {
if (useNative && preferNative()) {
return cacheNativeClientLoops();
}
return cacheNioClientLoops();
}
@Override
public EventLoopGroup onServer(boolean useNative) {
if (useNa... |
<<<<<<<
import reactor.core.publisher.MonoProcessor;
import reactor.core.publisher.UnicastProcessor;
=======
import reactor.core.publisher.SignalType;
>>>>>>>
import reactor.core.publisher.MonoProcessor;
import reactor.core.publisher.UnicastProcessor;
import reactor.core.publisher.SignalType; |
<<<<<<<
=======
this.redirectRequestConsumer = from.redirectRequestConsumer;
this.chunkedTransfer = from.chunkedTransfer;
>>>>>>>
this.redirectRequestConsumer = from.redirectRequestConsumer; |
<<<<<<<
publishNewProperty(edgeExistingElementMutation, property, workspaceId, user);
=======
OntologyProperty ontologyProperty = ontologyRepository.getPropertyByIRI(property.getName());
checkNotNull(ontologyProperty, "Could not find ontology property " + property.getName());
... |
<<<<<<<
import java.util.function.Predicate;
=======
import java.util.regex.Pattern;
>>>>>>>
import java.util.function.Predicate;
import java.util.regex.Pattern; |
<<<<<<<
createHttpClientForContextWithAddress()
.doOnRequest((r, c) -> log.debug("onReq: "+r))
.doAfterRequest((r, c) -> log.debug("afterReq: "+r))
.doOnResponse((r, c) -> log.debug("onResp: "+r))
.doAfterResponse((r, c) -> log.debug("afterResp: "+r))
=======
AtomicInteger ... |
<<<<<<<
import static com.altamiracorp.lumify.core.model.properties.EntityLumifyProperties.GEO_LOCATION;
import com.altamiracorp.securegraph.Direction;
import com.altamiracorp.securegraph.Edge;
import com.altamiracorp.securegraph.Element;
import com.altamiracorp.securegraph.Property;
import com.altamiracorp.securegrap... |
<<<<<<<
private static final String NO_COLOR_OPT = "no-color";
private static final String INVERT_COLOR_OPT = "invert-color";
=======
private static final String DEBUG_OPT = "debug";
>>>>>>>
private static final String NO_COLOR_OPT = "no-color";
private static final String INVERT_COLOR_OPT = "inv... |
<<<<<<<
final Option xcodeIntegration = addArgument(XCODE_INTEGRATION_OPT, Messages.XCODE_INTEGRATION_DESC);
=======
final Option debug = Option.builder().longOpt(DEBUG_OPT).desc(Messages.DEBUG_DESC).build();
final Option noColor = Option.builder().longOpt(NO_COLOR_OPT).desc(Messages.NO_COLOR_... |
<<<<<<<
void verifyLowerCamelCase(String constructType, ParserRuleContext ctx) {
String constructName = ctx.getText();
if (!CharFormatUtil.isLowerCamelCase(constructName)) {
Location location = new Location(ctx.getStart().getLine(), ctx.getStart().getCharPositionInLine() + 1);
... |
<<<<<<<
Set<Rules> enabledRules = argumentParser.getEnabledRules();
=======
ColorSettings colorSettings =
new ColorSettings(argumentParser.shouldColorOutput(), argumentParser.shouldInvertColorOutput());
>>>>>>>
ColorSettings colorSettings =
new ColorSettings(argumentPa... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.