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

Extract common logic to abstract class, replace deprecated client met… #262

Merged
merged 2 commits into from
Dec 22, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Copyright 2020 ABSA Group Limited
*
* Licensed 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.
*/

package za.co.absa.abris.avro.registry

import io.confluent.kafka.schemaregistry.avro.AvroSchema
import io.confluent.kafka.schemaregistry.client.{SchemaMetadata, SchemaRegistryClient}
import org.apache.avro.Schema

import java.util


abstract class AbstractAbrisRegistryClient(client: SchemaRegistryClient) extends AbrisRegistryClient {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be renamed to AbstractConfluentRegistryClient?

Abris Client - not dependent on implementation
Confluent Client - depends on confluent

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that makes sense


override def getAllVersions(subject: String): util.List[Integer] =
client.getAllVersions(subject)

override def testCompatibility(subject: String, schema: Schema): Boolean =
client.testCompatibility(subject, new AvroSchema(schema))

override def register(subject: String, schema: Schema): Int =
client.register(subject, new AvroSchema(schema))

override def getLatestSchemaMetadata(subject: String): SchemaMetadata =
client.getLatestSchemaMetadata(subject)

override def getSchemaMetadata(subject: String, version: Int): SchemaMetadata =
client.getSchemaMetadata(subject, version)

override def getById(schemaId: Int): Schema = {
val parsedSchema = client.getSchemaById(schemaId)
parsedSchema match {
case schema: AvroSchema => schema.rawSchema()
case schema => throw new UnsupportedOperationException(s"Only AvroSchema is supported," +
s" got schema type ${schema.schemaType()}")
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,14 @@ package za.co.absa.abris.avro.registry

import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException
import io.confluent.kafka.schemaregistry.client.{MockSchemaRegistryClient, SchemaMetadata, SchemaRegistryClient}
import org.apache.avro.Schema

import java.io.IOException
import java.util


class ConfluentMockRegistryClient(client: SchemaRegistryClient) extends AbrisRegistryClient {
class ConfluentMockRegistryClient(client: SchemaRegistryClient) extends AbstractAbrisRegistryClient(client) {

def this() = this(new MockSchemaRegistryClient())

override def getAllVersions(subject: String): util.List[Integer] =
client.getAllVersions(subject)

override def testCompatibility(subject: String, schema: Schema): Boolean =
client.testCompatibility(subject, schema)

override def register(subject: String, schema: Schema): Int =
client.register(subject, schema)

/**
* MockSchemaRegistryClient is throwing different Exception than the mocked client, this is a workaround
*/
Expand All @@ -49,10 +38,4 @@ class ConfluentMockRegistryClient(client: SchemaRegistryClient) extends AbrisReg
throw new RestClientException("No schema registered under subject!", 404, 40401)
}
}

override def getSchemaMetadata(subject: String, version: Int): SchemaMetadata =
client.getSchemaMetadata(subject, version)

override def getById(schemaId: Int): Schema =
client.getById(schemaId)
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,14 @@
*/

package za.co.absa.abris.avro.registry
import io.confluent.kafka.schemaregistry.client.{CachedSchemaRegistryClient, SchemaMetadata, SchemaRegistryClient}
import io.confluent.kafka.schemaregistry.client.{CachedSchemaRegistryClient, SchemaRegistryClient}
import io.confluent.kafka.serializers.KafkaAvroDeserializerConfig
import org.apache.avro.Schema

import java.util
import scala.collection.JavaConverters._

class ConfluentRegistryClient(client: SchemaRegistryClient) extends AbrisRegistryClient {
class ConfluentRegistryClient(client: SchemaRegistryClient) extends AbstractAbrisRegistryClient(client) {

def this(configs: Map[String,String]) = this(ConfluentRegistryClient.createClient(configs))

override def getAllVersions(subject: String): util.List[Integer] =
client.getAllVersions(subject)

override def testCompatibility(subject: String, schema: Schema): Boolean =
client.testCompatibility(subject, schema)

override def register(subject: String, schema: Schema): Int =
client.register(subject, schema)

override def getLatestSchemaMetadata(subject: String): SchemaMetadata =
client.getLatestSchemaMetadata(subject)

override def getSchemaMetadata(subject: String, version: Int): SchemaMetadata =
client.getSchemaMetadata(subject, version)

override def getById(schemaId: Int): Schema =
client.getById(schemaId)
}

object ConfluentRegistryClient {
Expand Down