Skip to content
This repository was archived by the owner on Nov 14, 2024. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions atlasdb-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ dependencies {
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind'
compile group: 'javax.validation', name: 'validation-api'

compile group: 'com.palantir.remoting-api', name: 'ssl-config'
compile (group: 'com.palantir.remoting3', name: 'jaxrs-clients') {
compile group: 'com.palantir.conjure.java.api', name: 'ssl-config'
compile (group: 'com.palantir.conjure.java.runtime', name: 'conjure-java-jaxrs-client') {
exclude (module:'jsr305')
}
compile (group: 'com.palantir.tritium', name: 'tritium-registry') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.common.base.Preconditions;
import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
import com.palantir.logsafe.SafeArg;
import com.palantir.remoting.api.config.ssl.SslConfiguration;

@JsonDeserialize(as = ImmutableLeaderConfig.class)
@JsonSerialize(as = ImmutableLeaderConfig.class)
Expand Down
6 changes: 3 additions & 3 deletions atlasdb-cassandra/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ dependencies {

explicitShadow 'org.apache.commons:commons-pool2:2.4.2'

explicitShadow group: 'com.palantir.remoting-api', name: 'ssl-config'
explicitShadow group: 'com.palantir.remoting3', name: 'keystores'
explicitShadow group: 'com.palantir.remoting3', name: 'tracing'
explicitShadow group: 'com.palantir.conjure.java.api', name: 'ssl-config'
explicitShadow group: 'com.palantir.conjure.java.runtime', name: 'keystores'
explicitShadow group: 'com.palantir.tracing', name: 'tracing'

// does shadowing statically analysed annotations really buy us anything?
explicitShadow group: 'com.google.code.findbugs', name: 'findbugs-annotations'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
import com.palantir.atlasdb.AtlasDbConstants;
import com.palantir.atlasdb.keyvalue.cassandra.CassandraConstants;
import com.palantir.atlasdb.spi.KeyValueServiceConfig;
import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
import com.palantir.processors.AutoDelegate;
import com.palantir.remoting.api.config.ssl.SslConfiguration;

@AutoService(KeyValueServiceConfig.class)
@JsonDeserialize(as = ImmutableCassandraKeyValueServiceConfig.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
import com.palantir.atlasdb.util.AtlasDbMetrics;
import com.palantir.atlasdb.util.MetricsManager;
import com.palantir.common.exception.AtlasDbDependencyException;
import com.palantir.conjure.java.config.ssl.SslSocketFactories;
import com.palantir.logsafe.SafeArg;
import com.palantir.logsafe.UnsafeArg;
import com.palantir.remoting3.config.ssl.SslSocketFactories;

public class CassandraClientFactory extends BasePooledObjectFactory<CassandraClient> {
private static final Logger log = LoggerFactory.getLogger(CassandraClientFactory.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.junit.Test;

import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
import com.palantir.remoting.api.config.ssl.SslConfiguration;
import com.palantir.conjure.java.api.config.ssl.SslConfiguration;

public class CassandraKeyValueServiceConfigTest {
private static final InetSocketAddress SERVER_ADDRESS = InetSocketAddress.createUnresolved("localhost", 9160);
Expand Down
3 changes: 2 additions & 1 deletion atlasdb-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ dependencies {
compile (group: 'com.googlecode.json-simple', name: 'json-simple') {
exclude group: 'junit'
}
compile group: 'com.palantir.remoting-api', name: 'errors'
compile group: "commons-lang", name: "commons-lang", version: libVersions.commons_lang
compile group: "org.xerial.snappy", name: "snappy-java", version: libVersions.snappy
compile group: "com.github.ben-manes.caffeine", name: "caffeine"
Expand All @@ -61,7 +62,7 @@ dependencies {
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core'
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-guava'
compile group: 'com.palantir.remoting3', name: 'tracing'
compile group: 'com.palantir.tracing', name: 'tracing'
compile group: 'com.palantir.safe-logging', name: 'safe-logging'
compile (group: 'com.palantir.tritium', name: 'tritium-caffeine') {
exclude (group: 'com.palantir.remoting3', module: 'tracing')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.util.concurrent.ExecutionException;

import com.palantir.common.base.Throwables;
import com.palantir.remoting.api.errors.QosException;
import com.palantir.conjure.java.api.errors.QosException;

public final class QosAwareThrowables {
private QosAwareThrowables() {
Expand All @@ -39,6 +39,8 @@ public static RuntimeException unwrapAndThrowRateLimitExceededOrAtlasDbDependenc
throw unwrapAndThrowRateLimitExceededOrAtlasDbDependencyException(ex.getCause());
} else if (ex instanceof QosException.Throttle) {
throw (QosException.Throttle) ex;
} else if (ex instanceof com.palantir.remoting.api.errors.QosException.Throttle) {
throw (com.palantir.remoting.api.errors.QosException.Throttle) ex;
}
throw Throwables.unwrapAndThrowAtlasDbDependencyException(ex);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
import org.slf4j.helpers.MessageFormatter;

import com.google.common.collect.ObjectArrays;
import com.palantir.remoting.api.tracing.OpenSpan;
import com.palantir.remoting.api.tracing.SpanType;
import com.palantir.remoting3.tracing.Tracer;
import com.palantir.tracing.Tracer;
import com.palantir.tracing.api.OpenSpan;
import com.palantir.tracing.api.SpanType;

public final class CloseableTrace implements AutoCloseable {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
import com.palantir.atlasdb.keyvalue.api.TableReference;
import com.palantir.atlasdb.keyvalue.api.Value;
import com.palantir.atlasdb.tracing.TestSpanObserver;
import com.palantir.remoting.api.tracing.SpanType;
import com.palantir.remoting3.tracing.Tracer;
import com.palantir.tracing.Tracer;
import com.palantir.tracing.api.SpanType;
import com.palantir.util.paging.TokenBackedBasicResultsPage;

@RunWith(MockitoJUnitRunner.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@
import org.junit.Test;

import com.palantir.common.exception.AtlasDbDependencyException;
import com.palantir.remoting.api.errors.QosException;
import com.palantir.conjure.java.api.errors.QosException;

public class QosAwareThrowablesTest {
private static final Exception THROTTLE_EXCEPTION = QosException.throttle();
private static final Exception REMOTING_THROTTLE_EXCEPTION = com.palantir.remoting.api.errors.QosException.throttle();
private static final Exception ATLASDB_DEPENDENCY_EXCEPTION =
new AtlasDbDependencyException("The TimeLock is dead, long live the TimeLock");

Expand All @@ -38,6 +39,12 @@ public void unwrapAndThrowRateLimitExceededOrAtlasDbDependencyExceptionCanThrowR
THROTTLE_EXCEPTION)).isEqualTo(THROTTLE_EXCEPTION);
}

@Test
public void unwrapAndThrowRateLimitExceededOrAtlasDbDependencyExceptionCanThrowRemotingRateLimitExceededException() {
assertThatThrownBy(() -> QosAwareThrowables.unwrapAndThrowRateLimitExceededOrAtlasDbDependencyException(
REMOTING_THROTTLE_EXCEPTION)).isEqualTo(REMOTING_THROTTLE_EXCEPTION);
}

@Test
public void unwrapAndThrowRateLimitExceededOrAtlasDbDependencyExceptionCanThrowAtlasDbDependencyException() {
assertThatThrownBy(() -> QosAwareThrowables.unwrapAndThrowRateLimitExceededOrAtlasDbDependencyException(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@
import org.junit.Before;
import org.junit.Test;

import com.palantir.remoting.api.tracing.Span;
import com.palantir.remoting3.tracing.AlwaysSampler;
import com.palantir.remoting3.tracing.Tracer;

import com.palantir.tracing.AlwaysSampler;
import com.palantir.tracing.Tracer;
import com.palantir.tracing.api.Span;

public class CloseableTraceTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import java.util.Collections;
import java.util.List;

import com.palantir.remoting.api.tracing.Span;
import com.palantir.remoting.api.tracing.SpanObserver;
import com.palantir.tracing.api.Span;
import com.palantir.tracing.api.SpanObserver;

public class TestSpanObserver implements SpanObserver {
private final List<Span> spans = new ArrayList<>();
Expand Down
6 changes: 3 additions & 3 deletions atlasdb-config/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ dependencies {

compile group: 'javax.validation', name: 'validation-api'
compile group: 'com.palantir.config.crypto', name: 'encrypted-config-value-module'
compile group: 'com.palantir.remoting-api', name: 'service-config'
compile group: 'com.palantir.conjure.java.api', name: 'service-config'
compile group: 'com.palantir.remoting2', name: 'error-handling' // needed for backwards compatibility
compile group: 'com.palantir.remoting3', name: 'keystores'
compile group: 'com.palantir.conjure.java.runtime', name: 'keystores'
compile group: 'com.palantir.safe-logging', name: 'safe-logging'
compile (group: 'com.palantir.tritium', name: 'tritium-lib') {
exclude (group: 'com.palantir.remoting3', module: 'tracing')
exclude (group: 'io.dropwizard.metrics', module: 'metrics-core')
exclude (group: 'org.hdrhistogram', module: 'HdrHistogram')
}
compile group: 'com.palantir.remoting3', name: 'tracing'
compile group: 'com.palantir.tracing', name: 'tracing'
compile group: 'org.hdrhistogram', name: 'HdrHistogram'

compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import com.palantir.config.crypto.DecryptingVariableSubstitutor;
import com.palantir.config.crypto.jackson.JsonNodeStringReplacer;
import com.palantir.config.crypto.jackson.JsonNodeVisitors;
import com.palantir.remoting.api.config.ssl.SslConfiguration;
import com.palantir.conjure.java.api.config.ssl.SslConfiguration;

public final class AtlasDbConfigs {
public static final String ATLASDB_CONFIG_OBJECT_PATH = "/atlasdb";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
import com.palantir.atlasdb.http.AtlasDbHttpClients;
import com.palantir.atlasdb.util.AtlasDbMetrics;
import com.palantir.atlasdb.util.MetricsManager;
import com.palantir.remoting.api.config.service.ProxyConfiguration;
import com.palantir.remoting.api.config.ssl.SslConfiguration;
import com.palantir.remoting3.config.ssl.SslSocketFactories;
import com.palantir.conjure.java.api.config.service.ProxyConfiguration;
import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
import com.palantir.conjure.java.config.ssl.SslSocketFactories;

public class ServiceCreator<T> implements Function<ServerListConfig, T> {
private final MetricsManager metricsManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@
import com.palantir.atlasdb.util.MetricsManager;
import com.palantir.atlasdb.util.MetricsManagers;
import com.palantir.common.annotation.Output;
import com.palantir.conjure.java.api.config.service.ServiceConfiguration;
import com.palantir.conjure.java.api.config.service.UserAgent;
import com.palantir.conjure.java.client.config.ClientConfigurations;
import com.palantir.conjure.java.client.jaxrs.JaxRsClient;
import com.palantir.conjure.java.okhttp.HostMetricsRegistry;
import com.palantir.leader.LeaderElectionService;
import com.palantir.leader.PingableLeader;
import com.palantir.leader.proxy.AwaitingLeadershipProxy;
Expand All @@ -138,9 +143,6 @@
import com.palantir.lock.impl.LockServiceImpl;
import com.palantir.lock.v2.TimelockService;
import com.palantir.logsafe.SafeArg;
import com.palantir.remoting.api.config.service.ServiceConfiguration;
import com.palantir.remoting3.clients.ClientConfigurations;
import com.palantir.remoting3.jaxrs.JaxRsClient;
import com.palantir.timestamp.TimestampService;
import com.palantir.timestamp.TimestampStoreInvalidator;
import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
Expand Down Expand Up @@ -456,7 +458,11 @@ private QosClient getQosClient(MetricsManager metricsManager, Supplier<QosClient
Optional<ServiceConfiguration> qosServiceConfig = config.get().qosService();
QosRateLimiters rateLimiters;
if (qosServiceConfig.isPresent()) {
QosService qosService = JaxRsClient.create(QosService.class, userAgent(),

// HACHACK: to get build pass
QosService qosService = JaxRsClient.create(QosService.class,
com.palantir.conjure.java.api.config.service.UserAgents.parse(userAgent()),
new HostMetricsRegistry(),
ClientConfigurations.of(qosServiceConfig.get()));
rateLimiters = QosRateLimiters.create(
JavaSuppliers.compose(conf -> conf.maxBackoffSleepTime().toMilliseconds(), config),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import com.google.common.collect.Lists;
import com.palantir.atlasdb.config.ServerListConfig;
import com.palantir.atlasdb.util.AtlasDbMetrics;
import com.palantir.remoting.api.config.service.ProxyConfiguration;
import com.palantir.remoting.api.config.ssl.SslConfiguration;
import com.palantir.conjure.java.api.config.service.ProxyConfiguration;
import com.palantir.conjure.java.api.config.ssl.SslConfiguration;

public final class AtlasDbHttpClients {
private static final int QUICK_FEIGN_TIMEOUT_MILLIS = 100;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import com.palantir.atlasdb.AtlasDbConstants;
import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig;
import com.palantir.remoting.api.config.ssl.SslConfiguration;
import com.palantir.conjure.java.api.config.ssl.SslConfiguration;

public class AtlasDbConfigDeserializationTest {
private static final File TEST_CONFIG_FILE = new File(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig;
import com.palantir.atlasdb.spi.KeyValueServiceConfig;
import com.palantir.remoting.api.config.ssl.SslConfiguration;
import com.palantir.conjure.java.api.config.ssl.SslConfiguration;

public class AtlasDbConfigTest {
private static final KeyValueServiceConfig KVS_CONFIG_WITHOUT_NAMESPACE = mock(KeyValueServiceConfig.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

import org.junit.Test;

import com.palantir.remoting.api.config.ssl.SslConfiguration;
import com.palantir.conjure.java.api.config.ssl.SslConfiguration;

public class AtlasDbRuntimeConfigDeserializationTest {
private static final File TEST_RUNTIME_CONFIG_FILE = new File(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.junit.Test;

import com.google.common.collect.ImmutableList;
import com.palantir.remoting.api.config.ssl.SslConfiguration;
import com.palantir.conjure.java.api.config.ssl.SslConfiguration;

public class TimeLockClientConfigTest {
private static final String CLIENT = "testClient";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
import com.palantir.atlasdb.config.ServerListConfig;
import com.palantir.atlasdb.factory.ServiceCreator;
import com.palantir.common.remoting.ServiceNotAvailableException;
import com.palantir.remoting.api.config.service.ProxyConfiguration;
import com.palantir.remoting3.config.ssl.SslSocketFactories;
import com.palantir.conjure.java.api.config.service.ProxyConfiguration;
import com.palantir.conjure.java.config.ssl.SslSocketFactories;

public class AtlasDbHttpClientsTest {
private static final Optional<SSLSocketFactory> NO_SSL = Optional.empty();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.palantir.common.remoting.ServiceNotAvailableException;
import com.palantir.conjure.java.serialization.ObjectMappers;
import com.palantir.remoting2.errors.SerializableError;
import com.palantir.remoting3.ext.jackson.ObjectMappers;

public class ExceptionMappersSerializationTest {
private static final ObjectMapper MAPPER = ObjectMappers.newServerObjectMapper();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import com.palantir.nexus.db.pool.config.ConnectionConfig;
import com.palantir.nexus.db.pool.config.ImmutableMaskedValue;
import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig;
import com.palantir.remoting.api.config.service.HumanReadableDuration;
import com.palantir.conjure.java.api.config.service.HumanReadableDuration;

@RunWith(Suite.class)
@SuiteClasses({
Expand Down
2 changes: 1 addition & 1 deletion atlasdb-dbkvs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
compile project(':timestamp-impl')
compile project(':commons-db')
compile project(':commons-api')
compile group: 'com.palantir.remoting-api', name: 'service-config'
compile group: 'com.palantir.conjure.java.api', name: 'service-config'


testCompile project(':atlasdb-config')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.palantir.atlasdb.AtlasDbConstants;
import com.palantir.atlasdb.keyvalue.api.TableReference;
import com.palantir.remoting.api.config.service.HumanReadableDuration;
import com.palantir.conjure.java.api.config.service.HumanReadableDuration;

@JsonDeserialize(as = ImmutablePostgresDdlConfig.class)
@JsonSerialize(as = ImmutablePostgresDdlConfig.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import com.palantir.nexus.db.DBType;
import com.palantir.nexus.db.sql.AgnosticResultSetImpl;
import com.palantir.nexus.db.sql.SqlConnection;
import com.palantir.remoting.api.config.service.HumanReadableDuration;
import com.palantir.conjure.java.api.config.service.HumanReadableDuration;

public class PostgresDdlTableTest {
private PostgresDdlTable postgresDdlTable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
import com.palantir.atlasdb.transaction.service.TransactionService;
import com.palantir.atlasdb.transaction.service.TransactionServices;
import com.palantir.atlasdb.util.MetricsManagers;
import com.palantir.remoting3.servers.jersey.HttpRemotingJerseyFeature;
import com.palantir.conjure.java.server.jersey.ConjureJerseyFeature;
import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;

Expand Down Expand Up @@ -105,7 +105,7 @@ public void run(AtlasDbEteConfiguration config, final Environment environment) t
sweepTaskRunner,
sweeperSupplier)));
environment.jersey().register(new SimpleCheckAndSetResource(new CheckAndSetClient(txManager)));
environment.jersey().register(HttpRemotingJerseyFeature.INSTANCE);
environment.jersey().register(ConjureJerseyFeature.INSTANCE);
environment.jersey().register(new NotInitializedExceptionMapper());
environment.jersey().register(new CleanupMetadataResourceImpl(
txManager,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
import com.palantir.docker.compose.connection.Container;
import com.palantir.docker.compose.connection.DockerPort;
import com.palantir.docker.compose.logging.LogDirectory;
import com.palantir.remoting.api.config.service.HumanReadableDuration;
import com.palantir.conjure.java.api.config.service.HumanReadableDuration;
import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;

public class QosCassandraEteTestSetup {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import com.palantir.atlasdb.todo.Todo;
import com.palantir.atlasdb.todo.TodoSchema;
import com.palantir.common.base.BatchingVisitable;
import com.palantir.remoting.api.errors.QosException;
import com.palantir.conjure.java.api.errors.QosException;

public class QosCassandraReadEteTest extends QosCassandraEteTestSetup {
private static final int ONE_TODO_SIZE_IN_BYTES = 1050;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import com.google.common.base.Preconditions;
import com.google.common.base.Stopwatch;
import com.google.common.base.Throwables;
import com.palantir.remoting.api.errors.QosException;
import com.palantir.conjure.java.api.errors.QosException;

public class QosCassandraWriteEteTest extends QosCassandraEteTestSetup {

Expand Down
Loading