Move src folder to subproject

It also supports `ConnectionDetails`.

Author: eddumelendez

build.gradle

@@ -1,85 +1,87 @@
 plugins {
-    id 'java-library'
-    id 'org.springframework.boot' version "${springBootVersion}" apply false
+    id 'java'
     id 'io.spring.dependency-management' version "${springDependencyManagementVersion}"
 
     // quality
-    id 'com.diffplug.spotless' version '6.25.0'
-    id 'jacoco'
+    id 'com.diffplug.spotless' version '6.25.0' apply false
 
     // Publishing
-    id 'maven-publish'
-    id 'signing'
     id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
 }
 
-apply from: 'publish.gradle'
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'java-library'
+    apply plugin: 'io.spring.dependency-management'
 
-group = 'dev.openfga'
-version = '0.0.1'
+    // quality
+    apply plugin: 'com.diffplug.spotless'
+    apply plugin: 'jacoco'
 
-java {
-    sourceCompatibility = 17
-    targetCompatibility = 17
+    apply from: "$rootDir/publish.gradle"
 
-    withJavadocJar()
-    withSourcesJar()
-}
+    group = 'dev.openfga'
+    version = '0.0.1'
 
-repositories {
-    mavenCentral()
-}
+    java {
+        sourceCompatibility = 17
+        targetCompatibility = 17
 
-dependencyManagement {
-    imports {
-        mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES
+        withJavadocJar()
+        withSourcesJar()
     }
-}
 
-dependencies {
-    annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
-
-    implementation 'org.springframework.boot:spring-boot'
-    implementation 'org.springframework.boot:spring-boot-autoconfigure'
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-
-    api 'dev.openfga:openfga-sdk:0.4.0'
+    repositories {
+        mavenCentral()
+    }
 
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'org.springframework.security:spring-security-test'
-    testImplementation 'org.hamcrest:hamcrest:2.2'
-    testImplementation 'org.mockito:mockito-core:5.11.0'
-}
+    dependencyManagement {
+        imports {
+            mavenBom "org.springframework.boot:spring-boot-dependencies:${springBootVersion}"
+        }
+    }
 
-test {
-    useJUnitPlatform()
-}
+    test {
+        useJUnitPlatform()
+    }
 
-spotless {
-    format 'misc', {
-        // define the files (e.g. '*.gradle', '*.md') to apply `misc` to
-        target '.gitignore', '*.gradle'
-        // define the steps to apply to those files
-        trimTrailingWhitespace()
-        indentWithSpaces()
-        endWithNewline()
+    spotless {
+        format 'misc', {
+            // define the files (e.g. '*.gradle', '*.md') to apply `misc` to
+            target '.gitignore', '*.gradle'
+            // define the steps to apply to those files
+            trimTrailingWhitespace()
+            indentWithSpaces()
+            endWithNewline()
+        }
+        java {
+            palantirJavaFormat()
+            removeUnusedImports()
+            importOrder()
+        }
     }
-    java {
-        palantirJavaFormat()
-        removeUnusedImports()
-        importOrder()
+
+    test {
+        finalizedBy jacocoTestReport // report is always generated after tests run
     }
-}
 
-test {
-    finalizedBy jacocoTestReport // report is always generated after tests run
-}
+    jacocoTestReport {
+        // tests are required to run before generating a JaCoCo coverage report.
+        dependsOn test
+    }
 
-jacocoTestReport {
-    // tests are required to run before generating a JaCoCo coverage report.
-    dependsOn test
+    tasks.register('fmt') {
+        dependsOn 'spotlessApply'
+    }
 }
 
-tasks.register('fmt') {
-    dependsOn 'spotlessApply'
+nexusPublishing {
+    repositories {
+        sonatype {
+            nexusUrl.set(uri('https://s01.oss.sonatype.org/service/local/'))
+            snapshotRepositoryUrl.set(uri('https://s01.oss.sonatype.org/content/repositories/snapshots/'))
+            username.set(System.getenv('MAVEN_USERNAME'))
+            password.set(System.getenv('MAVEN_PASSWORD'))
+        }
+    }
 }

openfga-spring-boot-starter/build.gradle

@@ -0,0 +1,16 @@
+description = 'This is the Spring Boot Starter for OpenFGA.'
+
+dependencies {
+    annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
+
+    implementation 'org.springframework.boot:spring-boot'
+    implementation 'org.springframework.boot:spring-boot-autoconfigure'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+
+    api 'dev.openfga:openfga-sdk:0.4.0'
+
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.springframework.security:spring-security-test'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.mockito:mockito-core:5.11.0'
+}

src/main/java/dev/openfga/OpenFga.java renamed to openfga-spring-boot-starter/src/main/java/dev/openfga/OpenFga.java

@@ -0,0 +1,92 @@
+package dev.openfga.autoconfigure;
+
+import dev.openfga.OpenFga;
+import dev.openfga.sdk.api.client.OpenFgaClient;
+import dev.openfga.sdk.api.configuration.*;
+import dev.openfga.sdk.errors.FgaInvalidParameterException;
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Configures an {@code openFgaClient} and {@code openFga} beans based
+ * on configuration values. The beans will only be created if the
+ * {@link OpenFgaClient} is present on the classpath, and the
+ * {@code openfga.api-url} is specified.
+ */
+@AutoConfiguration
+@ConditionalOnFgaProperties
+@EnableConfigurationProperties(OpenFgaProperties.class)
+public class OpenFgaAutoConfiguration {
+
+    @Bean
+    @ConditionalOnMissingBean(OpenFgaConnectionDetails.class)
+    PropertiesOpenFgaConnectionDetails openFgaConnectionDetails(OpenFgaProperties openFgaProperties) {
+        return new PropertiesOpenFgaConnectionDetails(openFgaProperties);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public ClientConfiguration fgaConfig(OpenFgaProperties properties, OpenFgaConnectionDetails connectionDetails) {
+        var credentials = new Credentials();
+
+        var credentialsProperties = properties.getCredentials();
+
+        if (credentialsProperties != null) {
+            if (OpenFgaProperties.CredentialsMethod.API_TOKEN.equals(credentialsProperties.getMethod())) {
+                credentials.setCredentialsMethod(CredentialsMethod.API_TOKEN);
+                credentials.setApiToken(
+                        new ApiToken(credentialsProperties.getConfig().getApiToken()));
+            } else if (OpenFgaProperties.CredentialsMethod.CLIENT_CREDENTIALS.equals(
+                    credentialsProperties.getMethod())) {
+                ClientCredentials clientCredentials = new ClientCredentials()
+                        .clientId(credentialsProperties.getConfig().getClientId())
+                        .clientSecret(credentialsProperties.getConfig().getClientSecret())
+                        .apiTokenIssuer(credentialsProperties.getConfig().getApiTokenIssuer())
+                        .apiAudience(credentialsProperties.getConfig().getApiAudience())
+                        .scopes(credentialsProperties.getConfig().getScopes());
+
+                credentials.setCredentialsMethod(CredentialsMethod.CLIENT_CREDENTIALS);
+                credentials.setClientCredentials(clientCredentials);
+            }
+        }
+
+        return new ClientConfiguration()
+                .apiUrl(connectionDetails.getApiUrl())
+                .storeId(properties.getStoreId())
+                .authorizationModelId(properties.getAuthorizationModelId())
+                .credentials(credentials);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public OpenFgaClient fgaClient(ClientConfiguration configuration) {
+        try {
+            return new OpenFgaClient(configuration);
+        } catch (FgaInvalidParameterException e) {
+            throw new BeanCreationException("Failed to create OpenFgaClient", e);
+        }
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public OpenFga fga(OpenFgaClient openFgaClient) {
+        return new OpenFga(openFgaClient);
+    }
+
+    static class PropertiesOpenFgaConnectionDetails implements OpenFgaConnectionDetails {
+
+        private final OpenFgaProperties openFgaProperties;
+
+        public PropertiesOpenFgaConnectionDetails(OpenFgaProperties openFgaProperties) {
+            this.openFgaProperties = openFgaProperties;
+        }
+
+        @Override
+        public String getApiUrl() {
+            return this.openFgaProperties.getApiUrl();
+        }
+    }
+}

src/main/java/dev/openfga/OpenFgaCheckException.java renamed to openfga-spring-boot-starter/src/main/java/dev/openfga/OpenFgaCheckException.java

@@ -0,0 +1,8 @@
+package dev.openfga.autoconfigure;
+
+import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails;
+
+public interface OpenFgaConnectionDetails extends ConnectionDetails {
+
+    String getApiUrl();
+}