Merge branch 'develop' of github.com:Sphereon-Opensource/OpenID-Feder…

…ation into feature/OIDF-42

gradle/libs.versions.toml

@@ -16,6 +16,7 @@ kotlin = "2.0.0"
 kotlinxSerializationJson = "1.7.0-RC"
 springboot = "3.3.1"
 springDependencyManagement = "1.1.5"
+kermitLogging = "2.0.4"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -29,6 +30,7 @@ androidx-material = { group = "com.google.android.material", name = "material",
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
+kermit-logging = { module = "co.touchlab:kermit", version.ref = "kermitLogging"}
 
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" }
 springboot-actuator = { group = "org.springframework.boot", name = "spring-boot-starter-actuator" }

modules/admin-server/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.sphereon.oid.fed.server.admin"
-version = "1.0.0"
+version = "0.0.1"
 
 java {
     toolchain {
@@ -16,6 +16,7 @@ java {
 }
 
 dependencies {
+    api(projects.modules.openidFederationCommon)
     implementation(libs.springboot.actuator)
     implementation(libs.springboot.web)
     implementation(libs.springboot.data.jdbc)

modules/openapi/README.md

@@ -0,0 +1,33 @@
+# Open API specs
+
+The Open API specs of OpenID Federation.
+
+## Entity Statement
+
+An Entity Statement contains the information needed for the Entity that is the subject of the Entity Statement to 
+participate in federation(s). An Entity Statement is a signed JWT. The subject of the JWT is the Entity itself. The 
+issuer of the JWT is the party that issued the Entity Statement. All Entities in a federation publish an Entity Statement 
+about themselves called an Entity Configuration. Superior Entities in a federation publish Entity Statements about their
+Immediate Subordinate Entities called Subordinate Statements.
+
+### Profiles
+
+The Open API generator will generate models, infrastructures and apis by default. To make
+it generate models only uncomment `profiles=models-only` from gradle.properties or pass the profile in the comment line.
+
+### Run Open API generator
+
+Generate models, infrastructures and apis:
+```shell
+gradle clean openApiGenerate
+```
+
+Generate only models:
+```shell
+gradle clean openApiGenerate -Pprofile=model-only
+```
+
+Generate the jar file:
+```shell
+gradle clean build
+```

modules/openapi/build.gradle.kts

@@ -0,0 +1,82 @@
+plugins {
+    kotlin("jvm") version "2.0.0"
+    id("org.openapi.generator") version "7.7.0"
+    id("maven-publish")
+}
+
+group = "com.sphereon.oid.fed"
+version = "0.1.0-SNAPSHOT"
+
+project.extra.set("openApiPackage", "com.sphereon.oid.fed.openapi")
+
+val profiles = project.properties["profiles"]?.toString()?.split(",") ?: emptyList()
+val isModelsOnlyProfile = profiles.contains("models-only")
+val ktorVersion = "2.3.11"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("io.ktor:ktor-client-core:$ktorVersion")
+    implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.0")
+}
+
+openApiGenerate {
+    val openApiPackage: String by project
+    generatorName.set("kotlin")
+    packageName.set("com.sphereon.oid.fed.openapi")
+    apiPackage.set("$openApiPackage.api")
+    modelPackage.set("$openApiPackage.models")
+    inputSpec.set("$projectDir/src/main/kotlin/com/sphereon/oid/fed/openapi/openapi.yaml")
+    library.set("multiplatform")
+    outputDir.set("$projectDir/build/generated")
+configOptions.set(
+        mapOf(
+            "dateLibrary" to "string"
+        )
+    )
+
+    if (isModelsOnlyProfile) {
+        globalProperties.set(
+            configOptions.get().plus(
+                mapOf(
+                    "models" to ""
+                )
+            )
+        )
+    }
+}
+
+
+publishing {
+    publications {
+        create<MavenPublication>("mavenKotlin") {
+            from(components["kotlin"])
+        }
+    }
+}
+
+tasks.compileKotlin {
+    dependsOn(tasks.openApiGenerate)
+}
+
+tasks.jar {
+    dependsOn(tasks.compileKotlin)
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    archiveBaseName.set(project.name)
+    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    from("$projectDir/build/classes/kotlin/main")
+}
+
+kotlin {
+    sourceSets.main {
+        kotlin.srcDirs(
+            "$projectDir/build/generated/src/commonMain/kotlin"
+        )
+    }
+    jvmToolchain(21)
+}

modules/openapi/gradle.properties

@@ -0,0 +1,2 @@
+kotlin.code.style=official
+#profiles=models-only

modules/openapi/settings.gradle.kts

@@ -0,0 +1,4 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+rootProject.name = "openapi"