Skip to content

Commit 06d25ac

Browse files
authored
Merge pull request #84 from simplelocalize/write-nested-issue
Write nested issue
2 parents 332c664 + 7859f08 commit 06d25ac

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ ignoreKeys:
311311
- 'ABOUT-US'
312312
313313
# Properties used by 'pull' and 'publish' command
314-
pullPath: ./src/hosting/
314+
pullPath: ./src/hosting/
315315
environment: 'production' # or 'latest'
316316
317317
```
@@ -329,9 +329,10 @@ export http_proxy=http://someproxy.com:8080
329329
export http_proxy=http://user:[email protected]:8080
330330
```
331331
332-
## Documentation
332+
## Documentation
333333
334-
Visit [simplelocalize.io/docs/cli/get-started/](https://simplelocalize.io/docs/cli/get-started/) to get more information about SimpleLocalize CLI.
334+
Visit [simplelocalize.io/docs/cli/get-started/](https://simplelocalize.io/docs/cli/get-started/) to get more information
335+
about SimpleLocalize CLI.
335336
336337
## License
337338

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>io.simplelocalize</groupId>
66
<artifactId>simplelocalize-cli</artifactId>
7-
<version>2.4.0</version>
7+
<version>2.4.1</version>
88
<packaging>jar</packaging>
99
<name>simplelocalize-cli</name>
1010
<description>Official SimpleLocalize Command Line Interface</description>

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,15 @@ public void download(
248248
{
249249
configuration.setCustomerId(customerId);
250250
}
251-
configuration.setDownloadOptions(Objects.requireNonNullElseGet(downloadOptions, ArrayList::new));
251+
252+
List<String> nonNullConfigurationFileDownloadOptions = Objects.requireNonNullElse(configuration.getDownloadOptions(), List.of());
253+
configuration.setDownloadOptions(nonNullConfigurationFileDownloadOptions);
254+
boolean hasArgumentDownloadOptions = downloadOptions != null && !downloadOptions.isEmpty();
255+
if(hasArgumentDownloadOptions)
256+
{
257+
configuration.setDownloadOptions(downloadOptions);
258+
}
259+
252260
ConfigurationValidator configurationValidator = new ConfigurationValidator();
253261
configurationValidator.validateDownloadConfiguration(configuration);
254262
SimpleLocalizeClient client = SimpleLocalizeClient.create(configuration.getBaseUrl(), configuration.getApiKey());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
public class Version
44
{
55

6-
public static final String NUMBER = "2.4.0";
6+
public static final String NUMBER = "2.4.1";
77

88
private Version()
99
{

0 commit comments

Comments
 (0)