Skip to content

Commit 2bb1631

Browse files
BattlestadBattlestad
committed
bump and refactor
1 parent b1ab760 commit 2bb1631

30 files changed

+78
-78
lines changed

src/main/kotlin/no/novari/gateway/instance/ErrorCode.kt renamed to src/main/kotlin/no/novari/gateway/webinstance/ErrorCode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.novari.gateway.instance
1+
package no.novari.gateway.webinstance
22

33
enum class ErrorCode {
44
GENERAL_SYSTEM_ERROR,

src/main/kotlin/no/novari/gateway/instance/FileClient.kt renamed to src/main/kotlin/no/novari/gateway/webinstance/FileClient.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package no.novari.gateway.instance
1+
package no.novari.gateway.webinstance
22

3-
import no.novari.gateway.instance.exception.FileUploadException
4-
import no.novari.gateway.instance.model.File
3+
import no.novari.gateway.webinstance.exception.FileUploadException
4+
import no.novari.gateway.webinstance.model.File
55
import org.springframework.beans.factory.annotation.Qualifier
66
import org.springframework.retry.annotation.Backoff
77
import org.springframework.retry.annotation.Recover

src/main/kotlin/no/novari/gateway/instance/InstanceMapper.kt renamed to src/main/kotlin/no/novari/gateway/webinstance/InstanceMapper.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package no.novari.gateway.instance
1+
package no.novari.gateway.webinstance
22

3-
import no.novari.gateway.instance.model.File
4-
import no.novari.gateway.instance.model.instance.InstanceObject
3+
import no.novari.gateway.webinstance.model.File
4+
import no.novari.gateway.webinstance.model.instance.InstanceObject
55
import java.util.UUID
66

77
interface InstanceMapper<T> {

src/main/kotlin/no/novari/gateway/instance/InstanceProcessor.kt renamed to src/main/kotlin/no/novari/gateway/webinstance/InstanceProcessor.kt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
package no.novari.gateway.instance
1+
package no.novari.gateway.webinstance
22

33
import no.novari.flyt.kafka.instanceflow.headers.InstanceFlowHeaders
44
import no.novari.flyt.webresourceserver.security.client.sourceapplication.SourceApplicationAuthorizationService
5-
import no.novari.gateway.instance.exception.AbstractInstanceRejectedException
6-
import no.novari.gateway.instance.exception.FileUploadException
7-
import no.novari.gateway.instance.exception.IntegrationDeactivatedException
8-
import no.novari.gateway.instance.exception.NoIntegrationException
9-
import no.novari.gateway.instance.kafka.InstanceReceivalErrorEventProducerService
10-
import no.novari.gateway.instance.kafka.IntegrationRequestProducerService
11-
import no.novari.gateway.instance.kafka.ReceivedInstanceEventProducerService
12-
import no.novari.gateway.instance.model.Integration
13-
import no.novari.gateway.instance.model.SourceApplicationIdAndSourceApplicationIntegrationId
14-
import no.novari.gateway.instance.validation.InstanceValidationException
15-
import no.novari.gateway.instance.validation.InstanceValidationService
5+
import no.novari.gateway.webinstance.exception.AbstractInstanceRejectedException
6+
import no.novari.gateway.webinstance.exception.FileUploadException
7+
import no.novari.gateway.webinstance.exception.IntegrationDeactivatedException
8+
import no.novari.gateway.webinstance.exception.NoIntegrationException
9+
import no.novari.gateway.webinstance.kafka.InstanceReceivalErrorEventProducerService
10+
import no.novari.gateway.webinstance.kafka.IntegrationRequestProducerService
11+
import no.novari.gateway.webinstance.kafka.ReceivedInstanceEventProducerService
12+
import no.novari.gateway.webinstance.model.Integration
13+
import no.novari.gateway.webinstance.model.SourceApplicationIdAndSourceApplicationIntegrationId
14+
import no.novari.gateway.webinstance.validation.InstanceValidationException
15+
import no.novari.gateway.webinstance.validation.InstanceValidationService
1616
import org.slf4j.Logger
1717
import org.slf4j.LoggerFactory
1818
import org.springframework.beans.factory.annotation.Value
@@ -33,7 +33,7 @@ class InstanceProcessor<T : Any>(
3333
private val sourceApplicationInstanceIdFunction: (T) -> String,
3434
private val instanceMapper: InstanceMapper<T>,
3535
) {
36-
@Value("\${novari.flyt.instance-gateway.check-integration-exists:true}")
36+
@Value("\${novari.flyt.web-instance-gateway.check-integration-exists:true}")
3737
var checkIntegrationExists: Boolean = true
3838

3939
fun processInstance(

src/main/kotlin/no/novari/gateway/instance/InstanceProcessorFactoryService.kt renamed to src/main/kotlin/no/novari/gateway/webinstance/InstanceProcessorFactoryService.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package no.novari.gateway.instance
1+
package no.novari.gateway.webinstance
22

33
import no.novari.flyt.webresourceserver.security.client.sourceapplication.SourceApplicationAuthorizationService
4-
import no.novari.gateway.instance.kafka.InstanceReceivalErrorEventProducerService
5-
import no.novari.gateway.instance.kafka.IntegrationRequestProducerService
6-
import no.novari.gateway.instance.kafka.ReceivedInstanceEventProducerService
7-
import no.novari.gateway.instance.validation.InstanceValidationService
4+
import no.novari.gateway.webinstance.kafka.InstanceReceivalErrorEventProducerService
5+
import no.novari.gateway.webinstance.kafka.IntegrationRequestProducerService
6+
import no.novari.gateway.webinstance.kafka.ReceivedInstanceEventProducerService
7+
import no.novari.gateway.webinstance.validation.InstanceValidationService
88
import org.springframework.stereotype.Service
99

1010
@Service

src/main/kotlin/no/novari/gateway/instance/config/KafkaConfiguration.kt renamed to src/main/kotlin/no/novari/gateway/webinstance/config/KafkaConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package no.novari.gateway.instance.config
1+
package no.novari.gateway.webinstance.config
22

3-
import no.novari.gateway.instance.config.properties.InstanceProcessingEventsConfigurationProperties
3+
import no.novari.gateway.webinstance.config.properties.InstanceProcessingEventsConfigurationProperties
44
import org.springframework.boot.autoconfigure.AutoConfiguration
55
import org.springframework.boot.context.properties.EnableConfigurationProperties
66

src/main/kotlin/no/novari/gateway/instance/config/OAuth2ClientHttpRequestInterceptor.kt renamed to src/main/kotlin/no/novari/gateway/webinstance/config/OAuth2ClientHttpRequestInterceptor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.novari.gateway.instance.config
1+
package no.novari.gateway.webinstance.config
22

33
import org.springframework.http.HttpRequest
44
import org.springframework.http.client.ClientHttpRequestExecution

src/main/kotlin/no/novari/gateway/instance/config/RestClientConfiguration.kt renamed to src/main/kotlin/no/novari/gateway/webinstance/config/RestClientConfiguration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.novari.gateway.instance.config
1+
package no.novari.gateway.webinstance.config
22

33
import org.apache.hc.client5.http.config.ConnectionConfig
44
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder

src/main/kotlin/no/novari/gateway/instance/config/properties/InstanceProcessingEventsConfigurationProperties.kt renamed to src/main/kotlin/no/novari/gateway/webinstance/config/properties/InstanceProcessingEventsConfigurationProperties.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package no.novari.gateway.instance.config.properties
1+
package no.novari.gateway.webinstance.config.properties
22

33
import no.novari.kafka.topic.configuration.EventCleanupFrequency
44
import org.springframework.boot.context.properties.ConfigurationProperties
55
import java.time.Duration
66

7-
@ConfigurationProperties(prefix = "novari.flyt.instance-gateway.kafka.topic.instance-receival-error")
7+
@ConfigurationProperties(prefix = "novari.flyt.web-instance-gateway.kafka.topic.instance-receival-error")
88
data class InstanceProcessingEventsConfigurationProperties(
99
val retentionTime: Duration,
1010
val cleanupFrequency: EventCleanupFrequency,

src/main/kotlin/no/novari/gateway/instance/exception/AbstractInstanceRejectedException.kt renamed to src/main/kotlin/no/novari/gateway/webinstance/exception/AbstractInstanceRejectedException.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.novari.gateway.instance.exception
1+
package no.novari.gateway.webinstance.exception
22

33
abstract class AbstractInstanceRejectedException(
44
message: String,

0 commit comments

Comments
 (0)