Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove redundant import and else statement #48352

Merged
merged 3 commits into from
Oct 24, 2019
Merged

Remove redundant import and else statement #48352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3c5ef7
cleanup
pgomulka Oct 22, 2019
469fa0c
move systemprop to doFirst for consistency with 7x
pgomulka Oct 23, 2019
1534bf7
Merge branch 'master' into fix/cleanup_iso_week
elasticmachine Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,8 @@ class BuildPlugin implements Plugin<Project> {
} else {
nonInputProperties.systemProperty('runtime.java', "${-> (ext.get('runtimeJavaVersion') as JavaVersion).getMajorVersion()}")
}
//TODO remove once jvm.options are added to test system properties
test.systemProperty ('java.locale.providers','SPI,COMPAT')
}

test.jvmArgumentProviders.add(nonInputProperties)
Expand Down Expand Up @@ -861,8 +863,6 @@ class BuildPlugin implements Plugin<Project> {
'tests.security.manager': 'true',
'jna.nosys': 'true'

//TODO remove once jvm.options are added to test system properties
test.systemProperty ('java.locale.providers','SPI,COMPAT')

// ignore changing test seed when build is passed -Dignore.tests.seed for cacheability experimentation
if (System.getProperty('ignore.tests.seed') != null) {
Expand Down
1 change: 0 additions & 1 deletion buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestIntegTestTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import org.elasticsearch.gradle.testclusters.RestTestRunnerTask
import org.elasticsearch.gradle.tool.Boilerplate
import org.elasticsearch.gradle.tool.ClasspathUtils
import org.gradle.api.DefaultTask
import org.gradle.api.JavaVersion
import org.gradle.api.Task
import org.gradle.api.file.FileCopyDetails
import org.gradle.api.tasks.Copy
Expand Down
3 changes: 1 addition & 2 deletions server/src/main/java/org/elasticsearch/common/time/DateFormatters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,7 +1931,7 @@ private static LocalDate getLocalDate(TemporalAccessor accessor) {
} else {
return LocalDate.of(year, accessor.get(MONTH_OF_YEAR), 1);
}
} else
}

return LOCALDATE_EPOCH;
}
Expand All @@ -1943,7 +1943,6 @@ private static int getYear(TemporalAccessor accessor) {
if(accessor.isSupported(ChronoField.YEAR_OF_ERA)){
return accessor.get(ChronoField.YEAR_OF_ERA);
}

return 1970;
}

Expand Down
1 change: 0 additions & 1 deletion server/src/test/java/org/elasticsearch/common/time/DateFormattersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ public void testWeekBasedDates() {
equalTo(ZonedDateTime.of(2014,12,29, 0,0,0,0,ZoneOffset.UTC)));
}


// this is not in the duelling tests, because the epoch millis parser in joda time drops the milliseconds after the comma
// but is able to parse the rest
// as this feature is supported it also makes sense to make it exact
Expand Down