diff --git a/build.gradle b/build.gradle index cc8e4d6d09a7d..c54e484e49b7e 100644 --- a/build.gradle +++ b/build.gradle @@ -59,6 +59,27 @@ if (VersionProperties.elasticsearch.toString().endsWith('-SNAPSHOT')) { } String elasticLicenseUrl = "https://raw.githubusercontent.com/elastic/elasticsearch/${licenseCommit}/licenses/ELASTIC-LICENSE.txt" +// Get list of all changed files by project +List getChangedFilesByProject(Project project) { + ByteArrayOutputStream systemOutStream = new ByteArrayOutputStream() + + String ghprbTargetBranch = System.getenv("ghprbTargetBranch") + String targetBranch = ghprbTargetBranch ? "origin/${ghprbTargetBranch}" : "master" + String projectDir = project.getRootDir().toPath().relativize(project.getProjectDir().toPath()) + String command = "git diff --relative=" + projectDir + " --name-only --diff-filter=ACMRT " + targetBranch + + command.execute().waitForProcessOutput(systemOutStream, System.err) + List changedFiles = systemOutStream.toString().trim().split('\n') + systemOutStream.close() + List changedJavaFiles = new ArrayList<>() + for (f in changedFiles) { + if (f.endsWith(".java")) { + changedJavaFiles.add(f) + } + } + return changedJavaFiles +} + subprojects { // Default to the apache license project.ext.licenseName = 'The Apache Software License, Version 2.0' @@ -107,13 +128,24 @@ subprojects { // switched to an exclude list, and eventualy removed completely. def projectPathsToFormat = [ // ':build-tools' + ':x-pack:plugin:transform' ] if (projectPathsToFormat.contains(project.path)) { project.apply plugin: "com.diffplug.gradle.spotless" + List changedFiles = getChangedFilesByProject(project) + + println "[" + project.path + "] Check formating of: " + changedFiles + if (changedFiles.isEmpty()) { + return + } + spotless { java { + target project.fileTree('.') { + includes = changedFiles + } removeUnusedImports() eclipse().configFile rootProject.file('.eclipseformat.xml') diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java index e7d8dbe4a60e5..27bf4898f079e 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java @@ -132,36 +132,44 @@ public Transform(Settings settings) { this.enabled = XPackSettings.TRANSFORM_ENABLED.get(settings); } - protected XPackLicenseState getLicenseState() { return XPackPlugin.getSharedLicenseState(); } + protected XPackLicenseState getLicenseState() { + return XPackPlugin.getSharedLicenseState(); + } @Override - public List getRestHandlers(final Settings settings, final RestController restController, - final ClusterSettings clusterSettings, final IndexScopedSettings indexScopedSettings, final SettingsFilter settingsFilter, - final IndexNameExpressionResolver indexNameExpressionResolver, final Supplier nodesInCluster) { + public List getRestHandlers( + final Settings settings, + final RestController restController, + final ClusterSettings clusterSettings, + final IndexScopedSettings indexScopedSettings, + final SettingsFilter settingsFilter, + final IndexNameExpressionResolver indexNameExpressionResolver, + final Supplier nodesInCluster + ) { if (!enabled) { return emptyList(); } return Arrays.asList( - new RestPutTransformAction(restController), - new RestStartTransformAction(restController), - new RestStopTransformAction(restController), - new RestDeleteTransformAction(restController), - new RestGetTransformAction(restController), - new RestGetTransformStatsAction(restController), - new RestPreviewTransformAction(restController), - new RestUpdateTransformAction(restController), + new RestPutTransformAction(restController), + new RestStartTransformAction(restController), + new RestStopTransformAction(restController), + new RestDeleteTransformAction(restController), + new RestGetTransformAction(restController), + new RestGetTransformStatsAction(restController), + new RestPreviewTransformAction(restController), + new RestUpdateTransformAction(restController), - // deprecated endpoints, to be removed for 8.0.0 - new RestPutTransformActionDeprecated(restController), - new RestStartTransformActionDeprecated(restController), - new RestStopTransformActionDeprecated(restController), - new RestDeleteTransformActionDeprecated(restController), - new RestGetTransformActionDeprecated(restController), - new RestGetTransformStatsActionDeprecated(restController), - new RestPreviewTransformActionDeprecated(restController), - new RestUpdateTransformActionDeprecated(restController) + // deprecated endpoints, to be removed for 8.0.0 + new RestPutTransformActionDeprecated(restController), + new RestStartTransformActionDeprecated(restController), + new RestStopTransformActionDeprecated(restController), + new RestDeleteTransformActionDeprecated(restController), + new RestGetTransformActionDeprecated(restController), + new RestGetTransformStatsActionDeprecated(restController), + new RestPreviewTransformActionDeprecated(restController), + new RestUpdateTransformActionDeprecated(restController) ); } @@ -174,27 +182,28 @@ public List getRestHandlers(final Settings settings, final RestCont } return Arrays.asList( - new ActionHandler<>(PutTransformAction.INSTANCE, TransportPutTransformAction.class), - new ActionHandler<>(StartTransformAction.INSTANCE, TransportStartTransformAction.class), - new ActionHandler<>(StopTransformAction.INSTANCE, TransportStopTransformAction.class), - new ActionHandler<>(DeleteTransformAction.INSTANCE, TransportDeleteTransformAction.class), - new ActionHandler<>(GetTransformAction.INSTANCE, TransportGetTransformAction.class), - new ActionHandler<>(GetTransformStatsAction.INSTANCE, TransportGetTransformStatsAction.class), - new ActionHandler<>(PreviewTransformAction.INSTANCE, TransportPreviewTransformAction.class), - new ActionHandler<>(UpdateTransformAction.INSTANCE, TransportUpdateTransformAction.class), + new ActionHandler<>(PutTransformAction.INSTANCE, TransportPutTransformAction.class), + new ActionHandler<>(StartTransformAction.INSTANCE, TransportStartTransformAction.class), + new ActionHandler<>(StopTransformAction.INSTANCE, TransportStopTransformAction.class), + new ActionHandler<>(DeleteTransformAction.INSTANCE, TransportDeleteTransformAction.class), + new ActionHandler<>(GetTransformAction.INSTANCE, TransportGetTransformAction.class), + new ActionHandler<>(GetTransformStatsAction.INSTANCE, TransportGetTransformStatsAction.class), + new ActionHandler<>(PreviewTransformAction.INSTANCE, TransportPreviewTransformAction.class), + new ActionHandler<>(UpdateTransformAction.INSTANCE, TransportUpdateTransformAction.class), - // deprecated actions, to be removed for 8.0.0 - new ActionHandler<>(PutTransformActionDeprecated.INSTANCE, TransportPutTransformActionDeprecated.class), - new ActionHandler<>(StartTransformActionDeprecated.INSTANCE, TransportStartTransformActionDeprecated.class), - new ActionHandler<>(StopTransformActionDeprecated.INSTANCE, TransportStopTransformActionDeprecated.class), - new ActionHandler<>(DeleteTransformActionDeprecated.INSTANCE, TransportDeleteTransformActionDeprecated.class), - new ActionHandler<>(GetTransformActionDeprecated.INSTANCE, TransportGetTransformActionDeprecated.class), - new ActionHandler<>(GetTransformStatsActionDeprecated.INSTANCE, TransportGetTransformStatsActionDeprecated.class), - new ActionHandler<>(PreviewTransformActionDeprecated.INSTANCE, TransportPreviewTransformActionDeprecated.class), - new ActionHandler<>(UpdateTransformActionDeprecated.INSTANCE, TransportUpdateTransformActionDeprecated.class), + // deprecated actions, to be removed for 8.0.0 + new ActionHandler<>(PutTransformActionDeprecated.INSTANCE, TransportPutTransformActionDeprecated.class), + new ActionHandler<>(StartTransformActionDeprecated.INSTANCE, TransportStartTransformActionDeprecated.class), + new ActionHandler<>(StopTransformActionDeprecated.INSTANCE, TransportStopTransformActionDeprecated.class), + new ActionHandler<>(DeleteTransformActionDeprecated.INSTANCE, TransportDeleteTransformActionDeprecated.class), + new ActionHandler<>(GetTransformActionDeprecated.INSTANCE, TransportGetTransformActionDeprecated.class), + new ActionHandler<>(GetTransformStatsActionDeprecated.INSTANCE, TransportGetTransformStatsActionDeprecated.class), + new ActionHandler<>(PreviewTransformActionDeprecated.INSTANCE, TransportPreviewTransformActionDeprecated.class), + new ActionHandler<>(UpdateTransformActionDeprecated.INSTANCE, TransportUpdateTransformActionDeprecated.class), - usageAction, - infoAction); + usageAction, + infoAction + ); } @Override @@ -203,35 +212,58 @@ public List> getExecutorBuilders(Settings settings) { return emptyList(); } - FixedExecutorBuilder indexing = new FixedExecutorBuilder(settings, TASK_THREAD_POOL_NAME, 4, 4, - "transform.task_thread_pool"); + FixedExecutorBuilder indexing = new FixedExecutorBuilder( + settings, + TASK_THREAD_POOL_NAME, + 4, + 4, + "transform.task_thread_pool" + ); return Collections.singletonList(indexing); } @Override - public Collection createComponents(Client client, ClusterService clusterService, ThreadPool threadPool, - ResourceWatcherService resourceWatcherService, ScriptService scriptService, NamedXContentRegistry xContentRegistry, - Environment environment, NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry) { + public Collection createComponents( + Client client, + ClusterService clusterService, + ThreadPool threadPool, + ResourceWatcherService resourceWatcherService, + ScriptService scriptService, + NamedXContentRegistry xContentRegistry, + Environment environment, + NodeEnvironment nodeEnvironment, + NamedWriteableRegistry namedWriteableRegistry + ) { if (enabled == false) { return emptyList(); } transformAuditor.set(new TransformAuditor(client, clusterService.getNodeName())); transformConfigManager.set(new TransformConfigManager(client, xContentRegistry)); - transformCheckpointService.set(new TransformCheckpointService(client, - transformConfigManager.get(), - transformAuditor.get())); + transformCheckpointService.set( + new TransformCheckpointService( + client, + transformConfigManager.get(), + transformAuditor.get() + ) + ); - return Arrays.asList(transformConfigManager.get(), transformAuditor.get(), transformCheckpointService.get(), - new TransformClusterStateListener(clusterService, client)); + return Arrays.asList( + transformConfigManager.get(), + transformAuditor.get(), + transformCheckpointService.get(), + new TransformClusterStateListener(clusterService, client) + ); } @Override public UnaryOperator> getIndexTemplateMetaDataUpgrader() { return templates -> { try { - templates.put(TransformInternalIndexConstants.LATEST_INDEX_VERSIONED_NAME, - TransformInternalIndex.getIndexTemplateMetaData()); + templates.put( + TransformInternalIndexConstants.LATEST_INDEX_VERSIONED_NAME, + TransformInternalIndex.getIndexTemplateMetaData() + ); } catch (IOException e) { logger.error("Error creating data frame index template", e); } @@ -245,8 +277,12 @@ public UnaryOperator> getIndexTemplateMetaDat } @Override - public List> getPersistentTasksExecutor(ClusterService clusterService, ThreadPool threadPool, - Client client, SettingsModule settingsModule) { + public List> getPersistentTasksExecutor( + ClusterService clusterService, + ThreadPool threadPool, + Client client, + SettingsModule settingsModule + ) { if (enabled == false) { return emptyList(); } @@ -260,14 +296,17 @@ public List> getPersistentTasksExecutor(ClusterServic assert transformCheckpointService.get() != null; return Collections.singletonList( - new TransformPersistentTasksExecutor(client, + new TransformPersistentTasksExecutor( + client, transformConfigManager.get(), transformCheckpointService.get(), schedulerEngine.get(), transformAuditor.get(), threadPool, clusterService, - settingsModule.getSettings())); + settingsModule.getSettings() + ) + ); } @Override