Skip to content

Commit a95dfe2

Browse files
mumrahmumrah
authored
MINOR: Move generated sources to build directory (#16993)
Reviewers: Chia-Ping Tsai <[email protected]>
1 parent 4a485dd commit a95dfe2

File tree

4 files changed

+39
-38
lines changed

4 files changed

+39
-38
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ jmh-benchmarks/src/main/generated
5656
**/.jqwik-database
5757
**/src/generated
5858
**/src/generated-test
59-
6059
storage/kafka-tiered-storage/
6160

6261
docker/test/report_*.html

‎build.gradle‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ subprojects {
776776
apply plugin: 'com.diffplug.spotless'
777777
spotless {
778778
java {
779-
targetExclude('src/generated/**/*.java','src/generated-test/**/*.java')
779+
targetExclude('**/generated/**/*.java','**/generated-test/**/*.java')
780780
importOrder('kafka', 'org.apache.kafka', 'com', 'net', 'org', 'java', 'javax', '', '\\#')
781781
removeUnusedImports()
782782
}
@@ -1312,7 +1312,7 @@ project(':metadata') {
13121312
mainClass = "org.apache.kafka.message.MessageGenerator"
13131313
classpath = configurations.generator
13141314
args = [ "-p", "org.apache.kafka.common.metadata",
1315-
"-o", "src/generated/java/org/apache/kafka/common/metadata",
1315+
"-o", "${projectDir}/build/generated/main/java/org/apache/kafka/common/metadata",
13161316
"-i", "src/main/resources/common/metadata",
13171317
"-m", "MessageDataGenerator", "JsonConverterGenerator",
13181318
"-t", "MetadataRecordTypeGenerator", "MetadataJsonConvertersGenerator"
@@ -1321,7 +1321,7 @@ project(':metadata') {
13211321
.withPropertyName("messages")
13221322
.withPathSensitivity(PathSensitivity.RELATIVE)
13231323
outputs.cacheIf { true }
1324-
outputs.dir("src/generated/java/org/apache/kafka/common/metadata")
1324+
outputs.dir("${projectDir}/build/generated/main/java/org/apache/kafka/common/metadata")
13251325
}
13261326

13271327
compileJava.dependsOn 'processMessages'
@@ -1330,7 +1330,7 @@ project(':metadata') {
13301330
sourceSets {
13311331
main {
13321332
java {
1333-
srcDirs = ["src/generated/java", "src/main/java"]
1333+
srcDirs = ["src/main/java", "${projectDir}/build/generated/main/java"]
13341334
}
13351335
}
13361336
test {
@@ -1446,7 +1446,7 @@ project(':group-coordinator') {
14461446
sourceSets {
14471447
main {
14481448
java {
1449-
srcDirs = ["src/generated/java", "src/main/java"]
1449+
srcDirs = ["src/main/java", "${projectDir}/build/generated/main/java"]
14501450
}
14511451
}
14521452
test {
@@ -1468,15 +1468,15 @@ project(':group-coordinator') {
14681468
mainClass = "org.apache.kafka.message.MessageGenerator"
14691469
classpath = configurations.generator
14701470
args = [ "-p", "org.apache.kafka.coordinator.group.generated",
1471-
"-o", "src/generated/java/org/apache/kafka/coordinator/group/generated",
1471+
"-o", "${projectDir}/build/generated/main/java/org/apache/kafka/coordinator/group/generated",
14721472
"-i", "src/main/resources/common/message",
14731473
"-m", "MessageDataGenerator", "JsonConverterGenerator"
14741474
]
14751475
inputs.dir("src/main/resources/common/message")
14761476
.withPropertyName("messages")
14771477
.withPathSensitivity(PathSensitivity.RELATIVE)
14781478
outputs.cacheIf { true }
1479-
outputs.dir("src/generated/java/org/apache/kafka/coordinator/group/generated")
1479+
outputs.dir("${projectDir}/build/generated/main/java/org/apache/kafka/coordinator/group/generated")
14801480
}
14811481

14821482
compileJava.dependsOn 'processMessages'
@@ -1501,7 +1501,7 @@ project(':transaction-coordinator') {
15011501
sourceSets {
15021502
main {
15031503
java {
1504-
srcDirs = ["src/generated/java", "src/main/java"]
1504+
srcDirs = ["src/main/java", "${projectDir}/build/generated/main/java"]
15051505
}
15061506
}
15071507
test {
@@ -1519,15 +1519,15 @@ project(':transaction-coordinator') {
15191519
mainClass = "org.apache.kafka.message.MessageGenerator"
15201520
classpath = configurations.generator
15211521
args = [ "-p", "org.apache.kafka.coordinator.transaction.generated",
1522-
"-o", "src/generated/java/org/apache/kafka/coordinator/transaction/generated",
1522+
"-o", "${projectDir}/build/generated/main/java/org/apache/kafka/coordinator/transaction/generated",
15231523
"-i", "src/main/resources/common/message",
15241524
"-m", "MessageDataGenerator", "JsonConverterGenerator"
15251525
]
15261526
inputs.dir("src/main/resources/common/message")
15271527
.withPropertyName("messages")
15281528
.withPathSensitivity(PathSensitivity.RELATIVE)
15291529
outputs.cacheIf { true }
1530-
outputs.dir("src/generated/java/org/apache/kafka/coordinator/transaction/generated")
1530+
outputs.dir("${projectDir}/build/generated/main/java/org/apache/kafka/coordinator/transaction/generated")
15311531
}
15321532

15331533
compileJava.dependsOn 'processMessages'
@@ -1602,7 +1602,7 @@ project(':share-coordinator') {
16021602
sourceSets {
16031603
main {
16041604
java {
1605-
srcDirs = ["src/generated/java", "src/main/java"]
1605+
srcDirs = ["src/main/java", "${projectDir}/build/generated/main/java"]
16061606
}
16071607
}
16081608
test {
@@ -1620,15 +1620,15 @@ project(':share-coordinator') {
16201620
mainClass = "org.apache.kafka.message.MessageGenerator"
16211621
classpath = configurations.generator
16221622
args = [ "-p", "org.apache.kafka.coordinator.share.generated",
1623-
"-o", "src/generated/java/org/apache/kafka/coordinator/share/generated",
1623+
"-o", "${projectDir}/build/generated/main/java/org/apache/kafka/coordinator/share/generated",
16241624
"-i", "src/main/resources/common/message",
16251625
"-m", "MessageDataGenerator", "JsonConverterGenerator"
16261626
]
16271627
inputs.dir("src/main/resources/common/message")
16281628
.withPropertyName("messages")
16291629
.withPathSensitivity(PathSensitivity.RELATIVE)
16301630
outputs.cacheIf { true }
1631-
outputs.dir("src/generated/java/org/apache/kafka/coordinator/share/generated")
1631+
outputs.dir("${projectDir}/build/generated/main/java/org/apache/kafka/coordinator/share/generated")
16321632
}
16331633

16341634
compileJava.dependsOn 'processMessages'
@@ -1777,7 +1777,7 @@ project(':clients') {
17771777
mainClass = "org.apache.kafka.message.MessageGenerator"
17781778
classpath = configurations.generator
17791779
args = [ "-p", "org.apache.kafka.common.message",
1780-
"-o", "src/generated/java/org/apache/kafka/common/message",
1780+
"-o", "${projectDir}/build/generated/main/java/org/apache/kafka/common/message",
17811781
"-i", "src/main/resources/common/message",
17821782
"-t", "ApiMessageTypeGenerator",
17831783
"-m", "MessageDataGenerator", "JsonConverterGenerator"
@@ -1786,33 +1786,33 @@ project(':clients') {
17861786
.withPropertyName("messages")
17871787
.withPathSensitivity(PathSensitivity.RELATIVE)
17881788
outputs.cacheIf { true }
1789-
outputs.dir("src/generated/java/org/apache/kafka/common/message")
1789+
outputs.dir("${projectDir}/build/generated/main/java/org/apache/kafka/common/message")
17901790
}
17911791

17921792
task processTestMessages(type:JavaExec) {
17931793
mainClass = "org.apache.kafka.message.MessageGenerator"
17941794
classpath = configurations.generator
17951795
args = [ "-p", "org.apache.kafka.common.message",
1796-
"-o", "src/generated-test/java/org/apache/kafka/common/message",
1796+
"-o", "${projectDir}/build/generated/test/java/org/apache/kafka/common/message",
17971797
"-i", "src/test/resources/common/message",
17981798
"-m", "MessageDataGenerator", "JsonConverterGenerator"
17991799
]
18001800
inputs.dir("src/test/resources/common/message")
18011801
.withPropertyName("testMessages")
18021802
.withPathSensitivity(PathSensitivity.RELATIVE)
18031803
outputs.cacheIf { true }
1804-
outputs.dir("src/generated-test/java/org/apache/kafka/common/message")
1804+
outputs.dir("${projectDir}/build/generated/test/java/org/apache/kafka/common/message")
18051805
}
18061806

18071807
sourceSets {
18081808
main {
18091809
java {
1810-
srcDirs = ["src/generated/java", "src/main/java"]
1810+
srcDirs = ["src/main/java", "${projectDir}/build/generated/main/java"]
18111811
}
18121812
}
18131813
test {
18141814
java {
1815-
srcDirs = ["src/generated-test/java", "src/test/java"]
1815+
srcDirs = ["src/test/java", "${projectDir}/build/generated/test/java"]
18161816
}
18171817
}
18181818
}
@@ -1903,20 +1903,20 @@ project(':raft') {
19031903
mainClass = "org.apache.kafka.message.MessageGenerator"
19041904
classpath = configurations.generator
19051905
args = [ "-p", "org.apache.kafka.raft.generated",
1906-
"-o", "src/generated/java/org/apache/kafka/raft/generated",
1906+
"-o", "${projectDir}/build/generated/main/java/org/apache/kafka/raft/generated",
19071907
"-i", "src/main/resources/common/message",
19081908
"-m", "MessageDataGenerator", "JsonConverterGenerator"]
19091909
inputs.dir("src/main/resources/common/message")
19101910
.withPropertyName("messages")
19111911
.withPathSensitivity(PathSensitivity.RELATIVE)
19121912
outputs.cacheIf { true }
1913-
outputs.dir("src/generated/java/org/apache/kafka/raft/generated")
1913+
outputs.dir("${projectDir}/build/generated/main/java/org/apache/kafka/raft/generated")
19141914
}
19151915

19161916
sourceSets {
19171917
main {
19181918
java {
1919-
srcDirs = ["src/generated/java", "src/main/java"]
1919+
srcDirs = ["src/main/java", "${projectDir}/build/generated/main/java"]
19201920
}
19211921
}
19221922
test {
@@ -2144,15 +2144,15 @@ project(':storage') {
21442144
mainClass = "org.apache.kafka.message.MessageGenerator"
21452145
classpath = configurations.generator
21462146
args = [ "-p", "org.apache.kafka.server.log.remote.metadata.storage.generated",
2147-
"-o", "src/generated/java/org/apache/kafka/server/log/remote/metadata/storage/generated",
2147+
"-o", "${projectDir}/build/generated/main/java/org/apache/kafka/server/log/remote/metadata/storage/generated",
21482148
"-i", "src/main/resources/message",
21492149
"-m", "MessageDataGenerator", "JsonConverterGenerator",
21502150
"-t", "MetadataRecordTypeGenerator", "MetadataJsonConvertersGenerator" ]
21512151
inputs.dir("src/main/resources/message")
21522152
.withPropertyName("messages")
21532153
.withPathSensitivity(PathSensitivity.RELATIVE)
21542154
outputs.cacheIf { true }
2155-
outputs.dir("src/generated/java/org/apache/kafka/server/log/remote/metadata/storage/generated")
2155+
outputs.dir("${projectDir}/build/generated/main/java/org/apache/kafka/server/log/remote/metadata/storage/generated")
21562156
}
21572157

21582158
task genRemoteLogManagerConfigDoc(type: JavaExec) {
@@ -2172,7 +2172,7 @@ project(':storage') {
21722172
sourceSets {
21732173
main {
21742174
java {
2175-
srcDirs = ["src/generated/java", "src/main/java"]
2175+
srcDirs = ["src/main/java", "${projectDir}/build/generated/main/java"]
21762176
}
21772177
}
21782178
test {
@@ -2493,21 +2493,21 @@ project(':streams') {
24932493
mainClass = "org.apache.kafka.message.MessageGenerator"
24942494
classpath = configurations.generator
24952495
args = [ "-p", "org.apache.kafka.streams.internals.generated",
2496-
"-o", "src/generated/java/org/apache/kafka/streams/internals/generated",
2496+
"-o", "${projectDir}/build/generated/main/java/org/apache/kafka/streams/internals/generated",
24972497
"-i", "src/main/resources/common/message",
24982498
"-m", "MessageDataGenerator"
24992499
]
25002500
inputs.dir("src/main/resources/common/message")
25012501
.withPropertyName("messages")
25022502
.withPathSensitivity(PathSensitivity.RELATIVE)
25032503
outputs.cacheIf { true }
2504-
outputs.dir("src/generated/java/org/apache/kafka/streams/internals/generated")
2504+
outputs.dir("${projectDir}/build/generated/main/java/org/apache/kafka/streams/internals/generated")
25052505
}
25062506

25072507
sourceSets {
25082508
main {
25092509
java {
2510-
srcDirs = ["src/generated/java", "src/main/java"]
2510+
srcDirs = ["src/main/java", "${projectDir}/build/generated/main/java"]
25112511
}
25122512
}
25132513
test {

‎checkstyle/suppressions.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<!-- core -->
3939
<suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
40-
files="core[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
40+
files="core[\\/]build[\\/]generated[\\/].+.java$"/>
4141
<suppress checks="NPathComplexity" files="(ClusterTestExtensions|KafkaApisBuilder|SharePartition).java"/>
4242
<suppress checks="NPathComplexity|ClassFanOutComplexity|ClassDataAbstractionCoupling" files="(RemoteLogManager|RemoteLogManagerTest).java"/>
4343
<suppress checks="MethodLength" files="RemoteLogManager.java"/>
@@ -111,7 +111,7 @@
111111
files="Murmur3.java"/>
112112

113113
<suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
114-
files="clients[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
114+
files="clients[\\/]build[\\/]generated[\\/].+.java$"/>
115115

116116
<suppress checks="NPathComplexity"
117117
files="MessageTest.java|OffsetFetchRequest.java"/>
@@ -222,17 +222,17 @@
222222

223223
<!-- Generated code -->
224224
<suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
225-
files="streams[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
225+
files="streams[\\/]build[\\/]generated[\\/].+.java$"/>
226226
<suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
227-
files="raft[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
227+
files="raft[\\/]build[\\/]generated[\\/].+.java$"/>
228228
<suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
229-
files="storage[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
229+
files="storage[\\/]build[\\/]generated[\\/].+.java$"/>
230230
<suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
231-
files="group-coordinator[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
231+
files="group-coordinator[\\/]build[\\/]generated[\\/].+.java$"/>
232232
<suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
233-
files="transaction-coordinator[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
233+
files="transaction-coordinator[\\/]build[\\/]generated[\\/].+.java$"/>
234234
<suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
235-
files="share-coordinator[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
235+
files="share-coordinator[\\/]build[\\/]generated[\\/].+.java$"/>
236236

237237
<suppress checks="ImportControl" files="FetchResponseData.java"/>
238238
<suppress checks="ImportControl" files="RecordsSerdeTest.java"/>
@@ -331,7 +331,7 @@
331331
<suppress checks="NPathComplexity"
332332
files="(ClientQuotasImage|KafkaEventQueue|ReplicationControlManager|FeatureControlManager|KRaftMigrationDriver|ScramControlManager|ClusterControlManager|MetadataDelta|MetaPropertiesEnsemble).java"/>
333333
<suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
334-
files="metadata[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
334+
files="metadata[\\/]build[\\/]generated[\\/].+.java$"/>
335335
<suppress checks="BooleanExpressionComplexity"
336336
files="(MetadataImage).java"/>
337337
<suppress checks="ImportControl"

‎settings.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ plugins {
2121
def isGithubActions = System.getenv('GITHUB_ACTIONS') != null
2222
def isJenkins = System.getenv('JENKINS_URL') != null
2323
def isCI = isGithubActions || isJenkins
24+
def currentJvm = JavaVersion.current()
2425

2526
develocity {
2627
server = "https://ge.apache.org"
@@ -40,6 +41,7 @@ develocity {
4041
} else {
4142
tag "local"
4243
}
44+
tag "JDK$currentJvm"
4345
}
4446
}
4547

0 commit comments

Comments
 (0)