Skip to content

Commit 03b1d49

Browse files
SIMULATANSIMULATAN
committed
Move integration API to me.snoty.integration 
1 parent 759b087 commit 03b1d49

File tree

28 files changed

+45
-50
lines changed

28 files changed

+45
-50
lines changed

‎api/src/main/kotlin/me/snoty/backend/User.kt

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ import java.util.*
44
import kotlinx.serialization.Serializable
55
import me.snoty.backend.utils.UUIDSerializer
66

7-
/*
8-
@Serializable
9-
*/
107
@Serializable
118
data class User(
129
@Serializable(with = UUIDSerializer::class)

‎integrations/api/src/main/kotlin/me/snoty/backend/User.kt

-1
This file was deleted.

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/AbstractIntegration.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/AbstractIntegration.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package me.snoty.backend.integration.common
1+
package me.snoty.integration.common
22

33
import io.micrometer.core.instrument.MeterRegistry
44
import me.snoty.backend.User
5-
import me.snoty.backend.integration.common.diff.EntityDiffMetrics
6-
import me.snoty.backend.integration.common.diff.EntityStateTable
5+
import me.snoty.integration.common.diff.EntityDiffMetrics
6+
import me.snoty.integration.common.diff.EntityStateTable
77
import me.snoty.backend.scheduling.JobRequest
88
import me.snoty.backend.scheduling.Scheduler
99
import org.jetbrains.exposed.sql.Database

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/Fetcher.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/Fetcher.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package me.snoty.backend.integration.common
1+
package me.snoty.integration.common
22

3-
import me.snoty.backend.integration.common.diff.EntityDiffMetrics
3+
import me.snoty.integration.common.diff.EntityDiffMetrics
44
import me.snoty.backend.scheduling.JobRequest
55
import me.snoty.backend.scheduling.JobRequestHandler
66

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/InstanceId.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/InstanceId.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.snoty.backend.integration.common
1+
package me.snoty.integration.common
22

33
/**
44
* Unique ID representing a 3rd party service instance.

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/Integration.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/Integration.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.snoty.backend.integration.common
1+
package me.snoty.integration.common
22

33
import me.snoty.backend.User
44
import kotlin.reflect.KClass

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/IntegrationConfigTable.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/IntegrationConfigTable.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.snoty.backend.integration.common
1+
package me.snoty.integration.common
22

33
import kotlinx.serialization.json.Json
44
import org.jetbrains.exposed.dao.id.IdTable
@@ -24,10 +24,10 @@ object IntegrationConfigTable : IdTable<Long>() {
2424

2525
fun <S> getAllIntegrationConfigs(integrationType: String) = transaction {
2626
select(settings, user)
27-
.where { this@IntegrationConfigTable.integrationType eq integrationType }
27+
.where { IntegrationConfigTable.integrationType eq integrationType }
2828
.map { row ->
2929
@Suppress("UNCHECKED_CAST")
30-
IntegrationConfig(row[user], row[settings] as S)
30+
(IntegrationConfig(row[user], row[settings] as S))
3131
}
3232
}
3333
}

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/IntegrationContext.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/IntegrationContext.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.snoty.backend.integration.common
1+
package me.snoty.integration.common
22

33
import io.micrometer.core.instrument.MeterRegistry
44
import me.snoty.backend.scheduling.Scheduler

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/IntegrationScheduler.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/IntegrationScheduler.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.snoty.backend.integration.common
1+
package me.snoty.integration.common
22

33
import me.snoty.backend.scheduling.JobRequest
44
import me.snoty.backend.scheduling.Scheduler

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/IntegrationSettings.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/IntegrationSettings.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.snoty.backend.integration.common
1+
package me.snoty.integration.common
22

33
import kotlinx.serialization.Serializable
44

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/diff/EntityDiffMetrics.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/diff/EntityDiffMetrics.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.snoty.backend.integration.common.diff
1+
package me.snoty.integration.common.diff
22

33
import io.micrometer.core.instrument.Counter
44
import io.micrometer.core.instrument.MeterRegistry

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/diff/EntityStateTable.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/diff/EntityStateTable.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package me.snoty.backend.integration.common.diff
1+
package me.snoty.integration.common.diff
22

33
import kotlinx.serialization.json.Json
4-
import me.snoty.backend.integration.common.InstanceId
4+
import me.snoty.integration.common.InstanceId
55
import me.snoty.backend.utils.When
66
import org.jetbrains.exposed.sql.*
77
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/diff/Updatable.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/diff/Updatable.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.snoty.backend.integration.common.diff
1+
package me.snoty.integration.common.diff
22

33
import kotlinx.serialization.json.JsonObject
44

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/diff/UpdatableEntity.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/diff/UpdatableEntity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.snoty.backend.integration.common.diff
1+
package me.snoty.integration.common.diff
22

33
/**
44
* Represents an entity that can be updated.

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/jsonrpc/JsonRpc.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/jsonrpc/JsonRpc.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.snoty.backend.integration.common.jsonrpc
1+
package me.snoty.integration.common.jsonrpc
22

33
import io.ktor.http.*
44

‎integrations/api/src/main/kotlin/me/snoty/backend/integration/common/jsonrpc/JsonRpcResponse.kt ‎integrations/api/src/main/kotlin/me/snoty/integration/common/jsonrpc/JsonRpcResponse.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.snoty.backend.integration.common.jsonrpc
1+
package me.snoty.integration.common.jsonrpc
22

33
import kotlinx.serialization.SerialName
44
import kotlinx.serialization.Serializable

‎integrations/moodle/src/main/kotlin/me/snoty/integration/moodle/MoodleFetcher.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package me.snoty.integration.moodle
22

33
import kotlinx.coroutines.runBlocking
4-
import me.snoty.backend.integration.common.*
5-
import me.snoty.backend.integration.common.diff.EntityDiffMetrics
6-
import me.snoty.backend.integration.common.diff.IUpdatableEntity
4+
import me.snoty.integration.common.Fetcher
5+
import me.snoty.integration.common.InstanceId
6+
import me.snoty.integration.common.IntegrationFetcherFactory
7+
import me.snoty.integration.common.diff.EntityDiffMetrics
8+
import me.snoty.integration.common.diff.IUpdatableEntity
79
import me.snoty.integration.moodle.request.getCalendarUpcoming
810
import org.slf4j.LoggerFactory
911

‎integrations/moodle/src/main/kotlin/me/snoty/integration/moodle/MoodleIntegration.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.snoty.integration.moodle
22

33
import kotlinx.serialization.Serializable
4-
import me.snoty.backend.integration.common.*
5-
import me.snoty.backend.integration.common.diff.EntityStateTable
6-
import me.snoty.backend.integration.common.diff.ID
4+
import me.snoty.integration.common.*
5+
import me.snoty.integration.common.diff.EntityStateTable
6+
import me.snoty.integration.common.diff.ID
77
import org.jetbrains.exposed.sql.Column
88
import org.jobrunr.jobs.lambdas.JobRequest
99
import java.util.*

‎integrations/moodle/src/main/kotlin/me/snoty/integration/moodle/model/MoodleAssignement.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import kotlinx.serialization.Contextual
66
import kotlinx.serialization.Serializable
77
import kotlinx.serialization.json.buildJsonObject
88
import kotlinx.serialization.json.put
9-
import me.snoty.backend.integration.common.diff.UpdatableEntity
10-
import me.snoty.backend.integration.common.diff.Fields
9+
import me.snoty.integration.common.diff.UpdatableEntity
10+
import me.snoty.integration.common.diff.Fields
1111
import me.snoty.integration.moodle.model.raw.MoodleEvent
1212
import java.time.Instant
1313
import java.time.ZoneId

‎integrations/moodle/src/main/resources/META-INF/services/me.snoty.backend.integration.common.IntegrationFactory ‎integrations/moodle/src/main/resources/META-INF/services/me.snoty.integration.common.IntegrationFactory

File renamed without changes.

‎integrations/webuntis/src/main/kotlin/me/snoty/integration/untis/WebUntisAPI.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import io.ktor.serialization.kotlinx.json.*
1212
import io.ktor.util.reflect.*
1313
import kotlinx.serialization.Serializable
1414
import kotlinx.serialization.json.Json
15-
import me.snoty.backend.integration.common.jsonrpc.JsonRpc
16-
import me.snoty.backend.integration.common.jsonrpc.JsonRpcResponse
15+
import me.snoty.integration.common.jsonrpc.JsonRpc
16+
import me.snoty.integration.common.jsonrpc.JsonRpcResponse
1717
import me.snoty.integration.untis.param.UntisParam
1818
import org.apache.http.client.utils.URIBuilder
1919
import org.slf4j.LoggerFactory

‎integrations/webuntis/src/main/kotlin/me/snoty/integration/untis/WebUntisFetcher.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package me.snoty.integration.untis
22

33
import kotlinx.coroutines.runBlocking
4-
import me.snoty.backend.integration.common.Fetcher
5-
import me.snoty.backend.integration.common.InstanceId
6-
import me.snoty.backend.integration.common.IntegrationFetcherFactory
7-
import me.snoty.backend.integration.common.diff.EntityDiffMetrics
8-
import me.snoty.backend.integration.common.diff.IUpdatableEntity
4+
import me.snoty.integration.common.Fetcher
5+
import me.snoty.integration.common.InstanceId
6+
import me.snoty.integration.common.IntegrationFetcherFactory
7+
import me.snoty.integration.common.diff.EntityDiffMetrics
8+
import me.snoty.integration.common.diff.IUpdatableEntity
99
import me.snoty.integration.untis.request.getExams
1010
import org.slf4j.LoggerFactory
1111

‎integrations/webuntis/src/main/kotlin/me/snoty/integration/untis/WebUntisIntegration.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package me.snoty.integration.untis
22

33
import kotlinx.serialization.Serializable
4-
import me.snoty.backend.integration.common.*
5-
import me.snoty.backend.integration.common.diff.EntityStateTable
6-
import me.snoty.backend.integration.common.diff.ID
4+
import me.snoty.integration.common.diff.EntityStateTable
5+
import me.snoty.integration.common.diff.ID
76
import me.snoty.backend.scheduling.JobRequest
7+
import me.snoty.integration.common.*
88
import org.jetbrains.exposed.sql.Column
99
import java.util.*
1010

‎integrations/webuntis/src/main/kotlin/me/snoty/integration/untis/model/UntisExam.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import kotlinx.serialization.json.add
66
import kotlinx.serialization.json.buildJsonObject
77
import kotlinx.serialization.json.put
88
import kotlinx.serialization.json.putJsonArray
9-
import me.snoty.backend.integration.common.diff.Fields
10-
import me.snoty.backend.integration.common.diff.UpdatableEntity
9+
import me.snoty.integration.common.diff.Fields
10+
import me.snoty.integration.common.diff.UpdatableEntity
1111

1212
@Serializable
1313
data class UntisExam(

‎integrations/webuntis/src/main/resources/META-INF/services/me.snoty.backend.integration.common.IntegrationFactory ‎integrations/webuntis/src/main/resources/META-INF/services/me.snoty.integration.common.IntegrationFactory

File renamed without changes.

‎src/main/kotlin/me/snoty/backend/Application.kt

-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@ import me.snoty.backend.scheduling.JobRunrConfigurer
99
import me.snoty.backend.scheduling.JobRunrScheduler
1010
import me.snoty.backend.server.KtorServer
1111
import me.snoty.backend.spi.DevManager
12-
import me.snoty.backend.spi.IntegrationRegistry
1312
import org.jetbrains.exposed.sql.Database
1413

1514
fun main() {
1615
// ran pre-config load to allow dev functions to configure the environment
1716
DevManager.runDevFunctions()
1817

19-
println(IntegrationRegistry.getIntegrationFactories())
20-
2118
val configLoader = ConfigLoaderImpl()
2219
val config = configLoader.loadConfig()
2320

‎src/main/kotlin/me/snoty/backend/integration/IntegrationManager.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.snoty.backend.integration
22

33
import io.micrometer.core.instrument.MeterRegistry
4-
import me.snoty.backend.integration.common.Integration
5-
import me.snoty.backend.integration.common.IntegrationContext
4+
import me.snoty.integration.common.Integration
5+
import me.snoty.integration.common.IntegrationContext
66
import me.snoty.backend.scheduling.Scheduler
77
import me.snoty.backend.spi.IntegrationRegistry
88
import org.jetbrains.exposed.sql.Database

‎src/main/kotlin/me/snoty/backend/spi/IntegrationRegistry.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.snoty.backend.spi
22

3-
import me.snoty.backend.integration.common.IntegrationFactory
3+
import me.snoty.integration.common.IntegrationFactory
44
import org.slf4j.Logger
55
import org.slf4j.LoggerFactory
66
import java.util.*

0 commit comments

Comments
 (0)