diff --git a/echo-notifications/echo-notifications.gradle b/echo-notifications/echo-notifications.gradle index de027d2ad..2eb195600 100644 --- a/echo-notifications/echo-notifications.gradle +++ b/echo-notifications/echo-notifications.gradle @@ -18,7 +18,6 @@ dependencies { implementation project(':echo-core') implementation project(':echo-model') implementation project(":echo-pipelinetriggers") - implementation project(":echo-test") implementation "org.springframework.boot:spring-boot-starter-web" implementation "com.squareup.retrofit2:retrofit" implementation "com.squareup.retrofit2:converter-jackson" @@ -35,6 +34,7 @@ dependencies { implementation "io.cloudevents:cloudevents-http-basic:3.0.0" implementation "io.cloudevents:cloudevents-json-jackson:3.0.0" implementation ("dev.cdevents:cdevents-sdk-java:0.3.1") + testImplementation project(":echo-test") testImplementation("com.icegreen:greenmail:1.5.14") { exclude group: "com.sun.mail", module: "javax.mail" } @@ -45,3 +45,10 @@ dependencies { testImplementation "com.github.tomakehurst:wiremock-jre8" annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" } + +sourceSets { + main { + java { srcDirs = [] } // no source dirs for the java compiler + groovy { srcDirs = ["src/main/java", "src/main/groovy"] } // compile everything in src/ with groovy + } +} diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/BaseCDEvent.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/BaseCDEvent.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/BaseCDEvent.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/BaseCDEvent.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunFinished.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunFinished.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunFinished.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunFinished.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunQueued.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunQueued.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunQueued.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunQueued.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunStarted.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunStarted.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunStarted.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventPipelineRunStarted.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventTaskRunFinished.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventTaskRunFinished.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventTaskRunFinished.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventTaskRunFinished.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventTaskRunStarted.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventTaskRunStarted.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventTaskRunStarted.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventTaskRunStarted.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventsBuilderService.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventsBuilderService.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventsBuilderService.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventsBuilderService.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventsConverterFactory.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventsConverterFactory.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventsConverterFactory.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventsConverterFactory.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventsSenderClient.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventsSenderClient.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventsSenderClient.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventsSenderClient.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventsSenderService.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventsSenderService.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/cdevents/CDEventsSenderService.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/cdevents/CDEventsSenderService.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/config/DryRunConfig.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/config/DryRunConfig.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/config/DryRunConfig.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/config/DryRunConfig.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/config/GithubConfig.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/config/GithubConfig.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/config/GithubConfig.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/config/GithubConfig.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/config/JiraConfig.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/config/JiraConfig.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/config/JiraConfig.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/config/JiraConfig.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/config/MicrosoftTeamsConfig.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/config/MicrosoftTeamsConfig.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/config/MicrosoftTeamsConfig.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/config/MicrosoftTeamsConfig.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/config/PagerDutyConfig.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/config/PagerDutyConfig.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/config/PagerDutyConfig.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/config/PagerDutyConfig.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/controller/EchoResponse.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/controller/EchoResponse.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/controller/EchoResponse.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/controller/EchoResponse.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/controller/NotificationController.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/controller/NotificationController.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/controller/NotificationController.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/controller/NotificationController.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/exceptions/FieldNotFoundException.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/exceptions/FieldNotFoundException.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/exceptions/FieldNotFoundException.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/exceptions/FieldNotFoundException.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/github/GithubCommit.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/github/GithubCommit.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/github/GithubCommit.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/github/GithubCommit.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/github/GithubCommitDetail.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/github/GithubCommitDetail.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/github/GithubCommitDetail.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/github/GithubCommitDetail.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/github/GithubService.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/github/GithubService.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/github/GithubService.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/github/GithubService.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/github/GithubStatus.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/github/GithubStatus.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/github/GithubStatus.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/github/GithubStatus.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/googlechat/GoogleChatClient.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/googlechat/GoogleChatClient.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/googlechat/GoogleChatClient.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/googlechat/GoogleChatClient.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/googlechat/GoogleChatMessage.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/googlechat/GoogleChatMessage.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/googlechat/GoogleChatMessage.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/googlechat/GoogleChatMessage.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/googlechat/GoogleChatNotificationService.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/googlechat/GoogleChatNotificationService.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/googlechat/GoogleChatNotificationService.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/googlechat/GoogleChatNotificationService.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/googlechat/GoogleChatService.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/googlechat/GoogleChatService.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/googlechat/GoogleChatService.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/googlechat/GoogleChatService.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/jira/JiraNotificationService.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/jira/JiraNotificationService.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/jira/JiraNotificationService.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/jira/JiraNotificationService.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/jira/JiraProperties.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/jira/JiraProperties.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/jira/JiraProperties.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/jira/JiraProperties.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/jira/JiraService.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/jira/JiraService.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/jira/JiraService.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/jira/JiraService.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsClient.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsClient.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsClient.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsClient.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsMessage.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsMessage.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsMessage.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsMessage.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsNotificationService.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsNotificationService.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsNotificationService.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsNotificationService.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsService.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsService.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsService.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/MicrosoftTeamsService.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsFact.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsFact.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsFact.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsFact.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialAction.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialAction.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialAction.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialAction.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialActionChoice.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialActionChoice.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialActionChoice.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialActionChoice.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialActionTarget.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialActionTarget.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialActionTarget.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsPotentialActionTarget.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsSection.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsSection.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsSection.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/microsoftteams/api/MicrosoftTeamsSection.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/CDEventsNotificationAgent.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/CDEventsNotificationAgent.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/CDEventsNotificationAgent.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/CDEventsNotificationAgent.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/DryRunNotificationAgent.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/DryRunNotificationAgent.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/DryRunNotificationAgent.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/DryRunNotificationAgent.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/EventContent.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/EventContent.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/EventContent.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/EventContent.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgent.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/GithubNotificationAgent.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgent.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/GithubNotificationAgent.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/GoogleCloudBuildNotificationAgent.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/GoogleCloudBuildNotificationAgent.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/GoogleCloudBuildNotificationAgent.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/GoogleCloudBuildNotificationAgent.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/HtmlToPlainText.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/HtmlToPlainText.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/HtmlToPlainText.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/HtmlToPlainText.java diff --git a/echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/MicrosoftTeamsNotificationAgent.java b/echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/MicrosoftTeamsNotificationAgent.java similarity index 100% rename from echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/MicrosoftTeamsNotificationAgent.java rename to echo-notifications/src/main/java/com/netflix/spinnaker/echo/notification/MicrosoftTeamsNotificationAgent.java