From 4aa8633c43dcaab6eb919ef1298706bac8cd1893 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Tue, 31 Jul 2018 22:39:22 +0300 Subject: [PATCH 1/3] add libraries server project --- libraries-server/.gitignore | 9 ++++ libraries-server/pom.xml | 19 ++++++++ .../mqtt/EngineTemperatureSensor.java | 0 .../mqtt/EngineTemperatureSensorLiveTest.java | 0 libraries-server/src/test/resources/ABC.txt | 1 + .../resources/JunitParamsTestParameters.csv | 4 ++ libraries-server/src/test/resources/aaa.txt | 1 + .../src/test/resources/adder-beans.xml | 13 ++++++ libraries-server/src/test/resources/book.csv | 3 ++ .../src/test/resources/csv/fourColumn.csv | 5 +++ .../src/test/resources/csv/namedColumn.csv | 5 +++ .../src/test/resources/csv/twoColumn.csv | 5 +++ .../src/test/resources/csv/writtenAll.csv | 0 .../src/test/resources/csv/writtenBean.csv | 0 .../test/resources/csv/writtenOneByOne.csv | 0 .../src/test/resources/dockerapi/Dockerfile | 8 ++++ .../src/test/resources/employees.sql | 43 +++++++++++++++++++ .../src/test/resources/fileTest.txt | 1 + .../src/test/resources/ftp/baz.txt | 0 libraries-server/src/test/resources/input.txt | 1 + .../src/test/resources/output.txt | 1 + .../src/test/resources/sample.txt | 2 + .../github_user_profile_payload_test.story | 13 ++++++ .../resources/stories/spring/adder_test.story | 11 +++++ .../src/test/resources/yaml/customer.yaml | 3 ++ .../yaml/customer_with_contact_details.yaml | 7 +++ ...omer_with_contact_details_and_address.yaml | 13 ++++++ ...ustomer_with_contact_details_and_tags.yaml | 6 +++ .../resources/yaml/customer_with_type.yaml | 4 ++ .../src/test/resources/yaml/customers.yaml | 8 ++++ libraries/pom.xml | 7 --- 31 files changed, 186 insertions(+), 7 deletions(-) create mode 100644 libraries-server/.gitignore create mode 100644 libraries-server/pom.xml rename {libraries => libraries-server}/src/main/java/com/baeldung/mqtt/EngineTemperatureSensor.java (100%) rename {libraries => libraries-server}/src/test/java/com/baeldung/mqtt/EngineTemperatureSensorLiveTest.java (100%) create mode 100644 libraries-server/src/test/resources/ABC.txt create mode 100644 libraries-server/src/test/resources/JunitParamsTestParameters.csv create mode 100644 libraries-server/src/test/resources/aaa.txt create mode 100644 libraries-server/src/test/resources/adder-beans.xml create mode 100644 libraries-server/src/test/resources/book.csv create mode 100644 libraries-server/src/test/resources/csv/fourColumn.csv create mode 100644 libraries-server/src/test/resources/csv/namedColumn.csv create mode 100644 libraries-server/src/test/resources/csv/twoColumn.csv create mode 100644 libraries-server/src/test/resources/csv/writtenAll.csv create mode 100644 libraries-server/src/test/resources/csv/writtenBean.csv create mode 100644 libraries-server/src/test/resources/csv/writtenOneByOne.csv create mode 100644 libraries-server/src/test/resources/dockerapi/Dockerfile create mode 100644 libraries-server/src/test/resources/employees.sql create mode 100644 libraries-server/src/test/resources/fileTest.txt create mode 100644 libraries-server/src/test/resources/ftp/baz.txt create mode 100644 libraries-server/src/test/resources/input.txt create mode 100644 libraries-server/src/test/resources/output.txt create mode 100644 libraries-server/src/test/resources/sample.txt create mode 100644 libraries-server/src/test/resources/stories/github_rest/user_profile/github_user_profile_payload_test.story create mode 100644 libraries-server/src/test/resources/stories/spring/adder_test.story create mode 100644 libraries-server/src/test/resources/yaml/customer.yaml create mode 100644 libraries-server/src/test/resources/yaml/customer_with_contact_details.yaml create mode 100644 libraries-server/src/test/resources/yaml/customer_with_contact_details_and_address.yaml create mode 100644 libraries-server/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml create mode 100644 libraries-server/src/test/resources/yaml/customer_with_type.yaml create mode 100644 libraries-server/src/test/resources/yaml/customers.yaml diff --git a/libraries-server/.gitignore b/libraries-server/.gitignore new file mode 100644 index 000000000000..e594daf27a9e --- /dev/null +++ b/libraries-server/.gitignore @@ -0,0 +1,9 @@ +*.class + +# Folders # +/gensrc +/target + +# Packaged files # +*.jar +/bin/ diff --git a/libraries-server/pom.xml b/libraries-server/pom.xml new file mode 100644 index 000000000000..517cf6a07c53 --- /dev/null +++ b/libraries-server/pom.xml @@ -0,0 +1,19 @@ + + 4.0.0 + com.baeldung + libraries-server + 0.0.1-SNAPSHOT + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.0 + + + \ No newline at end of file diff --git a/libraries/src/main/java/com/baeldung/mqtt/EngineTemperatureSensor.java b/libraries-server/src/main/java/com/baeldung/mqtt/EngineTemperatureSensor.java similarity index 100% rename from libraries/src/main/java/com/baeldung/mqtt/EngineTemperatureSensor.java rename to libraries-server/src/main/java/com/baeldung/mqtt/EngineTemperatureSensor.java diff --git a/libraries/src/test/java/com/baeldung/mqtt/EngineTemperatureSensorLiveTest.java b/libraries-server/src/test/java/com/baeldung/mqtt/EngineTemperatureSensorLiveTest.java similarity index 100% rename from libraries/src/test/java/com/baeldung/mqtt/EngineTemperatureSensorLiveTest.java rename to libraries-server/src/test/java/com/baeldung/mqtt/EngineTemperatureSensorLiveTest.java diff --git a/libraries-server/src/test/resources/ABC.txt b/libraries-server/src/test/resources/ABC.txt new file mode 100644 index 000000000000..f78e42598c9c --- /dev/null +++ b/libraries-server/src/test/resources/ABC.txt @@ -0,0 +1 @@ +Hello World from ABC.txt!!! \ No newline at end of file diff --git a/libraries-server/src/test/resources/JunitParamsTestParameters.csv b/libraries-server/src/test/resources/JunitParamsTestParameters.csv new file mode 100644 index 000000000000..84eb5a0b239b --- /dev/null +++ b/libraries-server/src/test/resources/JunitParamsTestParameters.csv @@ -0,0 +1,4 @@ +1,2,3 +-10, 30, 20 +15, -5, 10 +-5, -10, -15 \ No newline at end of file diff --git a/libraries-server/src/test/resources/aaa.txt b/libraries-server/src/test/resources/aaa.txt new file mode 100644 index 000000000000..e5875f97d685 --- /dev/null +++ b/libraries-server/src/test/resources/aaa.txt @@ -0,0 +1 @@ +Hello World from aaa.txt!!! \ No newline at end of file diff --git a/libraries-server/src/test/resources/adder-beans.xml b/libraries-server/src/test/resources/adder-beans.xml new file mode 100644 index 000000000000..2fbdbd378ff2 --- /dev/null +++ b/libraries-server/src/test/resources/adder-beans.xml @@ -0,0 +1,13 @@ + + + + + + 4 + + + + + diff --git a/libraries-server/src/test/resources/book.csv b/libraries-server/src/test/resources/book.csv new file mode 100644 index 000000000000..d709152a5e97 --- /dev/null +++ b/libraries-server/src/test/resources/book.csv @@ -0,0 +1,3 @@ +author,title +Dan Simmons,Hyperion +Douglas Adams,The Hitchhiker's Guide to the Galaxy diff --git a/libraries-server/src/test/resources/csv/fourColumn.csv b/libraries-server/src/test/resources/csv/fourColumn.csv new file mode 100644 index 000000000000..51a69fd1a029 --- /dev/null +++ b/libraries-server/src/test/resources/csv/fourColumn.csv @@ -0,0 +1,5 @@ +ColA,ColB,ColC,ColD +A,B,B,B +C,D,W,W +G,G,E,E +G,F,Q,Q diff --git a/libraries-server/src/test/resources/csv/namedColumn.csv b/libraries-server/src/test/resources/csv/namedColumn.csv new file mode 100644 index 000000000000..279b74360034 --- /dev/null +++ b/libraries-server/src/test/resources/csv/namedColumn.csv @@ -0,0 +1,5 @@ +name,age +adam,1000 +martin,27 +gigi,41 +seraphine,30 \ No newline at end of file diff --git a/libraries-server/src/test/resources/csv/twoColumn.csv b/libraries-server/src/test/resources/csv/twoColumn.csv new file mode 100644 index 000000000000..3eab8e8a6410 --- /dev/null +++ b/libraries-server/src/test/resources/csv/twoColumn.csv @@ -0,0 +1,5 @@ +ColA,ColB +A,B +C,D +G,G +G,F diff --git a/libraries-server/src/test/resources/csv/writtenAll.csv b/libraries-server/src/test/resources/csv/writtenAll.csv new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/libraries-server/src/test/resources/csv/writtenBean.csv b/libraries-server/src/test/resources/csv/writtenBean.csv new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/libraries-server/src/test/resources/csv/writtenOneByOne.csv b/libraries-server/src/test/resources/csv/writtenOneByOne.csv new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/libraries-server/src/test/resources/dockerapi/Dockerfile b/libraries-server/src/test/resources/dockerapi/Dockerfile new file mode 100644 index 000000000000..f9ad47f03257 --- /dev/null +++ b/libraries-server/src/test/resources/dockerapi/Dockerfile @@ -0,0 +1,8 @@ +FROM alpine:3.6 + +RUN apk --update add git openssh && \ + rm -rf /var/lib/apt/lists/* && \ + rm /var/cache/apk/* + +ENTRYPOINT ["git"] +CMD ["--help"] \ No newline at end of file diff --git a/libraries-server/src/test/resources/employees.sql b/libraries-server/src/test/resources/employees.sql new file mode 100644 index 000000000000..c6109724cfc0 --- /dev/null +++ b/libraries-server/src/test/resources/employees.sql @@ -0,0 +1,43 @@ +CREATE TABLE employee( + id int NOT NULL PRIMARY KEY auto_increment, + firstname varchar(255), + lastname varchar(255), + salary double, + hireddate date +); + +CREATE TABLE email( + id int NOT NULL PRIMARY KEY auto_increment, + employeeid int, + address varchar(255) +); + +CREATE TABLE employee_legacy( + id int NOT NULL PRIMARY KEY auto_increment, + first_name varchar(255), + last_name varchar(255), + salary double, + hired_date date +); + + +INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('John', 'Doe', 10000.10, to_date('01-01-2001','dd-mm-yyyy')); +INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Kevin', 'Smith', 20000.20, to_date('02-02-2002','dd-mm-yyyy')); +INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Kim', 'Smith', 30000.30, to_date('03-03-2003','dd-mm-yyyy')); +INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Stephen', 'Torvalds', 40000.40, to_date('04-04-2004','dd-mm-yyyy')); +INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Christian', 'Reynolds', 50000.50, to_date('05-05-2005','dd-mm-yyyy')); + +INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('John', 'Doe', 10000.10, to_date('01-01-2001','dd-mm-yyyy')); +INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Kevin', 'Smith', 20000.20, to_date('02-02-2002','dd-mm-yyyy')); +INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Kim', 'Smith', 30000.30, to_date('03-03-2003','dd-mm-yyyy')); +INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Stephen', 'Torvalds', 40000.40, to_date('04-04-2004','dd-mm-yyyy')); +INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Christian', 'Reynolds', 50000.50, to_date('05-05-2005','dd-mm-yyyy')); + +INSERT INTO email (employeeid,address) VALUES (1, 'john@baeldung.com'); +INSERT INTO email (employeeid,address) VALUES (1, 'john@gmail.com'); +INSERT INTO email (employeeid,address) VALUES (2, 'kevin@baeldung.com'); +INSERT INTO email (employeeid,address) VALUES (3, 'kim@baeldung.com'); +INSERT INTO email (employeeid,address) VALUES (3, 'kim@gmail.com'); +INSERT INTO email (employeeid,address) VALUES (3, 'kim@outlook.com'); +INSERT INTO email (employeeid,address) VALUES (4, 'stephen@baeldung.com'); +INSERT INTO email (employeeid,address) VALUES (5, 'christian@gmail.com'); diff --git a/libraries-server/src/test/resources/fileTest.txt b/libraries-server/src/test/resources/fileTest.txt new file mode 100644 index 000000000000..ce4bea208b76 --- /dev/null +++ b/libraries-server/src/test/resources/fileTest.txt @@ -0,0 +1 @@ +Hello World from fileTest.txt!!! \ No newline at end of file diff --git a/libraries-server/src/test/resources/ftp/baz.txt b/libraries-server/src/test/resources/ftp/baz.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/libraries-server/src/test/resources/input.txt b/libraries-server/src/test/resources/input.txt new file mode 100644 index 000000000000..811232fa1f52 --- /dev/null +++ b/libraries-server/src/test/resources/input.txt @@ -0,0 +1 @@ +This file is merely for testing. \ No newline at end of file diff --git a/libraries-server/src/test/resources/output.txt b/libraries-server/src/test/resources/output.txt new file mode 100644 index 000000000000..34e1e27d5aa7 --- /dev/null +++ b/libraries-server/src/test/resources/output.txt @@ -0,0 +1 @@ +Should be copied to OutputStream. \ No newline at end of file diff --git a/libraries-server/src/test/resources/sample.txt b/libraries-server/src/test/resources/sample.txt new file mode 100644 index 000000000000..20f137b41622 --- /dev/null +++ b/libraries-server/src/test/resources/sample.txt @@ -0,0 +1,2 @@ +line 1 +a second line \ No newline at end of file diff --git a/libraries-server/src/test/resources/stories/github_rest/user_profile/github_user_profile_payload_test.story b/libraries-server/src/test/resources/stories/github_rest/user_profile/github_user_profile_payload_test.story new file mode 100644 index 000000000000..841bf901b5fa --- /dev/null +++ b/libraries-server/src/test/resources/stories/github_rest/user_profile/github_user_profile_payload_test.story @@ -0,0 +1,13 @@ + +Meta: + +Narrative: +As a user +I want to look up a valid user's profile on github +So that I can know the login payload should be the same as username + +Scenario: Github user's profile should have a login payload same as username + +Given github user profile api +When looking for eugenp via the api +Then github's response contains a 'login' payload same as eugenp diff --git a/libraries-server/src/test/resources/stories/spring/adder_test.story b/libraries-server/src/test/resources/stories/spring/adder_test.story new file mode 100644 index 000000000000..e8de2cf076c0 --- /dev/null +++ b/libraries-server/src/test/resources/stories/spring/adder_test.story @@ -0,0 +1,11 @@ +Meta: + +Narrative: +As user +I want to add a number +So that I can have the sum + +Scenario: A user can submit a number to adder and get current sum +Given a number +When I submit another number 5 to adder +Then I get a sum of the numbers \ No newline at end of file diff --git a/libraries-server/src/test/resources/yaml/customer.yaml b/libraries-server/src/test/resources/yaml/customer.yaml new file mode 100644 index 000000000000..aa76141c7d90 --- /dev/null +++ b/libraries-server/src/test/resources/yaml/customer.yaml @@ -0,0 +1,3 @@ +firstName: "John" +lastName: "Doe" +age: 20 \ No newline at end of file diff --git a/libraries-server/src/test/resources/yaml/customer_with_contact_details.yaml b/libraries-server/src/test/resources/yaml/customer_with_contact_details.yaml new file mode 100644 index 000000000000..34563cbd21ba --- /dev/null +++ b/libraries-server/src/test/resources/yaml/customer_with_contact_details.yaml @@ -0,0 +1,7 @@ +firstName: "John" +lastName: "Doe" +age: 31 +contactDetails: + - { type: "mobile", number: 123456789} + - { type: "landline", number: 456786868} + \ No newline at end of file diff --git a/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_address.yaml b/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_address.yaml new file mode 100644 index 000000000000..664afe859419 --- /dev/null +++ b/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_address.yaml @@ -0,0 +1,13 @@ +firstName: "John" +lastName: "Doe" +age: 31 +contactDetails: + - type: "mobile" + number: 123456789 + - type: "landline" + number: 456786868 +homeAddress: + line: "Xyz, DEF Street" + city: "City Y" + state: "State Y" + zip: 345657 diff --git a/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml b/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml new file mode 100644 index 000000000000..145da256d91b --- /dev/null +++ b/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml @@ -0,0 +1,6 @@ +firstName: "John" +lastName: "Doe" +age: 31 +contactDetails: + - !contact { type: "mobile", number: 123456789} + - !contact { type: "landline", number: 456786868} diff --git a/libraries-server/src/test/resources/yaml/customer_with_type.yaml b/libraries-server/src/test/resources/yaml/customer_with_type.yaml new file mode 100644 index 000000000000..6e13c26cea07 --- /dev/null +++ b/libraries-server/src/test/resources/yaml/customer_with_type.yaml @@ -0,0 +1,4 @@ +!!com.baeldung.snakeyaml.Customer +firstName: "John" +lastName: "Doe" +age: 20 \ No newline at end of file diff --git a/libraries-server/src/test/resources/yaml/customers.yaml b/libraries-server/src/test/resources/yaml/customers.yaml new file mode 100644 index 000000000000..23b9039c2e33 --- /dev/null +++ b/libraries-server/src/test/resources/yaml/customers.yaml @@ -0,0 +1,8 @@ +--- +firstName: "John" +lastName: "Doe" +age: 20 +--- +firstName: "Jack" +lastName: "Jones" +age: 25 \ No newline at end of file diff --git a/libraries/pom.xml b/libraries/pom.xml index b19a005d9423..7402d88ef306 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -778,13 +778,6 @@ ${snakeyaml.version} - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - 1.2.0 - - - From 2299a6647254380b8957f192ffba7a1f4d983d3c Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Tue, 31 Jul 2018 22:39:56 +0300 Subject: [PATCH 2/3] remove extra files --- libraries-server/src/test/resources/ABC.txt | 1 - .../resources/JunitParamsTestParameters.csv | 4 -- libraries-server/src/test/resources/aaa.txt | 1 - .../src/test/resources/adder-beans.xml | 13 ------ libraries-server/src/test/resources/book.csv | 3 -- .../src/test/resources/csv/fourColumn.csv | 5 --- .../src/test/resources/csv/namedColumn.csv | 5 --- .../src/test/resources/csv/twoColumn.csv | 5 --- .../src/test/resources/csv/writtenAll.csv | 0 .../src/test/resources/csv/writtenBean.csv | 0 .../test/resources/csv/writtenOneByOne.csv | 0 .../src/test/resources/dockerapi/Dockerfile | 8 ---- .../src/test/resources/employees.sql | 43 ------------------- .../src/test/resources/fileTest.txt | 1 - .../src/test/resources/ftp/baz.txt | 0 libraries-server/src/test/resources/input.txt | 1 - .../src/test/resources/output.txt | 1 - .../src/test/resources/sample.txt | 2 - .../github_user_profile_payload_test.story | 13 ------ .../resources/stories/spring/adder_test.story | 11 ----- .../src/test/resources/yaml/customer.yaml | 3 -- .../yaml/customer_with_contact_details.yaml | 7 --- ...omer_with_contact_details_and_address.yaml | 13 ------ ...ustomer_with_contact_details_and_tags.yaml | 6 --- .../resources/yaml/customer_with_type.yaml | 4 -- .../src/test/resources/yaml/customers.yaml | 8 ---- 26 files changed, 158 deletions(-) delete mode 100644 libraries-server/src/test/resources/ABC.txt delete mode 100644 libraries-server/src/test/resources/JunitParamsTestParameters.csv delete mode 100644 libraries-server/src/test/resources/aaa.txt delete mode 100644 libraries-server/src/test/resources/adder-beans.xml delete mode 100644 libraries-server/src/test/resources/book.csv delete mode 100644 libraries-server/src/test/resources/csv/fourColumn.csv delete mode 100644 libraries-server/src/test/resources/csv/namedColumn.csv delete mode 100644 libraries-server/src/test/resources/csv/twoColumn.csv delete mode 100644 libraries-server/src/test/resources/csv/writtenAll.csv delete mode 100644 libraries-server/src/test/resources/csv/writtenBean.csv delete mode 100644 libraries-server/src/test/resources/csv/writtenOneByOne.csv delete mode 100644 libraries-server/src/test/resources/dockerapi/Dockerfile delete mode 100644 libraries-server/src/test/resources/employees.sql delete mode 100644 libraries-server/src/test/resources/fileTest.txt delete mode 100644 libraries-server/src/test/resources/ftp/baz.txt delete mode 100644 libraries-server/src/test/resources/input.txt delete mode 100644 libraries-server/src/test/resources/output.txt delete mode 100644 libraries-server/src/test/resources/sample.txt delete mode 100644 libraries-server/src/test/resources/stories/github_rest/user_profile/github_user_profile_payload_test.story delete mode 100644 libraries-server/src/test/resources/stories/spring/adder_test.story delete mode 100644 libraries-server/src/test/resources/yaml/customer.yaml delete mode 100644 libraries-server/src/test/resources/yaml/customer_with_contact_details.yaml delete mode 100644 libraries-server/src/test/resources/yaml/customer_with_contact_details_and_address.yaml delete mode 100644 libraries-server/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml delete mode 100644 libraries-server/src/test/resources/yaml/customer_with_type.yaml delete mode 100644 libraries-server/src/test/resources/yaml/customers.yaml diff --git a/libraries-server/src/test/resources/ABC.txt b/libraries-server/src/test/resources/ABC.txt deleted file mode 100644 index f78e42598c9c..000000000000 --- a/libraries-server/src/test/resources/ABC.txt +++ /dev/null @@ -1 +0,0 @@ -Hello World from ABC.txt!!! \ No newline at end of file diff --git a/libraries-server/src/test/resources/JunitParamsTestParameters.csv b/libraries-server/src/test/resources/JunitParamsTestParameters.csv deleted file mode 100644 index 84eb5a0b239b..000000000000 --- a/libraries-server/src/test/resources/JunitParamsTestParameters.csv +++ /dev/null @@ -1,4 +0,0 @@ -1,2,3 --10, 30, 20 -15, -5, 10 --5, -10, -15 \ No newline at end of file diff --git a/libraries-server/src/test/resources/aaa.txt b/libraries-server/src/test/resources/aaa.txt deleted file mode 100644 index e5875f97d685..000000000000 --- a/libraries-server/src/test/resources/aaa.txt +++ /dev/null @@ -1 +0,0 @@ -Hello World from aaa.txt!!! \ No newline at end of file diff --git a/libraries-server/src/test/resources/adder-beans.xml b/libraries-server/src/test/resources/adder-beans.xml deleted file mode 100644 index 2fbdbd378ff2..000000000000 --- a/libraries-server/src/test/resources/adder-beans.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - 4 - - - - - diff --git a/libraries-server/src/test/resources/book.csv b/libraries-server/src/test/resources/book.csv deleted file mode 100644 index d709152a5e97..000000000000 --- a/libraries-server/src/test/resources/book.csv +++ /dev/null @@ -1,3 +0,0 @@ -author,title -Dan Simmons,Hyperion -Douglas Adams,The Hitchhiker's Guide to the Galaxy diff --git a/libraries-server/src/test/resources/csv/fourColumn.csv b/libraries-server/src/test/resources/csv/fourColumn.csv deleted file mode 100644 index 51a69fd1a029..000000000000 --- a/libraries-server/src/test/resources/csv/fourColumn.csv +++ /dev/null @@ -1,5 +0,0 @@ -ColA,ColB,ColC,ColD -A,B,B,B -C,D,W,W -G,G,E,E -G,F,Q,Q diff --git a/libraries-server/src/test/resources/csv/namedColumn.csv b/libraries-server/src/test/resources/csv/namedColumn.csv deleted file mode 100644 index 279b74360034..000000000000 --- a/libraries-server/src/test/resources/csv/namedColumn.csv +++ /dev/null @@ -1,5 +0,0 @@ -name,age -adam,1000 -martin,27 -gigi,41 -seraphine,30 \ No newline at end of file diff --git a/libraries-server/src/test/resources/csv/twoColumn.csv b/libraries-server/src/test/resources/csv/twoColumn.csv deleted file mode 100644 index 3eab8e8a6410..000000000000 --- a/libraries-server/src/test/resources/csv/twoColumn.csv +++ /dev/null @@ -1,5 +0,0 @@ -ColA,ColB -A,B -C,D -G,G -G,F diff --git a/libraries-server/src/test/resources/csv/writtenAll.csv b/libraries-server/src/test/resources/csv/writtenAll.csv deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/libraries-server/src/test/resources/csv/writtenBean.csv b/libraries-server/src/test/resources/csv/writtenBean.csv deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/libraries-server/src/test/resources/csv/writtenOneByOne.csv b/libraries-server/src/test/resources/csv/writtenOneByOne.csv deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/libraries-server/src/test/resources/dockerapi/Dockerfile b/libraries-server/src/test/resources/dockerapi/Dockerfile deleted file mode 100644 index f9ad47f03257..000000000000 --- a/libraries-server/src/test/resources/dockerapi/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM alpine:3.6 - -RUN apk --update add git openssh && \ - rm -rf /var/lib/apt/lists/* && \ - rm /var/cache/apk/* - -ENTRYPOINT ["git"] -CMD ["--help"] \ No newline at end of file diff --git a/libraries-server/src/test/resources/employees.sql b/libraries-server/src/test/resources/employees.sql deleted file mode 100644 index c6109724cfc0..000000000000 --- a/libraries-server/src/test/resources/employees.sql +++ /dev/null @@ -1,43 +0,0 @@ -CREATE TABLE employee( - id int NOT NULL PRIMARY KEY auto_increment, - firstname varchar(255), - lastname varchar(255), - salary double, - hireddate date -); - -CREATE TABLE email( - id int NOT NULL PRIMARY KEY auto_increment, - employeeid int, - address varchar(255) -); - -CREATE TABLE employee_legacy( - id int NOT NULL PRIMARY KEY auto_increment, - first_name varchar(255), - last_name varchar(255), - salary double, - hired_date date -); - - -INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('John', 'Doe', 10000.10, to_date('01-01-2001','dd-mm-yyyy')); -INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Kevin', 'Smith', 20000.20, to_date('02-02-2002','dd-mm-yyyy')); -INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Kim', 'Smith', 30000.30, to_date('03-03-2003','dd-mm-yyyy')); -INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Stephen', 'Torvalds', 40000.40, to_date('04-04-2004','dd-mm-yyyy')); -INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Christian', 'Reynolds', 50000.50, to_date('05-05-2005','dd-mm-yyyy')); - -INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('John', 'Doe', 10000.10, to_date('01-01-2001','dd-mm-yyyy')); -INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Kevin', 'Smith', 20000.20, to_date('02-02-2002','dd-mm-yyyy')); -INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Kim', 'Smith', 30000.30, to_date('03-03-2003','dd-mm-yyyy')); -INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Stephen', 'Torvalds', 40000.40, to_date('04-04-2004','dd-mm-yyyy')); -INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Christian', 'Reynolds', 50000.50, to_date('05-05-2005','dd-mm-yyyy')); - -INSERT INTO email (employeeid,address) VALUES (1, 'john@baeldung.com'); -INSERT INTO email (employeeid,address) VALUES (1, 'john@gmail.com'); -INSERT INTO email (employeeid,address) VALUES (2, 'kevin@baeldung.com'); -INSERT INTO email (employeeid,address) VALUES (3, 'kim@baeldung.com'); -INSERT INTO email (employeeid,address) VALUES (3, 'kim@gmail.com'); -INSERT INTO email (employeeid,address) VALUES (3, 'kim@outlook.com'); -INSERT INTO email (employeeid,address) VALUES (4, 'stephen@baeldung.com'); -INSERT INTO email (employeeid,address) VALUES (5, 'christian@gmail.com'); diff --git a/libraries-server/src/test/resources/fileTest.txt b/libraries-server/src/test/resources/fileTest.txt deleted file mode 100644 index ce4bea208b76..000000000000 --- a/libraries-server/src/test/resources/fileTest.txt +++ /dev/null @@ -1 +0,0 @@ -Hello World from fileTest.txt!!! \ No newline at end of file diff --git a/libraries-server/src/test/resources/ftp/baz.txt b/libraries-server/src/test/resources/ftp/baz.txt deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/libraries-server/src/test/resources/input.txt b/libraries-server/src/test/resources/input.txt deleted file mode 100644 index 811232fa1f52..000000000000 --- a/libraries-server/src/test/resources/input.txt +++ /dev/null @@ -1 +0,0 @@ -This file is merely for testing. \ No newline at end of file diff --git a/libraries-server/src/test/resources/output.txt b/libraries-server/src/test/resources/output.txt deleted file mode 100644 index 34e1e27d5aa7..000000000000 --- a/libraries-server/src/test/resources/output.txt +++ /dev/null @@ -1 +0,0 @@ -Should be copied to OutputStream. \ No newline at end of file diff --git a/libraries-server/src/test/resources/sample.txt b/libraries-server/src/test/resources/sample.txt deleted file mode 100644 index 20f137b41622..000000000000 --- a/libraries-server/src/test/resources/sample.txt +++ /dev/null @@ -1,2 +0,0 @@ -line 1 -a second line \ No newline at end of file diff --git a/libraries-server/src/test/resources/stories/github_rest/user_profile/github_user_profile_payload_test.story b/libraries-server/src/test/resources/stories/github_rest/user_profile/github_user_profile_payload_test.story deleted file mode 100644 index 841bf901b5fa..000000000000 --- a/libraries-server/src/test/resources/stories/github_rest/user_profile/github_user_profile_payload_test.story +++ /dev/null @@ -1,13 +0,0 @@ - -Meta: - -Narrative: -As a user -I want to look up a valid user's profile on github -So that I can know the login payload should be the same as username - -Scenario: Github user's profile should have a login payload same as username - -Given github user profile api -When looking for eugenp via the api -Then github's response contains a 'login' payload same as eugenp diff --git a/libraries-server/src/test/resources/stories/spring/adder_test.story b/libraries-server/src/test/resources/stories/spring/adder_test.story deleted file mode 100644 index e8de2cf076c0..000000000000 --- a/libraries-server/src/test/resources/stories/spring/adder_test.story +++ /dev/null @@ -1,11 +0,0 @@ -Meta: - -Narrative: -As user -I want to add a number -So that I can have the sum - -Scenario: A user can submit a number to adder and get current sum -Given a number -When I submit another number 5 to adder -Then I get a sum of the numbers \ No newline at end of file diff --git a/libraries-server/src/test/resources/yaml/customer.yaml b/libraries-server/src/test/resources/yaml/customer.yaml deleted file mode 100644 index aa76141c7d90..000000000000 --- a/libraries-server/src/test/resources/yaml/customer.yaml +++ /dev/null @@ -1,3 +0,0 @@ -firstName: "John" -lastName: "Doe" -age: 20 \ No newline at end of file diff --git a/libraries-server/src/test/resources/yaml/customer_with_contact_details.yaml b/libraries-server/src/test/resources/yaml/customer_with_contact_details.yaml deleted file mode 100644 index 34563cbd21ba..000000000000 --- a/libraries-server/src/test/resources/yaml/customer_with_contact_details.yaml +++ /dev/null @@ -1,7 +0,0 @@ -firstName: "John" -lastName: "Doe" -age: 31 -contactDetails: - - { type: "mobile", number: 123456789} - - { type: "landline", number: 456786868} - \ No newline at end of file diff --git a/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_address.yaml b/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_address.yaml deleted file mode 100644 index 664afe859419..000000000000 --- a/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_address.yaml +++ /dev/null @@ -1,13 +0,0 @@ -firstName: "John" -lastName: "Doe" -age: 31 -contactDetails: - - type: "mobile" - number: 123456789 - - type: "landline" - number: 456786868 -homeAddress: - line: "Xyz, DEF Street" - city: "City Y" - state: "State Y" - zip: 345657 diff --git a/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml b/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml deleted file mode 100644 index 145da256d91b..000000000000 --- a/libraries-server/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml +++ /dev/null @@ -1,6 +0,0 @@ -firstName: "John" -lastName: "Doe" -age: 31 -contactDetails: - - !contact { type: "mobile", number: 123456789} - - !contact { type: "landline", number: 456786868} diff --git a/libraries-server/src/test/resources/yaml/customer_with_type.yaml b/libraries-server/src/test/resources/yaml/customer_with_type.yaml deleted file mode 100644 index 6e13c26cea07..000000000000 --- a/libraries-server/src/test/resources/yaml/customer_with_type.yaml +++ /dev/null @@ -1,4 +0,0 @@ -!!com.baeldung.snakeyaml.Customer -firstName: "John" -lastName: "Doe" -age: 20 \ No newline at end of file diff --git a/libraries-server/src/test/resources/yaml/customers.yaml b/libraries-server/src/test/resources/yaml/customers.yaml deleted file mode 100644 index 23b9039c2e33..000000000000 --- a/libraries-server/src/test/resources/yaml/customers.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -firstName: "John" -lastName: "Doe" -age: 20 ---- -firstName: "Jack" -lastName: "Jones" -age: 25 \ No newline at end of file From cdf7aef433fd0232d1ef9a8536bebe6e6c23f6bd Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Wed, 1 Aug 2018 07:31:11 +0300 Subject: [PATCH 3/3] add new module --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 20ad5160d92d..ee7a5a43d252 100644 --- a/pom.xml +++ b/pom.xml @@ -368,6 +368,7 @@ jws libraries libraries-data + libraries-server linkrest logging-modules/log-mdc logging-modules/log4j