zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-16 09:27:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix premium list command regressions

Browse source 
This CL fixes bugs introduced when the premium list commands were moved to
be server-side commands.

Fixes:

 - omitting the --name parameter actually works now; before it was failing
   in the local build() call since it uses the name as the @Id and tries to
   create a key for PremiumListRevision, but key IDs cannot be null.

 - premium list data larger than about 2K works now (see [] before
   it was stuffing the list data all into a POST query parameter, and URLs of
   more than 2K in length were all getting 404s.  Fix was changing it to put
   the inputData param in the POST body.

 - misc test cleanup
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=119912494
This commit is contained in:
nickfelt 2016-04-14 18:05:56 -07:00 • committed by Justine Tunney
parent 625c34662b
commit f20b1d89a9
4 changed files with 86 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

14
java/com/google/domain/registry/tools/CreateOrUpdatePremiumListCommand.java
View file

@ -21,6 +21,7 @@ import static com.google.domain.registry.tools.server.CreateOrUpdatePremiumListA
import static com.google.domain.registry.util.ListNamingUtils.convertFilePathToName;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.base.Joiner;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableMap;
import com.google.common.net.MediaType;
@ -31,6 +32,7 @@ import com.beust.jcommander.Parameter;
import org.json.simple.JSONValue;
import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
@ -75,7 +77,9 @@ abstract class CreateOrUpdatePremiumListCommand extends ConfirmingCommand
@Override
protected void init() throws Exception {
name = isNullOrEmpty(name) ? convertFilePathToName(inputFile) : name;
List<String> lines = Files.readAllLines(inputFile, UTF_8);
// Try constructing the premium list locally to check up front for validation errors.
new PremiumList.Builder()
.setName(name)
.setPremiumListMapFromLines(lines)
@ -91,10 +95,12 @@ abstract class CreateOrUpdatePremiumListCommand extends ConfirmingCommand
@Override
public String execute() throws Exception {
name = isNullOrEmpty(name) ? convertFilePathToName(inputFile) : name;
ImmutableMap.Builder<String, Object> params = new ImmutableMap.Builder<>();
params.put(NAME_PARAM, name);
params.put(INPUT_PARAM, new String(Files.readAllBytes(inputFile), UTF_8));
String inputFileContents = new String(Files.readAllBytes(inputFile), UTF_8);
String requestBody =
Joiner.on('&').withKeyValueSeparator("=").join(
ImmutableMap.of(INPUT_PARAM, URLEncoder.encode(inputFileContents, UTF_8.toString())));
ImmutableMap<String, ?> extraParams = getParameterMap();
if (extraParams != null) {
@ -105,8 +111,8 @@ abstract class CreateOrUpdatePremiumListCommand extends ConfirmingCommand
String response = connection.send(
getCommandPath(),
params.build(),
MediaType.PLAIN_TEXT_UTF_8,
new byte[0]);
MediaType.FORM_DATA,
requestBody.getBytes());
return extractServerResponse(response);
}