diff --git a/javadsl/.idea/.name b/javadsl/.idea/.name
deleted file mode 100644
index 1bd61ef..0000000
--- a/javadsl/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-scdfdsl
\ No newline at end of file
diff --git a/javadsl/.idea/compiler.xml b/javadsl/.idea/compiler.xml
deleted file mode 100644
index da2d27a..0000000
--- a/javadsl/.idea/compiler.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/encodings.xml b/javadsl/.idea/encodings.xml
deleted file mode 100644
index b26911b..0000000
--- a/javadsl/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml b/javadsl/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml
deleted file mode 100644
index c6ea67e..0000000
--- a/javadsl/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml b/javadsl/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml
deleted file mode 100644
index f538e36..0000000
--- a/javadsl/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml b/javadsl/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml
deleted file mode 100644
index 33c30b4..0000000
--- a/javadsl/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml b/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml
deleted file mode 100644
index 49b4ec7..0000000
--- a/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_10.xml b/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_10.xml
deleted file mode 100644
index 5d9d662..0000000
--- a/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_10.xml b/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_10.xml
deleted file mode 100644
index df5cb22..0000000
--- a/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_8_10.xml b/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_8_10.xml
deleted file mode 100644
index 88c8172..0000000
--- a/javadsl/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_8_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__com_ibm_jbatch_com_ibm_jbatch_tck_spi_1_0.xml b/javadsl/.idea/libraries/Maven__com_ibm_jbatch_com_ibm_jbatch_tck_spi_1_0.xml
deleted file mode 100644
index 2d6c591..0000000
--- a/javadsl/.idea/libraries/Maven__com_ibm_jbatch_com_ibm_jbatch_tck_spi_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml b/javadsl/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml
deleted file mode 100644
index 578b079..0000000
--- a/javadsl/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_7.xml b/javadsl/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_7.xml
deleted file mode 100644
index 08952d7..0000000
--- a/javadsl/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/javadsl/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
deleted file mode 100644
index b8581a6..0000000
--- a/javadsl/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/javadsl/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
deleted file mode 100644
index 27424a1..0000000
--- a/javadsl/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__javax_batch_javax_batch_api_1_0.xml b/javadsl/.idea/libraries/Maven__javax_batch_javax_batch_api_1_0.xml
deleted file mode 100644
index 6be63d2..0000000
--- a/javadsl/.idea/libraries/Maven__javax_batch_javax_batch_api_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/javadsl/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
deleted file mode 100644
index 940ce73..0000000
--- a/javadsl/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml b/javadsl/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml
deleted file mode 100644
index a468f58..0000000
--- a/javadsl/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__junit_junit_4_12.xml b/javadsl/.idea/libraries/Maven__junit_junit_4_12.xml
deleted file mode 100644
index d411041..0000000
--- a/javadsl/.idea/libraries/Maven__junit_junit_4_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml b/javadsl/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml
deleted file mode 100644
index 88d626e..0000000
--- a/javadsl/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml b/javadsl/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml
deleted file mode 100644
index 6c692c8..0000000
--- a/javadsl/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/javadsl/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
deleted file mode 100644
index 78cfcd3..0000000
--- a/javadsl/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml b/javadsl/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml
deleted file mode 100644
index c82bb7c..0000000
--- a/javadsl/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_8.xml b/javadsl/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_8.xml
deleted file mode 100644
index 6372678..0000000
--- a/javadsl/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_23.xml b/javadsl/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_23.xml
deleted file mode 100644
index 9837b75..0000000
--- a/javadsl/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_23.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml b/javadsl/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml
deleted file mode 100644
index 58bdc9a..0000000
--- a/javadsl/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_2.xml b/javadsl/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_2.xml
deleted file mode 100644
index ddac9ec..0000000
--- a/javadsl/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/javadsl/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
deleted file mode 100644
index f58bbc1..0000000
--- a/javadsl/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/javadsl/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
deleted file mode 100644
index 78dbe45..0000000
--- a/javadsl/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_5_Final.xml b/javadsl/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_5_Final.xml
deleted file mode 100644
index 4bd0591..0000000
--- a/javadsl/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_5_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/javadsl/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml
deleted file mode 100644
index 6492b2b..0000000
--- a/javadsl/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml b/javadsl/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml
deleted file mode 100644
index 6dc7a37..0000000
--- a/javadsl/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml b/javadsl/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml
deleted file mode 100644
index a523703..0000000
--- a/javadsl/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml b/javadsl/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml
deleted file mode 100644
index 7ab319b..0000000
--- a/javadsl/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml b/javadsl/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml
deleted file mode 100644
index da69f6c..0000000
--- a/javadsl/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml b/javadsl/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml
deleted file mode 100644
index f86d2c8..0000000
--- a/javadsl/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml b/javadsl/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml
deleted file mode 100644
index bae9949..0000000
--- a/javadsl/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml b/javadsl/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml
deleted file mode 100644
index 6073e53..0000000
--- a/javadsl/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml b/javadsl/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml
deleted file mode 100644
index a14ac63..0000000
--- a/javadsl/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/javadsl/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
deleted file mode 100644
index 20e8163..0000000
--- a/javadsl/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_analytics_spring_analytics_1_1_3_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_analytics_spring_analytics_1_1_3_RELEASE.xml
deleted file mode 100644
index 2ae0f28..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_analytics_spring_analytics_1_1_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_batch_spring_batch_core_3_0_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_batch_spring_batch_core_3_0_8_RELEASE.xml
deleted file mode 100644
index 34d1a84..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_batch_spring_batch_core_3_0_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_batch_spring_batch_infrastructure_3_0_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_batch_spring_batch_infrastructure_3_0_8_RELEASE.xml
deleted file mode 100644
index 0718365..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_batch_spring_batch_infrastructure_3_0_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_8_RELEASE.xml
deleted file mode 100644
index 5226c5b..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_1_5_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_1_5_8_RELEASE.xml
deleted file mode 100644
index ffd6fef..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_8_RELEASE.xml
deleted file mode 100644
index 9297c27..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_metadata_1_5_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_metadata_1_5_8_RELEASE.xml
deleted file mode 100644
index 569bf4d..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_metadata_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_8_RELEASE.xml
deleted file mode 100644
index 760647e..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_1_5_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_1_5_8_RELEASE.xml
deleted file mode 100644
index 61461eb..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_8_RELEASE.xml
deleted file mode 100644
index 1eb8fb2..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_8_RELEASE.xml
deleted file mode 100644
index 14ebf86..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_1_5_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_1_5_8_RELEASE.xml
deleted file mode 100644
index dbf83c5..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_8_RELEASE.xml
deleted file mode 100644
index 5d582d2..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_8_RELEASE.xml
deleted file mode 100644
index 5283f87..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_dataflow_core_1_3_0_BUILD_SNAPSHOT.xml b/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_dataflow_core_1_3_0_BUILD_SNAPSHOT.xml
deleted file mode 100644
index 794ea93..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_dataflow_core_1_3_0_BUILD_SNAPSHOT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_dataflow_rest_client_1_3_0_BUILD_SNAPSHOT.xml b/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_dataflow_rest_client_1_3_0_BUILD_SNAPSHOT.xml
deleted file mode 100644
index d3d071e..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_dataflow_rest_client_1_3_0_BUILD_SNAPSHOT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_dataflow_rest_resource_1_3_0_BUILD_SNAPSHOT.xml b/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_dataflow_rest_resource_1_3_0_BUILD_SNAPSHOT.xml
deleted file mode 100644
index 69cd439..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_dataflow_rest_resource_1_3_0_BUILD_SNAPSHOT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_deployer_resource_support_1_2_1_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_deployer_resource_support_1_2_1_RELEASE.xml
deleted file mode 100644
index 8df3d38..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_deployer_resource_support_1_2_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_deployer_spi_1_3_0_M2.xml b/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_deployer_spi_1_3_0_M2.xml
deleted file mode 100644
index 7be60f0..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_deployer_spi_1_3_0_M2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_skipper_1_0_0_BUILD_SNAPSHOT.xml b/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_skipper_1_0_0_BUILD_SNAPSHOT.xml
deleted file mode 100644
index 78ad035..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_skipper_1_0_0_BUILD_SNAPSHOT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_task_core_1_2_1_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_task_core_1_2_1_RELEASE.xml
deleted file mode 100644
index 8c69a80..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_task_core_1_2_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_13_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_13_8_RELEASE.xml
deleted file mode 100644
index 844b177..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_13_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_1_2_8_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_1_2_8_RELEASE.xml
deleted file mode 100644
index 3813e79..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_1_2_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_23_0_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_23_0_RELEASE.xml
deleted file mode 100644
index 92e7f9f..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_23_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
deleted file mode 100644
index fbc0452..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_1_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_1_RELEASE.xml
deleted file mode 100644
index bd2629e..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_spring_aop_4_3_12_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_spring_aop_4_3_12_RELEASE.xml
deleted file mode 100644
index 0804f96..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_spring_aop_4_3_12_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_spring_beans_4_3_12_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_spring_beans_4_3_12_RELEASE.xml
deleted file mode 100644
index 4630fab..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_spring_beans_4_3_12_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_spring_context_4_3_12_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_spring_context_4_3_12_RELEASE.xml
deleted file mode 100644
index 93ceada..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_spring_context_4_3_12_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_spring_core_4_3_12_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_spring_core_4_3_12_RELEASE.xml
deleted file mode 100644
index 134018a..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_spring_core_4_3_12_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_spring_expression_4_3_12_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_spring_expression_4_3_12_RELEASE.xml
deleted file mode 100644
index b9bbe52..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_spring_expression_4_3_12_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_12_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_12_RELEASE.xml
deleted file mode 100644
index aab4414..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_12_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_spring_test_4_3_12_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_spring_test_4_3_12_RELEASE.xml
deleted file mode 100644
index e6e7e5e..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_spring_test_4_3_12_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_spring_tx_4_3_12_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_spring_tx_4_3_12_RELEASE.xml
deleted file mode 100644
index 5abb24b..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_spring_tx_4_3_12_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_spring_web_4_3_12_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_spring_web_4_3_12_RELEASE.xml
deleted file mode 100644
index 27cfa73..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_spring_web_4_3_12_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_12_RELEASE.xml b/javadsl/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_12_RELEASE.xml
deleted file mode 100644
index 2a48cd9..0000000
--- a/javadsl/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_12_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml b/javadsl/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml
deleted file mode 100644
index 20e2920..0000000
--- a/javadsl/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__org_zeroturnaround_zt_zip_1_11.xml b/javadsl/.idea/libraries/Maven__org_zeroturnaround_zt_zip_1_11.xml
deleted file mode 100644
index 22fcf62..0000000
--- a/javadsl/.idea/libraries/Maven__org_zeroturnaround_zt_zip_1_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml b/javadsl/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml
deleted file mode 100644
index 0f2d9ef..0000000
--- a/javadsl/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml b/javadsl/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml
deleted file mode 100644
index 6726a2d..0000000
--- a/javadsl/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/misc.xml b/javadsl/.idea/misc.xml
deleted file mode 100644
index d30d09e..0000000
--- a/javadsl/.idea/misc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/modules.xml b/javadsl/.idea/modules.xml
deleted file mode 100644
index af35c29..0000000
--- a/javadsl/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/.idea/workspace.xml b/javadsl/.idea/workspace.xml
deleted file mode 100644
index bb46bfc..0000000
--- a/javadsl/.idea/workspace.xml
+++ /dev/null
@@ -1,551 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- DEFINITION_ORDER
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- AngularJS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1511449738195
-
-
- 1511449738195
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.8
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/javadsl/README.adoc b/javadsl/README.adoc
new file mode 100644
index 0000000..141836f
--- /dev/null
+++ b/javadsl/README.adoc
@@ -0,0 +1 @@
+include::../src/main/asciidoc/javadsl/main.adoc[]
diff --git a/javadsl/src/main/java/com/example/scdfdsl/ScdfdslApplication.java b/javadsl/src/main/java/com/example/scdfdsl/ScdfdslApplication.java
index 47b375c..7b90577 100644
--- a/javadsl/src/main/java/com/example/scdfdsl/ScdfdslApplication.java
+++ b/javadsl/src/main/java/com/example/scdfdsl/ScdfdslApplication.java
@@ -5,8 +5,10 @@ import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.dataflow.core.ApplicationType;
import org.springframework.cloud.dataflow.rest.client.DataFlowOperations;
import org.springframework.cloud.dataflow.rest.client.DataFlowTemplate;
+import org.springframework.cloud.dataflow.rest.client.dsl.DeploymentPropertiesBuilder;
import org.springframework.cloud.dataflow.rest.client.dsl.Stream;
import org.springframework.cloud.dataflow.rest.client.dsl.StreamApplication;
import org.springframework.cloud.dataflow.rest.client.dsl.StreamBuilder;
@@ -16,6 +18,9 @@ import java.net.URI;
import java.util.HashMap;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
@SpringBootApplication
public class ScdfdslApplication implements ApplicationRunner {
@@ -23,6 +28,8 @@ public class ScdfdslApplication implements ApplicationRunner {
SpringApplication.run(ScdfdslApplication.class, args);
}
+ private final Logger logger = LoggerFactory.getLogger(ScdfdslApplication.class);
+
@Autowired
private StreamApplication source;
@@ -32,6 +39,12 @@ public class ScdfdslApplication implements ApplicationRunner {
@Autowired
private StreamApplication sink;
+ @Autowired
+ private DataFlowOperations dataFlowOperations;
+
+ @Autowired
+ private StreamBuilder builder;
+
// Using @Bean defintions makes it easier to reuse an application in multiple streams
@Bean
public StreamApplication source() {
@@ -52,8 +65,7 @@ public class ScdfdslApplication implements ApplicationRunner {
@Override
public void run(ApplicationArguments applicationArguments) throws Exception {
- DataFlowOperations dataFlowOperations = createDataFlowOperations(applicationArguments);
-
+ importApplications();
if (applicationArguments.containsOption("style")) {
String style = applicationArguments.getOptionValues("style").get(0);
if (style.equalsIgnoreCase("definition")) {
@@ -63,7 +75,7 @@ public class ScdfdslApplication implements ApplicationRunner {
// FLUENT STYLE
fluentStyle(dataFlowOperations);
} else {
- System.out.println("Style [" + style + "] not supported");
+ logger.info("Style [" + style + "] not supported");
}
} else {
definitionStyle(dataFlowOperations);
@@ -74,9 +86,9 @@ public class ScdfdslApplication implements ApplicationRunner {
private void definitionStyle(DataFlowOperations dataFlowOperations) throws InterruptedException {
Map deploymentProperties = createDeploymentProperties();
- System.out.println("Deploying stream.");
+ logger.info("Deploying stream.");
- Stream woodchuck = Stream.builder(dataFlowOperations)
+ Stream woodchuck = builder
.name("woodchuck")
.definition(
"http --server.port=9900 | splitter --expression=payload.split(' ') | log")
@@ -86,13 +98,27 @@ public class ScdfdslApplication implements ApplicationRunner {
waitAndDestroy(woodchuck);
}
-
+ private void importApplications() {
+ this.dataFlowOperations.appRegistryOperations().register("log", ApplicationType.sink,
+ "maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.3.1.RELEASE",
+ "maven://org.springframework.cloud.stream.app:log-sink-rabbit:jar:metadata:1.3.1.RELEASE",
+ true);
+ this.dataFlowOperations.appRegistryOperations().register("splitter", ApplicationType.processor,
+ "maven://org.springframework.cloud.stream.app:splitter-processor-rabbit:1.3.1.RELEASE",
+ "maven://org.springframework.cloud.stream.app:splitter-processor-rabbit:jar:metadata:1.3.1.RELEASE",
+ true);
+ this.dataFlowOperations.appRegistryOperations().register("http", ApplicationType.source,
+ "maven://org.springframework.cloud.stream.app:http-source-rabbit:1.3.1.RELEASE",
+ "maven://org.springframework.cloud.stream.app:http-source-rabbit:jar:metadata:1.3.1.RELEASE",
+ true);
+ }
private void fluentStyle(DataFlowOperations dataFlowOperations) throws InterruptedException {
- System.out.println("Deploying stream.");
+ logger.info("Deploying stream.");
- Stream woodchuck = Stream.builder(dataFlowOperations).name("woodchuck")
+ Stream woodchuck = builder
+ .name("woodchuck")
.source(source)
.processor(processor)
.sink(sink)
@@ -103,38 +129,25 @@ public class ScdfdslApplication implements ApplicationRunner {
}
private Map createDeploymentProperties() {
- Map deploymentProperties = new HashMap<>();
- deploymentProperties.put("app.splitter.producer.partitionKeyExpression", "payload");
- deploymentProperties.put("deployer.log.count", "2");
- return deploymentProperties;
+ DeploymentPropertiesBuilder propertiesBuilder = new DeploymentPropertiesBuilder();
+ propertiesBuilder.memory("log", 512);
+ propertiesBuilder.count("log",2);
+ propertiesBuilder.put("app.splitter.producer.partitionKeyExpression", "payload");
+ return propertiesBuilder.build();
}
- private DataFlowOperations createDataFlowOperations(ApplicationArguments applicationArguments) {
- DataFlowOperations dataFlowOperations;
- if (applicationArguments.containsOption("uri")) {
- URI dataFlowUri = URI.create(applicationArguments.getOptionValues("uri").get(0));
- dataFlowOperations = new DataFlowTemplate(dataFlowUri);
- } else {
- dataFlowOperations = new DataFlowTemplate(URI.create("http://localhost:9393"));
- }
-
- dataFlowOperations.appRegistryOperations().importFromResource(
- "http://bit.ly/Celsius-RC1-stream-applications-rabbit-maven", true);
- return dataFlowOperations;
- }
-
private void waitAndDestroy(Stream stream) throws InterruptedException {
while(!stream.getStatus().equals("deployed")){
- System.out.println("Wating for deployment of stream.");
+ logger.info("Wating for deployment of stream.");
Thread.sleep(5000);
}
- System.out.println("Letting the stream run for 2 minutes.");
+ logger.info("Letting the stream run for 2 minutes.");
// Let woodchuck run for 2 minutes
Thread.sleep(120000);
- System.out.println("Destroying stream");
+ logger.info("Destroying stream");
stream.destroy();
}
diff --git a/src/main/asciidoc/javadsl/main.adoc b/src/main/asciidoc/javadsl/main.adoc
index 92355d0..94c6a71 100644
--- a/src/main/asciidoc/javadsl/main.adoc
+++ b/src/main/asciidoc/javadsl/main.adoc
@@ -14,10 +14,22 @@ With no command line options, the application will deploy the stream `http --ser
There is also a command line option `--style` whose value can be either `definition` or `fluent`.
This options picks which JavaDSL style will execute.
Both are identical in terms of behavior.
+The `spring-cloud-dataflow-rest-client` project provides instances of `DataFlowOperations` and `StreamBuilder`
+
+[source,java,options="nowrap"]
+----
+@Autowired
+private DataFlowOperations dataFlowOperations;
+
+@Autowired
+private StreamBuilder builder;
+----
+You can use those beans to build streams as well as work directly with `DataFlowOperations" REST client.
+
The `definition` style has code of the style
[source,java,options="nowrap"]
----
-Stream woodchuck = Stream.builder(dataFlowOperations)
+Stream woodchuck = builder
.name("woodchuck")
.definition("http --server.port=9900 | splitter --expression=payload.split(' ') | log")
.create()
@@ -26,7 +38,7 @@ Stream woodchuck = Stream.builder(dataFlowOperations)
while the `fluent` style has code of the style
[source,java]
----
-Stream woodchuck = Stream.builder(dataFlowOperations).name("woodchuck")
+Stream woodchuck = builder.name("woodchuck")
.source(source)
.processor(processor)
.sink(sink)
@@ -41,6 +53,18 @@ public StreamApplication source() {
return new StreamApplication("http").addProperty("server.port", 9900);
}
----
+
+Another useful class is the `DeploymentPropertiesBuilder` which aids in the creation of the Map of properties required to deploy stream applications.
+[source,java]
+----
+ private Map createDeploymentProperties() {
+ DeploymentPropertiesBuilder propertiesBuilder = new DeploymentPropertiesBuilder();
+ propertiesBuilder.memory("log", 512);
+ propertiesBuilder.count("log",2);
+ propertiesBuilder.put("app.splitter.producer.partitionKeyExpression", "payload");
+ return propertiesBuilder.build();
+ }
+----
2) Run a local Data Flow Server and run the sample application.
This sample demonstrates the use of the local Data Flow Server, but you can pass in the option `--uri` to point to another Data Flow server instance that is running elsewhere.
[source,bash]