Skip to content

Commit

Permalink
(MAJOR) move packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@rtc11
rtc11 committed Mar 14, 2024
1 parent d63d334 commit f64232c
Show file tree
Hide file tree
Showing 63 changed files with 165 additions and 396 deletions.
3 changes: 0 additions & 3 deletions cache/build.gradle.kts
View file

This file was deleted.

91 changes: 0 additions & 91 deletions cache/main/no/nav/aap/cache/Cache.kt
View file

This file was deleted.

120 changes: 0 additions & 120 deletions cache/test/no/nav/aap/cache/CacheTest.kt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion kafka-avroserde/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ repositories {
}

dependencies {
implementation(project(":kafka-2"))
implementation(project(":kafka-streams"))

api("org.apache.kafka:kafka-streams:3.7.0")
api("io.confluent:kafka-streams-avro-serde:7.4.0")
Expand Down
5 changes: 2 additions & 3 deletions .../no/nav/aap/kafka/serde/avro/AvroSerde.kt → kafka-avroserde/main/libs/kafka/AvroSerde.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package no.nav.aap.kafka.serde.avro
package libs.kafka

import io.confluent.kafka.streams.serdes.avro.GenericAvroSerde
import io.confluent.kafka.streams.serdes.avro.SpecificAvroSerde
import no.nav.aap.kafka.streams.v2.config.StreamsConfig
import no.nav.aap.kafka.streams.v2.serde.StreamSerde
import libs.kafka.serde.StreamSerde
import org.apache.avro.specific.SpecificRecord
import org.apache.kafka.common.serialization.Deserializer
import org.apache.kafka.common.serialization.Serializer
Expand Down
2 changes: 1 addition & 1 deletion ...afka/serde/avro/GenericRecordExtension.kt → ...main/libs/kafka/GenericRecordExtension.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package no.nav.aap.kafka.serde.avro
package libs.kafka

import org.apache.avro.generic.GenericData
import org.apache.avro.generic.GenericRecord
Expand Down
5 changes: 1 addition & 4 deletions ...serde/test/no/nav/aap/kafka/ConfigTest.kt → ...a-avroserde/test/libs/kafka/ConfigTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package no.nav.aap.kafka
package libs.kafka

import io.confluent.kafka.schemaregistry.client.SchemaRegistryClientConfig
import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig
import no.nav.aap.kafka.streams.v2.config.SchemaRegistryConfig
import no.nav.aap.kafka.streams.v2.config.SslConfig
import no.nav.aap.kafka.streams.v2.config.StreamsConfig
import org.junit.jupiter.api.Test
import kotlin.test.assertEquals

Expand Down
2 changes: 1 addition & 1 deletion kafka-test-2/build.gradle.kts → kafka-streams-test/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dependencies {
exclude("org.apache.kafka", "kafka-clients")
}

implementation(project(":kafka-2"))
implementation(project(":kafka-streams"))
implementation("org.apache.kafka:kafka-streams:3.7.0")

implementation(kotlin("test"))
Expand Down
0 ...strument/binder/kafka/KtorKafkaMetrics.kt → ...strument/binder/kafka/KtorKafkaMetrics.kt
View file
File renamed without changes.
0 .../streams/v2/test/OutputTopicAssertions.kt → .../streams/v2/test/OutputTopicAssertions.kt
View file
File renamed without changes.
7 changes: 3 additions & 4 deletions .../aap/kafka/streams/v2/test/StreamsMock.kt → .../aap/kafka/streams/v2/test/StreamsMock.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ package no.nav.aap.kafka.streams.v2.test

import io.micrometer.core.instrument.MeterRegistry
import io.micrometer.core.instrument.binder.kafka.KtorKafkaMetrics
import no.nav.aap.kafka.streams.v2.*
import no.nav.aap.kafka.streams.v2.config.StreamsConfig
import no.nav.aap.kafka.streams.v2.consumer.OffsetResetPolicy
import no.nav.aap.kafka.streams.v2.visual.TopologyVisulizer
import libs.kafka.*
import libs.kafka.client.OffsetResetPolicy
import libs.kafka.visual.TopologyVisulizer
import org.apache.kafka.clients.consumer.Consumer
import org.apache.kafka.clients.consumer.MockConsumer
import org.apache.kafka.clients.consumer.OffsetResetStrategy
Expand Down
0 ...av/aap/kafka/streams/v2/test/TestTopic.kt → ...av/aap/kafka/streams/v2/test/TestTopic.kt
View file
File renamed without changes.
11 changes: 3 additions & 8 deletions .../no/nav/aap/kafka/streams/v2/test/Test.kt → kafka-streams-test/test/libs/kafka/Test.kt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
package no.nav.aap.kafka.streams.v2.test
package libs.kafka

import io.micrometer.core.instrument.simple.SimpleMeterRegistry
import no.nav.aap.kafka.streams.v2.Table
import no.nav.aap.kafka.streams.v2.Topic
import no.nav.aap.kafka.streams.v2.config.SchemaRegistryConfig
import no.nav.aap.kafka.streams.v2.config.SslConfig
import no.nav.aap.kafka.streams.v2.config.StreamsConfig
import no.nav.aap.kafka.streams.v2.serde.StringSerde
import no.nav.aap.kafka.streams.v2.topology
import libs.kafka.serde.StringSerde
import no.nav.aap.kafka.streams.v2.test.StreamsMock
import org.junit.jupiter.api.Test
import kotlin.test.assertEquals

Expand Down
0 kafka-test-2/test/logback-test.xml → kafka-streams-test/test/logback-test.xml
View file
File renamed without changes.
2 changes: 0 additions & 2 deletions kafka-2/build.gradle.kts → kafka-streams/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
dependencies {
implementation(project(":cache"))

implementation("org.apache.kafka:kafka-streams:3.7.0")

implementation("ch.qos.logback:logback-classic:1.5.3")
Expand Down
11 changes: 4 additions & 7 deletions ...streams/v2/extension/KStreamsExtension.kt → ...eams/main/libs/kafka/KStreamsExtension.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package no.nav.aap.kafka.streams.v2.extension
package libs.kafka

import no.nav.aap.kafka.streams.v2.KTable
import no.nav.aap.kafka.streams.v2.Table
import no.nav.aap.kafka.streams.v2.Topic
import no.nav.aap.kafka.streams.v2.processor.LogProduceTableProcessor
import no.nav.aap.kafka.streams.v2.processor.LogProduceTopicProcessor
import no.nav.aap.kafka.streams.v2.processor.Processor.Companion.addProcessor
import libs.kafka.processor.LogProduceTableProcessor
import libs.kafka.processor.LogProduceTopicProcessor
import libs.kafka.processor.Processor.Companion.addProcessor
import org.apache.kafka.common.utils.Bytes
import org.apache.kafka.streams.kstream.KStream
import org.apache.kafka.streams.kstream.Materialized
Expand Down
7 changes: 3 additions & 4 deletions ...ain/no/nav/aap/kafka/streams/v2/KTable.kt → kafka-streams/main/libs/kafka/KTable.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package no.nav.aap.kafka.streams.v2
package libs.kafka

import no.nav.aap.kafka.streams.v2.extension.skipTombstone
import no.nav.aap.kafka.streams.v2.processor.state.StateInitProcessor
import no.nav.aap.kafka.streams.v2.processor.state.StateScheduleProcessor
import libs.kafka.processor.state.StateInitProcessor
import libs.kafka.processor.state.StateScheduleProcessor
import org.apache.kafka.streams.kstream.KTable

class KTable<T : Any>(
Expand Down
2 changes: 1 addition & 1 deletion ...ka/streams/v2/listener/RestoreListener.kt → ...treams/main/libs/kafka/RestoreListener.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package no.nav.aap.kafka.streams.v2.listener
package libs.kafka

import net.logstash.logback.argument.StructuredArguments
import org.apache.kafka.common.TopicPartition
Expand Down
2 changes: 1 addition & 1 deletion ...no/nav/aap/kafka/streams/v2/StateStore.kt → kafka-streams/main/libs/kafka/StateStore.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package no.nav.aap.kafka.streams.v2
package libs.kafka

import org.apache.kafka.streams.state.ReadOnlyKeyValueStore
import org.apache.kafka.streams.state.ValueAndTimestamp
Expand Down
11 changes: 4 additions & 7 deletions ...in/no/nav/aap/kafka/streams/v2/Streams.kt → kafka-streams/main/libs/kafka/Streams.kt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
package no.nav.aap.kafka.streams.v2
package libs.kafka

import io.micrometer.core.instrument.MeterRegistry
import io.micrometer.core.instrument.binder.kafka.KafkaStreamsMetrics
import no.nav.aap.kafka.streams.v2.config.StreamsConfig
import no.nav.aap.kafka.streams.v2.consumer.ConsumerFactory
import no.nav.aap.kafka.streams.v2.exception.ProcessingExceptionHandler
import no.nav.aap.kafka.streams.v2.listener.RestoreListener
import no.nav.aap.kafka.streams.v2.producer.ProducerFactory
import no.nav.aap.kafka.streams.v2.visual.TopologyVisulizer
import libs.kafka.client.ConsumerFactory
import libs.kafka.client.ProducerFactory
import libs.kafka.visual.TopologyVisulizer
import org.apache.kafka.streams.KafkaStreams.State.*
import org.apache.kafka.streams.StoreQueryParameters
import org.apache.kafka.streams.state.QueryableStoreTypes
Expand Down
4 changes: 1 addition & 3 deletions .../kafka/streams/v2/config/StreamsConfig.kt → ...-streams/main/libs/kafka/StreamsConfig.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package no.nav.aap.kafka.streams.v2.config
package libs.kafka

import no.nav.aap.kafka.streams.v2.exception.EntryPointExceptionHandler
import no.nav.aap.kafka.streams.v2.exception.ExitPointExceptionHandler
import org.apache.kafka.clients.CommonClientConfigs
import org.apache.kafka.clients.producer.ProducerConfig
import org.apache.kafka.common.config.SslConfigs
Expand Down
2 changes: 1 addition & 1 deletion .../streams/v2/exception/StreamsException.kt → ...reams/main/libs/kafka/StreamsException.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package no.nav.aap.kafka.streams.v2.exception
package libs.kafka

import org.apache.kafka.clients.consumer.ConsumerRecord
import org.apache.kafka.clients.producer.ProducerRecord
Expand Down
2 changes: 1 addition & 1 deletion .../kafka/streams/v2/logger/StreamsLogger.kt → ...-streams/main/libs/kafka/StreamsLogger.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package no.nav.aap.kafka.streams.v2.logger
package libs.kafka

import net.logstash.logback.argument.StructuredArgument
import org.slf4j.LoggerFactory
Expand Down
2 changes: 1 addition & 1 deletion ...o/nav/aap/kafka/streams/v2/StreamsPair.kt → kafka-streams/main/libs/kafka/StreamsPair.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package no.nav.aap.kafka.streams.v2
package libs.kafka

import org.apache.kafka.streams.KeyValue

Expand Down
2 changes: 1 addition & 1 deletion ...main/no/nav/aap/kafka/streams/v2/Table.kt → kafka-streams/main/libs/kafka/Table.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package no.nav.aap.kafka.streams.v2
package libs.kafka

data class Table<T : Any>(
val sourceTopic: Topic<T>,
Expand Down
Loading

0 comments on commit f64232c

Please sign in to comment.