Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some cq warnings #3913

Merged
merged 14 commits into from
Jul 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public Map<String, String> start() {
container = new GenericContainer(REDIS_IMAGE).withExposedPorts(REDIS_PORT).waitingFor(Wait.forListeningPort());
container.start();

final String authority = container.getContainerIpAddress() + ":" + container.getMappedPort(REDIS_PORT).toString();
final String authority = container.getHost() + ":" + container.getMappedPort(REDIS_PORT).toString();
return CollectionHelper.mapOf("camel.redis.test.server.authority", authority);
} catch (Exception e) {
throw new RuntimeException(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public Map<String, String> start() {
.forEach(s -> {
result.put(
"azure." + s.name() + ".service.url",
"http://" + container.getContainerIpAddress() + ":"
"http://" + container.getHost() + ":"
+ (s.azuritePort >= 0 ? container.getMappedPort(s.azuritePort) : s.azuritePort)
+ "/"
+ azureStorageAccountName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public Map<String, String> start() {

setUpDb();

String host = container.getContainerIpAddress() + ":" + container.getMappedPort(MONGODB_PORT).toString();
String host = container.getHost() + ":" + container.getMappedPort(MONGODB_PORT).toString();

Map<String, String> config = new HashMap<>();
config.put("quarkus.mongodb.hosts", host);
Expand All @@ -75,7 +75,7 @@ public Map<String, String> start() {
}

void setUpDb() {
final String mongoUrl = "mongodb://" + container.getContainerIpAddress() + ":"
final String mongoUrl = "mongodb://" + container.getHost() + ":"
+ container.getMappedPort(MONGODB_PORT).toString();

MongoClient mongoClient = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class ArangodbResource {
@Produces(MediaType.TEXT_PLAIN)
public Response put(String message) throws Exception {
LOG.infof("Saving to arangodb: %s", message);
final DocumentCreateEntity response = producerTemplate.requestBody(
final DocumentCreateEntity<?> response = producerTemplate.requestBody(
"arangodb:test?host={{camel.arangodb.host}}&port={{camel.arangodb.port}}&documentCollection=camel&operation=SAVE_DOCUMENT",
message, DocumentCreateEntity.class);
LOG.infof("Got response from arangodb: %s", response);
Expand Down Expand Up @@ -131,7 +131,7 @@ public Response getByFooName(@PathParam("fooName") String fooName) throws Except
headers.put(AQL_QUERY_OPTIONS, null);
headers.put(RESULT_CLASS_TYPE, String.class);

final Collection<String> responseList = producerTemplate.requestBodyAndHeaders(
final Collection<?> responseList = producerTemplate.requestBodyAndHeaders(
"arangodb:test?host={{camel.arangodb.host}}&port={{camel.arangodb.port}}&operation=AQL_QUERY",
fooName, headers, Collection.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.arangodb.ArangoCollection;
import com.arangodb.ArangoDB;
import com.arangodb.ArangoDatabase;
import com.arangodb.DbName;
import com.arangodb.entity.BaseDocument;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
Expand Down Expand Up @@ -139,8 +140,8 @@ public static void setup() {
String host = ConfigProvider.getConfig().getValue("camel.arangodb.host", String.class);
Integer port = ConfigProvider.getConfig().getValue("camel.arangodb.port", Integer.class);
arangoDb = new ArangoDB.Builder().host(host, port).build();
arangoDb.createDatabase(DATABASE_NAME);
ArangoDatabase arangoDatabase = arangoDb.db(DATABASE_NAME);
arangoDb.createDatabase(DbName.of(DATABASE_NAME));
ArangoDatabase arangoDatabase = arangoDb.db(DbName.of(DATABASE_NAME));
arangoDatabase.createCollection(COLLECTION_NAME);
collection = arangoDatabase.collection(COLLECTION_NAME);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public Map<String, String> start() {
"camel.arangodb.port",
container.getMappedPort(PORT_DEFAULT).toString(),
"camel.arangodb.host",
container.getContainerIpAddress());
container.getHost());
} catch (Exception e) {
throw new RuntimeException(e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public Map<String, String> start() {

initDB(container);

String cassandraUrl = container.getContainerIpAddress() + ":" + container.getMappedPort(PORT);
String cassandraUrl = container.getHost() + ":" + container.getMappedPort(PORT);
return CollectionHelper.mapOf(
// Note: The cassandra component does not depend on any of these being set.
// They're added to test the component with the (optional) QuarkusCqlSession
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public Map<String, String> start() {
return CollectionHelper.mapOf(
"camel.consul.test-url",
String.format("http://%s:%d",
container.getContainerIpAddress(),
container.getHost(),
container.getMappedPort(CONTAINER_PORT)));
} catch (Exception e) {
throw new RuntimeException(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public Map<String, String> start() {

return CollectionHelper.mapOf(
String.format("camel.fhir.%s.test-url", fhirVersion.simpleVersion()),
fhirVersion.getServerUrl(container.getContainerIpAddress(), container.getMappedPort(CONTAINER_PORT)));
fhirVersion.getServerUrl(container.getHost(), container.getMappedPort(CONTAINER_PORT)));
} catch (Exception e) {
throw new RuntimeException(e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ public Integer size(@QueryParam("component") String component) {
public Integer stats(@QueryParam("component") String component) {
Map<String, Object> headers = getCommonHeaders(component);
ServerStatistics statistics = template.requestBodyAndHeaders("direct:stats", null, headers, ServerStatistics.class);
return statistics.getIntStatistic(ServerStatistics.CURRENT_NR_OF_ENTRIES);
return statistics.getIntStatistic(ServerStatistics.APPROXIMATE_ENTRIES);
}

@POST
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public Map<String, String> start() {

container.start();

String serverList = String.format("%s:%s", container.getContainerIpAddress(),
String serverList = String.format("%s:%s", container.getHost(),
container.getMappedPort(HOTROD_PORT));

// Create 2 sets of configuration to test scenarios:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public Map<String, String> start() {

return CollectionHelper.mapOf(
InfluxdbResource.INFLUXDB_CONNECTION_PROPERTY,
"http://" + String.format("%s:%s", container.getContainerIpAddress(),
"http://" + String.format("%s:%s", container.getHost(),
container.getMappedPort(INFLUXDB_PORT)));
} catch (Exception e) {
throw new RuntimeException(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Map<String, String> start() {
container.start();

return CollectionHelper.mapOf(
"jsch.host", container.getContainerIpAddress(),
"jsch.host", container.getHost(),
"jsch.port", container.getMappedPort(JSCH_PORT).toString(),
"jsch.username", USERNAME,
"jsch.password", PASSWORD);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public Map<String, String> start() {
.withNetworkAliases("kafka")
.withServerProperties(MountableFile.forClasspathResource("kafkaServer.properties"))
.withBootstrapServers(
c -> String.format("JWT://%s:%s", c.getContainerIpAddress(), c.getMappedPort(KAFKA_PORT)));
c -> String.format("JWT://%s:%s", c.getHost(), c.getMappedPort(KAFKA_PORT)));
this.kafka.start();
log.info(this.kafka.getLogs());
properties.put("kafka.bootstrap.servers", this.kafka.getBootstrapServers());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,16 @@ public Map<String, String> start() {
tabletContainer.start();

// Print interesting Kudu servers connectivity information
final String masterRpcAuthority = masterContainer.getContainerIpAddress() + ":"
final String masterRpcAuthority = masterContainer.getHost() + ":"
+ masterContainer.getMappedPort(KUDU_MASTER_RPC_PORT);
LOG.info("Kudu master RPC accessible at " + masterRpcAuthority);
final String masterHttpAuthority = masterContainer.getContainerIpAddress() + ":"
final String masterHttpAuthority = masterContainer.getHost() + ":"
+ masterContainer.getMappedPort(KUDU_MASTER_HTTP_PORT);
LOG.info("Kudu master HTTP accessible at " + masterHttpAuthority);
final String tServerRpcAuthority = tabletContainer.getContainerIpAddress() + ":"
final String tServerRpcAuthority = tabletContainer.getHost() + ":"
+ tabletContainer.getMappedPort(KUDU_TABLET_RPC_PORT);
LOG.info("Kudu tablet server RPC accessible at " + tServerRpcAuthority);
final String tServerHttpAuthority = tabletContainer.getContainerIpAddress() + ":"
final String tServerHttpAuthority = tabletContainer.getHost() + ":"
+ tabletContainer.getMappedPort(KUDU_TABLET_HTTP_PORT);
LOG.info("Kudu tablet server HTTP accessible at " + tServerHttpAuthority);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ private static GenericContainer<?> basicAuthContainer(Map<String, String> proper

container.start();

String basicAuthIp = container.getContainerIpAddress();
String basicAuthIp = container.getHost();
Integer basicAuthPort = container.getMappedPort(NATS_SERVER_PORT);
String basicAuthAuthority = BASIC_AUTH_USERNAME + ":" + BASIC_AUTH_PASSWORD;
String basicAuthBrokerUrl = String.format("%s@%s:%d", basicAuthAuthority, basicAuthIp, basicAuthPort);
Expand All @@ -118,7 +118,7 @@ private static GenericContainer<?> noAuthContainer(Map<String, String> propertie

container.start();

String noAuthIp = container.getContainerIpAddress();
String noAuthIp = container.getHost();
Integer noAuthPort = container.getMappedPort(NATS_SERVER_PORT);
String noAuthBrokerUrl = String.format("%s:%s", noAuthIp, noAuthPort);

Expand Down Expand Up @@ -155,7 +155,7 @@ private static GenericContainer<?> tlsAuthContainer(Map<String, String> properti

container.start();

String tlsAuthIp = container.getContainerIpAddress();
String tlsAuthIp = container.getHost();
Integer tlsAuthPort = container.getMappedPort(NATS_SERVER_PORT);
String tlsAuthBrokerUrl = String.format("%s:%d", tlsAuthIp, tlsAuthPort);

Expand All @@ -176,7 +176,7 @@ private static GenericContainer<?> tokenAuthContainer(Map<String, String> proper

container.start();

String tokenAuthIp = container.getContainerIpAddress();
String tokenAuthIp = container.getHost();
Integer tokenAuthPort = container.getMappedPort(NATS_SERVER_PORT);
String tokenAuthBrokerUrl = String.format("%s@%s:%d", TOKEN_AUTH_TOKEN, tokenAuthIp, tokenAuthPort);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ public Map<String, String> start() {

container.start();

LOGGER.info("Started SSH container to {}:{}", container.getContainerIpAddress(),
LOGGER.info("Started SSH container to {}:{}", container.getHost(),
container.getMappedPort(SSH_PORT).toString());

return CollectionHelper.mapOf(
"quarkus.ssh.host",
container.getContainerIpAddress(),
container.getHost(),
"quarkus.ssh.port",
container.getMappedPort(SSH_PORT).toString());
} catch (Exception e) {
Expand Down