yifan-c commented on code in PR #68: URL: https://github.com/apache/cassandra-analytics/pull/68#discussion_r1690542595
########## cassandra-four-zero-types/build.gradle: ########## @@ -0,0 +1,63 @@ +import java.nio.file.Paths + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +plugins { + id('java-library') +} + +configurations { + all*.exclude(group: 'org.slf4j', module: 'slf4j-log4j12') + all*.exclude(group: 'log4j', module: 'log4j') +} + +dependencies { + compileOnly project(":cassandra-analytics-common") + compileOnly(project(':cassandra-bridge')) + + compileOnly(group: "${sparkGroupId}", name: "spark-core_${scalaMajorVersion}", version: "${project.rootProject.sparkVersion}") + compileOnly(group: "${sparkGroupId}", name: "spark-sql_${scalaMajorVersion}", version: "${project.rootProject.sparkVersion}") + + compileOnly(project(path: ':cassandra-four-zero', configuration: 'shadow')) + compileOnly "com.esotericsoftware:kryo-shaded:${kryoVersion}" + + testImplementation("org.junit.jupiter:junit-jupiter-api:${project.junitVersion}") + testImplementation("org.junit.jupiter:junit-jupiter-params:${project.junitVersion}") + testImplementation("org.junit.jupiter:junit-jupiter-engine:${project.junitVersion}") +} + +jar { + archiveFileName = "four-zero-types.jar" +} + +test { + useJUnitPlatform() + reports { + def destDir = Paths.get(rootProject.rootDir.absolutePath, "build", "test-reports", "four-zero-types").toFile() + junitXml { + enabled true + destination = destDir + } + html { + enabled true + destination = destDir + } + } +} Review Comment: add new line ########## cassandra-bridge/src/main/java/org/apache/cassandra/bridge/CassandraBridge.java: ########## @@ -200,65 +192,152 @@ public List<CqlField.NativeType> supportedTypes() // Native - public abstract CqlField.NativeType ascii(); + public CqlField.NativeType ascii() + { + return cassandraTypes().ascii(); + } Review Comment: How about only exposing `cassandraTypes()` from bridge and getting the specific type at the callsites? Maybe it comes in later refactoring? ########## cassandra-analytics-core/src/main/java/org/apache/cassandra/bridge/CassandraBridgeFactory.java: ########## @@ -124,6 +124,12 @@ private static String bridgeResourceName(@NotNull String label) return "/bridges/" + label + "-bridge.jar"; } + @NotNull + private static String typesResourceName(@NotNull String label) + { + return "/bridges/" + label + "-types.jar"; + } Review Comment: nit: this method and the 2 methods above can be merged, e.g. ```java private static String jarResourceName(String[] parts) { return "/bridges/" + String.join("-", parts) + ".jar"; } // usage jarResourceName(label); jarResourceName(label, "types); ``` Please feel free to ignore this nit. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
