diff --git a/.travis.yml b/.travis.yml index 1686522b..afc58d73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,54 +1,82 @@ language: java install: true - sudo: false addons: apt: packages: - - oracle-java8-installer - + - oracle-java8-installer before_install: - - chmod +x gradlew +- chmod +x ./showcase/gradlew +- chmod +x gradlew +- gcloud version || true +- if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash > /dev/null; fi +# Add gcloud to $PATH +- source /home/travis/google-cloud-sdk/path.bash.inc +- gcloud components install app-engine-java +- gcloud config set project wicked-charts-showcase stages: - - name: build - - # only publish snapshots from "master" branch and not in pull requests - - name: snapshot - if: branch = master AND type IN (push) - - # only publish release from "release" branch and not in pull requests - - name: release - if: branch = release AND type IN (push) - +- name: build +- name: snapshot + if: branch = master AND type IN (push) +- name: release + if: branch = release AND type IN (push) +- name: showcase-build +- name: showcase-deploy + if: branch = release OR branch = master AND type IN (push) jobs: include: + - stage: build + script: "./gradlew build" + - stage: snapshot + script: + - "./gradlew chartjs-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew highcharts-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew jsf:wicked-charts-jsf21:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket14:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket15:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket6:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket7:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket8:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - stage: release + script: + - "./gradlew chartjs-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew highcharts-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew jsf:wicked-charts-jsf21:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket14:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket15:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket6:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket7:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket8:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - stage: showcase-build + install: skip + script: + - "./gradlew build publishToMavenLocal -Dsnapshot=true && cd showcase && ./gradlew build" + - stage: showcase-deploy + install: skip + script: + - "cd showcase && + openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv -in Wicked-Charts-Showcase-887cff2298d0.json.enc -out Wicked-Charts-Showcase-887cff2298d0.json -d + && gcloud auth activate-service-account --key-file=Wicked-Charts-Showcase-887cff2298d0.json + &&./gradlew wicked-charts-showcase-wicket8:appengineDeploy + &&./gradlew wicked-charts-showcase-wicket7:appengineDeploy + &&./gradlew wicked-charts-showcase-wicket6:appengineDeploy + &&./gradlew wicked-charts-showcase-wicket15:appengineDeploy + &&./gradlew wicked-charts-showcase-wicket14:appengineDeploy" - # run gradle build - - stage: build - script: ./gradlew build - - # publish snapshot to oss.jfrog.org - - stage: snapshot - script: - - ./gradlew chartjs-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew highcharts-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew jsf:wicked-charts-jsf21:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket14:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket15:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket6:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket7:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket8:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - - # release a new stable version to bintray - - stage: release - script: - - ./gradlew chartjs-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew highcharts-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew jsf:wicked-charts-jsf21:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket14:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket15:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket6:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket7:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket8:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER diff --git a/NOTICE b/NOTICE index dcc02470..f014c6b5 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ - Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 29100dec..2ab51acc 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,14 @@ Beautiful and interactive JavaScript charts for Java-based web applications. * Check out the [Changelog](https://github.com/adessoAG/wicked-charts/wiki/Changelog) * Check out the [Feature Overview](https://github.com/adessoAG/wicked-charts/wiki/Feature-Overview) with coding examples * Browse the [Javadoc](http://adessoAG.github.io/wicked-charts/apidocs) - * Download and run the [Showcase](https://github.com/adessoAG/wicked-charts/wiki/Developer-Info:-Starting-the-Showcase-Application) application for your web framework + * [Browse](https://wicked-charts-showcase.appspot.com/) or download and run the [Showcase](https://github.com/adessoAG/wicked-charts/wiki/Developer-Info:-Starting-the-Showcase-Application) application for your web framework * Check out the [FAQ](https://github.com/adessoAG/wicked-charts/wiki/FAQ) [![Build Status](https://travis-ci.org/adessoAG/wicked-charts.png?branch=master)](https://travis-ci.org/adessoAG/wicked-charts) What is Wicked Charts? ====================== -Wicked Charts is a Java wrapper of the [Chart.js](www.chartjs.org) and [Highcharts](www.highcharts.com) JavaScript libraries. +Wicked Charts is a Java wrapper of the [Chart.js](https://www.chartjs.org/) and [Highcharts](https://www.highcharts.com/) JavaScript libraries. The Chart.js and Highcharts libraries provide eye-pleasing charts using HTML5 (see [Highcharts demo](http://www.highcharts.com/demo) and [Chart.js Samples](http://www.chartjs.org/samples/latest/)). With Wicked Charts, you can configure a chart in Java and display it in any web application based on Apache Wicket or JSF. Or you can use the Chart.js or Highcharts Java wrappers to integrate it in web applications built with other java web frameworks. @@ -30,7 +30,7 @@ If your Java-based framework of choice is not supported by Wicked Charts, feel f Want to contribute? =================== -Feel free to clone this repository and submit pull request. We'll see to get them merged into the main project. +Feel free to clone this repository and submit pull requests. We'll see to get them merged into the main project. Adding Wicked-Charts as a dependency ================= @@ -45,7 +45,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.2.0' } ``` @@ -54,7 +54,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket8 - 3.1.0 + 3.2.0 pom @@ -69,7 +69,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket7:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-wicket7:3.2.0' } ``` @@ -78,7 +78,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket7 - 3.1.0 + 3.2.0 pom ``` @@ -92,7 +92,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket6:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-wicket6:3.2.0' } ``` @@ -101,7 +101,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket6 - 3.1.0 + 3.2.0 pom ``` @@ -115,7 +115,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket15:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-wicket15:3.2.0' } ``` @@ -124,7 +124,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket15 - 3.1.0 + 3.2.0 pom ``` @@ -138,7 +138,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket14:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-wicket14:3.2.0' } ``` @@ -147,7 +147,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket14 - 3.1.0 + 3.2.0 pom ``` @@ -161,7 +161,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-jsf21:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-jsf21:3.2.0' } ``` @@ -170,7 +170,7 @@ Maven: de.adesso.wicked-charts wicked-charts-jsf21 - 3.1.0 + 3.2.0 pom ``` @@ -186,8 +186,8 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:chartjs-wrapper:3.1.0' - compile 'de.adesso.wicked-charts:highcharts-wrapper:3.1.0' + compile 'de.adesso.wicked-charts:chartjs-wrapper:3.2.0' + compile 'de.adesso.wicked-charts:highcharts-wrapper:3.2.0' } ``` @@ -197,15 +197,39 @@ Maven: de.adesso.wicked-charts chartjs-wrapper - 3.1.0 + 3.2.0 pom de.adesso.wicked-charts highcharts-wrapper - 3.1.0 + 3.2.0 pom ``` + +Latest snapshot release +----------------------- +Gradle: +```groovy +repositories { + maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' } +} + +dependencies { + compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.3.0-SNAPSHOT' +} +``` + +Maven: +```xml + + de.adesso.wicked-charts + wicked-charts-wicket8 + 3.3.0-SNAPSHOT + pom + +``` + diff --git a/build.gradle b/build.gradle index 76394e70..086e6991 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ buildscript { } } dependencies { - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.6.2" + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' + classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.9.1" } } @@ -25,17 +25,23 @@ subprojects { jcenter() } + dependencies{ + testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junit_version + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junit_version + } + test { + useJUnitPlatform() + } + // run gradle with "-Dsnapshot=true" to automatically append "-SNAPSHOT" to the version - version = '3.1.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "") - sourceCompatibility = 1.8 + version = '3.2.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "") ext { bintrayUser = System.getProperty("bintray.user") bintrayKey = System.getProperty("bintray.key") buildNumber = System.getProperty("build.number") } - - + task sourcesJar(type: Jar, dependsOn: classes) { classifier = 'sources' from sourceSets.main.allSource diff --git a/chartjs-wrapper/build.gradle b/chartjs-wrapper/build.gradle index e4cf1616..60ca3b69 100644 --- a/chartjs-wrapper/build.gradle +++ b/chartjs-wrapper/build.gradle @@ -1,6 +1,6 @@ dependencies { - compile 'org.projectlombok:lombok:1.16.20' - testCompile 'junit:junit:4.12' + 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' diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/ChartConfiguration.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/ChartConfiguration.java index 533a7fba..b24210d6 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/ChartConfiguration.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/ChartConfiguration.java @@ -6,6 +6,7 @@ import de.adesso.wickedcharts.chartjs.chartoptions.Options; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.List; /** @@ -13,7 +14,7 @@ */ @Accessors(chain = true) @lombok.Data -public class ChartConfiguration { +public class ChartConfiguration implements Serializable { private ChartType type; private Data data; private Options options; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Arc.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Arc.java index cf4aa9c7..c68f7f25 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Arc.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Arc.java @@ -4,6 +4,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the arc for polar area, doughnut and pie charts. * @@ -14,8 +16,8 @@ */ @Accessors(chain = true) @lombok.Data -@EqualsAndHashCode(callSuper=false) -public class Arc extends Element { +@EqualsAndHashCode(callSuper=true) +public class Arc extends Element implements Serializable { private Number borderWidth; private Color backgroundColor; private Color borderColor; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderCapStyle.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderCapStyle.java index 382ec34e..8d498e22 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderCapStyle.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderCapStyle.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Determines how the end points of every element are drawn. * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum BorderCapStyle implements JsonValueEnum { +public enum BorderCapStyle implements JsonValueEnum, Serializable { BUTT("butt"), ROUND("round"), SQUARE("square"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderJoinStyle.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderJoinStyle.java index 0c396d04..b94ca024 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderJoinStyle.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderJoinStyle.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Determines how two connecting segments (of lines, arcs or curves) with non-zero lengths in a shape are joined together. * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum BorderJoinStyle implements JsonValueEnum { +public enum BorderJoinStyle implements JsonValueEnum, Serializable { BEVEL("bevel"), ROUND("round"), MITER("miter"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BoundsType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BoundsType.java index 2cb547de..e406316d 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BoundsType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BoundsType.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Defines the bounds property which controls the scale boundary strategy. * @@ -9,7 +11,7 @@ * * @author SvenWirz */ -public enum BoundsType implements JsonValueEnum{ +public enum BoundsType implements JsonValueEnum, Serializable { DATA("data"), TICKS("ticks"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CallbackFunction.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CallbackFunction.java index cebeed66..4a0035d2 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CallbackFunction.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CallbackFunction.java @@ -3,6 +3,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines a callback function. * @@ -10,8 +12,8 @@ */ @Accessors(chain = true) @lombok.Data -@EqualsAndHashCode(callSuper=false) -public class CallbackFunction extends Callback { +@EqualsAndHashCode(callSuper=true) +public class CallbackFunction extends Callback implements Serializable { private static final long serialVersionUID = 1L; private String text; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java index 56fd8e0a..83a14a9e 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Defines the type of the chart. * @@ -11,7 +13,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum ChartType implements JsonValueEnum { +public enum ChartType implements JsonValueEnum, Serializable { LINE("line"), BAR("bar"), HORIZONTAL_BAR("horizontalBar"), @@ -22,7 +24,7 @@ public enum ChartType implements JsonValueEnum { DOUGHNUT("doughnut"), POLAR_AREA("polarArea"), BUBBLE("bubble"); - + private String jsonValue; private ChartType(String jsonValue) { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CubicInterpolationMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CubicInterpolationMode.java index 0a618b33..4309f662 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CubicInterpolationMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CubicInterpolationMode.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * 'default' : Uses a custom weighted cubic interpolation, which produces pleasant curves for all types of datasets. * 'monotone' : More suited to y = f(x) datasets : it preserves monotonicity (or piecewise monotonicity) of the dataset being interpolated, and ensures local extremums (if any) stay at input data points. @@ -12,7 +14,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum CubicInterpolationMode implements JsonValueEnum { +public enum CubicInterpolationMode implements JsonValueEnum, Serializable { DEFAULT("default"), MONOTONE("monotone"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Data.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Data.java index 140d8308..e54df3ae 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Data.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Data.java @@ -7,6 +7,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -26,7 +27,6 @@ @lombok.Data public class Data implements Serializable{ - private static final long serialVersionUID = 1L; @JsonProperty("labels") private List labels; @JsonProperty("datasets") diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/DistributionType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/DistributionType.java index 12bb0fee..08c0d5b4 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/DistributionType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/DistributionType.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Controls the data distribution along the scale. * @@ -9,7 +11,7 @@ * * @author SvenWirz */ -public enum DistributionType implements LowercaseEnum { +public enum DistributionType implements LowercaseEnum, Serializable { SERIES, LINEAR; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EasingType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EasingType.java index 5575019f..4016d73d 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EasingType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EasingType.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Defines the type of easing for animations. * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum EasingType implements JsonValueEnum{ +public enum EasingType implements JsonValueEnum, Serializable { EASE_IN_QUAD("easeInQuad"), EASE_OUT_QUAD("easeOutQuad"), EASE_IN_OUT_QUAD("easeInOutQuad"), diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EventType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EventType.java index 0c96632e..5d3b37ac 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EventType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EventType.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Defines the different event types. * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum EventType implements JsonValueEnum{ +public enum EventType implements JsonValueEnum, Serializable { MOUSEMOVE("mousemove"), MOUSEOUT("mouseout"), CLICK("click"), diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/FontStyle.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/FontStyle.java index 96a358c0..43f86bb1 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/FontStyle.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/FontStyle.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Defines the different font styles. * @@ -10,6 +12,6 @@ * * @author SvenWirz */ -public enum FontStyle implements LowercaseEnum { +public enum FontStyle implements LowercaseEnum, Serializable { NORMAL,BOLD, ITALIC, OBLIQUE, INITIAL, INHERIT; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/HoverMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/HoverMode.java index 042f8f73..0cd4c767 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/HoverMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/HoverMode.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Defines the different hover event types. * @@ -10,6 +12,6 @@ * @author anedomansky * @author maximAtanasov */ -public enum HoverMode implements LowercaseEnum { +public enum HoverMode implements LowercaseEnum, Serializable { INDEX,DATASET,POINT,X,Y,NEAREST; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Layout.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Layout.java index 207b25d0..8ea17ca2 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Layout.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Layout.java @@ -2,6 +2,8 @@ import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the padding for the layout. * @@ -11,6 +13,6 @@ */ @Accessors(chain = true) @lombok.Data -public class Layout { +public class Layout implements Serializable { private Padding padding; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Padding.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Padding.java index 91e8007f..70722c90 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Padding.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Padding.java @@ -2,6 +2,8 @@ import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Generate space around a chart. * @@ -12,7 +14,7 @@ */ @Accessors(chain = true) @lombok.Data -public class Padding { +public class Padding implements Serializable { private Integer left; private Integer right; private Integer top; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/PointStyle.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/PointStyle.java index 205a6748..4d8d7839 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/PointStyle.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/PointStyle.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * An enum defining all point styles * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum PointStyle implements JsonValueEnum { +public enum PointStyle implements JsonValueEnum, Serializable { CIRCLE("circle"), CROSS("cross"), CROSS_ROT("crossRot"), diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Position.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Position.java index 729070f1..7e6cab3b 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Position.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Position.java @@ -2,11 +2,13 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * An enum used for expressing position in different options. * * @author SvenWirz */ -public enum Position implements LowercaseEnum { +public enum Position implements LowercaseEnum, Serializable { TOP, RIGHT, BOTTOM, LEFT; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Rectangle.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Rectangle.java index 29841909..3eb9797f 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Rectangle.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Rectangle.java @@ -4,6 +4,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the rectangle element that is used in bar charts * @@ -14,7 +16,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class Rectangle extends Element { +public class Rectangle extends Element implements Serializable { private Number borderWidth; private Color backgroundColor; private Color borderColor; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/SteppedLineValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/SteppedLineValue.java index 58e63253..1b6de67e 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/SteppedLineValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/SteppedLineValue.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * An enum to define if a line is stepped or not. * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum SteppedLineValue implements JsonValueEnum { +public enum SteppedLineValue implements JsonValueEnum, Serializable { BEFORE("before"), AFTER("after"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TickSource.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TickSource.java index e72e182f..2283ca38 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TickSource.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TickSource.java @@ -2,11 +2,13 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Defines an enum to specify the source for the ticks. * * @author SvenWirz */ -public enum TickSource implements LowercaseEnum { +public enum TickSource implements LowercaseEnum, Serializable { LABELS; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TimeFormatRound.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TimeFormatRound.java index ac20c724..a9df8fc7 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TimeFormatRound.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TimeFormatRound.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Defines the time display formats. * @@ -9,6 +11,6 @@ * * @author SvenWirz */ -public enum TimeFormatRound implements LowercaseEnum { +public enum TimeFormatRound implements LowercaseEnum, Serializable { DAY, MILLISECOND, SECOND, MINUTE, HOUR, WEEK, MONTH, QUARTER, YEAR; } \ No newline at end of file diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TooltipPosition.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TooltipPosition.java index 794b5b35..60d419c5 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TooltipPosition.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TooltipPosition.java @@ -2,11 +2,13 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Defines all possible positions for tooltips. * * @see http://www.chartjs.org/docs/latest/configuration/tooltip.html#position-modes */ -public enum TooltipPosition implements LowercaseEnum { +public enum TooltipPosition implements LowercaseEnum, Serializable { NEAREST, AVERAGE; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/Color.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/Color.java index 90f8bf9c..87478413 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/Color.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/Color.java @@ -1,5 +1,7 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; +import java.io.Serializable; + /**  * Defines the base class for colors.  * @@ -7,6 +9,6 @@ * * @author SvenWirz  */ -public class Color { +public class Color implements Serializable { } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/HexColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/HexColor.java index d5008648..d5455724 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/HexColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/HexColor.java @@ -2,6 +2,8 @@ import lombok.EqualsAndHashCode; +import java.io.Serializable; + /**  * Defines the color as a hexadecimal encoded color.  * @see http://www.chartjs.org/docs/latest/general/colors.html @@ -10,8 +12,8 @@ * @author maximAtanasov  */ @lombok.Data -@EqualsAndHashCode(callSuper=false) -public class HexColor extends Color { +@EqualsAndHashCode(callSuper=true) +public class HexColor extends Color implements Serializable { private int red; private int green; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java index 128ba6d0..c6badebc 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java @@ -1,8 +1,11 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** * Defines an RGB encoded color * @@ -11,11 +14,10 @@ * @author SvenWirz */ @AllArgsConstructor -@lombok.Data -@EqualsAndHashCode(callSuper=false) -public class RgbColor extends Color { +@Data +@EqualsAndHashCode(callSuper=true) +public class RgbColor extends Color implements Serializable { private int red; private int green; private int blue; - } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java index eec2f709..5ec0c884 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java @@ -1,16 +1,19 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; +import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** * Defines an RGBA encoded color * @see http://www.chartjs.org/docs/latest/general/colors.html * * @author SvenWirz */ -@lombok.Data -@EqualsAndHashCode(callSuper=false) -public class RgbaColor extends RgbColor { +@Data +@EqualsAndHashCode(callSuper=true) +public class RgbaColor extends RgbColor implements Serializable { private float alpha; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java index b67fa7a1..4537577d 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java @@ -1,5 +1,7 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; +import java.io.Serializable; + /** * Defines colors with predefined values. * @@ -7,7 +9,7 @@ * * @author SvenWirz */ -public class SimpleColor extends Color { +public class SimpleColor extends Color implements Serializable { private Color color; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/StringValueColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/StringValueColor.java index 761d6e0b..654cb407 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/StringValueColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/StringValueColor.java @@ -1,6 +1,8 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; +import java.io.Serializable; + /** * Defines the color as a string. * @@ -8,7 +10,7 @@ * * @author SvenWirz */ -public class StringValueColor extends Color { +public class StringValueColor extends Color implements Serializable { private String colorname; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/AbsoluteIndex.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/AbsoluteIndex.java index 0b444e03..0a2ab1b4 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/AbsoluteIndex.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/AbsoluteIndex.java @@ -2,6 +2,8 @@ import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the filling mode as an absolute Integer. * @@ -10,7 +12,7 @@ */ @Accessors(chain = true) @lombok.Data -public class AbsoluteIndex implements FillingMode { +public class AbsoluteIndex implements FillingMode, Serializable { private Integer index; public AbsoluteIndex(Integer index) { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BooleanFillingMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BooleanFillingMode.java index 56b3c3aa..061baece 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BooleanFillingMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BooleanFillingMode.java @@ -1,12 +1,14 @@ package de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes; +import java.io.Serializable; + /** * Defines the filling mode as a Boolean. * * @see http://www.chartjs.org/docs/latest/charts/area.html * @author SvenWirz */ -public enum BooleanFillingMode implements FillingMode, FillingModeLine { +public enum BooleanFillingMode implements FillingMode, FillingModeLine, Serializable { FALSE(false), TRUE(true) ; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BoundaryFillingMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BoundaryFillingMode.java index 1a760db6..bc038361 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BoundaryFillingMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BoundaryFillingMode.java @@ -1,5 +1,7 @@ package de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes; +import java.io.Serializable; + /**  * Defines the additional filling modes as Strings. * @@ -8,7 +10,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum BoundaryFillingMode implements FillingMode { +public enum BoundaryFillingMode implements FillingMode, Serializable { START("start"), END("end"), ORIGIN("origin"), diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/LocationFillingMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/LocationFillingMode.java index 126197c3..1d3347ae 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/LocationFillingMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/LocationFillingMode.java @@ -1,12 +1,14 @@ package de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes; +import java.io.Serializable; + /** * Defines the the filling mode in the line element. * * @see http://www.chartjs.org/docs/latest/charts/area.html * @author SvenWirz */ -public enum LocationFillingMode implements FillingModeLine { +public enum LocationFillingMode implements FillingModeLine, Serializable { ZERO("zero"), TOP("top"), BOTTOM("bottom"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/RelativeIndex.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/RelativeIndex.java index 08567384..9599851e 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/RelativeIndex.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/RelativeIndex.java @@ -2,6 +2,8 @@ import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the Filling mode as a relative value. * @see http://www.chartjs.org/docs/latest/charts/area.html @@ -9,7 +11,7 @@ */ @Accessors(chain = true) @lombok.Data -public class RelativeIndex implements FillingMode { +public class RelativeIndex implements FillingMode, Serializable { private String index; 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 6bcc2b60..00d887ee 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,5 +1,6 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -9,7 +10,7 @@ * * @author SvenWirz */ -public class ConstLabel extends Label { +public class ConstLabel extends Label implements Serializable { private final String text; public ConstLabel(final String 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 c304400c..e86dd215 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,5 +1,6 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; +import java.io.Serializable; import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; @@ -10,7 +11,7 @@ * * @author SvenWirz */ -public class DateTimeLabel extends Label { +public class DateTimeLabel extends Label implements Serializable { private LocalDateTime date; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/Label.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/Label.java index 15cf3ea8..71f542e8 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/Label.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/Label.java @@ -1,5 +1,7 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; -public abstract class Label { +import java.io.Serializable; + +public abstract class Label implements Serializable { } 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 a9f7b596..5cded944 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 @@ -1,6 +1,9 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; +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; @@ -10,7 +13,7 @@ * * @author SvenWirz */ -public class TextLabel extends Label { +public class TextLabel extends Label implements Serializable { private String text; public TextLabel(String text) { @@ -19,11 +22,11 @@ public TextLabel(String text) { } public static List of(String... texts) { - return Arrays.stream(texts).map(textLabel -> new TextLabel(textLabel)).collect(Collectors.toList()); + return Arrays.stream(texts).map(TextLabel::new).collect(Collectors.toList()); } public static List of(List textList) { - return textList.stream().map(textLabel -> new TextLabel(textLabel)).collect(Collectors.toList()); + return textList.stream().map(TextLabel::new).collect(Collectors.toList()); } public String getText() { @@ -57,12 +60,7 @@ public boolean equals(Object obj) { return false; TextLabel other = (TextLabel) obj; if (text == null) { - if (other.text != null) - return false; - } else if (!text.equals(other.text)) - return false; - return true; + return other.text == null; + } else return text.equals(other.text); } - - } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextListLabel.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextListLabel.java index 4832be3d..6d09b1e7 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextListLabel.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextListLabel.java @@ -1,5 +1,6 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; +import java.io.Serializable; import java.util.Arrays; import java.util.List; @@ -8,7 +9,7 @@ * * @author SvenWirz */ -public class TextListLabel extends Label { +public class TextListLabel extends Label implements Serializable { private List textList; public TextListLabel(String...texts) { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/BubbleValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/BubbleValue.java index c4cfaeae..c16647cf 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/BubbleValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/BubbleValue.java @@ -3,6 +3,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the value type for use in the bubble chart (x and y coordinates and a radius for the bubbles) * Using this class you can create BubbleValues from any other ValueType or primitive types like Double and Integer. @@ -12,8 +14,8 @@ */ @Accessors(chain = true) @lombok.Data -@EqualsAndHashCode(callSuper=false) -public class BubbleValue extends ValueType { +@EqualsAndHashCode(callSuper=true) +public class BubbleValue extends ValueType implements Serializable { private ValueType x; private ValueType y; 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 aebb1c1a..59cdb588 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 @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -17,7 +18,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class ConstValue extends ValueType { +public class ConstValue extends ValueType implements Serializable { private final String value; public ConstValue(final String value) { 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 821210ef..a31d826f 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 @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -26,7 +27,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class DoubleValue extends ValueType { +public class DoubleValue extends ValueType implements Serializable { private Double value; public DoubleValue() { 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 577f1cd5..5ef6d38a 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 @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -25,7 +26,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class FloatValue extends ValueType { +public class FloatValue extends ValueType implements Serializable { private Float value; public FloatValue() { 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 4e18f315..248f902d 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 @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -25,7 +26,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class IntegerValue extends ValueType { +public class IntegerValue extends ValueType implements Serializable { private Integer value; public IntegerValue() { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/PointValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/PointValue.java index a6ccfa57..a15a4a65 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/PointValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/PointValue.java @@ -3,6 +3,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines a ValueType to represent the x and y coordinates in, for example, a scatter chart. * X and y can be any other ValueType or primitive types (Integer, Double). @@ -13,7 +15,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class PointValue extends ValueType { +public class PointValue extends ValueType implements Serializable { private ValueType x; private ValueType y; 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 6f93d7e1..2f9688e7 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 @@ -1,8 +1,10 @@ package de.adesso.wickedcharts.chartjs.chartoptions.valueType; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -15,9 +17,9 @@ * @author SvenWirz */ @Accessors(chain = true) -@lombok.Data +@Data @EqualsAndHashCode(callSuper = false) -public class StringValue extends ValueType { +public class StringValue extends ValueType implements Serializable { private String value; public StringValue() {} @@ -27,11 +29,11 @@ public StringValue(String value) { } public static List of(List stringList) { - return stringList.stream().map(string -> new StringValue(string)).collect(Collectors.toList()); + return stringList.stream().map(StringValue::new).collect(Collectors.toList()); } public static List of(String...strings) { - return Arrays.stream(strings).map(string -> new StringValue(string)).collect(Collectors.toList()); + return Arrays.stream(strings).map(StringValue::new).collect(Collectors.toList()); } } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ValueType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ValueType.java index 00489c5f..1ac5f6f8 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ValueType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ValueType.java @@ -1,9 +1,11 @@ package de.adesso.wickedcharts.chartjs.chartoptions.valueType; +import java.io.Serializable; + /** * Base class for all value types * @author SvenWirz */ -public class ValueType { +public class ValueType implements Serializable { } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/WickedChartsJacksonModule.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/WickedChartsJacksonModule.java index 6b9f464d..cad01cc0 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/WickedChartsJacksonModule.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/WickedChartsJacksonModule.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.chartjs.jackson; /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/CallbackFunctionSerializer.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/CallbackFunctionSerializer.java index 6f5e8247..6c27c27a 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/CallbackFunctionSerializer.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/CallbackFunctionSerializer.java @@ -1,7 +1,6 @@ package de.adesso.wickedcharts.chartjs.jackson.serializer; import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import de.adesso.wickedcharts.chartjs.chartoptions.CallbackFunction; @@ -15,7 +14,7 @@ public class CallbackFunctionSerializer extends JsonSerializer @Override public void serialize(CallbackFunction value, JsonGenerator gen, SerializerProvider serializers) - throws IOException, JsonProcessingException { + throws IOException { gen.writeRawValue(value.getText()); } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/JavaScriptReferenceSerializer.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/JavaScriptReferenceSerializer.java index f1f6ea05..02f1c87e 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/JavaScriptReferenceSerializer.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/JavaScriptReferenceSerializer.java @@ -15,7 +15,7 @@ public class JavaScriptReferenceSerializer extends JsonSerializer { @Override public void serialize(RgbColor color, JsonGenerator jgen, SerializerProvider provider) - throws IOException, JsonProcessingException { + throws IOException { jgen.writeRawValue(String.format(Locale.ENGLISH, RGB, color.getRed(), color.getGreen(), color.getBlue())); } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/StringValueSerializer.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/StringValueSerializer.java index 2952b377..f14ccdb9 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/StringValueSerializer.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/StringValueSerializer.java @@ -1,7 +1,6 @@ package de.adesso.wickedcharts.chartjs.jackson.serializer; import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.StringValue; @@ -15,7 +14,7 @@ public class StringValueSerializer extends JsonSerializer { @Override public void serialize(StringValue value, JsonGenerator gen, SerializerProvider serializers) - throws IOException, JsonProcessingException { + throws IOException { if(value.getValue() != null) { gen.writeString(value.getValue()); } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/json/JsonValueEnum.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/json/JsonValueEnum.java index 5afaa32e..12ee011e 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/json/JsonValueEnum.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/json/JsonValueEnum.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/json/LowercaseEnum.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/json/LowercaseEnum.java index 2efb3405..06eab179 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/json/LowercaseEnum.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/json/LowercaseEnum.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/ChartConfigurationTest.java b/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/ChartConfigurationTest.java deleted file mode 100644 index aa3fc46d..00000000 --- a/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/ChartConfigurationTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package de.adesso.wickedcharts.chartjs; - -import org.junit.Test; - -public class ChartConfigurationTest { - - @Test - public void test() { - - } - -} diff --git a/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/chartoptions/DataTest.java b/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/chartoptions/DataTest.java index 3d0ecb80..9d15488d 100644 --- a/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/chartoptions/DataTest.java +++ b/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/chartoptions/DataTest.java @@ -2,28 +2,28 @@ import de.adesso.wickedcharts.chartjs.chartoptions.label.Label; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class DataTest { +class DataTest { - Data testData; - List