Skip to content
This repository was archived by the owner on Mar 16, 2025. It is now read-only.

Implement prototype for annotation processing #100

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ class ApiOptions {
* validate that targetDir is set, throws if not.
*/
fun validate() {
if (targetDir == null) {
throw InvalidOptionException("targetDir")
}
// if (targetDir == null) {
// throw InvalidOptionException("targetDir")
// }
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ class OptionsConverter(private val checkObsoleteProcessorOptions: Boolean = fals

checkDeprecatedMapOptions(processorOptions, options)

if (processorOptions.containsKey("targetDir")) {
options.targetDir = processorOptions["targetDir"].toString()
} else {
log.warn("required option 'targetDir' is missing!")
}
// if (processorOptions.containsKey("targetDir")) {
// options.targetDir = processorOptions["targetDir"].toString()
// } else {
// log.warn("required option 'targetDir' is missing!")
// }

if (processorOptions.containsKey("mapping")) {
readMapping(processorOptions["mapping"].toString(), options)
Expand Down
42 changes: 7 additions & 35 deletions src/main/kotlin/io/openapiprocessor/core/writer/java/ApiWriter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,19 @@ class ApiWriter(
private val interfaceWriter: InterfaceWriter,
private val dataTypeWriter: DataTypeWriter,
private val enumWriter: StringEnumWriter,
private val interfaceDataTypeWriter: InterfaceDataTypeWriter
private val interfaceDataTypeWriter: InterfaceDataTypeWriter,
private val fileHandler: FileHandler
) {
private var log: Logger = LoggerFactory.getLogger(this.javaClass.name)

private lateinit var apiFolder: Path
private lateinit var modelFolder: Path

private var formatter: Formatter? = null

init {
initFormatter()
}

fun write(api: Api) {
createTargetFolders()
fileHandler.createTargetFolders()
writeInterfaces(api)
writeObjectDataTypes(api)
writeInterfaceDataTypes(api)
Expand All @@ -54,35 +52,31 @@ class ApiWriter(

private fun writeInterfaces(api: Api) {
api.forEachInterface {
val target = apiFolder.resolve("${it.getInterfaceName()}.java")
val writer = BufferedWriter(PathWriter(target))
val writer = fileHandler.createApiWriter(it.getPackageName(), it.getInterfaceName())
writeInterface(writer, it)
writer.close()
}
}

private fun writeObjectDataTypes(api: Api) {
api.forEachModelDataType {
val target = modelFolder.resolve ("${it.getTypeName()}.java")
val writer = BufferedWriter(PathWriter(target))
val writer = fileHandler.createModelWriter(it.getPackageName(), it.getTypeName())
writeDataType(writer, it)
writer.close()
}
}

private fun writeInterfaceDataTypes(api: Api) {
api.forEachInterfaceDataType() {
val target = modelFolder.resolve ("${it.getTypeName()}.java")
val writer = BufferedWriter(PathWriter(target))
val writer = fileHandler.createModelWriter(it.getPackageName(), it.getTypeName())
writeDataType(writer, it)
writer.close()
}
}

private fun writeEnumDataTypes(api: Api) {
api.forEachEnumDataType {
val target = modelFolder.resolve("${it.getTypeName()}.java")
val writer = BufferedWriter(PathWriter(target))
val writer = fileHandler.createModelWriter(it.getPackageName(), it.getTypeName())
writeEnumDataType(writer, it)
writer.close()
}
Expand Down Expand Up @@ -134,28 +128,6 @@ class ApiWriter(
.toString()
}

private fun createTargetFolders() {
val rootPkg = options.packageName.replace(".", "/")
val apiPkg = listOf(rootPkg, "api").joinToString("/")
val modelPkg = listOf(rootPkg, "model").joinToString("/")
log.debug ("creating target folders: {}", rootPkg)

apiFolder = createTargetPackage(apiPkg)
log.debug ("created target folder: {}", apiFolder.toAbsolutePath ().toString ())

modelFolder = createTargetPackage(modelPkg)
log.debug ("created target folder: {}", modelFolder.toAbsolutePath ().toString ())
}

private fun createTargetPackage(apiPkg: String): Path {
val root = options.targetDir
val pkg = listOf(root, apiPkg).joinToString("/")

val target = Paths.get (toURI(pkg))
Files.createDirectories(target)
return target
}

private fun initFormatter() {
if (options.formatCode) {
formatter = Formatter(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package io.openapiprocessor.core.writer.java

import java.io.Writer

interface FileHandler {
fun createApiWriter(packageName: String, className: String): Writer
fun createModelWriter(packageName: String, className: String): Writer
fun createTargetFolders()
}