Skip to content

Commit 37be438

Browse files
authored
separate internal and external public processors (#1167)
In #1165 I included a new public processor with a previously only internal one. In retrospect these need to be two different modules. This PR separates the internal only and the processor required by `@SdkImport`.
1 parent 278d2e8 commit 37be438

File tree

10 files changed

+35
-4
lines changed

10 files changed

+35
-4
lines changed

buildSrc/src/main/groovy/io.micronaut.build.internal.ocisdk-metadata-module.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
dependencies {
9-
annotationProcessor(projects.micronautOraclecloudSerdeProcessor)
9+
annotationProcessor(projects.micronautOraclecloudSerdeInternalProcessor)
1010
// The dependency is required for annotations and their metadata
1111
implementation(mnSerde.micronaut.serde.api)
1212
}

oraclecloud-httpclient-netty/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ dependencies {
2525

2626
testAnnotationProcessor mn.micronaut.inject.java
2727
testAnnotationProcessor projects.micronautOraclecloudSerdeProcessor
28+
testAnnotationProcessor projects.micronautOraclecloudSerdeInternalProcessor
2829
testAnnotationProcessor(mnSourcegen.micronaut.sourcegen.generator.java)
2930
testCompileOnly mn.micronaut.jackson.databind
3031
testRuntimeOnly mn.micronaut.runtime
3132

3233
testImplementation mn.micronaut.inject.java.test
3334
testImplementation mnSerde.micronaut.serde.processor
3435
testImplementation projects.micronautOraclecloudSerdeProcessor
36+
testImplementation projects.micronautOraclecloudSerdeInternalProcessor
3537
testImplementation mn.micronaut.management
3638
testImplementation mn.micronaut.context
3739
testImplementation projects.micronautOraclecloudCommon
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
plugins {
2+
id 'io.micronaut.build.internal.common'
3+
id 'io.micronaut.build.internal.oraclecloud-base'
4+
}
5+
6+
dependencies {
7+
// Transitive dependencies
8+
implementation mn.micronaut.inject
9+
implementation mn.micronaut.inject.java
10+
implementation mnSerde.micronaut.serde.processor
11+
implementation mnSerde.micronaut.serde.api
12+
13+
testImplementation mn.micronaut.inject.java.test
14+
testImplementation libs.oci.common
15+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.micronaut.oraclecloud.httpclient.netty.visitor.OciSdkModelSerdeVisitor
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<configuration>
2+
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
6+
</encoder>
7+
</appender>
8+
9+
<root level="info">
10+
<appender-ref ref="STDOUT" />
11+
</root>
12+
13+
</configuration>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.micronaut.oraclecloud.httpclient.netty.visitor;
16+
package io.micronaut.oraclecloud.sdk.processor;
1717

1818
import io.micronaut.context.annotation.Bean;
1919
import io.micronaut.context.annotation.Factory;
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
io.micronaut.oraclecloud.httpclient.netty.visitor.OciSdkModelSerdeVisitor
2-
io.micronaut.oraclecloud.httpclient.netty.visitor.SdkImportVisitor
1+
io.micronaut.oraclecloud.sdk.processor.SdkImportVisitor

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ include("oraclecloud-function-http-test")
3030
include("oraclecloud-httpclient-apache-http-core")
3131
include("oraclecloud-httpclient-netty")
3232
include("oraclecloud-serde-processor")
33+
include("oraclecloud-serde-internal-processor")
3334
include("oraclecloud-logging")
3435
include("oraclecloud-micrometer")
3536
include("oraclecloud-oke-kubernetes-client")

0 commit comments

Comments
 (0)