update: add options embedded

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/ChartOption.java

@@ -10,6 +10,7 @@
 import com.github.koooooo7.echarts4j.option.chart.YAxis;
 import com.github.koooooo7.echarts4j.option.series.SeriesOption;
 import com.github.koooooo7.echarts4j.option.chart.Title;
+import com.github.koooooo7.echarts4j.type.FuncStr;
 import lombok.Data;
 import lombok.experimental.SuperBuilder;
 
@@ -32,6 +33,9 @@ public class ChartOption {
     private Toolbox toolbox;
     private Object color;
     private Boolean animation;
+    private Integer animationThreshold;
+    private FuncStr animationDuration;
+    private FuncStr animationDelay;
     private Boolean useUTC;
     private final List<SeriesOption> series = new ArrayList<>();
 

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/chart/Polar.java

@@ -0,0 +1,19 @@
+package com.github.koooooo7.echarts4j.option.chart;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.koooooo7.echarts4j.type.FuncStr;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Polar {
+    private String id;
+    @JsonProperty("zlevel")
+    private Integer zLevel;
+    private Integer z;
+    private FuncStr center;
+    private Object radius;
+}

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/chart/RadiusAxis.java

@@ -0,0 +1,39 @@
+package com.github.koooooo7.echarts4j.option.chart;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.github.koooooo7.echarts4j.option.embedded.NameTextStyle;
+import com.github.koooooo7.echarts4j.option.embedded.NameTruncate;
+import com.github.koooooo7.echarts4j.type.FuncStr;
+import com.github.koooooo7.echarts4j.util.annotation.EmbedScope;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+@Data
+@SuperBuilder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class RadiusAxis {
+    private String id;
+    private Integer polarIndex;
+    private String type;
+    private String name;
+    private String nameLocation;
+    private List<?> data;
+    private NameTextStyle nameTextStyle;
+    private NameTruncate nameTruncate;
+    private Boolean inverse;
+    private Object boundaryGap;
+    private FuncStr min;
+    private FuncStr max;
+    private Boolean scale;
+    private Integer splitNumber;
+    private Integer minInterval;
+    private Integer maxInterval;
+    private Integer interval;
+    private Integer logBase;
+    private Boolean silent;
+    private Boolean triggerEvent;
+
+}

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/series/embed/SeriesTextStyle.java → echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/chart/TextStyle.java

@@ -1,4 +1,4 @@
-package com.github.koooooo7.echarts4j.option.series.embed;
+package com.github.koooooo7.echarts4j.option.chart;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
@@ -7,7 +7,7 @@
 @Data
 @Builder
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class SeriesTextStyle {
+public class TextStyle {
     private String color;
     private String fontStyle;
     private String fontWeight;

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/chart/XAxis.java

@@ -1,6 +1,8 @@
 package com.github.koooooo7.echarts4j.option.chart;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.github.koooooo7.echarts4j.option.embedded.NameTextStyle;
+import com.github.koooooo7.echarts4j.option.embedded.NameTruncate;
 import com.github.koooooo7.echarts4j.type.FuncStr;
 import com.github.koooooo7.echarts4j.util.annotation.EmbedScope;
 import lombok.Builder;
@@ -36,16 +38,4 @@ public class XAxis {
     private Boolean silent;
     private Boolean triggerEvent;
 
-    @Data
-    @Builder
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    @EmbedScope({XAxis.class, YAxis.class})
-    public static class NameTextStyle {
-    }
-
-    @Data
-    @Builder
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    public static class NameTruncate {
-    }
 }

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/chart/YAxis.java

@@ -1,6 +1,8 @@
 package com.github.koooooo7.echarts4j.option.chart;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.github.koooooo7.echarts4j.option.embedded.NameTextStyle;
+import com.github.koooooo7.echarts4j.option.embedded.NameTruncate;
 import com.github.koooooo7.echarts4j.type.FuncStr;
 import com.github.koooooo7.echarts4j.util.annotation.EmbedScope;
 import lombok.Builder;
@@ -36,16 +38,4 @@ public class YAxis {
     private Boolean silent;
     private Boolean triggerEvent;
 
-    @Data
-    @Builder
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    @EmbedScope({XAxis.class, YAxis.class})
-    public static class NameTextStyle {
-    }
-
-    @Data
-    @Builder
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    public static class NameTruncate {
-    }
 }

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/embedded/AreaStyle.java

@@ -0,0 +1,11 @@
+package com.github.koooooo7.echarts4j.option.embedded;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class AreaStyle {
+}

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/embedded/ItemStyle.java

@@ -0,0 +1,11 @@
+package com.github.koooooo7.echarts4j.option.embedded;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ItemStyle {
+}

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/embedded/Label.java

@@ -0,0 +1,11 @@
+package com.github.koooooo7.echarts4j.option.embedded;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Label {
+}

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/embedded/LineStyle.java

@@ -0,0 +1,11 @@
+package com.github.koooooo7.echarts4j.option.embedded;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LineStyle {
+}

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/embedded/NameTextStyle.java

@@ -0,0 +1,16 @@
+package com.github.koooooo7.echarts4j.option.embedded;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.github.koooooo7.echarts4j.option.chart.RadiusAxis;
+import com.github.koooooo7.echarts4j.option.chart.XAxis;
+import com.github.koooooo7.echarts4j.option.chart.YAxis;
+import com.github.koooooo7.echarts4j.util.annotation.EmbedScope;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@EmbedScope({XAxis.class, YAxis.class, RadiusAxis.class})
+public class NameTextStyle {
+}

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/embedded/NameTruncate.java

@@ -0,0 +1,16 @@
+package com.github.koooooo7.echarts4j.option.embedded;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.github.koooooo7.echarts4j.option.chart.RadiusAxis;
+import com.github.koooooo7.echarts4j.option.chart.XAxis;
+import com.github.koooooo7.echarts4j.option.chart.YAxis;
+import com.github.koooooo7.echarts4j.util.annotation.EmbedScope;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@EmbedScope({XAxis.class, YAxis.class, RadiusAxis.class})
+public class NameTruncate {
+}

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/embedded/TextStyle.java

@@ -0,0 +1,15 @@
+package com.github.koooooo7.echarts4j.option.embedded;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TextStyle {
+    private String color;
+    private String fontStyle;
+    private String fontWeight;
+    private Integer fontSize;
+}

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/series/embed/SeriesTooltip.java → echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/embedded/Tooltip.java

@@ -1,4 +1,4 @@
-package com.github.koooooo7.echarts4j.option.series.embed;
+package com.github.koooooo7.echarts4j.option.embedded;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.github.koooooo7.echarts4j.type.FuncStr;
@@ -8,7 +8,7 @@
 @Data
 @Builder
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class SeriesTooltip {
+public class Tooltip {
     private Object position;
     private FuncStr formatter;
     private FuncStr valueFormatter;

echarts4j-project/src/main/java/com/github/koooooo7/echarts4j/option/series/GenericSeriesOption.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.github.koooooo7.echarts4j.chart.ChartType;
-import com.github.koooooo7.echarts4j.option.series.embed.SeriesTextStyle;
-import com.github.koooooo7.echarts4j.option.series.embed.SeriesTooltip;
+import com.github.koooooo7.echarts4j.option.embedded.TextStyle;
+import com.github.koooooo7.echarts4j.option.embedded.Tooltip;
 import com.github.koooooo7.echarts4j.type.FuncStr;
 import lombok.Builder;
 import lombok.Data;
@@ -56,8 +56,8 @@ public class GenericSeriesOption implements SeriesOption {
     private FuncStr animationDurationUpdate;
     private String animationEasingUpdate;
     private FuncStr animationDelayUpdate;
-    private SeriesTooltip tooltip;
-    private SeriesTextStyle textStyle;
+    private Tooltip tooltip;
+    private TextStyle textStyle;
 
 
 }