Skip to content

Start dogfooding #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 18 commits into
base: master
Choose a base branch
from
Draft
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
2 changes: 1 addition & 1 deletion .idea/live-templates/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ We need to have separate test-only modules because of the following reasons.
resources by [ProtoTap][prototap] using [`PipelineSetup`][pipeline-setup] API.

* We need this code to be "vanilla" Protobuf — not the one produced by the previous
version of McJava — because ProtoData plugins run on top of such code.
version of McJava — because the Compiler plugins run on top of such code.

* We use `testFixtures` source set for storing input proto files for the code generation tests.

* It is not possible to apply a Gradle plugin to a source set. Plugins are applied to a project.

* The module `mc-java-signal` needs McJava plugin for generating events and entity states for
the Signal ProtoData plugin. Once McJava plugin is applied to a project, it serves all
the Signal Compiler plugin. Once McJava plugin is applied to a project, it serves all
the source sets, including `testFixtures`, making the generated code enhanced with Spine features,
which we need to avoid.

Therefore, to have "vanilla" Protobuf code generated for our stub types, we need to have
a separate Gradle project

[prototap]: https://github.com/SpineEventEngine/ProtoTap
[pipeline-setup]: https://github.com/SpineEventEngine/ProtoData/blob/master/testlib/src/main/kotlin/io/spine/protodata/testing/PipelineSetup.kt
[pipeline-setup]: https://github.com/SpineEventEngine/compiler/blob/master/testlib/src/main/kotlin/io/spine/compiler/testing/PipelineSetup.kt
6 changes: 3 additions & 3 deletions annotation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import io.spine.dependency.local.TestLib
import io.spine.dependency.local.ToolBase

plugins {
id("io.spine.mc-java")
id("io.spine.core-jvm")
}

