Skip to content

Commit 1d2a196

Browse files
committed
Add proper header
1 parent a52ebda commit 1d2a196

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

src/main/java/io/simplelocalize/cli/SimplelocalizeCliCommand.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ public void extract(
8585
{
8686
configuration.setSearchDir(searchDirectory);
8787
}
88+
this.effectiveCommandConfiguration = configuration;
8889
ConfigurationValidator configurationValidator = new ConfigurationValidator();
8990
configurationValidator.validateExtractConfiguration(configuration);
90-
this.effectiveCommandConfiguration = configuration;
9191
SimpleLocalizeClient client = SimpleLocalizeClient.create(configuration.getBaseUrl(), configuration.getApiKey());
9292
ExtractCommand extractCommand = new ExtractCommand(client, configuration);
9393
extractCommand.invoke();
@@ -196,9 +196,9 @@ public void upload(
196196
configuration.setDryRun(true);
197197
}
198198

199+
this.effectiveCommandConfiguration = configuration;
199200
ConfigurationValidator configurationValidator = new ConfigurationValidator();
200201
configurationValidator.validateUploadConfiguration(configuration);
201-
this.effectiveCommandConfiguration = configuration;
202202
SimpleLocalizeClient client = SimpleLocalizeClient.create(configuration.getBaseUrl(), configuration.getApiKey());
203203
UploadCommand uploadCommand = new UploadCommand(client, configuration);
204204
uploadCommand.invoke();
@@ -263,9 +263,9 @@ public void download(
263263
configuration.setDownloadOptions(downloadOptions);
264264
}
265265

266+
this.effectiveCommandConfiguration = configuration;
266267
ConfigurationValidator configurationValidator = new ConfigurationValidator();
267268
configurationValidator.validateDownloadConfiguration(configuration);
268-
this.effectiveCommandConfiguration = configuration;
269269
SimpleLocalizeClient client = SimpleLocalizeClient.create(configuration.getBaseUrl(), configuration.getApiKey());
270270
DownloadCommand downloadCommand = new DownloadCommand(client, configuration);
271271
downloadCommand.invoke();
@@ -315,9 +315,9 @@ public void pull(
315315
configuration.setFilterRegex(filterRegex);
316316
}
317317

318+
this.effectiveCommandConfiguration = configuration;
318319
ConfigurationValidator configurationValidator = new ConfigurationValidator();
319320
configurationValidator.validateHostingPullConfiguration(configuration);
320-
this.effectiveCommandConfiguration = configuration;
321321
SimpleLocalizeClient client = SimpleLocalizeClient.create(configuration.getBaseUrl(), configuration.getApiKey());
322322
PullHostingCommand command = new PullHostingCommand(client, configuration);
323323
command.invoke();
@@ -357,9 +357,9 @@ public void startAutoTranslation(
357357
configuration.setAutoTranslation(autoTranslationConfiguration);
358358
}
359359

360+
this.effectiveCommandConfiguration = configuration;
360361
ConfigurationValidator configurationValidator = new ConfigurationValidator();
361362
configurationValidator.validateAutoTranslationConfiguration(configuration);
362-
this.effectiveCommandConfiguration = configuration;
363363
SimpleLocalizeClient client = SimpleLocalizeClient.create(configuration.getBaseUrl(), configuration.getApiKey());
364364
AutoTranslationCommand command = new AutoTranslationCommand(client, configuration);
365365
command.invoke();
@@ -406,9 +406,9 @@ public void status(
406406
configuration.setApiKey(apiKey);
407407
}
408408

409+
this.effectiveCommandConfiguration = configuration;
409410
ConfigurationValidator configurationValidator = new ConfigurationValidator();
410411
configurationValidator.validateGetStatusConfiguration(configuration);
411-
this.effectiveCommandConfiguration = configuration;
412412
SimpleLocalizeClient client = SimpleLocalizeClient.create(configuration.getBaseUrl(), configuration.getApiKey());
413413
StatusCommand command = new StatusCommand(client);
414414
command.invoke();
@@ -445,9 +445,9 @@ public void publish(
445445
configuration.setEnvironment(environment);
446446
}
447447

448+
this.effectiveCommandConfiguration = configuration;
448449
ConfigurationValidator configurationValidator = new ConfigurationValidator();
449450
configurationValidator.validateHostingPublishConfiguration(configuration);
450-
this.effectiveCommandConfiguration = configuration;
451451
SimpleLocalizeClient client = SimpleLocalizeClient.create(configuration.getBaseUrl(), configuration.getApiKey());
452452
PublishHostingCommand command = new PublishHostingCommand(client, configuration);
453453
command.invoke();
@@ -480,9 +480,9 @@ public void purge(
480480
configuration.setApiKey(apiKey);
481481
}
482482

483+
this.effectiveCommandConfiguration = configuration;
483484
ConfigurationValidator configurationValidator = new ConfigurationValidator();
484485
configurationValidator.validateGetPurgeConfiguration(configuration);
485-
this.effectiveCommandConfiguration = configuration;
486486
SimpleLocalizeClient client = SimpleLocalizeClient.create(configuration.getBaseUrl(), configuration.getApiKey());
487487
PurgeCommand command = new PurgeCommand(client, force);
488488
command.invoke();
@@ -512,7 +512,7 @@ private void trySendException(Exception exception)
512512
client.sendException(effectiveCommandConfiguration, exception);
513513
} catch (Exception ex)
514514
{
515-
log.error("Unable to send exception to SimpleLocalize, please contact us at [email protected]", ex);
515+
log.error("Unable to send exception to SimpleLocalize, please contact us at [email protected]. {}", ex.getMessage());
516516
if (ex instanceof InterruptedException)
517517
{
518518
Thread.currentThread().interrupt();

src/test/java/io/simplelocalize/cli/SimplelocalizeCliCommandTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,15 @@ void pull() throws IOException
208208
});
209209
}
210210

211+
@Test
212+
void sendException() throws IOException
213+
{
214+
//when
215+
assertDoesNotThrow(() -> {
216+
sut.pull("my-api-key", "./my-path", null, null, MOCK_SERVER_BASE_URL);
217+
});
218+
}
219+
211220
@Test
212221
void status() throws IOException
213222
{

0 commit comments

Comments
 (0)