Skip to content

Commit

Permalink
Rename KafkaIngester module to Kafka. (#1110)
Browse files Browse the repository at this point in the history
* Rename KafkaIngester module to Kafka.

* Missing files

* missing gradle file

Co-authored-by: Charles P. Wright <charleswright@illumon.com>
  • Loading branch information
cpwright and cpwright authored Aug 24, 2021
1 parent 5e135dd commit c646eb2
Show file tree
Hide file tree
Showing 53 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ private static String getModuleName(Class sourceClass) {
return file.getPath();
}
} else if(sourceClass.getName().startsWith("io.deephaven.kafka.ingest")) {
if (file.isDirectory() && file.getName().equals("KafkaIngester")) {
if (file.isDirectory() && file.getName().equals("Kafka")) {
return file.getPath();
}
} else {
Expand Down
4 changes: 2 additions & 2 deletions Generators/Generators.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ dependencies {

compile project(':DB'),
project(':Plot')
project(':KafkaIngester')
project(':Kafka')

runtime project(path: ':configs'), project(path: ':test-configs'), project(':KafkaIngester')
runtime project(path: ':configs'), project(path: ':test-configs'), project(':Kafka')

runtimeOnly project(':log-to-slf4j')
runtimeOnly 'ch.qos.logback:logback-classic:1.2.3'
Expand Down
2 changes: 1 addition & 1 deletion Integrations/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
// add configs, and some runtime dependencies to test classpaths
testRuntime project(':configs'), project(':test-configs'),
// need these projects so session default imports / generated type wrappers resolve correctly
project(':Numerics'), project(':Plot'), project(':KafkaIngester'), project(':DbTypesImpl')
project(':Numerics'), project(':Plot'), project(':Kafka'), project(':DbTypesImpl')
}

sourceSets {
Expand Down
2 changes: 1 addition & 1 deletion KafkaIngester/KafkaIngester.gradle → Kafka/Kafka.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sourceSets {
}

configurations {
compile.extendsFrom dhKafkaIngester
compile.extendsFrom dhKafka
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
public class TestAvroAdapter {
@NotNull
private File getSchemaFile(String name) {
final String avscPath = Configuration.getInstance().getDevRootPath() + "/KafkaIngester/src/test/resources/avro-examples/";
final String avscPath = Configuration.getInstance().getDevRootPath() + "/Kafka/src/test/resources/avro-examples/";
return new File(avscPath + name);
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ tasks.register 'allJavadoc', Javadoc, {

//add to as javadoc gets completed
String [] exportedProjects = [
':DataStructures', ':DB', ':Util', ':ModelFarm', ':Numerics', ':Plot', ':KafkaIngester', ':grpc-api', ':qst', ':table-api'
':DataStructures', ':DB', ':Util', ':ModelFarm', ':Numerics', ':Plot', ':Kafka', ':grpc-api', ':qst', ':table-api'
]
jdoc.source = exportedProjects.collect { Java.sourceSet(project(it)).allJava }
jdoc.classpath = files(exportedProjects.collect { project(it).sourceSets.main.compileClasspath })
Expand Down
4 changes: 2 additions & 2 deletions classpaths.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ configurations {
dhDbTypesImpl.extendsFrom fishBase, commonsIo
dhBenchmarkSupport.extendsFrom fishData, commonsCsv
dhIntegrations.extendsFrom math3
dhKafkaIngester.extendsFrom dhDb
dhKafka.extendsFrom dhDb
}

// exported properties
Expand Down Expand Up @@ -127,6 +127,6 @@ dependencies {
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
'com.fasterxml.jackson.core:jackson-core:2.9.8'

dhKafkaIngester 'org.apache.kafka:kafka-clients:2.4.0',
dhKafka 'org.apache.kafka:kafka-clients:2.4.0',
'org.apache.avro:avro:1.9.2'
}
2 changes: 1 addition & 1 deletion grpc-api/grpc-api.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {
testCompile TestTools.projectDependency(project, 'DB'),
TestTools.projectDependency(project, 'Util')

runtimeOnly project(':Numerics'), project(':Integrations'), project(':KafkaIngester')
runtimeOnly project(':Numerics'), project(':Integrations'), project(':Kafka')

testRuntimeOnly project(':log-to-slf4j')
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.30'
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ String[] mods = [ 'Util', 'Numerics', 'TableLogger', 'DB', 'Plot',
'CompilerTools', 'Generators',
'Integrations', 'ModelFarm', 'ClientSupport',
'BenchmarkSupport', 'DB-test', 'DbTypes', 'DbTypesImpl', 'Parquet',
'KafkaIngester', 'grpc-api', 'grpc-api-client', 'table-api', 'qst']
'Kafka', 'grpc-api', 'grpc-api-client', 'table-api', 'qst']

// new web projects; these modules are intended to form a complete, modular web application,
// with heavy dependency isolation that should enable very fast rebuilds.
Expand Down

0 comments on commit c646eb2

Please sign in to comment.