Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
language: java
jdk:
- openjdk11
dist: trusty
jdk: openjdk8
24 changes: 0 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,9 @@
group 'io.lindstrom'
version '1.0-SNAPSHOT'

task wrapper(type: Wrapper) {
gradleVersion = '4.10.3'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}

allprojects {
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
options.compilerArgs << "-Werror" << "-Xlint:all" << "-Xlint:-processing" << "-Xlint:-serial"
}
}

subprojects {
afterEvaluate {
javadoc {
options.addStringOption('-module-path', classpath.asPath)
options.addStringOption('-html5')
}

compileJava {
inputs.property("moduleName", moduleName)
doFirst {
options.compilerArgs = [
'--module-path', classpath.asPath,
]
classpath = files()
}
}
}
}
4 changes: 2 additions & 2 deletions parser/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ apply plugin: 'signing'

ext.moduleName = 'io.lindstrom.mpd'

sourceCompatibility = 11
sourceCompatibility = 8

repositories {
mavenCentral()
}

dependencies {
compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.5'
compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.10.0'

testImplementation("org.junit.jupiter:junit-jupiter-api:5.5.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.1")
Expand Down
4 changes: 2 additions & 2 deletions parser/src/main/java/io/lindstrom/mpd/MPDParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public static ObjectMapper defaultObjectMapper() {
return new XmlMapper(new XmlFactory(new WstxInputFactory(), new WstxPrefixedOutputFactory()), module)
.enable(SerializationFeature.INDENT_OUTPUT)
.setSerializationInclusion(JsonInclude.Include.NON_NULL)
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true)
.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE, true)
.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
.enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE)
.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
.setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static long parseFraction(CharSequence text, int start, int end, boolean negate)
end = start + 9;
}

long fraction = Long.parseLong(text, start, end, 10);
long fraction = Long.parseLong(text.subSequence(start, end).toString());

// for number strings smaller than 9 digits, interpret as if there were trailing zeros
for (int i = end - start; i < 9; i++) {
Expand Down Expand Up @@ -88,27 +88,27 @@ private Duration parse(String text) {
long nanos = 0;

if (yearStart >= 0) {
years = Integer.parseInt(text, yearStart, yearEnd, 10);
years = Integer.parseInt(text.substring(yearStart, yearEnd));
}

if (monthStart >= 0) {
months = Integer.parseInt(text, monthStart, monthEnd, 10);
months = Integer.parseInt(text.substring(monthStart, monthEnd));
}

if (dayStart >= 0) {
days = Integer.parseInt(text, dayStart, dayEnd, 10);
days = Integer.parseInt(text.substring(dayStart, dayEnd));
}

if (hourStart >= 0) {
hoursAsSecs = Math.multiplyExact(3600L, Integer.parseInt(text, hourStart, hourEnd, 10));
hoursAsSecs = Math.multiplyExact(3600L, Integer.parseInt(text.substring(hourStart, hourEnd)));
}

if (minuteStart >= 0) {
minutesAsSecs = Math.multiplyExact(60L, Integer.parseInt(text, minuteStart, minuteEnd, 10));
minutesAsSecs = Math.multiplyExact(60L, Integer.parseInt(text.substring(minuteStart, minuteEnd)));
}

if (secondStart >= 0) {
seconds = Integer.parseInt(text, secondStart, secondEnd, 10);
seconds = Integer.parseInt(text.substring(secondStart, secondEnd), 10);
boolean negativeSecs = text.charAt(secondStart) == '-';
nanos = parseFraction(text, fractionStart, fractionEnd, negativeSecs);
}
Expand Down
1 change: 1 addition & 0 deletions parser/src/main/java/io/lindstrom/mpd/support/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public static <T> List<T> unmodifiableList(List<T> list) {
}

@SafeVarargs
@SuppressWarnings("varargs")
public static <T> List<T> varargsToList(T head, T ...tail) {
if (tail.length == 0) {
return Collections.singletonList(head);
Expand Down
14 changes: 0 additions & 14 deletions parser/src/main/java/module-info.java

This file was deleted.

2 changes: 1 addition & 1 deletion validator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply plugin: 'java'
ext.moduleName = 'io.lindstrom.mpd.validator'


sourceCompatibility = 11
sourceCompatibility = 8

repositories {
mavenCentral()
Expand Down
4 changes: 0 additions & 4 deletions validator/src/main/java/module-info.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static List<List<Path>> params() throws IOException {
.map(input -> {
String resultFileName = "result_" + input.getFileName().toString().replace(".mpd", ".xml");
Path output = input.getParent().resolveSibling("output/" + resultFileName);
return List.of(input, output);
return Arrays.asList(input, output);
}).collect(Collectors.toList());
}
}
Expand Down