Skip to content

Commit 2f1fafe

Browse files
committed
Move the existing module files to the extensions repo. This module will contain the factory functions to be utilized by users and the cross lang expansion service.
1 parent 24c074b commit 2f1fafe

7 files changed

Lines changed: 31 additions & 30 deletions

File tree

sdks/java/io/kafka/file-aware-factories/build.gradle renamed to sdks/java/extensions/kafka-factories/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
plugins { id 'org.apache.beam.module' }
2020
applyJavaNature(
21-
automaticModuleName: 'org.apache.beam.sdk.io.kafka.file.aware.factories',
21+
automaticModuleName: 'org.apache.beam.sdk.extensions.kafka.factories',
2222
publish: 'False'
2323
)
2424

25-
description = "Apache Beam :: SDKs :: Java :: IO :: Kafka :: File :: Aware :: Factories"
25+
description = "Apache Beam :: SDKs :: Java :: Extensions :: Kafka :: Factories"
2626
ext.summary = "Library to instantiate kafka clients with files from GCS or SecretManager."
2727

2828
dependencies {

sdks/java/io/kafka/file-aware-factories/src/main/java/org/apache/beam/sdk/io/kafka/file/aware/factories/FileAwareFactoryFn.java renamed to sdks/java/extensions/kafka-factories/src/main/java/org/apache/beam/sdk/extensions/kafka/factories/FileAwareFactoryFn.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.beam.sdk.io.kafka.file.aware.factories;
18+
package org.apache.beam.sdk.extensions.kafka.factories;
1919

2020
import com.google.cloud.secretmanager.v1.AccessSecretVersionResponse;
2121
import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;

sdks/java/io/kafka/file-aware-factories/src/main/java/org/apache/beam/sdk/io/kafka/file/aware/factories/KerberosConsumerFactoryFn.java renamed to sdks/java/extensions/kafka-factories/src/main/java/org/apache/beam/sdk/extensions/kafka/factories/KerberosConsumerFactoryFn.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.beam.sdk.io.kafka.file.aware.factories;
18+
package org.apache.beam.sdk.extensions.kafka.factories;
1919

2020
import java.io.File;
2121
import java.io.IOException;

sdks/java/io/kafka/file-aware-factories/src/main/java/org/apache/beam/sdk/io/kafka/file/aware/factories/package-info.java renamed to sdks/java/extensions/kafka-factories/src/main/java/org/apache/beam/sdk/extensions/kafka/factories/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
*/
1818

1919
/** ConsumerFactoryFns for file paths that exist in GCS or Google SecretManager. */
20-
package org.apache.beam.sdk.io.kafka.file.aware.factories;
20+
package org.apache.beam.sdk.extensions.kafka.factories;

sdks/java/io/kafka/file-aware-factories/src/test/java/org/apache/beam/sdk/io/kafka/file/aware/factories/FileAwareFactoryFnTest.java renamed to sdks/java/extensions/kafka-factories/src/test/java/org/apache/beam/sdk/io/kafka/file/aware/factories/FileAwareFactoryFnTest.java

File renamed without changes.

sdks/java/io/kafka/file-aware-factories/src/test/java/org/apache/beam/sdk/io/kafka/file/aware/factories/KerberosConsumerFactoryFnTest.java renamed to sdks/java/extensions/kafka-factories/src/test/java/org/apache/beam/sdk/io/kafka/file/aware/factories/KerberosConsumerFactoryFnTest.java

File renamed without changes.

settings.gradle.kts

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
1919

2020
pluginManagement {
21-
plugins {
22-
id("org.javacc.javacc") version "3.0.3" // enable the JavaCC parser generator
23-
}
21+
plugins {
22+
id("org.javacc.javacc") version "3.0.3" // enable the JavaCC parser generator
23+
}
2424
}
2525

2626
plugins {
27-
id("com.gradle.develocity") version "3.19"
28-
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.4.0"
27+
id("com.gradle.develocity") version "3.19"
28+
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.2.1"
2929
}
3030

3131

@@ -36,32 +36,32 @@ val isGithubActionsBuild = arrayOf("GITHUB_REPOSITORY", "GITHUB_RUN_ID").all { S
3636
val isCi = isJenkinsBuild || isGithubActionsBuild
3737

3838
develocity {
39-
server = "https://develocity.apache.org"
40-
projectId = "beam"
39+
server = "https://develocity.apache.org"
40+
projectId = "beam"
4141

42-
buildScan {
43-
uploadInBackground = !isCi
44-
publishing.onlyIf { it.isAuthenticated }
45-
obfuscation {
46-
ipAddresses { addresses -> addresses.map { "0.0.0.0" } }
42+
buildScan {
43+
uploadInBackground = !isCi
44+
publishing.onlyIf { it.isAuthenticated }
45+
obfuscation {
46+
ipAddresses { addresses -> addresses.map { "0.0.0.0" } }
47+
}
4748
}
48-
}
4949
}
5050

5151
buildCache {
52-
local {
53-
isEnabled = true
54-
}
55-
remote<HttpBuildCache> {
56-
url = uri("https://beam-cache.apache.org/cache/")
57-
isAllowUntrustedServer = false
58-
credentials {
59-
username = System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME")
60-
password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
52+
local {
53+
isEnabled = true
54+
}
55+
remote<HttpBuildCache> {
56+
url = uri("https://beam-cache.apache.org/cache/")
57+
isAllowUntrustedServer = false
58+
credentials {
59+
username = System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME")
60+
password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
61+
}
62+
isEnabled = !System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME").isNullOrBlank()
63+
isPush = isCi && !System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME").isNullOrBlank()
6164
}
62-
isEnabled = !System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME").isNullOrBlank()
63-
isPush = isCi && !System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME").isNullOrBlank()
64-
}
6565
}
6666

6767
rootProject.name = "beam"
@@ -186,6 +186,7 @@ include(":sdks:java:extensions:kryo")
186186
include(":sdks:java:extensions:google-cloud-platform-core")
187187
include(":sdks:java:extensions:jackson")
188188
include(":sdks:java:extensions:join-library")
189+
include(":sdks:java:extensions:kafka-factories")
189190
include(":sdks:java:extensions:ml")
190191
include(":sdks:java:extensions:ordered")
191192
include(":sdks:java:extensions:protobuf")

0 commit comments

Comments
 (0)