dependencies {
Expand Down Expand Up @@ -69,7 +69,7 @@ tasks.withType<ProcessResources>().configureEach {
* Disable the generation of rejections because:
* 1. We don't have rejections in this code.
* 2. We want to avoid errors that may be caused by the code which has not yet
* fully migrated to the latest ProtoData API.
* fully migrated to the latest Compiler API.
*/
modelCompiler {
java {
Expand All @@ -79,4 +79,4 @@ modelCompiler {
}
}

protoDataRemoteDebug(enabled = false)
spineCompilerRemoteDebug(enabled = false)
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

package io.spine.tools.core.annotation

import io.spine.protodata.plugin.Plugin
import io.spine.tools.compiler.plugin.Plugin
import io.spine.server.BoundedContextBuilder
import io.spine.tools.core.jvm.annotation.ClassPatternAnnotator
import io.spine.tools.core.jvm.annotation.EnumAnnotator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import com.google.protobuf.BoolValue
import com.google.protobuf.kotlin.isA
import com.google.protobuf.kotlin.unpack
import io.spine.protobuf.pack
import io.spine.protodata.ast.Option
import io.spine.protodata.ast.TypeInstances
import io.spine.protodata.ast.option
import io.spine.tools.compiler.ast.Option
import io.spine.tools.compiler.ast.TypeInstances
import io.spine.tools.compiler.ast.option
import com.google.protobuf.Any as ProtoAny

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ package io.spine.tools.core.annotation

import io.spine.core.External
import io.spine.core.Subscribe
import io.spine.protodata.ast.TypeName
import io.spine.protodata.ast.event.EnumOptionDiscovered
import io.spine.protodata.plugin.View
import io.spine.protodata.plugin.ViewRepository
import io.spine.tools.compiler.ast.TypeName
import io.spine.tools.compiler.ast.event.EnumOptionDiscovered
import io.spine.tools.compiler.plugin.View
import io.spine.tools.compiler.plugin.ViewRepository
import io.spine.server.entity.alter
import io.spine.server.route.EventRouting
import io.spine.server.route.Route
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
package io.spine.tools.core.annotation

import io.spine.core.External
import io.spine.protodata.ast.File
import io.spine.protodata.ast.Option
import io.spine.protodata.ast.ProtobufSourceFile
import io.spine.protodata.ast.event.FileExited
import io.spine.protodata.ast.event.FileOptionDiscovered
import io.spine.tools.compiler.ast.File
import io.spine.tools.compiler.ast.Option
import io.spine.tools.compiler.ast.ProtobufSourceFile
import io.spine.tools.compiler.ast.event.FileExited
import io.spine.tools.compiler.ast.event.FileOptionDiscovered
import io.spine.server.entity.alter
import io.spine.server.entity.state
import io.spine.server.event.NoReaction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ package io.spine.tools.core.annotation

import io.spine.core.External
import io.spine.core.Subscribe
import io.spine.protodata.ast.TypeName
import io.spine.protodata.ast.event.FieldOptionDiscovered
import io.spine.protodata.ast.event.MessageOptionDiscovered
import io.spine.protodata.plugin.View
import io.spine.tools.compiler.ast.TypeName
import io.spine.tools.compiler.ast.event.FieldOptionDiscovered
import io.spine.tools.compiler.ast.event.MessageOptionDiscovered
import io.spine.tools.compiler.plugin.View
import io.spine.server.entity.alter
import io.spine.server.route.Route
import io.spine.tools.core.annotation.event.FileOptionMatched
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ package io.spine.tools.core.annotation

import io.spine.core.External
import io.spine.core.Subscribe
import io.spine.protodata.ast.TypeName
import io.spine.protodata.ast.event.FieldOptionDiscovered
import io.spine.protodata.plugin.View
import io.spine.tools.compiler.ast.TypeName
import io.spine.tools.compiler.ast.event.FieldOptionDiscovered
import io.spine.tools.compiler.plugin.View
import io.spine.server.entity.alter
import io.spine.server.route.Route

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

package io.spine.tools.core.annotation

import io.spine.protodata.ast.ServiceName
import io.spine.protodata.ast.TypeName
import io.spine.tools.compiler.ast.ServiceName
import io.spine.tools.compiler.ast.TypeName
import io.spine.tools.core.annotation.event.FileOptionMatched
import io.spine.tools.core.annotation.event.FileOptionMatched.TargetCase.ENUM_TYPE
import io.spine.tools.core.annotation.event.FileOptionMatched.TargetCase.MESSAGE_TYPE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ package io.spine.tools.core.annotation

import io.spine.core.External
import io.spine.core.Subscribe
import io.spine.protodata.ast.ServiceName
import io.spine.protodata.ast.event.ServiceOptionDiscovered
import io.spine.protodata.plugin.View
import io.spine.tools.compiler.ast.ServiceName
import io.spine.tools.compiler.ast.event.ServiceOptionDiscovered
import io.spine.tools.compiler.plugin.View
import io.spine.server.entity.alter
import io.spine.server.route.Route
import io.spine.tools.core.annotation.event.FileOptionMatched
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
package io.spine.tools.core.annotation

import io.spine.annotation.GeneratedMixin
import io.spine.protodata.ast.File
import io.spine.protodata.ast.Option
import io.spine.tools.compiler.ast.File
import io.spine.tools.compiler.ast.Option

/**
* Common interface for views that deal with API options.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

package io.spine.tools.core.jvm.annotation

import io.spine.protodata.java.file.hasJavaRoot
import io.spine.protodata.java.render.JavaRenderer
import io.spine.protodata.render.SourceFileSet
import io.spine.protodata.settings.loadSettings
import io.spine.tools.compiler.jvm.file.hasJavaRoot
import io.spine.tools.compiler.jvm.render.JavaRenderer
import io.spine.tools.compiler.render.SourceFileSet
import io.spine.tools.compiler.settings.loadSettings
import io.spine.tools.core.annotation.ApiAnnotationsPlugin
import io.spine.tools.core.annotation.ApiOption
import io.spine.tools.core.annotation.ApiOption.BETA
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

package io.spine.tools.core.jvm.annotation

import io.spine.protodata.java.ClassName
import io.spine.protodata.java.annotation.TypeAnnotation
import io.spine.protodata.render.SourceFile
import io.spine.protodata.render.SourceFileSet
import io.spine.tools.compiler.jvm.ClassName
import io.spine.tools.compiler.jvm.annotation.TypeAnnotation
import io.spine.tools.compiler.render.SourceFile
import io.spine.tools.compiler.render.SourceFileSet
import io.spine.tools.code.Java

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

package io.spine.tools.core.jvm.annotation

import io.spine.protodata.java.annotation.TypeAnnotation
import io.spine.protodata.render.SourceFile
import io.spine.protodata.render.SourceFileSet
import io.spine.protodata.render.forEachOfLanguage
import io.spine.tools.compiler.jvm.annotation.TypeAnnotation
import io.spine.tools.compiler.render.SourceFile
import io.spine.tools.compiler.render.SourceFileSet
import io.spine.tools.compiler.render.forEachOfLanguage
import io.spine.tools.code.Java

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
package io.spine.tools.core.jvm.annotation

import com.intellij.psi.PsiMethod
import io.spine.protodata.ast.FieldName
import io.spine.protodata.java.ClassName
import io.spine.protodata.java.file.locate
import io.spine.protodata.render.InsertionPoint
import io.spine.tools.compiler.ast.FieldName
import io.spine.tools.compiler.jvm.ClassName
import io.spine.tools.compiler.jvm.file.locate
import io.spine.tools.compiler.render.InsertionPoint
import io.spine.string.Separator
import io.spine.string.camelCase
import io.spine.text.TextCoordinates
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

package io.spine.tools.core.jvm.annotation

import io.spine.protodata.ast.FieldName
import io.spine.protodata.ast.MessageType
import io.spine.protodata.java.MessageOrBuilderConvention
import io.spine.protodata.java.MessageOrEnumConvention
import io.spine.tools.compiler.ast.FieldName
import io.spine.tools.compiler.ast.MessageType
import io.spine.tools.compiler.jvm.MessageOrBuilderConvention
import io.spine.tools.compiler.jvm.MessageOrEnumConvention
import io.spine.tools.core.annotation.ApiOption
import io.spine.tools.core.annotation.FieldOptions
import io.spine.tools.core.annotation.MessageFieldAnnotations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

package io.spine.tools.core.jvm.annotation

import io.spine.protodata.java.ClassName
import io.spine.protodata.java.MessageOrBuilderConvention
import io.spine.tools.compiler.jvm.ClassName
import io.spine.tools.compiler.jvm.MessageOrBuilderConvention
import io.spine.tools.core.annotation.MessageAnnotations

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
package io.spine.tools.core.jvm.annotation

import io.spine.base.EntityState
import io.spine.protodata.ast.ProtoFileHeader
import io.spine.protodata.java.MessageOrEnumConvention
import io.spine.protodata.java.javaMultipleFiles
import io.spine.tools.compiler.ast.ProtoFileHeader
import io.spine.tools.compiler.jvm.MessageOrEnumConvention
import io.spine.tools.compiler.jvm.javaMultipleFiles
import io.spine.tools.core.annotation.ApiOption
import io.spine.tools.core.annotation.WithOptions

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ package io.spine.tools.core.jvm.annotation
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiJavaFile
import com.intellij.psi.PsiMethod
import io.spine.protodata.render.SourceFile
import io.spine.protodata.render.SourceFileSet
import io.spine.protodata.render.forEachOfLanguage
import io.spine.tools.compiler.render.SourceFile
import io.spine.tools.compiler.render.SourceFileSet
import io.spine.tools.compiler.render.forEachOfLanguage
import io.spine.tools.code.Java
import io.spine.tools.java.isRepeatable
import io.spine.tools.java.reference
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
package io.spine.tools.core.jvm.annotation

import io.spine.core.External
import io.spine.protodata.ast.File
import io.spine.protodata.ast.event.FileEntered
import io.spine.protodata.java.javaMultipleFiles
import io.spine.tools.compiler.ast.File
import io.spine.tools.compiler.ast.event.FileEntered
import io.spine.tools.compiler.jvm.javaMultipleFiles
import io.spine.server.entity.alter
import io.spine.server.event.NoReaction
import io.spine.server.event.React
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

package io.spine.tools.core.jvm.annotation

import io.spine.protodata.ast.ProtoFileHeader
import io.spine.protodata.java.ClassName
import io.spine.protodata.java.javaOuterClassName
import io.spine.protodata.java.javaPackage
import io.spine.tools.compiler.ast.ProtoFileHeader
import io.spine.tools.compiler.jvm.ClassName
import io.spine.tools.compiler.jvm.javaOuterClassName
import io.spine.tools.compiler.jvm.javaPackage
import io.spine.tools.core.annotation.ApiOption

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

package io.spine.tools.core.jvm.annotation

import io.spine.protodata.render.SourceFile
import io.spine.tools.compiler.render.SourceFile
import io.spine.tools.code.Java
import io.spine.tools.core.annotation.ApiOption
import java.io.File
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
package io.spine.tools.core.jvm.annotation

import io.spine.base.EntityState
import io.spine.protodata.render.SourceFileSet
import io.spine.tools.compiler.render.SourceFileSet

/**
* An abstract base for annotation renderers that annotate Protobuf generated code
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

package io.spine.tools.core.jvm.annotation

import io.spine.protodata.ast.ProtoFileHeader
import io.spine.protodata.java.GrpcServiceConvention
import io.spine.protodata.java.file.hasGrpcRoot
import io.spine.protodata.render.SourceFileSet
import io.spine.tools.compiler.ast.ProtoFileHeader
import io.spine.tools.compiler.jvm.GrpcServiceConvention
import io.spine.tools.compiler.jvm.file.hasGrpcRoot
import io.spine.tools.compiler.render.SourceFileSet
import io.spine.tools.core.annotation.ApiOption
import io.spine.tools.core.annotation.ServiceAnnotations

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ package io.spine.tools.core.jvm.annotation

import com.google.errorprone.annotations.OverridingMethodsMustInvokeSuper
import io.spine.base.EntityState
import io.spine.protodata.ast.ProtoFileHeader
import io.spine.protodata.context.findHeader
import io.spine.tools.compiler.ast.ProtoFileHeader
import io.spine.tools.compiler.context.findHeader
import io.spine.tools.core.annotation.ApiOption
import io.spine.tools.core.annotation.WithOptions
import io.spine.tools.core.annotation.file
Expand Down
Loading
Loading