diff --git a/core/src/main/java/google/registry/beam/BeamUtils.java b/core/src/main/java/google/registry/beam/BeamUtils.java index dd1b7d6bf..b913c6391 100644 --- a/core/src/main/java/google/registry/beam/BeamUtils.java +++ b/core/src/main/java/google/registry/beam/BeamUtils.java @@ -18,9 +18,7 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; -import com.google.common.io.Resources; import google.registry.util.Clock; -import google.registry.util.ResourceUtils; import java.util.regex.Pattern; import org.apache.avro.generic.GenericRecord; import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord; @@ -57,14 +55,6 @@ public class BeamUtils { } } - /** - * Returns the {@link String} contents for a file in the {@code sql/} directory relative to a - * class. - */ - public static String getQueryFromFile(Class clazz, String filename) { - return ResourceUtils.readResourceUtf8(Resources.getResource(clazz, "sql/" + filename)); - } - /** Creates a beam job name and validates that it conforms to the requirements. */ public static String createJobName(String prefix, Clock clock) { // Flex template job name must be unique and consists of only characters [-a-z0-9], starting diff --git a/core/src/main/java/google/registry/beam/invoicing/InvoicingPipeline.java b/core/src/main/java/google/registry/beam/invoicing/InvoicingPipeline.java index b6af2d885..6b9089c14 100644 --- a/core/src/main/java/google/registry/beam/invoicing/InvoicingPipeline.java +++ b/core/src/main/java/google/registry/beam/invoicing/InvoicingPipeline.java @@ -15,7 +15,6 @@ package google.registry.beam.invoicing; import static com.google.common.collect.ImmutableSet.toImmutableSet; -import static google.registry.beam.BeamUtils.getQueryFromFile; import static org.apache.beam.sdk.values.TypeDescriptors.strings; import com.google.common.flogger.FluentLogger; @@ -29,6 +28,7 @@ import google.registry.model.registrar.Registrar; import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import google.registry.reporting.billing.BillingModule; import google.registry.util.DomainNameUtils; +import google.registry.util.ResourceUtils; import google.registry.util.SqlTemplate; import java.io.Serializable; import java.time.YearMonth; @@ -209,7 +209,8 @@ public class InvoicingPipeline implements Serializable { YearMonth endMonth = YearMonth.parse(yearMonth).plusMonths(1); String queryWithComments = SqlTemplate.create( - getQueryFromFile(InvoicingPipeline.class, "cloud_sql_billing_events.sql")) + ResourceUtils.readResourceUtf8( + InvoicingPipeline.class, "sql/cloud_sql_billing_events.sql")) .put("FIRST_TIMESTAMP_OF_MONTH", yearMonth + "-01") .put( "LAST_TIMESTAMP_OF_MONTH", diff --git a/core/src/main/java/google/registry/reporting/icann/BasicDnsCountQueryCoordinator.java b/core/src/main/java/google/registry/reporting/icann/BasicDnsCountQueryCoordinator.java index f5c4ceab3..8a3dcd547 100644 --- a/core/src/main/java/google/registry/reporting/icann/BasicDnsCountQueryCoordinator.java +++ b/core/src/main/java/google/registry/reporting/icann/BasicDnsCountQueryCoordinator.java @@ -14,7 +14,6 @@ package google.registry.reporting.icann; -import com.google.common.io.Resources; import google.registry.util.ResourceUtils; import google.registry.util.SqlTemplate; import org.joda.time.YearMonth; @@ -28,9 +27,7 @@ public class BasicDnsCountQueryCoordinator implements DnsCountQueryCoordinator { @Override public String createQuery(YearMonth yearMonth) { - return SqlTemplate.create( - ResourceUtils.readResourceUtf8( - Resources.getResource(this.getClass(), "sql/" + "dns_counts.sql"))) + return SqlTemplate.create(ResourceUtils.readResourceUtf8(this.getClass(), "sql/dns_counts.sql")) .build(); } diff --git a/core/src/main/java/google/registry/reporting/icann/sql/activity_report_aggregation.sql b/core/src/main/resources/google/registry/reporting/icann/sql/activity_report_aggregation.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/activity_report_aggregation.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/activity_report_aggregation.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_activity_report_aggregation.sql b/core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_activity_report_aggregation.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_activity_report_aggregation.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_activity_report_aggregation.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_attempted_adds.sql b/core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_attempted_adds.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_attempted_adds.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_attempted_adds.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_registrar_iana_id.sql b/core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_registrar_iana_id.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_registrar_iana_id.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_registrar_iana_id.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_registrar_operating_status.sql b/core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_registrar_operating_status.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_registrar_operating_status.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_registrar_operating_status.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_total_domains.sql b/core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_total_domains.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_total_domains.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_total_domains.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_total_nameservers.sql b/core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_total_nameservers.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_total_nameservers.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_total_nameservers.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_transaction_counts.sql b/core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_transaction_counts.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_transaction_counts.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_transaction_counts.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_transaction_transfer_losing.sql b/core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_transaction_transfer_losing.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_transaction_transfer_losing.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_transaction_transfer_losing.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_transactions_report_aggregation.sql b/core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_transactions_report_aggregation.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_transactions_report_aggregation.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/cloud_sql_transactions_report_aggregation.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/dns_counts.sql b/core/src/main/resources/google/registry/reporting/icann/sql/dns_counts.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/dns_counts.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/dns_counts.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/epp_metrics.sql b/core/src/main/resources/google/registry/reporting/icann/sql/epp_metrics.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/epp_metrics.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/epp_metrics.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/monthly_logs.sql b/core/src/main/resources/google/registry/reporting/icann/sql/monthly_logs.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/monthly_logs.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/monthly_logs.sql diff --git a/core/src/main/java/google/registry/reporting/icann/sql/whois_counts.sql b/core/src/main/resources/google/registry/reporting/icann/sql/whois_counts.sql similarity index 100% rename from core/src/main/java/google/registry/reporting/icann/sql/whois_counts.sql rename to core/src/main/resources/google/registry/reporting/icann/sql/whois_counts.sql diff --git a/core/src/nonprod/java/google/registry/tools/GenerateSqlErDiagramCommand.java b/core/src/nonprod/java/google/registry/tools/GenerateSqlErDiagramCommand.java index d421b7904..8a7d105e4 100644 --- a/core/src/nonprod/java/google/registry/tools/GenerateSqlErDiagramCommand.java +++ b/core/src/nonprod/java/google/registry/tools/GenerateSqlErDiagramCommand.java @@ -142,7 +142,7 @@ public class GenerateSqlErDiagramCommand implements Command { // Add pan and zoom support for the embedded SVG in the HTML. StringBuilder svgPanZoomLib = new StringBuilder(""); doc.select("head").first().append(svgPanZoomLib.toString()); doc.select("svg") @@ -207,8 +207,7 @@ public class GenerateSqlErDiagramCommand implements Command { private static void initDb(Connection connection) { try (Statement statement = connection.createStatement()) { - statement.execute( - ResourceUtils.readResourceUtf8(Resources.getResource(NOMULUS_GOLDEN_SCHEMA))); + statement.execute(ResourceUtils.readResourceUtf8(NOMULUS_GOLDEN_SCHEMA)); } catch (SQLException e) { throw new RuntimeException(e); } diff --git a/core/src/test/java/google/registry/tools/GenerateSqlErDiagramCommandTest.java b/core/src/test/java/google/registry/tools/GenerateSqlErDiagramCommandTest.java index 7d0bea810..2860469dc 100644 --- a/core/src/test/java/google/registry/tools/GenerateSqlErDiagramCommandTest.java +++ b/core/src/test/java/google/registry/tools/GenerateSqlErDiagramCommandTest.java @@ -20,7 +20,6 @@ import static google.registry.tools.GenerateSqlErDiagramCommand.FLYWAY_FILE_ELEM import static google.registry.tools.GenerateSqlErDiagramCommand.getLastFlywayFileName; import com.google.common.base.Joiner; -import com.google.common.io.Resources; import google.registry.util.ResourceUtils; import java.nio.charset.StandardCharsets; import java.nio.file.Path; @@ -61,16 +60,14 @@ class GenerateSqlErDiagramCommandTest extends CommandTestCase