Skip to content

Commit 100cead

Browse files
committed
Add TLD identifier to premium terms filename and header
https://b.corp.google.com/issues/390053672 This makes it easier to identify what file you're looking at, at a glance
1 parent bf02544 commit 100cead

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

core/src/main/java/google/registry/export/ExportPremiumTermsAction.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public class ExportPremiumTermsAction implements Runnable {
5454

5555
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
5656
static final MediaType EXPORT_MIME_TYPE = MediaType.PLAIN_TEXT_UTF_8;
57-
static final String PREMIUM_TERMS_FILENAME = "CONFIDENTIAL_premium_terms.txt";
57+
static final String TLD_IDENTIFIER_FORMAT = "# TLD: %s";
58+
static final String PREMIUM_TERMS_FILENAME_FORMAT = "CONFIDENTIAL_premium_terms_%s.txt";
5859

5960
@Inject DriveConnection driveConnection;
6061

@@ -127,7 +128,7 @@ private String exportPremiumTerms(Tld tld) {
127128
try {
128129
String fileId =
129130
driveConnection.createOrUpdateFile(
130-
PREMIUM_TERMS_FILENAME,
131+
String.format(PREMIUM_TERMS_FILENAME_FORMAT, tldStr),
131132
EXPORT_MIME_TYPE,
132133
tld.getDriveFolderId(),
133134
getFormattedPremiumTerms(tld).getBytes(UTF_8));
@@ -150,11 +151,9 @@ private String getFormattedPremiumTerms(Tld tld) {
150151
.map(PremiumEntry::toString)
151152
.collect(ImmutableSortedSet.toImmutableSortedSet(String::compareTo));
152153

153-
return Joiner.on("\n")
154-
.appendTo(
155-
new StringBuilder(),
156-
Iterables.concat(ImmutableList.of(exportDisclaimer.trim()), premiumTerms))
157-
.append("\n")
158-
.toString();
154+
String tldIdentifier = String.format(TLD_IDENTIFIER_FORMAT, tldStr);
155+
Iterable<String> commentsAndTerms =
156+
Iterables.concat(ImmutableList.of(exportDisclaimer.trim(), tldIdentifier), premiumTerms);
157+
return Joiner.on("\n").join(commentsAndTerms) + "\n";
159158
}
160159
}

core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
1818
import static com.google.common.truth.Truth.assertThat;
1919
import static google.registry.export.ExportPremiumTermsAction.EXPORT_MIME_TYPE;
20-
import static google.registry.export.ExportPremiumTermsAction.PREMIUM_TERMS_FILENAME;
2120
import static google.registry.testing.DatabaseHelper.createTld;
2221
import static google.registry.testing.DatabaseHelper.deleteTld;
2322
import static google.registry.testing.DatabaseHelper.persistResource;
@@ -52,11 +51,10 @@
5251
/** Unit tests for {@link ExportPremiumTermsAction}. */
5352
public class ExportPremiumTermsActionTest {
5453

55-
private static final String DISCLAIMER_WITH_NEWLINE = "# Premium Terms Export Disclaimer\n";
5654
private static final ImmutableList<String> PREMIUM_NAMES =
5755
ImmutableList.of("2048,USD 549", "0,USD 549");
5856
private static final String EXPECTED_FILE_CONTENT =
59-
DISCLAIMER_WITH_NEWLINE + "0, 549.00\n" + "2048, 549.00\n";
57+
"# Premium Terms Export Disclaimer\n# TLD: tld\n0, 549.00\n" + "2048, 549.00\n";
6058

6159
@RegisterExtension
6260
final JpaIntegrationTestExtension jpa =
@@ -69,7 +67,7 @@ private void runAction(String tld) {
6967
ExportPremiumTermsAction action = new ExportPremiumTermsAction();
7068
action.response = response;
7169
action.driveConnection = driveConnection;
72-
action.exportDisclaimer = DISCLAIMER_WITH_NEWLINE;
70+
action.exportDisclaimer = "# Premium Terms Export Disclaimer\n";
7371
action.tldStr = tld;
7472
action.run();
7573
}
@@ -94,7 +92,7 @@ void test_exportPremiumTerms_success() throws IOException {
9492

9593
verify(driveConnection)
9694
.createOrUpdateFile(
97-
PREMIUM_TERMS_FILENAME,
95+
"CONFIDENTIAL_premium_terms_tld.txt",
9896
EXPORT_MIME_TYPE,
9997
"folder_id",
10098
EXPECTED_FILE_CONTENT.getBytes(UTF_8));
@@ -157,7 +155,7 @@ void testExportPremiumTerms_failure_driveIdThrowsException() throws IOException
157155

158156
verify(driveConnection)
159157
.createOrUpdateFile(
160-
PREMIUM_TERMS_FILENAME,
158+
"CONFIDENTIAL_premium_terms_tld.txt",
161159
EXPORT_MIME_TYPE,
162160
"bad_folder_id",
163161
EXPECTED_FILE_CONTENT.getBytes(UTF_8));

0 commit comments

Comments
 (0)