From fb2d40c1c63d4dff14fb87101d4479ee8933e77b Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 12:05:35 -0400 Subject: [PATCH 01/13] Set initial status of lab, downloaded Spring dependencies, compiling with no errors --- .idea/.gitignore | 3 + .idea/compiler.xml | 21 ++ .idea/encodings.xml | 6 + .idea/jarRepositories.xml | 20 ++ ...__ch_qos_logback_logback_classic_1_2_4.xml | 13 + ...ven__ch_qos_logback_logback_core_1_2_4.xml | 13 + ...ackson_core_jackson_annotations_2_12_4.xml | 13 + ...erxml_jackson_core_jackson_core_2_12_4.xml | 13 + ...l_jackson_core_jackson_databind_2_12_4.xml | 13 + ..._datatype_jackson_datatype_jdk8_2_12_4.xml | 13 + ...atatype_jackson_datatype_jsr310_2_12_4.xml | 13 + ..._jackson_module_parameter_names_2_12_4.xml | 13 + ...n__com_jayway_jsonpath_json_path_2_5_0.xml | 13 + ...ogle_android_json_0_0_20131108_vaadin1.xml | 13 + ...ctivation_jakarta_activation_api_1_2_2.xml | 13 + ...nnotation_jakarta_annotation_api_1_3_5.xml | 13 + ...ta_xml_bind_jakarta_xml_bind_api_2_3_3.xml | 13 + ...aven__net_bytebuddy_byte_buddy_1_10_22.xml | 13 + ...net_bytebuddy_byte_buddy_agent_1_10_22.xml | 13 + ...ven__net_minidev_accessors_smart_2_4_7.xml | 13 + .../Maven__net_minidev_json_smart_2_4_7.xml | 13 + ..._apache_logging_log4j_log4j_api_2_14_1.xml | 13 + ...he_logging_log4j_log4j_to_slf4j_2_14_1.xml | 13 + ..._tomcat_embed_tomcat_embed_core_9_0_50.xml | 13 + ...he_tomcat_embed_tomcat_embed_el_9_0_50.xml | 13 + ...at_embed_tomcat_embed_websocket_9_0_50.xml | 13 + ..._org_apiguardian_apiguardian_api_1_1_0.xml | 13 + ...Maven__org_assertj_assertj_core_3_19_0.xml | 13 + .../Maven__org_hamcrest_hamcrest_2_2.xml | 13 + ..._org_junit_jupiter_junit_jupiter_5_7_2.xml | 13 + ..._junit_jupiter_junit_jupiter_api_5_7_2.xml | 13 + ...nit_jupiter_junit_jupiter_engine_5_7_2.xml | 13 + ...nit_jupiter_junit_jupiter_params_5_7_2.xml | 13 + ..._platform_junit_platform_commons_1_7_2.xml | 13 + ...t_platform_junit_platform_engine_1_7_2.xml | 13 + .../Maven__org_mockito_mockito_core_3_9_0.xml | 13 + ...rg_mockito_mockito_junit_jupiter_3_9_0.xml | 13 + .../Maven__org_objenesis_objenesis_3_2.xml | 13 + ...Maven__org_opentest4j_opentest4j_1_2_0.xml | 13 + .../libraries/Maven__org_ow2_asm_asm_9_1.xml | 13 + ...aven__org_skyscreamer_jsonassert_1_5_0.xml | 13 + .../Maven__org_slf4j_jul_to_slf4j_1_7_32.xml | 13 + .../Maven__org_slf4j_slf4j_api_1_7_32.xml | 13 + ...springframework_boot_spring_boot_2_5_3.xml | 13 + ...k_boot_spring_boot_autoconfigure_2_5_3.xml | 13 + ...mework_boot_spring_boot_devtools_2_5_3.xml | 13 + ...amework_boot_spring_boot_starter_2_5_3.xml | 13 + ...rk_boot_spring_boot_starter_json_2_5_3.xml | 13 + ...boot_spring_boot_starter_logging_2_5_3.xml | 13 + ...rk_boot_spring_boot_starter_test_2_5_3.xml | 13 + ..._boot_spring_boot_starter_tomcat_2_5_3.xml | 13 + ...ork_boot_spring_boot_starter_web_2_5_3.xml | 13 + ...gframework_boot_spring_boot_test_2_5_3.xml | 13 + ...t_spring_boot_test_autoconfigure_2_5_3.xml | 13 + ...__org_springframework_spring_aop_5_3_9.xml | 13 + ...org_springframework_spring_beans_5_3_9.xml | 13 + ...g_springframework_spring_context_5_3_9.xml | 13 + ..._org_springframework_spring_core_5_3_9.xml | 13 + ...pringframework_spring_expression_5_3_9.xml | 13 + ...__org_springframework_spring_jcl_5_3_9.xml | 13 + ..._org_springframework_spring_test_5_3_9.xml | 13 + ...__org_springframework_spring_web_5_3_9.xml | 13 + ...rg_springframework_spring_webmvc_5_3_9.xml | 13 + .../Maven__org_xmlunit_xmlunit_core_2_8_2.xml | 13 + .../Maven__org_yaml_snakeyaml_1_28.xml | 13 + .idea/misc.xml | 11 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + demo.iml | 76 +++++ mvnw | 310 ++++++++++++++++++ mvnw.cmd | 182 ++++++++++ pom.xml | 47 +++ .../com/example/demo/DemoApplication.java | 13 + src/main/resources/application.properties | 1 + .../example/demo/DemoApplicationTests.java | 13 + target/classes/application.properties | 1 + .../com/example/demo/DemoApplication.class | Bin 0 -> 733 bytes .../example/demo/DemoApplicationTests.class | Bin 0 -> 531 bytes 78 files changed, 1511 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_4.xml create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_4.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_4.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_4.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_4.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_4.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_4.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_4.xml create mode 100644 .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_5_0.xml create mode 100644 .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml create mode 100644 .idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml create mode 100644 .idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml create mode 100644 .idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml create mode 100644 .idea/libraries/Maven__net_minidev_accessors_smart_2_4_7.xml create mode 100644 .idea/libraries/Maven__net_minidev_json_smart_2_4_7.xml create mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml create mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_50.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_50.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_50.xml create mode 100644 .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml create mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_3_19_0.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_2.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_2.xml create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_2.xml create mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_3_9_0.xml create mode 100644 .idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_9_0.xml create mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_3_2.xml create mode 100644 .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml create mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_9_1.xml create mode 100644 .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml create mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_32.xml create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_32.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_5_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_5_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_5_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_context_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_core_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_jcl_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_2.xml create mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 demo.iml create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/com/example/demo/DemoApplication.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/example/demo/DemoApplicationTests.java create mode 100644 target/classes/application.properties create mode 100644 target/classes/com/example/demo/DemoApplication.class create mode 100644 target/test-classes/com/example/demo/DemoApplicationTests.class diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..bb1644a --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..63e9001 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_4.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_4.xml new file mode 100644 index 0000000..4c5df29 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_4.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_4.xml new file mode 100644 index 0000000..1e5c99e --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_4.xml new file mode 100644 index 0000000..5351aad --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_4.xml new file mode 100644 index 0000000..b61928e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_4.xml new file mode 100644 index 0000000..3088e4d --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_4.xml new file mode 100644 index 0000000..03661ab --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_4.xml new file mode 100644 index 0000000..518a6c9 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_4.xml new file mode 100644 index 0000000..9c5251c --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_5_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_5_0.xml new file mode 100644 index 0000000..b76ecb0 --- /dev/null +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml new file mode 100644 index 0000000..b8581a6 --- /dev/null +++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml new file mode 100644 index 0000000..be90656 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml new file mode 100644 index 0000000..cba9dd2 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml new file mode 100644 index 0000000..04213f7 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml new file mode 100644 index 0000000..db4968e --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml new file mode 100644 index 0000000..910ad03 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_7.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_7.xml new file mode 100644 index 0000000..8157bb4 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_4_7.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_4_7.xml new file mode 100644 index 0000000..a17f648 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml new file mode 100644 index 0000000..700b41b --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml new file mode 100644 index 0000000..ae5c0b5 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_50.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_50.xml new file mode 100644 index 0000000..add4136 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_50.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_50.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_50.xml new file mode 100644 index 0000000..f3aab20 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_50.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_50.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_50.xml new file mode 100644 index 0000000..149da37 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_50.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml new file mode 100644 index 0000000..f854ab0 --- /dev/null +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_19_0.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_19_0.xml new file mode 100644 index 0000000..94e438d --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_19_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml new file mode 100644 index 0000000..6b5496f --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_2.xml new file mode 100644 index 0000000..a9a0266 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml new file mode 100644 index 0000000..2b9b506 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml new file mode 100644 index 0000000..636171a --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml new file mode 100644 index 0000000..380c9dd --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_2.xml new file mode 100644 index 0000000..66260e6 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_2.xml new file mode 100644 index 0000000..af6fc85 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_3_9_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_3_9_0.xml new file mode 100644 index 0000000..a46e355 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_3_9_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_9_0.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_9_0.xml new file mode 100644 index 0000000..0fc879a --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_9_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml new file mode 100644 index 0000000..6613def --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml new file mode 100644 index 0000000..fbc1b16 --- /dev/null +++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml new file mode 100644 index 0000000..67127c2 --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml new file mode 100644 index 0000000..c4c54d6 --- /dev/null +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_32.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_32.xml new file mode 100644 index 0000000..a758eac --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_32.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_32.xml new file mode 100644 index 0000000..e5a84fb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_3.xml new file mode 100644 index 0000000..9692f2c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_3.xml new file mode 100644 index 0000000..2de3bc4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_3.xml new file mode 100644 index 0000000..6b12dca --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_3.xml new file mode 100644 index 0000000..b31fb3d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_3.xml new file mode 100644 index 0000000..d70f5b2 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_3.xml new file mode 100644 index 0000000..c26578f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_5_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_5_3.xml new file mode 100644 index 0000000..039b0fc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_3.xml new file mode 100644 index 0000000..a8e470e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_3.xml new file mode 100644 index 0000000..a5e1c5d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_5_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_5_3.xml new file mode 100644 index 0000000..18a4a48 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_5_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_5_3.xml new file mode 100644 index 0000000..a81ff33 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_9.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_9.xml new file mode 100644 index 0000000..06b191b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_9.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_9.xml new file mode 100644 index 0000000..c5bd2d3 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_3_9.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_3_9.xml new file mode 100644 index 0000000..4c2900a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_3_9.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_3_9.xml new file mode 100644 index 0000000..2529cbf --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_9.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_9.xml new file mode 100644 index 0000000..dea9689 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_9.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_9.xml new file mode 100644 index 0000000..feea851 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_3_9.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_3_9.xml new file mode 100644 index 0000000..b90da2f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_3_9.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_3_9.xml new file mode 100644 index 0000000..eeb831a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_9.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_9.xml new file mode 100644 index 0000000..b4ee97b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_2.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_2.xml new file mode 100644 index 0000000..e6506e0 --- /dev/null +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml new file mode 100644 index 0000000..1f853f7 --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..25daa30 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..0fb9717 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/demo.iml b/demo.iml new file mode 100644 index 0000000..693851e --- /dev/null +++ b/demo.iml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..a16b543 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..e70006e --- /dev/null +++ b/pom.xml @@ -0,0 +1,47 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.3 + + + com.example + demo + 0.0.1-SNAPSHOT + demo + Demo project for Spring Boot + + 1.8 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..64b538a --- /dev/null +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/test/java/com/example/demo/DemoApplicationTests.java b/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 0000000..2778a6a --- /dev/null +++ b/src/test/java/com/example/demo/DemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/target/classes/application.properties b/target/classes/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/target/classes/application.properties @@ -0,0 +1 @@ + diff --git a/target/classes/com/example/demo/DemoApplication.class b/target/classes/com/example/demo/DemoApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..25a3a3a6b963a50e4f39dabf4d68dc5745fc038f GIT binary patch literal 733 zcmah{%TC)s6g?9X9NbW7pio{?=_+K=*`RJxAwjCHOj|W5ELe@5i5Y6oMB_2#x4LS@ zf)C)M5O)kxqAFD_`Ci@UIcH|>A8zje9AYm-9j^mygxJKJ09y=;AC*?_h+&~~Fl4Cr z%}6q=L`usqWgbg=CgO}T?Z_k|8w#s@{G6=2OI0wuixQJ_c_Z>kCizI_hJPY+Jeg!F z5l$K1qs_Tcnqi}J5nYLE!84&#K5$m)v{xYuo6@eeIc0{`Q|T_v=$o)2mrh!03w+O?ff#1jc^tPh)@Z*cit}=}cnu zSf!V3#yZWq*yYWa1dQ|D^B)Is-@-WJ@}~xHEHn z{Y(@^Z_bGw%oRtPoV;& z%bs%=$Z?>*#e~Gb2k=pd zo3sNG3|R7goO{o?*Z%x^{{V1;trlw7@X_e>+VtI40~a0QZDBr%@WBcGBx~~%pl7W6$__~9?9J0XAD7X zw3Ble8ZjYa|Gv;prE;utMXCd>jjQ^pwjCNf<+FmeBbzBFEf<;Mr4%W(hNiHwyiw(H z{lCT?&&0D}IIVQ@%ql&7up*T&#y;`L7{?t+@#RK*San Date: Mon, 16 Aug 2021 12:12:17 -0400 Subject: [PATCH 02/13] Added Person class --- src/main/java/com/example/demo/Learner.java | 4 ++++ src/main/java/com/example/demo/Person.java | 23 +++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 src/main/java/com/example/demo/Learner.java create mode 100644 src/main/java/com/example/demo/Person.java diff --git a/src/main/java/com/example/demo/Learner.java b/src/main/java/com/example/demo/Learner.java new file mode 100644 index 0000000..c740e7b --- /dev/null +++ b/src/main/java/com/example/demo/Learner.java @@ -0,0 +1,4 @@ +package com.example.demo; + +public interface Learner { +} diff --git a/src/main/java/com/example/demo/Person.java b/src/main/java/com/example/demo/Person.java new file mode 100644 index 0000000..88b7e0f --- /dev/null +++ b/src/main/java/com/example/demo/Person.java @@ -0,0 +1,23 @@ +package com.example.demo; + +public class Person { + private final Long id; + private String name; + + public Person(Long id, String name) { + this.id = id; + this.name = name; + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} From c586280be59c5711e226fea0f2ca0fbd568f005c Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 12:38:12 -0400 Subject: [PATCH 03/13] completed section 5, Instructor class --- .../java/com/example/demo/Instructor.java | 28 +++++++++++++++++++ src/main/java/com/example/demo/Learner.java | 1 + src/main/java/com/example/demo/Student.java | 15 ++++++++++ src/main/java/com/example/demo/Teacher.java | 6 ++++ 4 files changed, 50 insertions(+) create mode 100644 src/main/java/com/example/demo/Instructor.java create mode 100644 src/main/java/com/example/demo/Student.java create mode 100644 src/main/java/com/example/demo/Teacher.java diff --git a/src/main/java/com/example/demo/Instructor.java b/src/main/java/com/example/demo/Instructor.java new file mode 100644 index 0000000..aab2168 --- /dev/null +++ b/src/main/java/com/example/demo/Instructor.java @@ -0,0 +1,28 @@ +package com.example.demo; + +import java.util.ArrayList; +import java.util.List; + +public class Instructor extends Person implements Teacher{ + + public Instructor(Long id, String name) { + super(id, name); + } + + @Override + public void teach(Learner learner, double numberOfHours) { + learner.learn(numberOfHours); + } + + @Override + public void lecture(Iterable learners, double numberOfHours) { + List classSize = new ArrayList<>(); + learners.forEach(classSize::add); + double numberOfHoursPerLearner = numberOfHours / classSize.size(); + + for(Learner learner : classSize) { + teach(learner, numberOfHoursPerLearner); + } + } + +} diff --git a/src/main/java/com/example/demo/Learner.java b/src/main/java/com/example/demo/Learner.java index c740e7b..d53d5d1 100644 --- a/src/main/java/com/example/demo/Learner.java +++ b/src/main/java/com/example/demo/Learner.java @@ -1,4 +1,5 @@ package com.example.demo; public interface Learner { + void learn(double numberOfHours); } diff --git a/src/main/java/com/example/demo/Student.java b/src/main/java/com/example/demo/Student.java new file mode 100644 index 0000000..16f0314 --- /dev/null +++ b/src/main/java/com/example/demo/Student.java @@ -0,0 +1,15 @@ +package com.example.demo; + +public class Student extends Person implements Learner{ + + private double totalStudyTime = 0; + + public Student(Long id, String name) { + super(id, name); + } + + @Override + public void learn(double numberOfHours) { + totalStudyTime += numberOfHours; + } +} diff --git a/src/main/java/com/example/demo/Teacher.java b/src/main/java/com/example/demo/Teacher.java new file mode 100644 index 0000000..55af134 --- /dev/null +++ b/src/main/java/com/example/demo/Teacher.java @@ -0,0 +1,6 @@ +package com.example.demo; + +public interface Teacher { + void teach(Learner learner, double numberOfHours); + void lecture(Iterable learners, double numberOfHours); +} From 74f5ccfa0bf174f3f4bf935dbdde9abaefaec33e Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 12:48:29 -0400 Subject: [PATCH 04/13] Completed section 6, People class --- src/main/java/com/example/demo/People.java | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/main/java/com/example/demo/People.java diff --git a/src/main/java/com/example/demo/People.java b/src/main/java/com/example/demo/People.java new file mode 100644 index 0000000..dc6bafe --- /dev/null +++ b/src/main/java/com/example/demo/People.java @@ -0,0 +1,45 @@ +package com.example.demo; + +import java.util.Iterator; +import java.util.List; + +public abstract class People implements Iterator { + private List personList; + + public People(List personList){ + this.personList = personList; + } + + public void add(PersonType person){ + personList.add(person); + } + + public void remove(PersonType person){ + personList.remove(person); + } + + public Integer size(){ + return personList.size(); + } + + public void clear(){ + personList.clear(); + } + + public void addAll(Iterable pIterator){ + pIterator.forEach(personList::add); + } + + public PersonType findById(Long id){ + for(PersonType element : personList){ + if(element.getId().equals(id)){ + return element; + } + } + return null; + } + + public List findAll(){ + return personList; + } +} From dd647b94b6e8e76c6ca8e51329132600df84dac5 Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 12:55:16 -0400 Subject: [PATCH 05/13] Completed section 7 Students Class --- src/main/java/com/example/demo/Students.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/main/java/com/example/demo/Students.java diff --git a/src/main/java/com/example/demo/Students.java b/src/main/java/com/example/demo/Students.java new file mode 100644 index 0000000..ad319ca --- /dev/null +++ b/src/main/java/com/example/demo/Students.java @@ -0,0 +1,20 @@ +package com.example.demo; + +import java.util.List; + +public class Students extends People{ + + public Students(List personList) { + super(personList); + } + + @Override + public boolean hasNext() { + return false; + } + + @Override + public Person next() { + return null; + } +} From c9ae3d396d3fd322a7a6618d7394cb9ca44b1179 Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 13:08:33 -0400 Subject: [PATCH 06/13] Fixed issue where People was extending Iterator instead of Iterable --- .../java/com/example/demo/Instructors.java | 19 +++++++++++++++++++ src/main/java/com/example/demo/People.java | 2 +- src/main/java/com/example/demo/Students.java | 7 ++----- 3 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/example/demo/Instructors.java diff --git a/src/main/java/com/example/demo/Instructors.java b/src/main/java/com/example/demo/Instructors.java new file mode 100644 index 0000000..4857a51 --- /dev/null +++ b/src/main/java/com/example/demo/Instructors.java @@ -0,0 +1,19 @@ +package com.example.demo; + +import java.util.List; + +public class Instructors extends People{ + public Instructors(List personList) { + super(personList); + } + + @Override + public boolean hasNext() { + return false; + } + + @Override + public Person next() { + return null; + } +} diff --git a/src/main/java/com/example/demo/People.java b/src/main/java/com/example/demo/People.java index dc6bafe..2f155cf 100644 --- a/src/main/java/com/example/demo/People.java +++ b/src/main/java/com/example/demo/People.java @@ -3,7 +3,7 @@ import java.util.Iterator; import java.util.List; -public abstract class People implements Iterator { +public abstract class People implements Iterable { private List personList; public People(List personList){ diff --git a/src/main/java/com/example/demo/Students.java b/src/main/java/com/example/demo/Students.java index ad319ca..3505bc0 100644 --- a/src/main/java/com/example/demo/Students.java +++ b/src/main/java/com/example/demo/Students.java @@ -1,5 +1,6 @@ package com.example.demo; +import java.util.Iterator; import java.util.List; public class Students extends People{ @@ -8,13 +9,9 @@ public Students(List personList) { super(personList); } - @Override - public boolean hasNext() { - return false; - } @Override - public Person next() { + public Iterator iterator() { return null; } } From 459a1aa9525081b9ec2bb6d101d486a2ebaa3fe1 Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 13:22:15 -0400 Subject: [PATCH 07/13] Completed section 9 Classroom --- src/main/java/com/example/demo/Classroom.java | 17 +++++++++++++++++ src/main/java/com/example/demo/Instructors.java | 7 ++----- 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/example/demo/Classroom.java diff --git a/src/main/java/com/example/demo/Classroom.java b/src/main/java/com/example/demo/Classroom.java new file mode 100644 index 0000000..a8f9e4d --- /dev/null +++ b/src/main/java/com/example/demo/Classroom.java @@ -0,0 +1,17 @@ +package com.example.demo; + +import java.util.List; + +public class Classroom { + private Instructors instructors; + private Students students; + + public Classroom(Instructors instructors, Students students) { + this.instructors = instructors; + this.students = students; + } + + public void hostLecture(Teacher teacher, double numberOfHours) { + teacher.lecture(students.findAll(), numberOfHours); + } +} diff --git a/src/main/java/com/example/demo/Instructors.java b/src/main/java/com/example/demo/Instructors.java index 4857a51..1df8b2f 100644 --- a/src/main/java/com/example/demo/Instructors.java +++ b/src/main/java/com/example/demo/Instructors.java @@ -1,5 +1,6 @@ package com.example.demo; +import java.util.Iterator; import java.util.List; public class Instructors extends People{ @@ -7,13 +8,9 @@ public Instructors(List personList) { super(personList); } - @Override - public boolean hasNext() { - return false; - } @Override - public Person next() { + public Iterator iterator() { return null; } } From 3acdd5adbbd11aeb33e68d655605463c4837bdbf Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 14:01:16 -0400 Subject: [PATCH 08/13] completed section 10.1 and 10.2, launching with no errors --- src/main/java/com/example/demo/Classroom.java | 16 ++++++++++ .../com/example/demo/InstructorsConfig.java | 28 ++++++++++++++++++ .../java/com/example/demo/StudentConfig.java | 21 +++++++++++++ .../classes/com/example/demo/Classroom.class | Bin 0 -> 1408 bytes .../classes/com/example/demo/Instructor.class | Bin 0 -> 2338 bytes .../com/example/demo/Instructors.class | Bin 0 -> 783 bytes .../com/example/demo/InstructorsConfig.class | Bin 0 -> 1046 bytes target/classes/com/example/demo/Learner.class | Bin 0 -> 181 bytes target/classes/com/example/demo/People.class | Bin 0 -> 3127 bytes target/classes/com/example/demo/Person.class | Bin 0 -> 786 bytes target/classes/com/example/demo/Student.class | Bin 0 -> 636 bytes .../com/example/demo/StudentConfig.class | Bin 0 -> 758 bytes .../classes/com/example/demo/Students.class | Bin 0 -> 762 bytes target/classes/com/example/demo/Teacher.class | Bin 0 -> 368 bytes 14 files changed, 65 insertions(+) create mode 100644 src/main/java/com/example/demo/InstructorsConfig.java create mode 100644 src/main/java/com/example/demo/StudentConfig.java create mode 100644 target/classes/com/example/demo/Classroom.class create mode 100644 target/classes/com/example/demo/Instructor.class create mode 100644 target/classes/com/example/demo/Instructors.class create mode 100644 target/classes/com/example/demo/InstructorsConfig.class create mode 100644 target/classes/com/example/demo/Learner.class create mode 100644 target/classes/com/example/demo/People.class create mode 100644 target/classes/com/example/demo/Person.class create mode 100644 target/classes/com/example/demo/Student.class create mode 100644 target/classes/com/example/demo/StudentConfig.class create mode 100644 target/classes/com/example/demo/Students.class create mode 100644 target/classes/com/example/demo/Teacher.class diff --git a/src/main/java/com/example/demo/Classroom.java b/src/main/java/com/example/demo/Classroom.java index a8f9e4d..1cb2d49 100644 --- a/src/main/java/com/example/demo/Classroom.java +++ b/src/main/java/com/example/demo/Classroom.java @@ -14,4 +14,20 @@ public Classroom(Instructors instructors, Students students) { public void hostLecture(Teacher teacher, double numberOfHours) { teacher.lecture(students.findAll(), numberOfHours); } + + public Instructors getInstructors() { + return instructors; + } + + public void setInstructors(Instructors instructors) { + this.instructors = instructors; + } + + public Students getStudents() { + return students; + } + + public void setStudents(Students students) { + this.students = students; + } } diff --git a/src/main/java/com/example/demo/InstructorsConfig.java b/src/main/java/com/example/demo/InstructorsConfig.java new file mode 100644 index 0000000..cba25fd --- /dev/null +++ b/src/main/java/com/example/demo/InstructorsConfig.java @@ -0,0 +1,28 @@ +package com.example.demo; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +@Configuration +public class InstructorsConfig { + Instructors usaInstructors; + Instructors ukInstructors; + Instructors zcwInstructors; + + @Bean(name = "tcUsaInstructors") + public Instructors getTcUsaInstructors(){ + return usaInstructors; + } + + @Bean(name = "tcUkInstructors") + public Instructors getTcUkInstructors(){ + return ukInstructors; + } + + @Bean(name = "instructors") + @Primary + public Instructors getZcwInstructors(){ + return zcwInstructors; + } +} diff --git a/src/main/java/com/example/demo/StudentConfig.java b/src/main/java/com/example/demo/StudentConfig.java new file mode 100644 index 0000000..6ecd7ad --- /dev/null +++ b/src/main/java/com/example/demo/StudentConfig.java @@ -0,0 +1,21 @@ +package com.example.demo; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class StudentConfig { + + Students students; + Students previousStudents; + + @Bean(name = "students") + public Students currentStudents(){ + return students; + } + + @Bean(name = "previousStudents") + public Students previousStudents(){ + return previousStudents; + } +} diff --git a/target/classes/com/example/demo/Classroom.class b/target/classes/com/example/demo/Classroom.class new file mode 100644 index 0000000000000000000000000000000000000000..6154865859e83fd5139e611529ddce3036c2bfba GIT binary patch literal 1408 zcmZ`(+fEZv6kVscp`D>cR45`)yq1ED7v3Nw24W;BqJfb3IJ5^kWIAJJrpC|GL^S%~ z2l!FOb>>oPr?%-nx4qX|d+&4l`_Io`0JgAIfrbZVl<-iQM-@CqQ^y)w8rC&z2oUgSr`rm=a?Ff6@|CSxQ5_a{^V0fg88Gm~z!b^`D$q4-8Zhxx!!rZV@q#tWT(Thm zo1-91$8s;sqq9qPL?GW(lna@tR1y1eZoA!=j>BugJR^ibXgg-x4nihZ&x9sDVx*Hc zz21xiBkBWQ3w5tlyRpirqwziE_+?hnjEQk9K`_~A?pL{b&oR%j*7^?7TE9ZBwQ+^~ zmnfh{JBtEsnYKc!GswUUcN%dRZqP%0Y7vcyW{N0>o1B*wI~WSG-oovK^&R09Y;C>u z75Q%{G=HF2z%^@yjta9%uE}h3m?xz2sbk@qZH`-Y{@5`r(yAOyj>@%2vfO7*a*T=# z0jgB^M(mJe!`FzVMCvX_rKJ=VXI$YtilkErbFtU39;KunstQH^331>Z#R~1Xru?|3 n#fh34Y--%Je>9EsDz4fJH8uXDNp(gm4JairP literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/Instructor.class b/target/classes/com/example/demo/Instructor.class new file mode 100644 index 0000000000000000000000000000000000000000..de3efe1add4e00bc8864c402d0c13aeb30750c3e GIT binary patch literal 2338 zcma)7>sA|O6y1{qCYOOArId^GW|2U!X|+{LklI3#)Nm<5D)ss?8DJopiIYiJ@dbPa zpTOV#X%}@Zm%m*;g)iY+{;2Nn%Y+Puviw2jyPR|O+54RH@%yWnzXG@gKZ!JMrC{K; zj`x#@;)5hU#GQWL-c8|S+)Lp;=H<^q3J@guo5Hi@ zJ~)i|dv;yJSkZK=IqR9I)+$!6Y*pP{!KwRR!}MJ*uOVWWHS~o5RRRQaL{)`urxv6_ z^JUB5bIWVOqm6HQgz54vVeV1IfD?KOV%V&p?RPv5|&^SrPSm$^M>!0^$wduH=e#-KQWIP9U#Y zUXZ?q!ILr{)>=~EJOyYr`+9nFgqd#o93#)3ZQfJzg?X?nYO1UZCNIl(+&-$>LPT+ALJ~yz1Cpx|`@Fl(?2LoT@8w1}$kd1+Dmm7X+ghH6-Znc)j6>BvP|d?}VVkS&;&fz`cF~M% z={{wtrgwFF-!kbO-?jXC*=Ce2GZ|_Rb(l|L2fG^1hfCIU<)F)#gOfCN#w1D9Zef~M zjaa!L%5f{@13-1K({N1RcAeb3>(m=nj$w$(K=|)I>Pt;eeXH1tqPvrBWHUlmDka~F?wt;;(23*uMTy4v1J5SvM zD_0cN?XqBti5(%Iu|o|hK18jZ4pyqW=(-0Dx*G+DkB`#bVmbZ@YaYaFHtUjb$`z}A zt?78m8yqU*3C9h-1Yz_4f7ygQ+c(@jLF9Q+sgx)>b&ZNL-|tf!iIYaY;~naq#+DEF z*>j9kvOE7^9qfa16nzGj{?a~6`=-@2 zt={2X8j)AHq2qc~NA7Qe1k#W5PHJ+4e-YfID(|Y*d#Li8WSj$hhYB;D;ojgrPn%hM Hgt>nKi4je; literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/Instructors.class b/target/classes/com/example/demo/Instructors.class new file mode 100644 index 0000000000000000000000000000000000000000..31ce5794e840fcd1cc8e15ded463351d7d4a22f1 GIT binary patch literal 783 zcmah{+e!m56r8NJt?RAcuL!=?3oeL)Q1L|&gjEWP?`az}(%qEZtmt3qli-6N;75s* zZUwE`rB6(}C-SlbhUxoUVXA7qeO-3~&X+S=BQ zK;hK1l)!YTV|AHD4V7HWMw`rRXqvKpBNOd#k1W_boeFG(O%ny`QAVA%3R)^M!Fin8 zBx_oeq%{G*qmtCb&PAZo?<=tQTl}f>Z4mV39uIP=ozSXsq3oS$)ny_hWoaugcBOA) zX|sfF?Duy)Owk=mSyM=|7gk!``ccw(kEie9zYD|E1&;o9R9A-QIDD&rWwNBH&a}Iq z%8wJ@a~C^-0!9Va2VIT8(x2tr9h>m@Y~1I8&jO=FMWQ;f$GNz@^9u38Xaptx{VrQ( z-WbZni+L82PsDtTV}eSPjNP0wQ;en=v(Rx)6%G$GBxfxdWmD^(|Y;Ls}f_-x& z8R|`?<*PJqOM58V9f~xXCKR2Pu*#qR1OxX;k&3mUD)x;&RuO5Ljifsa-}gOXd2?%M zIwdZ=O|?_8Y^g+1@#k6_C!8{xYCmoo8}a1KDjgkL5zBL9PkCsxlNXMQzfk@{3Qb&r zCJe*0`%g%tE3da-b;9*VW(fA7uZfc?|0z#LmGs7{SlBP5s`AdHHk2=wZ}oicgSyRo zaw0wphV4;_yIHBtnzU2JB&t=EP_AOan+nPdtHUOzOF(V%g?UHlh`(;1$k1Vh=CMeV zTA)RYWZ_9OPrT#KvW4plF!S9mSSIvac zHpJO2YV}ZrX=#n*r!qIqvSMT9-}lYoLTc5VWnR==wkd%S`ELM<2|dJ~6Hf^t4I+e} G5&A!|St_ys literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/People.class b/target/classes/com/example/demo/People.class new file mode 100644 index 0000000000000000000000000000000000000000..70101ec9fa2063d22112dd1648c86ff148acd032 GIT binary patch literal 3127 zcmb_dTXz#x6#gbnJMDCOp`|HzQZAAT!L(FcLGZ?Da@r1^%!Fi8DPB7L*|^b&%S*7+k2n<_V?3Y0Gz`&21anH z4|_1zk2i5yeXgj_TL!Kor*_wr%G)DUf2SX#cvs1m`mv1n)aQndn+68)zJXh~t>Xh7 zAL{r>gHe{1s_W#fs;6N%e^+dZOwF_GjFMzE^etIyj__&~so_Y=_0003Z@j!!mf2Y< z_sm$1<;`jsO|__ICvRwo&$&gq8OmFZT&R^+WMx^b*p!Uq-GZ=hh>E4op)l^PTU8DF z^98q*k@rQZY|BhhmfXyubh&4|#7;ZH2yIX8X4D3GcwTzzZgEjmL`ix~N5e!b_!c9T zN|z`WH5^KHilg}S^X&<^-6aQKO@kRFk>sSJXBDca!kjnBQoL$C;4+q)49K;GvzEy@ zo?Md^lF?nTrKk{E%C{oGi?*#{Jj^E0W`>GlA6{QMr;eUWqrFj=btMhQI*41?&~UO- zgcdCYsdv?KikG%>BrY8_$-B;4c5+uHHR#foCF!t1V-}6WF7*@gZ8Z!md7`i}FUo%X zb$rZbZ4VJ;mR=PcpQ4dEqtV7swh3EO(r|mG+5Z=I#XlS2@cPPKS@5zEiC+R%q|Ldp zw@UX1DZ#KdvjF)^t=QxG~H!QD9AEmfm>ZeE3F4u*MkwiMw?$H3H+Wx zCM=l6RrSnRS~Uy+JOMTj>- z&T7TReeo?vF9OKb7dks@`6IGV**l4Qf}EOQG2 hypA_0jnVZNTn)Pa3=i=+hd6 literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/Person.class b/target/classes/com/example/demo/Person.class new file mode 100644 index 0000000000000000000000000000000000000000..d0b5a5f12014be4cb87b13795b368a49b665347d GIT binary patch literal 786 zcmZ`$T}$IY6g`tB&9+8cqpj=5uKFOfT`@2Fwu>)a041pGqhBuhinD}N8;FxwZ{X%*TASh(lo?H1mr-A( zr?NjW^vOU@dNK|5JulkXIGhTsb_YomsNXWWn5bZ=q9iz0=`@L{uKrVH<79X&Q>x5Z z6>vr>`#~>$t6dP0yK&h(GKQA_X}?%Pd2$4%A_&brrO|} YH4Q^^HuYk!Z0rkT$`QGtk4E|GU)H&W3jhEB literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/Student.class b/target/classes/com/example/demo/Student.class new file mode 100644 index 0000000000000000000000000000000000000000..b0c019d0c723332c7f11bb239b2043361bcea515 GIT binary patch literal 636 zcmZ{h-A)rh9L3KpZI|wDTP!LFLg0dkg|Ii?VYq=9E>FG^VCulll06o!{Ba??3my0KCC=fEr#jv4jmDn?7Fp*b-=4V`bL2)AZXw z=So1F2{hj7LfaF8z5V2~ypeGxi%FcAVsbne_id?}c|8=Uotl)hokSPv!!#eMav(<; zGu_0DWj2(hcJVA(v)B5oz(z7Qd8}?_{v}g!s&W%MAF8m&0-jC@wD|>Cy3t6(qs*;R)res-gZ2!#pY!#Kck5}hr>dHZ%=UBbd&TBNIAGu$Su#9Ge z27H0_$9xK`EtD?EH6$($CC-W}vCAi@f!?@0N8s~#yc5VXV06ijC7x05;P4Kj*Zv9b zd({qp&u<)-4~&Q6>7TM6LhJ&%6rpe8ccwtr+7BQol?l*!rrGJ l@LrAoqXldNbpt9p((@_~|B*swe9Affx?te6*SLFF{|lKmf71W} literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/StudentConfig.class b/target/classes/com/example/demo/StudentConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..f43958ddbb73ce1fe0f4f42d98203d9fa7c0bbed GIT binary patch literal 758 zcma)3OG^VW5dPBF*1ER7wZ71s3Yv>}Q3Mq{6$O=EJf+)MQ@csYX4RjiAP64(0sbg) zc3TyT1rM3bOy+xpdH;BQ1F(bT67rZIK@QaV7llZWM{G4i!B%`dYO}xe~XDp@*YQBzn9fbc>%g+A?rhqmAZi%^5mGL=g!W z#VlCDPjQqgPB)`Fzxe|8L`eod#X{QjFh;rG8$cNqsz?kIH1!+&jLhQzxcmorl4i<8 iF-2$k3M@*6ihmMj2MMSCMOY+nGpUtXBy!15=73Kd(xeIi literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/Students.class b/target/classes/com/example/demo/Students.class new file mode 100644 index 0000000000000000000000000000000000000000..b885ee68ffb8f9165d09ef2a165e9edc8ff51603 GIT binary patch literal 762 zcmah{T}uK%6g{))s;j1bY35UJTGB$)li^Dc1X~D(@1qVm;qJ&f8}+a1Dd?de(2t7l zxC*6d1H1R0Gk4Cp^YQuh{sG_&RRsK8h-6cFJ*nYo!^^mp9TDiq7tzbxub`VP9NHb0PWp z5uccA%prj!LuKVfFqD_(VpAN#q8DO@1$qHU60!-k30oBHqvJQQSIRb!qQ5g`GgRjw zO}G?SAw$><8(HK?DNnhHF|$cofpY3HOQA@gg)Jhtu|t_LY!EW#7JHe_8Z&#!6sAV8 Tm^Cws6?SQDob6E~Mzj14zg4(w literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/Teacher.class b/target/classes/com/example/demo/Teacher.class new file mode 100644 index 0000000000000000000000000000000000000000..f32d662e20cdaff3812bb721b06c0bce010e1cbf GIT binary patch literal 368 zcmZ`#yH3ME5S%kf9ESvwj*2=6iEE$&Q6U79QILY@*Ow&^-P!0kBfgD-58$H^Yt9k{ zp}O7Knc3O<{CfWYaEeKa{S;$`ZeTJig~MrXDyR94+_Po9U{~p!$(QWUuZ|uS#&;Z6 z)#9E!IS%Y!6jB=r3Zt@i1^e04O;xuO6Kc;22h)5*ucR%NOMNRkDlA9Gek&KJY`$KW z6cuON6c@+;$GePngSqTBe7&}^cKFbo#r~vOE-C)p*3RXw-*~fP!zT0;6cYI*An7RV gpd)=(x-3CYo)i$ck4#7{JcuxM8x4lSAN^E&-_+e)_5c6? literal 0 HcmV?d00001 From bb0c21a793a1056b5985b880aab7f6e43fb4a20b Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 14:10:22 -0400 Subject: [PATCH 09/13] completed section 10 --- .../com/example/demo/ClassroomConfig.java | 24 ++++++++++++++++++ .../com/example/demo/ClassroomConfig.class | Bin 0 -> 867 bytes 2 files changed, 24 insertions(+) create mode 100644 src/main/java/com/example/demo/ClassroomConfig.java create mode 100644 target/classes/com/example/demo/ClassroomConfig.class diff --git a/src/main/java/com/example/demo/ClassroomConfig.java b/src/main/java/com/example/demo/ClassroomConfig.java new file mode 100644 index 0000000..d4e277c --- /dev/null +++ b/src/main/java/com/example/demo/ClassroomConfig.java @@ -0,0 +1,24 @@ +package com.example.demo; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; + +@Configuration +public class ClassroomConfig { + + Classroom currentCohort; + Classroom previousCohort; + + @Bean(name = "currentCohort") + @DependsOn({"instructors", "students"}) + public Classroom currentCohort(){ + return currentCohort; + } + + @Bean(name = "previousCohort") + @DependsOn({"instructors", "students"}) + public Classroom previousCohort(){ + return previousCohort; + } +} diff --git a/target/classes/com/example/demo/ClassroomConfig.class b/target/classes/com/example/demo/ClassroomConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..2a3ffb2cb7f1b77228ba257e8c3a3b7d4f263640 GIT binary patch literal 867 zcma)4TTc@~6#iy=Tgn0z5JkEA1SUF(F}`3-w8W=I5;c9{X}TTC!0t>lm&(t=#Kgo0 ze*iyiXAj0I#vrL=8{pP{l?Jn+w6okXxhT5As#yQstol>s7@pnZ**5w_4aj+GZ~q<`0oFeU?Nuqe$|U3wrjdNm1sBt;QXjba5XI#8Uaiqpzy ztv&w<_MMUh8O8c|GsObs*#v+^EK$YiUyD%xlYbz&oFcbwAwM9@CXts(X5|>nk=QEb k508;JtT{ZQBE40=GOfQhlYTm_pWyMh(RIXT;+#)_KT(CljsO4v literal 0 HcmV?d00001 From bd392827dd6f1a86b4ff9483bbd290bec1fe539d Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 14:58:28 -0400 Subject: [PATCH 10/13] reworked StudentConfig tests and StudentConfig class to allow associated beans to return prepopulated Student values for testing --- .idea/libraries/Maven__junit_junit_4_13_2.xml | 13 ++++++ .../Maven__org_hamcrest_hamcrest_core_2_2.xml | 13 ++++++ demo.iml | 2 + pom.xml | 7 +++- .../java/com/example/demo/Instructors.java | 6 +-- src/main/java/com/example/demo/People.java | 5 ++- .../java/com/example/demo/StudentConfig.java | 13 +++++- src/main/java/com/example/demo/Students.java | 4 +- .../com/example/demo/TestConfigStudent.java | 39 ++++++++++++++++++ .../com/example/demo/Instructors.class | Bin 783 -> 690 bytes target/classes/com/example/demo/People.class | Bin 3127 -> 3249 bytes .../com/example/demo/StudentConfig.class | Bin 758 -> 1213 bytes .../classes/com/example/demo/Students.class | Bin 762 -> 666 bytes .../com/example/demo/TestConfigStudent.class | Bin 0 -> 1574 bytes 14 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 .idea/libraries/Maven__junit_junit_4_13_2.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml create mode 100644 src/test/java/com/example/demo/TestConfigStudent.java create mode 100644 target/test-classes/com/example/demo/TestConfigStudent.class diff --git a/.idea/libraries/Maven__junit_junit_4_13_2.xml b/.idea/libraries/Maven__junit_junit_4_13_2.xml new file mode 100644 index 0000000..606c352 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_13_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml new file mode 100644 index 0000000..15f1e4c --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/demo.iml b/demo.iml index 693851e..d24453d 100644 --- a/demo.iml +++ b/demo.iml @@ -72,5 +72,7 @@ + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index e70006e..62dc40d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,12 @@ spring-boot-starter-test test - + + junit + junit + test + + diff --git a/src/main/java/com/example/demo/Instructors.java b/src/main/java/com/example/demo/Instructors.java index 1df8b2f..2958ac8 100644 --- a/src/main/java/com/example/demo/Instructors.java +++ b/src/main/java/com/example/demo/Instructors.java @@ -4,10 +4,10 @@ import java.util.List; public class Instructors extends People{ - public Instructors(List personList) { - super(personList); - } + public Instructors(Instructor... instructors){ + super(instructors); + } @Override public Iterator iterator() { diff --git a/src/main/java/com/example/demo/People.java b/src/main/java/com/example/demo/People.java index 2f155cf..6f06085 100644 --- a/src/main/java/com/example/demo/People.java +++ b/src/main/java/com/example/demo/People.java @@ -1,13 +1,14 @@ package com.example.demo; +import java.util.Arrays; import java.util.Iterator; import java.util.List; public abstract class People implements Iterable { private List personList; - public People(List personList){ - this.personList = personList; + public People(PersonType... personList){ + this.personList = Arrays.asList(personList); } public void add(PersonType person){ diff --git a/src/main/java/com/example/demo/StudentConfig.java b/src/main/java/com/example/demo/StudentConfig.java index 6ecd7ad..816535f 100644 --- a/src/main/java/com/example/demo/StudentConfig.java +++ b/src/main/java/com/example/demo/StudentConfig.java @@ -11,11 +11,20 @@ public class StudentConfig { @Bean(name = "students") public Students currentStudents(){ - return students; + //return students; + return new Students( + new Student(1l, "Zach"), + new Student(2l, "Manny"), + new Student(3l, "Dee") + ); } @Bean(name = "previousStudents") public Students previousStudents(){ - return previousStudents; + return new Students( + new Student(4l, "Pank"), + new Student(5l, "Shank"), + new Student(6l, "Stank") + ); } } diff --git a/src/main/java/com/example/demo/Students.java b/src/main/java/com/example/demo/Students.java index 3505bc0..ca04642 100644 --- a/src/main/java/com/example/demo/Students.java +++ b/src/main/java/com/example/demo/Students.java @@ -5,8 +5,8 @@ public class Students extends People{ - public Students(List personList) { - super(personList); + public Students(Student... students){ + super(students); } diff --git a/src/test/java/com/example/demo/TestConfigStudent.java b/src/test/java/com/example/demo/TestConfigStudent.java new file mode 100644 index 0000000..2f458fa --- /dev/null +++ b/src/test/java/com/example/demo/TestConfigStudent.java @@ -0,0 +1,39 @@ +package com.example.demo; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest +@RunWith(SpringRunner.class) +@ContextConfiguration +public class TestConfigStudent { + + @Autowired + @Qualifier("students") + private Students currentCohort; + + @Autowired + @Qualifier("previousStudents") + private Students previousCohort; + + @Test + public void testCurrentStudents(){ + String actual = currentCohort.findById(1l).getName(); + String expected = "Zach"; + Assert.assertEquals(expected, actual); + } + + @Test + public void testPreviousStudents(){ + String expected = "Shank"; + String actual = previousCohort.findById(5l).getName(); + + Assert.assertEquals(expected, actual); + } +} diff --git a/target/classes/com/example/demo/Instructors.class b/target/classes/com/example/demo/Instructors.class index 31ce5794e840fcd1cc8e15ded463351d7d4a22f1..5140be8a57fdc36e8b7544583ad3877cb83e84b4 100644 GIT binary patch delta 253 zcmeBY+r+AT>ff$?3=9k=43b<7%nYLJ3}WmI;*1PzHko;uC3cJqiWHP5G>Q`7 z&de(=DJo4a$uBBqWRL@k3o|kZ_@XJFh2mS+c&Twqa7pgOL}RZNOJtc(oYKw(A( YJ_i2D2brve1%V0#z{-Ufgu%230F_!X>;M1& delta 339 zcmdnQ+RtWq>ff$?3=9k=4ANW-%nTCj43g{&Qj832Hko;uC3cJq!WuqViDilUr6rj; z`aYS(B@^wVJ-G@}i;DB}KwL%!0W<~Hj0|Ev`N@enVTnbViAg!BA(aKGAs_}LgFc$t z$+3(|1_HjRB^miC0f|M4xv3>UlNlK}gEQ0f5=%;pfO?G3T>#Xiz@!;A@s`?T9>%FG ztc(mYlj9ksCm&#xwqa0YU;_FB1eh2Y8CV!tfjl-KF967A0@7?++S?fzHv(DA4D3LX z3oOb3RL42loJmoQ2dE3Eih-Mf56I#NvVrDv11SL@W?~Qo3JNg@PflU778U{WA)=xT IVqjTu0D*x{q1jGlHdM*_zQri@NEKp zIGeyZywZVQobN;i7v$qr`N$?Phk5ySQR*%9^3J7B^y9LWz1fK?xGEplbi9>7H{MR* z9lWdKx(=aZSwo^|dL`G%S|wjYPxgk`5UH|n*(oVWYv@?CRvqD&JyXNuJC3K97S!dX z&7zq;P35*}%dz~^8itbBvN^YqGH;1O(Kb_gv*4xz<@DGk4e?nwPlMfA%Q5H6g=N!Q z63aFvy;(OW>`TJ4PzUKZk3~o0{w4veAW)|xr>$(<=l}yc< z{+gR#5S}QQK3SkBxlKog*&_0J4F{5q+(_0H7i~cXn#8BnG#K06cPFEJ>8i~m#T#TW zUb1d;8Ay%=*|LSRn#wr7xoUbOsx@bu!Xvb#xf6rM=>L}zROGf zjg&MTZXm8>aHNrk9a<7n`-_GFtV z1(R)r1F2>xBslDlXg+r-rK&{sQGI*GbK~PN`f_-LJ2> z-dT}j4u+$5>s3`JTGhrMte{k`DwK1a=xd@hZ{8vp4iwT7chsi8q8~}696pR&Hg>g@ zqTLx#UzIRU^JZDtB^`GRe2OnQXKHL)&W5{grm~{2oENNAu_AIDQJZW6&g05X$JaEI zb=~!Hkux;oIHsp4Hp%?&(aeVSf|@@soV;z8js_Q_eYog*7ROMeB(_~tKZO73FmU;3 z!_is_-OdWzUSyimI=;~`QpZoDcsTSPtrtJU{~3MYxaT(}M+etE{9_TrV`#@6PL_RW z!G20i%3@r*#(#!3KJfstpV0CH1uZzh=Ps^50&#T0;Ae=t!QcWO$3gCRl@5mK;Lx_S z!_~7RJUhx=D;t7KfMbNhV;BulTn|wg<3FNhVhiyYF4sULl*4X9=!pO@ssIcmF}4kW zJPQEGv+){$WEH>!g_BJIv^D_HM*#i*FMuf=Ck&Z~3|Eb7mt`F;s_X#{1Cd}d* z&z|O4SUM-^EhwF5 zD0~*rg-E_9jyTU!L4<~exydbbX}F6azU(ssP{`o_b)W%hb z52BUtM~LqzYh{GhGRmLUq{2H)Cqpdo=UHE}5mHs;DV#z&f;`X~uWHE{ruj9{@)r_1 zUO4zCfrhc1;z1D0X_|NuFY!obYlb_StyUS!&g4%jL_v~TLmai_ONsOun4Mv4!P^T!L(FcLGZ?Da@r1^%!Fi8DPB7L*|^b&%S*7+k2n<_V?3Y0Gz`&21anH z4|_1zk2i5yeXgj_TL!Kor*_wr%G)DUf2SX#cvs1m`mv1n)aQndn+68)zJXh~t>Xh7 zAL{r>gHe{1s_W#fs;6N%e^+dZOwF_GjFMzE^etIyj__&~so_Y=_0003Z@j!!mf2Y< z_sm$1<;`jsO|__ICvRwo&$&gq8OmFZT&R^+WMx^b*p!Uq-GZ=hh>E4op)l^PTU8DF z^98q*k@rQZY|BhhmfXyubh&4|#7;ZH2yIX8X4D3GcwTzzZgEjmL`ix~N5e!b_!c9T zN|z`WH5^KHilg}S^X&<^-6aQKO@kRFk>sSJXBDca!kjnBQoL$C;4+q)49K;GvzEy@ zo?Md^lF?nTrKk{E%C{oGi?*#{Jj^E0W`>GlA6{QMr;eUWqrFj=btMhQI*41?&~UO- zgcdCYsdv?KikG%>BrY8_$-B;4c5+uHHR#foCF!t1V-}6WF7*@gZ8Z!md7`i}FUo%X zb$rZbZ4VJ;mR=PcpQ4dEqtV7swh3EO(r|mG+5Z=I#XlS2@cPPKS@5zEiC+R%q|Ldp zw@UX1DZ#KdvjF)^t=QxG~H!QD9AEmfm>ZeE3F4u*MkwiMw?$H3H+Wx zCM=l6RrSnRS~Uy+JOMTj>- z&T7TReeo?vF9OKb7dks@`6IGV**l4Qf}EOQG2 hypA_0jnVZNTn)Pa3=i=+hd6 diff --git a/target/classes/com/example/demo/StudentConfig.class b/target/classes/com/example/demo/StudentConfig.class index f43958ddbb73ce1fe0f4f42d98203d9fa7c0bbed..8f3c595669802341671a72ac96ea56158e22b685 100644 GIT binary patch literal 1213 zcma)*YflqF6o%hvx80?w+=E;M@q)G}tjfhpQEtW$ri!tK1o<>9Lm6mi$X*bQKT1Dg zB>DsVQN}a7Ew^M7+w5H4bLO09&dmJz`|~$|Su7SXh_$2kY{?Q!10V;fIwJY{f#FxnO>3>ZeLo^HD0h&K-!!rc~4 z?bcex3PbmSFAk-Sg0{wxUyw?MFBr0=@;ZaHs<#D0S5+$UHfnAO{{!D@kkVV#9&fC3 zUz&MKw8C9UNyk%@u4=U->y)|6i+rCD&k~Q8%Bjl&S~2uKQlV^$bs0#?xU7^8c__7_ zgi}@R*WKX2m#V(w^QQQu{e9QdDilYd%THb16~Pt7vK09+6lyy1J@HD$8)~5>h|_!g zkTcBxZ{TEAF$Q}_X^H+PJDZNoD2 ze%MCoh?QKT#6Cr%9OKG2ik0LYfO&RZ^zWv8J(xi+7HKw4YQnM9;+P<%ld|8T@9rj8 zK-;8OdCK;+#kO*htsk9+rTaWxk5T&0)Abu=Acby_xQ3_-!0~U-*gmhyH^gQ$(1IO^V+L<(_lu*PaL^#8EpW5zzYkM1}Vuq4ig$P1C zM;Ks`PFPkqS2oJw?2I|8uq47_K6F%6CvO5(YU&Irb+Nw1C+y)vyz!RRAL>RvH)Qf@ fE-~wTQ}oj@_;mD!*}s4F>U-l|4Rp6dmt4J diff --git a/target/classes/com/example/demo/Students.class b/target/classes/com/example/demo/Students.class index b885ee68ffb8f9165d09ef2a165e9edc8ff51603..6c2929df88f2244cd55142be2e4f07f4766a969c 100644 GIT binary patch delta 218 zcmeyxI*V2L)W2Q(7#J8#7$mtEm>ERb8N}Eb#2FdbY%=pQOY9gKDG486?>mq!=04Y%=pQOY9gKgf)D!63Y_xOG`3y z^nEgmCt62(aTTN%73b#xc_oYt0;uvO){G2dKKaRsIbn%KnTbg`sUejGsUaW+BZCf_ zTAPUrrA+OBIs|-EOEU6P0uqZ7b5l!zrZX~d24|+{C6<&H0rlylIidulk;TqhGi>5H zwMmRUjI5J;8O?MU6d9O+o&W(R21W)J238=C4af@s@|l1%o0j%=2F8s*7V~6&CPOtI wpemp!12+R7ki`#VvoZoX3=9H5%)}rF6cl0*p6tV9Ei3}$LqtUx#K5xR0KE7{GXMYp diff --git a/target/test-classes/com/example/demo/TestConfigStudent.class b/target/test-classes/com/example/demo/TestConfigStudent.class new file mode 100644 index 0000000000000000000000000000000000000000..421580a2ecef2ee0155f2a06fe5e4079d68a68c1 GIT binary patch literal 1574 zcmb7EU2hvj6g^|dUdL<`|cNX{s(|NcwEIC)@N}J8&!OW+f@Yk z$iv4~l<-LfpH}JfSp|2U$Gs9E?pN|~-^1qu=c3eFsgoVkGd2-eZbfDg$m4Ku*q1?D z4ot9{q-}b{n*vKeq&iUpxu;^a-(Xqh&ma*L+KD0`AJ2o81SH`{!_GPH! zpc6)kv9E*h6cB8siFu{0Y?JnXLcdSLzUnAx2`wFk{ZtB6;#{S`+@Y06%B1m0PPG%m zNhSj22TH5tp+K?G+!L7DF>R8}x0IGo)4{&9FGA)gP;Z$i?C*tExqWV&NqUM2-L z^K{WMKF^aJQC4?NY9slLa>CC~NV)Ce2;80CCS#Jo(FT#xi9Ak%-K>$@wC7PTjR~=- z*3t%?h96bZqonDqX9%+t?&Q2gl7PT_Q{|iivY<}Uu&$}i=55o*MJ)N4N6o_*J~r{d z!t*5Lp&zH5#(*&Q?SrHMeJPF6Zfx3^z^%l5A~{tazTj@@%{{6ST%P?hr_fL$I{(+Kg<@7f95!Hs&9=49A>vUCLy;p_i&BhlR17$ z3jDJT5O|lndG6|bFL1vY<2`O!*Xf5BP~-vo$mbWV-Y2+_fhEa`v@NgwibC}*if=IUCrWQnZq>af8|!aT8Bx|T<6NoqG9|8% z;7Ue+bx4uZ*D;H$%u~>(j8(1*S&mN7^(_32)9~Fq{7QYcMFrJGyfd!h$@<0=0jmUE u#|3=A;5WwvtmFcU6z0MT`jj&%X9X09bXB^U$yy-WE$$oiUyRVi8t@Nt%!qXW literal 0 HcmV?d00001 From 5e8ddcd831808b151b23114d9e62045cb2088ef8 Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 15:33:43 -0400 Subject: [PATCH 11/13] Completed Instructor tests --- .../com/example/demo/InstructorsConfig.java | 18 +++++- .../java/com/example/demo/StudentConfig.java | 1 - .../example/demo/TestInstructorConfig.java | 52 ++++++++++++++++++ .../com/example/demo/InstructorsConfig.class | Bin 1046 -> 1731 bytes .../com/example/demo/StudentConfig.class | Bin 1213 -> 1213 bytes .../example/demo/TestInstructorConfig.class | Bin 0 -> 1851 bytes 6 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 src/test/java/com/example/demo/TestInstructorConfig.java create mode 100644 target/test-classes/com/example/demo/TestInstructorConfig.class diff --git a/src/main/java/com/example/demo/InstructorsConfig.java b/src/main/java/com/example/demo/InstructorsConfig.java index cba25fd..964c5ff 100644 --- a/src/main/java/com/example/demo/InstructorsConfig.java +++ b/src/main/java/com/example/demo/InstructorsConfig.java @@ -12,17 +12,29 @@ public class InstructorsConfig { @Bean(name = "tcUsaInstructors") public Instructors getTcUsaInstructors(){ - return usaInstructors; + return new Instructors( + new Instructor(100l, "Leon Hunter"), + new Instructor(101l, "Leon HunterX"), + new Instructor(102l, "Leon Hunter-Moon") + ); } @Bean(name = "tcUkInstructors") public Instructors getTcUkInstructors(){ - return ukInstructors; + return new Instructors( + new Instructor(103l, "Sir Leon Hunter"), + new Instructor(104l, "Sir Leon HunterX"), + new Instructor(105l, "Sir Leon Hunter-Moon") + ); } @Bean(name = "instructors") @Primary public Instructors getZcwInstructors(){ - return zcwInstructors; + return new Instructors( + new Instructor(106l, "Big Leon"), + new Instructor(107l, "Small Leon"), + new Instructor(108l, "RegularSize Leon") + ); } } diff --git a/src/main/java/com/example/demo/StudentConfig.java b/src/main/java/com/example/demo/StudentConfig.java index 816535f..5fc56f4 100644 --- a/src/main/java/com/example/demo/StudentConfig.java +++ b/src/main/java/com/example/demo/StudentConfig.java @@ -11,7 +11,6 @@ public class StudentConfig { @Bean(name = "students") public Students currentStudents(){ - //return students; return new Students( new Student(1l, "Zach"), new Student(2l, "Manny"), diff --git a/src/test/java/com/example/demo/TestInstructorConfig.java b/src/test/java/com/example/demo/TestInstructorConfig.java new file mode 100644 index 0000000..f2ebc10 --- /dev/null +++ b/src/test/java/com/example/demo/TestInstructorConfig.java @@ -0,0 +1,52 @@ +package com.example.demo; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest +@RunWith(SpringRunner.class) +@ContextConfiguration +public class TestInstructorConfig { + + @Autowired + @Qualifier("tcUsaInstructors") + private Instructors usaInstructors; + + @Autowired + @Qualifier("tcUkInstructors") + private Instructors ukInstructors; + + @Autowired + @Qualifier("instructors") + private Instructors instructors; + + @Test + public void testUSAInstructors(){ + String actual = usaInstructors.findById(100l).getName(); + String expected = "Leon Hunter"; + + Assert.assertEquals(expected, actual); + } + + @Test + public void testUKInstructors(){ + String actual = ukInstructors.findById(103l).getName(); + String expected = "Sir Leon Hunter"; + + Assert.assertEquals(expected, actual); + } + + @Test + public void testZCWInstructors(){ + String actual = instructors.findById(107l).getName(); + String expected = "Small Leon"; + + Assert.assertEquals(expected, actual); + } +} diff --git a/target/classes/com/example/demo/InstructorsConfig.class b/target/classes/com/example/demo/InstructorsConfig.class index 8576afe50e2d46e214a8e8c90864383cd1524ccf..ca3b853fffe86d72c65f6b5259750513ffd29d89 100644 GIT binary patch literal 1731 zcma)+Yg5xe6o%iWr46OhQjh^*5DI9ELhyzc@Ip}pEEg#RaE)0Ry;7cy2Fc>>YJZpxaRKr1X|%Fe^eucriCe-7Yu<^dV?W2 zYwd7`SXP*P*)48!dtKW$NJ(U^yk=}@wvgkB7<6_8Q4BYvn6=D;(21o(=gxZmL)|M3 zq|yz;DX?eFH62mp8=@pA`HX2=j^+rfh|nEU~5HwWZC;_-ZCA2?5Ns5 zS2e>mlhz8F)7- z>#i|GebPs&tZz8BWLc(k%h8d_346ddN1k;G1$Wj--U19tM(AFwtW;4mjLIOs#&y@w z?3_5^6)D-^HA>~WP-apmUpAOlNDSY0E}Z z^_p*-bL4rPl3&zdYOB%tCLatUN!JYMIst|;A}<--s`R(LJ_sf^k=jw3Q>kavH;m|DGE7467-Q&yYdSvEaKV6?x u`u%h_r80N{U6SaA=ou!u5u!_8K$oD3pV#gQo_c%m%xkA0t1C~zH1HR&<&|gv delta 444 zcmaiwJ8r^26h+V2U>h)hNPv(4=2N7Jkf_)Sn~0PJum~j90TNQA6lv0B5iA99pBo@@ zL^1cinYr)G=cl}lCcmezZ(zZ!NWic_o{>pnG7g!9O!wQR*DevqghVj~lOmBL+00$C zIr_~tBgF%Od<~_fSTJ>Eu@TjVjN%W0)4Q$;7z8kSCVlR`J`%CQoLu}~W%N3vK Pr#E>{^#yx`eb4~Tf)N^q diff --git a/target/classes/com/example/demo/StudentConfig.class b/target/classes/com/example/demo/StudentConfig.class index 8f3c595669802341671a72ac96ea56158e22b685..b621c98e5761e6aa2b621726e414c51ee76da48d 100644 GIT binary patch delta 51 zcmdnXxtDXpC1ycB27Vw^WDsC5W)NhsXW*Osn7LO_9LSbnP-c*1FlCTpaAXjl+{j`B E0Q*J=p8x;= delta 51 zcmdnXxtDXpC1yc>27U$s21N!z24e;x273nn$&ZZUJRno5C#CCup!wtAHENpZ9DJR}Mgh0*jXih!^|?+S-&(_WuMLNJ)EsO&*b+DuNB*{sOc*y!5Jmz^ z^=8oXPoLAdx4koZwSo)9BZR`a!*BSzbk862gWxl&eS0IwFC;JFHAi?IJQ^rzVGsxQ<7+X??98+8OQ$!mRp%SZw+@J6Pbkw8}0D(V+G z4wKQ`aB&{XEMkB)$HgMf za5fq$Tu!-NELn4*(eu0A#369;1cNQoupxb|?C7xJyZZ-hGwdDFdQHD{ViR*Nv+2M^AC|A<7Zzglb zUj6K-oeZ&l_WZVWlwG6>9ZSLE&^e&@Mg zh;Wu$b|Bk%j!yO=+qr~sIyew~Um&2zui$rL^$&>OxX9sSz9$o75ub4F_7C7wT;xvR z5`%L|aEB_#Xgjz1J91@=y~4yxO#Th$CGz#s)WgebuTU6*mdFiqmkBUOnnl7}g5^HQ zfS`;ite`@oIm)PVl}k!sC9U!_o0lnIx(s(zz^QBjD-=*6s oWee~q;3@@tK>^p^LqHCnu?{(0N$N7o>UrE>Wn~tc_?)o#4;ZMpsQ>@~ literal 0 HcmV?d00001 From 8ea93db4070acfe9fca33653a734bddb6b5f64da Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 18:11:15 -0400 Subject: [PATCH 12/13] Completed ClassroomConfig tests --- .../com/example/demo/ClassroomConfig.java | 11 ++--- src/main/java/com/example/demo/alumni.java | 4 ++ .../com/example/demo/ClassroomConfigTest.java | 40 ++++++++++++++++++ .../com/example/demo/ClassroomConfig.class | Bin 867 -> 1319 bytes target/classes/com/example/demo/alumni.class | Bin 0 -> 277 bytes .../example/demo/ClassroomConfigTest.class | Bin 0 -> 1663 bytes 6 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/example/demo/alumni.java create mode 100644 src/test/java/com/example/demo/ClassroomConfigTest.java create mode 100644 target/classes/com/example/demo/alumni.class create mode 100644 target/test-classes/com/example/demo/ClassroomConfigTest.class diff --git a/src/main/java/com/example/demo/ClassroomConfig.java b/src/main/java/com/example/demo/ClassroomConfig.java index d4e277c..5b0cb1d 100644 --- a/src/main/java/com/example/demo/ClassroomConfig.java +++ b/src/main/java/com/example/demo/ClassroomConfig.java @@ -1,5 +1,6 @@ package com.example.demo; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; @@ -12,13 +13,13 @@ public class ClassroomConfig { @Bean(name = "currentCohort") @DependsOn({"instructors", "students"}) - public Classroom currentCohort(){ - return currentCohort; + public Classroom currentCohort(Instructors instructor, Students students){ + return new Classroom(instructor, students); } @Bean(name = "previousCohort") - @DependsOn({"instructors", "students"}) - public Classroom previousCohort(){ - return previousCohort; + @DependsOn({"instructors", "previousStudents"}) + public Classroom previousCohort(Instructors instructors,@Qualifier("previousStudents") Students students){ + return new Classroom(instructors, students); } } diff --git a/src/main/java/com/example/demo/alumni.java b/src/main/java/com/example/demo/alumni.java new file mode 100644 index 0000000..5ba60be --- /dev/null +++ b/src/main/java/com/example/demo/alumni.java @@ -0,0 +1,4 @@ +package com.example.demo; + +public class alumni { +} diff --git a/src/test/java/com/example/demo/ClassroomConfigTest.java b/src/test/java/com/example/demo/ClassroomConfigTest.java new file mode 100644 index 0000000..a984bcd --- /dev/null +++ b/src/test/java/com/example/demo/ClassroomConfigTest.java @@ -0,0 +1,40 @@ +package com.example.demo; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest +@RunWith(SpringRunner.class) +@ContextConfiguration +public class ClassroomConfigTest { + + @Autowired + @Qualifier("currentCohort") + private Classroom currrentCohort; + + @Autowired + @Qualifier("previousCohort") + private Classroom previousCohort; + + @Test + public void testClassroomCurrent(){ + String expected = "Zach"; + String actual = currrentCohort.getStudents().findById(1l).getName(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void testClassroomPrevious(){ + String expected = "Pank"; + String actual = previousCohort.getStudents().findById(4l).getName(); + + Assert.assertEquals(expected, actual); + } +} diff --git a/target/classes/com/example/demo/ClassroomConfig.class b/target/classes/com/example/demo/ClassroomConfig.class index 2a3ffb2cb7f1b77228ba257e8c3a3b7d4f263640..a2f242b4934fa4ec2ffcac4611bab3bba2939d1a 100644 GIT binary patch literal 1319 zcmbtT+invv5Is)PrrF+0p|mN`mRrkhC4>-CDkKO(AO#8(1))AU8z*(ywIkab%3r}# zC6M?4J_<3rxsWOes>H*3?c*~uXJ$OVet-W7-~qNhOkgXIs~$4AmdEuxZZOOSu`xoq zvOd(tF|1bt9r@yzN3Br!brEU59CB-o)=`OJu4P19>e%-9lefQMCXWOD9;Id>>6!`44ymbGfgCPn_RJGzI!n=?Ed>3&3EI##hsD_WXC0UpEJ_~)E3ZZd3)XLLML zWfCQR$W_zds~w4e=4AIjo?{i8$k8x@1`(JpKg{b#`v;j~T@=F^|if8y2&*f-i_ zFhlEP3KlR+`{m7E=!!9ah%^@v(@d z)T@VcSSE|}WLL-#3<7`)^j#u&g-90Xm>XN0U2zhi6ph$1pWX(YD|a# delta 298 zcma)0yAr`r5Iwn9lA8$P70)C}G!(`ssP*X#t>#AU2Q=pD%xD!Fg-YQA{DRVd7@KH} z%IxgU*`2fJoTL3T!u#ub1296zhK`nn4BE-?O#~*wt$*S{x3?VzYNH)2A>-A2v5ckK zvzhI{fayTMR3RU$9iM1IJ$PfykR{ClG%7&vU%<`;7#x~LdUTN^?0g8wqd;4c+9y_t uuH^`tByNRpH3F0HBxxJ3EY=imC%#MS%DK>Qjo)ajX_k)}zqHi0*9p&t7xl5QJxqf5347r9qT*K#^NvLbmxm4JL0vdkSKTn9x7r@ z(q>m0?R?rOS3iLciG(MiyJK%=Rj;FoMUgH$~hWXARkjy9a{l33O!OAz}>~g9B~WmjtbXyxMuuuta}$_MYq=j& zv6oTKo}%2&vJ)un=-34EkxIm08pQ0&xs?PGxIMZ(T3at+_5vMRd1Sqvw1Hb(&jQa6 zX)$paO5@Q5uas?5@o3glglQJ*8849}An?veIj4ZEXricB*w~~#+i-CSb8O!ae$aL? zi3<+yx%dkA9XxRHH8ve=xv1eA7UPVScWm6CM_fF_BM0BQ_zsWBwe5$mU0lQkfoo?l zBPz=N44U_BZ=Wp{nEz*_!1AAJa-=QOPY)cdAkfaVZKjmjkH&gFGQs1qU$@kv#=w=kj z zt3M-uj6&%h#*R_^9nLYvzhArg4(A4}Qz-ECWnva6VTp`a(g@2vmMlV^CzhFNBD07O z`Ibx5Of+33p6=@_*v}L!Pn8k{=c!-@?tg2zO58Q(aDxg~hBPeqH7sTt=0|GC;X0M% Uh))_YO|}(|6>6IeP{k_n7vC(S%>V!Z literal 0 HcmV?d00001 From 138253a06f2d05086aabed366f42d33a7a97e2fd Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 16 Aug 2021 19:36:32 -0400 Subject: [PATCH 13/13] Alumni Test and classes complete --- .idea/uiDesigner.xml | 124 ++++++++++++++++++ src/main/java/com/example/demo/Alumni.java | 72 ++++++++++ src/main/java/com/example/demo/Student.java | 8 +- src/main/java/com/example/demo/alumni.java | 4 - .../java/com/example/demo/AlumniTest.java | 52 ++++++++ target/classes/com/example/demo/Student.class | Bin 636 -> 723 bytes target/classes/com/example/demo/alumni.class | Bin 277 -> 2791 bytes .../com/example/demo/AlumniTest.class | Bin 0 -> 1746 bytes 8 files changed, 254 insertions(+), 6 deletions(-) create mode 100644 .idea/uiDesigner.xml create mode 100644 src/main/java/com/example/demo/Alumni.java delete mode 100644 src/main/java/com/example/demo/alumni.java create mode 100644 src/test/java/com/example/demo/AlumniTest.java create mode 100644 target/test-classes/com/example/demo/AlumniTest.class diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/example/demo/Alumni.java b/src/main/java/com/example/demo/Alumni.java new file mode 100644 index 0000000..d58e284 --- /dev/null +++ b/src/main/java/com/example/demo/Alumni.java @@ -0,0 +1,72 @@ +package com.example.demo; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Component; +import javax.annotation.PostConstruct; + +@Component +public class Alumni { + + @Autowired + Instructors instructors; + + @Autowired + @Qualifier("previousStudents") + Students students; + + double numberOfHoursToTeachEachStudent = 1200; + + @Autowired + public Alumni(Instructors instructors, @Qualifier("previousStudents") Students students) { + this.instructors = instructors; + this.students = students; + } + + @PostConstruct + public void executeBootcamp() { + for(Instructor instructor : instructors.findAll()) { + instructor.lecture(students.findAll(), totalHoursPerInstructor()); + } + } + + public int numberOfStudents() { + return students.size(); + } + + public int numberOfInstructors() { + return instructors.size(); + } + + public double hoursPerInstructor() { + return numberOfHoursToTeachEachStudent / numberOfInstructors(); + } + + public double totalHoursPerInstructor() { + return hoursPerInstructor() * numberOfStudents(); + } + + public Instructors getInstructors() { + return instructors; + } + + public void setInstructors(Instructors instructors) { + this.instructors = instructors; + } + + public Students getStudents() { + return students; + } + + public void setStudents(Students students) { + this.students = students; + } + + public double getNumberOfHoursToTeachEachStudent() { + return numberOfHoursToTeachEachStudent; + } + + public void setNumberOfHoursToTeachEachStudent(double numberOfHoursToTeachEachStudent) { + this.numberOfHoursToTeachEachStudent = numberOfHoursToTeachEachStudent; + } +} diff --git a/src/main/java/com/example/demo/Student.java b/src/main/java/com/example/demo/Student.java index 16f0314..cc4a091 100644 --- a/src/main/java/com/example/demo/Student.java +++ b/src/main/java/com/example/demo/Student.java @@ -2,7 +2,7 @@ public class Student extends Person implements Learner{ - private double totalStudyTime = 0; + private double totalStudyTime = 0.00; public Student(Long id, String name) { super(id, name); @@ -10,6 +10,10 @@ public Student(Long id, String name) { @Override public void learn(double numberOfHours) { - totalStudyTime += numberOfHours; + this.totalStudyTime += numberOfHours; + } + + public double getTotalStudyTime() { + return totalStudyTime; } } diff --git a/src/main/java/com/example/demo/alumni.java b/src/main/java/com/example/demo/alumni.java deleted file mode 100644 index 5ba60be..0000000 --- a/src/main/java/com/example/demo/alumni.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.demo; - -public class alumni { -} diff --git a/src/test/java/com/example/demo/AlumniTest.java b/src/test/java/com/example/demo/AlumniTest.java new file mode 100644 index 0000000..0482e1b --- /dev/null +++ b/src/test/java/com/example/demo/AlumniTest.java @@ -0,0 +1,52 @@ +package com.example.demo; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest +@RunWith(SpringRunner.class) +@ContextConfiguration +public class AlumniTest { + + @Autowired + Alumni alumni; + + @Test + public void testExecuteBootcampStudent1() { + //given + double expected = 1200; + //when + Student student1 = alumni.getStudents().findById(4l); + double actual = student1.getTotalStudyTime(); + //then + Assert.assertEquals(expected, actual, 0.01); + } + + @Test + public void testExecuteBootcampStudent2() { + //given + double expected = 1200; + //when + Student student2 = alumni.getStudents().findById(5L); + double actual = student2.getTotalStudyTime(); + //then + Assert.assertEquals(expected, actual, 0.01); + } + + @Test + public void testExecuteBootcampStudent3() { + //given + double expected = 1200; + //when + Student student3 = alumni.getStudents().findById(6L); + double actual = student3.getTotalStudyTime(); + //then + Assert.assertEquals(expected, actual, 0.01); + } +} diff --git a/target/classes/com/example/demo/Student.class b/target/classes/com/example/demo/Student.class index b0c019d0c723332c7f11bb239b2043361bcea515..29c34badc68dd96e3b834e3ca469f949fa99e7e7 100644 GIT binary patch delta 139 zcmeyva+y{3)W2Q(7#J8#7!mW1S&B<2K{ zl%`aMWag$aGB9gsx=fa4>}F)1yqxiZlLP}J0~gQ`eFi2Vi-CbvYYPL@dLV;|fg4D& afdvH_cz|pkhyn&)20kEiG6#jbIOR_rwLVzUZ!h)K>1{n?JVu&O_LV{T?35Xi6!)^luvoq9O65_K} zdH2m<;EPpim0-mOE6@H2e~4wNU(f99vX>;~!}d&{?*7hq&iPKy{_)RmzXNy|P8R)` zP2c?XIj6v3^x=*g?y6xfiw|%wha%>4SiqthmNK}X#RJ^Sa>H^KIjpGZhgq!RBekDz zefU@npQzzs2A^i|nLy68J>LyVzT`5z!xP=89nhx&-+64h zvP{@Ro*$H@?GxoxD~09iA~*g|ANK>pGS^M%@@VRjVFgm4d&iZJOegSSSb+gMsH{nM zas93nxZaAhB8}4KZT_lT1jH?Y^mWrV{YioA!>t?-rm1x`b~Q1wDv+FU%H+{iG;O&M zI$klDOM#xEQ!=bo!!^~sYE1f@Cew1V6?Do9Dz?eUy62_8>6DiYm2_XKLJl?7skYQm zur9ePOMx$^9mg-R`34t@Mj_a|~`H^McC~eOhJ0af;J{QOrw~R-|?!jU& zIi5d5m4s4Ll;e!YnF)Q*2^@P{F=&!#HOl633V@BpiF+@}Jquy9T5og31x? zoX+424PWA`3=9oxC{YX=%8(k?vBA!M$=#B{riLrHtii;VhHY3GR5aKa*LWRrxTMxD zVw?qUfr(eu;yv!PMf5U;;BM)UZ4R1m2k`Y_%A@2Y?ob<-~50K{WlPv^eNf60mV1dip zofwYDg=a%wyfr4m8YeyTYwqZ4fScfQIa7NhYU)i9N??T6!wH%dLo{$M zaNe2V!0U{^kgC81jPjTw_zhhug5!l>klIJ)84d{)FFeCxf$uQDm#n~Z z#94la3qom~qhfc7PoXwP&b#)}{R5{_&Qw{zT&ok%#|Y8;bh{a1tS!Vt(9%N{FB;rUV~rEnU@`Qdo)?5Fh*#fcM*QN;h-5 z)|S&GZqSFSOarF_y%2GlB&QoM;1soCm6KAuz|C5!b;8GaN;W5Xx-F+EOxHL?{hBVE iXQwvjX_lPsynvJHei3#e^OPs21ZKkVR!!Zvf&Tz#*Humc delta 212 zcmaDZI+aQ3)W2Q(7#J8#7zDT&m>GE48Ti;4_!$}4Y%=pQOY9gKm^CIpV)Us`%qh*y z%d}=>;0n$!ElN&x%gjk-WZ;Gf>t!XDCGs$^Ft9Q*h$rXg>ZevD<`(3n>ZhdU=IcY$ zFfs^$RO#m==B4ZVCuOB3moO+YFahlZ0Y)GMY6p^RK%PFB&%nT{wVi=+BT#@zgMl4L du>r*yfI2vUBoCO)%D~CM1>^yp0wkFjcmU==Cfxu4 diff --git a/target/test-classes/com/example/demo/AlumniTest.class b/target/test-classes/com/example/demo/AlumniTest.class new file mode 100644 index 0000000000000000000000000000000000000000..3f23416aebcb994b17df15c986d3f8d1feff2eee GIT binary patch literal 1746 zcma)6TXWM!7(HubIS362jY}>-TgoMNXjn+NhXPIwUV|D z1cqvU*p_O=YcIEytgCh?E7{g0_Z}zO1Z}kt#KB@qRkRL`XM#}20#|Bb)RggZ6zFCn z^4jWU7(J7V%G0rIc)kgvRq1Uw$Vy_umqDcJgte~+Ixsf`_La&D0@id`R|37YK&#oL zy{Mvjk8A=z)I#5DEqGCo+MPwqJPk;HY$w_CDmLUeVmQvMC_gc3Dh!R!_~uMfSK6Ex z=us=n$~USmAgVOujh*4GxE;4tIO9sZmOx(?{8GX&&iGZf@TtB9X07<2*WOZ#Nh&Nxu{^OfN2+1 z%oK3j#U0!g7~ImTo!Yp#hx-LQa8bh_O!1a;-R!Y=Y5ru((@ptsafxjpFtCGzz=5VR z9g?)`O648lyIM~HMjPz9-pqL?w z8YcEpjF2tm8|5l7JA4*SGN50{JBU7VUSJwO8%2Mo;WIRQ# z5&lYhDl6@(th|S^L*K1zjLIaHoujgGDx26-+2}6HayY}xttR literal 0 HcmV?d00001