From 018750da825891cce5e8cc4f881952cef1979128 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 10 Feb 2025 18:54:36 +0000 Subject: [PATCH] 1050: Reduce build warnings. (#1051) * Fixing unit tests related to mlclient getTask and adding integration test for workflow provisioning under multitenancy (#1045) * Fixing unit tests related to mlclient getTask Signed-off-by: Siddhartha Bingi * Adding integration tests for workflow provisioning under multitenancy Signed-off-by: Siddhartha Bingi * Addressing comments Signed-off-by: Siddhartha Bingi --------- Signed-off-by: Siddhartha Bingi Co-authored-by: Siddhartha Bingi Signed-off-by: Vikas Adyar * chore(deps): update aws-actions/configure-aws-credentials action to v4.0.3 (#1029) Signed-off-by: mend-for-github-com[bot] Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Vikas Adyar * fix(deps): update dependency com.google.code.gson:gson to v2.12.1 (#1035) Signed-off-by: mend-for-github-com[bot] Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Vikas Adyar * 1050: * Changed the indentation from spaces to tab. * Included private no-args constructors. * refactoring. Signed-off-by: Vikas Adyar * fix(deps): update dependency software.amazon.cryptography:aws-cryptographic-material-providers to v1.9.0 (#1047) Signed-off-by: mend-for-github-com[bot] Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Vikas Adyar * chore(deps): update plugin org.gradle.test-retry to v1.6.2 (#1052) Signed-off-by: mend-for-github-com[bot] Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Vikas Adyar * fix(deps): update dependency org.dafny:dafnyruntime to v4.10.0 (#1053) Signed-off-by: mend-for-github-com[bot] Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Vikas Adyar * Update template for alert summary with new log pattern tools (#1021) * Update template for alert summary with log pattern Signed-off-by: Sihan He * Update ChangeLog Signed-off-by: Sihan He --------- Signed-off-by: Sihan He Signed-off-by: Vikas Adyar * JDK 11 compatible changes. Signed-off-by: Vikas Adyar --------- Signed-off-by: Siddhartha Bingi Signed-off-by: Vikas Adyar Signed-off-by: mend-for-github-com[bot] Signed-off-by: Sihan He Co-authored-by: Siddhartha Bingi Co-authored-by: Siddhartha Bingi Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: 000FLMS (cherry picked from commit 2acbb567f1cd5e668b45e23211fcb9b6f016caba) Signed-off-by: github-actions[bot] --- formatter/formatting.gradle | 12 +++++------- .../flowframework/util/ApiSpecFetcher.java | 2 ++ .../flowframework/util/EncryptorUtils.java | 2 +- .../flowframework/util/TenantAwareHelper.java | 2 ++ .../flowframework/util/WorkflowTimeoutUtility.java | 2 ++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/formatter/formatting.gradle b/formatter/formatting.gradle index 8f842128f..118f74490 100644 --- a/formatter/formatting.gradle +++ b/formatter/formatting.gradle @@ -6,8 +6,7 @@ allprojects { target '**/*.java' removeUnusedImports() - importOrder( - 'de.thetaphi', + importOrder('de.thetaphi', 'com.carrotsearch', 'com.fasterxml', 'com.avast', @@ -19,11 +18,10 @@ allprojects { 'javax', 'java', '', - '\\#java|\\#org.opensearch|\\#org.hamcrest|\\#' - ) + '\\#java|\\#org.opensearch|\\#org.hamcrest|\\#') eclipse().configFile rootProject.file('formatter/formatterConfig.xml') trimTrailingWhitespace() - endWithNewline(); + endWithNewline() // See DEVELOPER_GUIDE.md for details of when to enable this. if (System.getProperty('spotless.paddedcell') != null) { @@ -35,10 +33,10 @@ allprojects { trimTrailingWhitespace() endWithNewline() - indentWithSpaces() + leadingTabsToSpaces() } format("license", { - licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}", "package "); + licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}", "package ") target("src/*/java/**/*.java") }) } diff --git a/src/main/java/org/opensearch/flowframework/util/ApiSpecFetcher.java b/src/main/java/org/opensearch/flowframework/util/ApiSpecFetcher.java index 12630b6c3..2df2210d2 100644 --- a/src/main/java/org/opensearch/flowframework/util/ApiSpecFetcher.java +++ b/src/main/java/org/opensearch/flowframework/util/ApiSpecFetcher.java @@ -40,6 +40,8 @@ public class ApiSpecFetcher { PARSE_OPTIONS.setResolveFully(true); } + private ApiSpecFetcher() {} + /** * Parses the OpenAPI specification directly from the URI. * diff --git a/src/main/java/org/opensearch/flowframework/util/EncryptorUtils.java b/src/main/java/org/opensearch/flowframework/util/EncryptorUtils.java index 52a7d2251..e271d6a51 100644 --- a/src/main/java/org/opensearch/flowframework/util/EncryptorUtils.java +++ b/src/main/java/org/opensearch/flowframework/util/EncryptorUtils.java @@ -76,7 +76,7 @@ public class EncryptorUtils { private static final String WRAPPING_ALGORITHM = "AES/GCM/NOPADDING"; // concurrent map can't have null as a key. This key is to support single tenancy - public static final String DEFAULT_TENANT_ID = ""; + private static final String DEFAULT_TENANT_ID = ""; private final ClusterService clusterService; private final Client client; diff --git a/src/main/java/org/opensearch/flowframework/util/TenantAwareHelper.java b/src/main/java/org/opensearch/flowframework/util/TenantAwareHelper.java index eb78bc02f..ed363b309 100644 --- a/src/main/java/org/opensearch/flowframework/util/TenantAwareHelper.java +++ b/src/main/java/org/opensearch/flowframework/util/TenantAwareHelper.java @@ -23,6 +23,8 @@ */ public class TenantAwareHelper { + private TenantAwareHelper() {} + /** * Validates the tenant ID based on the multi-tenancy feature setting. * diff --git a/src/main/java/org/opensearch/flowframework/util/WorkflowTimeoutUtility.java b/src/main/java/org/opensearch/flowframework/util/WorkflowTimeoutUtility.java index 2b2e7cc46..97192cd7b 100644 --- a/src/main/java/org/opensearch/flowframework/util/WorkflowTimeoutUtility.java +++ b/src/main/java/org/opensearch/flowframework/util/WorkflowTimeoutUtility.java @@ -34,6 +34,8 @@ public class WorkflowTimeoutUtility { private static final Logger logger = LogManager.getLogger(WorkflowTimeoutUtility.class); + private WorkflowTimeoutUtility() {} + /** * Schedules a timeout task for a workflow execution. *