diff --git a/README.md b/README.md index 2ab51acc..4fa611a0 100644 --- a/README.md +++ b/README.md @@ -219,7 +219,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.3.0-SNAPSHOT' + compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.2.1-SNAPSHOT' } ``` @@ -228,7 +228,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket8 - 3.3.0-SNAPSHOT + 3.2.1-SNAPSHOT pom ``` diff --git a/build.gradle b/build.gradle index 086e6991..4c196ba7 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ subprojects { } // run gradle with "-Dsnapshot=true" to automatically append "-SNAPSHOT" to the version - version = '3.2.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "") + version = '3.2.1' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "") ext { bintrayUser = System.getProperty("bintray.user") diff --git a/chartjs-wrapper/build.gradle b/chartjs-wrapper/build.gradle index 60ca3b69..0f9a823a 100644 --- a/chartjs-wrapper/build.gradle +++ b/chartjs-wrapper/build.gradle @@ -1,7 +1,13 @@ dependencies { compileOnly 'org.projectlombok:lombok:1.18.6' annotationProcessor 'org.projectlombok:lombok:1.18.6' - compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.1' - compile 'com.fasterxml.jackson.core:jackson-core:2.8.1' - compile 'com.fasterxml.jackson.core:jackson-databind:2.8.1' + compile 'com.fasterxml.jackson.core:jackson-annotations:2.7.9' + compile 'com.fasterxml.jackson.core:jackson-core:2.7.9' + compile 'com.fasterxml.jackson.core:jackson-databind:2.7.9' + compile group: 'org.threeten', name: 'threetenbp', version: '1.3.8' +} + +compileJava { + sourceCompatibility = 1.6 + targetCompatibility = 1.6 } \ No newline at end of file diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/ConstLabel.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/ConstLabel.java index 00d887ee..9716f290 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/ConstLabel.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/ConstLabel.java @@ -1,9 +1,9 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; import java.io.Serializable; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; /** * Defines constant textlabels for the axes . @@ -19,12 +19,19 @@ public ConstLabel(final String text) { } public static List of(String... texts) { - return Arrays.stream(texts).map(textLabel -> new ConstLabel(textLabel)).collect(Collectors.toList()); + List resultList = new ArrayList(); + for(String text : texts){ + resultList.add(new ConstLabel(text)); + } + return resultList; } public static List of(List textList) { - return textList.stream().map(textLabel -> new ConstLabel(textLabel)).collect(Collectors.toList()); - } + List resultList = new ArrayList(); + for(String text : textList){ + resultList.add(new ConstLabel(text)); + } + return resultList; } public String getText() { return text; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/DateTimeLabel.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/DateTimeLabel.java index e86dd215..9b979552 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/DateTimeLabel.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/DateTimeLabel.java @@ -1,10 +1,12 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; +import org.threeten.bp.LocalDateTime; + import java.io.Serializable; -import java.time.LocalDateTime; + +import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; /** * Defines datetime labels for the axes. @@ -20,11 +22,18 @@ public DateTimeLabel(LocalDateTime date) { } public static List of(String... texts) { - return Arrays.stream(texts).map(textLabel -> new TextLabel(textLabel)).collect(Collectors.toList()); - } + List resultList = new ArrayList(); + for(String text : texts){ + resultList.add(new TextLabel(text)); + } + return resultList; } public static List of(List textList) { - return textList.stream().map(textLabel -> new TextLabel(textLabel)).collect(Collectors.toList()); + List resultList = new ArrayList(); + for(String text : textList){ + resultList.add(new TextLabel(text)); + } + return resultList; } public LocalDateTime getDate() { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextLabel.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextLabel.java index 5cded944..e7f74800 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextLabel.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextLabel.java @@ -2,10 +2,7 @@ import java.io.Serializable; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; /** * Defines simple textlabels for the axes . @@ -22,11 +19,19 @@ public TextLabel(String text) { } public static List of(String... texts) { - return Arrays.stream(texts).map(TextLabel::new).collect(Collectors.toList()); + List resultList = new ArrayList(); + for(String text : texts){ + resultList.add(new TextLabel(text)); + } + return resultList; } public static List of(List textList) { - return textList.stream().map(TextLabel::new).collect(Collectors.toList()); + List resultList = new ArrayList(); + for(String text : textList){ + resultList.add(new TextLabel(text)); + } + return resultList; } public String getText() { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ConstValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ConstValue.java index 59cdb588..612d8f87 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ConstValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ConstValue.java @@ -4,9 +4,8 @@ import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * This class defines a constant ValueType using a final String. @@ -26,10 +25,17 @@ public ConstValue(final String value) { } public static List of(final List constList) { - return constList.stream().map(string -> new ConstValue(string)).collect(Collectors.toList()); + List resultList = new ArrayList(); + for(String s : constList){ + resultList.add(new ConstValue(s)); + } + return resultList; } public static List of(final String...consts) { - return Arrays.stream(consts).map(string -> new ConstValue(string)).collect(Collectors.toList()); - } + List resultList = new ArrayList(); + for(String s : consts){ + resultList.add(new ConstValue(s)); + } + return resultList; } } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java index 06208bfa..15b80b77 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java @@ -2,9 +2,9 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.threeten.bp.LocalDateTime; import java.io.Serializable; -import java.time.LocalDateTime; /** * This class defines a DateTimeValue object that can be used in charts that use different options related to time. diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DoubleValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DoubleValue.java index a31d826f..fb7f68d0 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DoubleValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DoubleValue.java @@ -4,9 +4,8 @@ import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * This class wraps Doubles in a DoubleValue object. @@ -39,10 +38,18 @@ public DoubleValue(Double doubleVal) { } public static List of(List doubleList) { - return doubleList.stream().map(doubleVal -> new DoubleValue(doubleVal)).collect(Collectors.toList()); + List resultList = new ArrayList(); + for(Double i : doubleList){ + resultList.add(new DoubleValue(i)); + } + return resultList; } public static List of(Double...doubles) { - return Arrays.stream(doubles).map(doubleVal -> new DoubleValue(doubleVal)).collect(Collectors.toList()); + List resultList = new ArrayList(); + for(Double i : doubles){ + resultList.add(new DoubleValue(i)); + } + return resultList; } } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/FloatValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/FloatValue.java index 5ef6d38a..824eae4d 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/FloatValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/FloatValue.java @@ -4,9 +4,8 @@ import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * This class wraps Floats in a FloatValue object. @@ -38,10 +37,18 @@ public FloatValue(Float value) { } public static List of(List floatList) { - return floatList.stream().map(floatVal -> new FloatValue(floatVal)).collect(Collectors.toList()); + List floatValues = new ArrayList(); + for(Float f : floatList){ + floatValues.add(new FloatValue(f)); + } + return floatValues; } public static List of(Float...floats) { - return Arrays.stream(floats).map(floatVal -> new FloatValue(floatVal)).collect(Collectors.toList()); + List floatValues = new ArrayList(); + for(Float f : floats){ + floatValues.add(new FloatValue(f)); + } + return floatValues; } } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/IntegerValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/IntegerValue.java index 248f902d..bd527b28 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/IntegerValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/IntegerValue.java @@ -4,9 +4,8 @@ import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * This class wraps Integers in a IntegerValue object. @@ -38,10 +37,18 @@ public IntegerValue(Integer integer) { } public static List of(List integerList) { - return integerList.stream().map(integer -> new IntegerValue(integer)).collect(Collectors.toList()); + List resultList = new ArrayList(); + for(Integer i : integerList){ + resultList.add(new IntegerValue(i)); + } + return resultList; } public static List of(Integer...integers) { - return Arrays.stream(integers).map(integer -> new IntegerValue(integer)).collect(Collectors.toList()); + List resultList = new ArrayList(); + for(Integer i : integers){ + resultList.add(new IntegerValue(i)); + } + return resultList; } } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java index 2f9688e7..51a7d58c 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java @@ -5,9 +5,8 @@ import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * This class wraps Strings in a StringValue object. @@ -29,11 +28,19 @@ public StringValue(String value) { } public static List of(List stringList) { - return stringList.stream().map(StringValue::new).collect(Collectors.toList()); + List resultList = new ArrayList(); + for(String string : stringList){ + resultList.add(new StringValue(string)); + } + return resultList; } public static List of(String...strings) { - return Arrays.stream(strings).map(StringValue::new).collect(Collectors.toList()); + List resultList = new ArrayList(); + for(String string : strings){ + resultList.add(new StringValue(string)); + } + return resultList; } } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/DateTimeLabelSerializer.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/DateTimeLabelSerializer.java index f186f918..c60a6499 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/DateTimeLabelSerializer.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/DateTimeLabelSerializer.java @@ -5,9 +5,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; +import org.threeten.bp.format.DateTimeFormatter; import java.io.IOException; -import java.time.format.DateTimeFormatter; /** * Serializes a DateTimeLabel object to JSON @@ -16,7 +16,7 @@ public class DateTimeLabelSerializer extends JsonSerializer { private static final String MOMENT_FORMAT = "moment('%s',moment.ISO_8601)"; private static final DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME; - + @Override public void serialize(DateTimeLabel value, JsonGenerator gen, SerializerProvider serializers) throws IOException, JsonProcessingException { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/DateTimeValueSerializer.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/DateTimeValueSerializer.java index 2b5a6d7d..2ba24d8e 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/DateTimeValueSerializer.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/DateTimeValueSerializer.java @@ -5,9 +5,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.DateTimeValue; +import org.threeten.bp.format.DateTimeFormatter; import java.io.IOException; -import java.time.format.DateTimeFormatter; /** * Serializes a DateTimeValue object to JSON diff --git a/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/jackson/serializer/LabelSerializerTest.java b/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/jackson/serializer/LabelSerializerTest.java index 095b7094..4218b323 100644 --- a/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/jackson/serializer/LabelSerializerTest.java +++ b/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/jackson/serializer/LabelSerializerTest.java @@ -4,8 +4,7 @@ import de.adesso.wickedcharts.chartjs.jackson.JsonRenderer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - -import java.time.LocalDateTime; +import org.threeten.bp.LocalDateTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/highcharts-wrapper/build.gradle b/highcharts-wrapper/build.gradle index 60ca3b69..aec4cd63 100644 --- a/highcharts-wrapper/build.gradle +++ b/highcharts-wrapper/build.gradle @@ -1,7 +1,12 @@ dependencies { compileOnly 'org.projectlombok:lombok:1.18.6' annotationProcessor 'org.projectlombok:lombok:1.18.6' - compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.1' - compile 'com.fasterxml.jackson.core:jackson-core:2.8.1' - compile 'com.fasterxml.jackson.core:jackson-databind:2.8.1' + compile 'com.fasterxml.jackson.core:jackson-annotations:2.7.9' + compile 'com.fasterxml.jackson.core:jackson-core:2.7.9' + compile 'com.fasterxml.jackson.core:jackson-databind:2.7.9' +} + +compileJava { + sourceCompatibility = 1.6 + targetCompatibility = 1.6 } \ No newline at end of file diff --git a/showcase/gradle.properties b/showcase/gradle.properties index d8e23c56..67b9cb5e 100644 --- a/showcase/gradle.properties +++ b/showcase/gradle.properties @@ -1,4 +1,4 @@ spring_boot_version=2.1.2.RELEASE spring_version=5.1.4.RELEASE -wickedcharts_version=3.2.0-SNAPSHOT +wickedcharts_version=3.2.1-SNAPSHOT junit_version=5.4.0 diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeLineConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeLineConfiguration.java index a9e2d9b2..50e10c42 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeLineConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeLineConfiguration.java @@ -8,9 +8,9 @@ import de.adesso.wickedcharts.chartjs.chartoptions.valueType.StringValue; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.ValueType; import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; +import org.threeten.bp.LocalDateTime; +import org.threeten.bp.format.DateTimeFormatter; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimePointConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimePointConfiguration.java index d4122272..690d27df 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimePointConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimePointConfiguration.java @@ -6,9 +6,9 @@ import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.*; import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; +import org.threeten.bp.LocalDateTime; +import org.threeten.bp.format.DateTimeFormatter; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeSeriesConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeSeriesConfiguration.java index 091e6496..1a5041b0 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeSeriesConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeSeriesConfiguration.java @@ -4,9 +4,9 @@ import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.DoubleValue; import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; +import org.threeten.bp.LocalDateTime; +import org.threeten.bp.temporal.ChronoUnit; -import java.time.LocalDateTime; -import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Arrays; import java.util.List;