Merge develop to master

.gitignore

@@ -18,3 +18,6 @@ target/
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+# order infos
+orders/

README.md

@@ -1,8 +1,17 @@
 # Codecool Online Shop
 
-Java SE: Web Project skeleton
+Java SE: Web Project in Codecool
+
+A simple demo webshop made with Java, Jetty, Thymeleaf, PostgreSQL and JUnit.
 
 # Install
 
-Import this project to IntelliJ as a Maven project.
-IntelliJ can auto-install the dependencies based on the pom.xml
+Import this project as a Maven project.
+
+Create a PostgreSQL database naming codecoolshop listening on port: localhost:5432
+
+Set environmental variables according to lines 12-13 of CodecoolShopDB.java
+
+Run server with command mvn jetty:run
+
+Run tests as JUnit5 tests (also add JUnit5 to classpath)

config

@@ -0,0 +1 @@
+datasource=DB

pom.xml

@@ -10,8 +10,8 @@
     <packaging>war</packaging>
 
     <properties>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <jetty.version>9.4.12.v20180830</jetty.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jetty.version>9.4.12.v20180830</jetty.version>
     </properties>
 
     <build>
@@ -24,8 +24,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.7.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -65,5 +65,33 @@
             <artifactId>thymeleaf</artifactId>
             <version>3.0.9.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.1.4.jre7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.3.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.1.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.3.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
-</project>
+</project>

src/data/csv/species.csv

@@ -0,0 +1,4 @@
+Bird|Vertebrate|Birds (Aves) are a group of endothermic vertebrates, characterised by feathers, toothless beaked jaws, the laying of hard-shelled eggs, a high metabolic rate, a four-chambered heart, and a lightweight but strong skeleton.
+Mammal|Vertebrate|Mammals (class Mammalia /məˈmeɪli.ə/ from Latin mamma "breast") are a clade of endothermic amniotes distinguished from reptiles and birds by the possession of a neocortex (a region of the brain), hair, three middle ear bones and mammary glands.
+Reptile|Vertebrate|Reptiles are a group (Reptilia) of tetrapod animals comprising today's turtles, crocodilians, snakes, amphisbaenians, lizards, tuatara, and their extinct relatives.
+Amphibian|Vertebrate|The amphibians are tetrapods, a class of vertebrate animals with four limbs. They are non-amniotes, which means that their eggs are not surrounded by the several membranes, some impervious, which enable mammals, reptiles and birds to reproduce on land.

src/data/csv/zoos.csv

@@ -0,0 +1,12 @@
+Montgomery Zoo|Alabama|Montgomery|Montgomery Zoo is a 40-acre (16 ha) zoo located on the north side of Montgomery, Alabama. The zoo is an independent city family, and is aided by The Montgomery Area Zoolocal Society. It is home to approximately 750 animals representing 140 species.
+Alaska Zoo|Alaska|Anchorage|The Alaska Zoo is a zoo in Anchorage, Alaska, located on 25 acres (10 ha) of the Anchorage Hillside. It is a popular attraction in Alaska, with nearly 200,000 visitors per year. The zoo is currently home to more than 100 birds and mammals representing some 50 species.
+Phoenix Zoo|Arizona|Phoenix|The Phoenix Zoo opened in 1962 and is the largest privately owned, non-profit zoo in the United States. Located in Phoenix, Arizona, the zoo was founded by Robert Maytag, a member of the Maytag family, and operates on 125 acres (51 ha) of land in the Papago Park area of Phoenix. It has been designated as a Phoenix Point of Pride.
+Los Angeles Zoo|California|Los Angeles|The Los Angeles Zoo and Botanical Gardens is a 133-acre (54 ha) zoo founded in 1966 and located in Los Angeles, California. The city of Los Angeles owns the entire zoo, its land and facilities, and the animals. Animal care, grounds maintenance, construction, education, public information, and administrative staff are city employees.
+San Diego Zoo|California|San Diego|The San Diego Zoo is a zoo in Balboa Park, San Diego, California, housing more than 3,500 animals of more than 650 species and subspecies. Its parent organization, San Diego Zoo Global, is one of the largest[better source need zoological membership associations in the world, with more than 250,000 member households and 130,000 child memberships, representing more than a half million people.
+San Francisco Zoo|California|San Francisco|The San Francisco Zoo is a 100-acre (40 ha) zoo located in the southwestern corner of San Francisco, California, between Lake Merced and the Pacific Ocean along the Great Highway. As of 2016, the zoo housed more than one thousand individual animals, representing more than 250 species. It is noted as the birthplace of Koko the gorilla, and, since 1974, the home of Elly, the oldest black rhinoceros in North America.
+Disney's Animal Kingdom|Florida|Bay Lake|Disney's Animal Kingdom is a zoological theme park at the Walt Disney World Resort in Bay Lake, Florida, near Orlando. Owned and operated by The Walt Disney Company through its Parks, Experiences and Consumer Products division, it is the largest theme park in the world, covering 580 acres (230 ha). The park opened on Earth Day, April 22, 1998, and was the fourth theme park built at the resort.
+Lion Country Safari|Florida|Loxahatchee|Lion Country Safari is a drive-through safari park and walk-through amusement park located on over 600 acres in Loxahatchee (near West Palm Beach), in Palm Beach County, Florida. Founded in 1967, it claims to be the first 'cageless zoo' in the United States.
+Monkey Jungle|Florida|Miami|Monkey Jungle is a 30-acre (12 ha) wildlife park established in 1933 for the exhibition and study of endangered monkeys in semi-natural habitats. Many projects have been conducted at the park, which is a tourist attraction in the Miami, Florida area. The park is in Redland, Florida at Southwest 216th Street/Hainlin Mill Road near Southwest 147th Avenue.
+Reptile World Serpentarium|Florida|St. Cloud|Reptile World Serpentarium is a reptile zoo in St. Cloud, Osceola County, Florida. It features more than 75 species of snakes, as well as lizards, crocodiles, alligators, and turtles. It is operated by the herpetologist George Van Horn. In addition to having animals on display, it has venom milking shows.
+World Center for Birds of Prey|Idaho|Boise|Built 35 years ago in 1984, the World Center for Birds of Prey is located on 580 acres (2.3 km2) on a hilltop overlooking Boise, south of the airport and east of Kuna. The campus consists of the business offices of The Peregrine Fund, breeding facilities for endangered raptors, the Velma Morrison Interpretive Center, and the Herrick Collections Building, which houses a large research library and the Archives of Falconry.
+Yellowstone Bear World|Idaho|Rexburg|Yellowstone Bear World is a privately owned drive-thru wildlife park. It is located in Rexburg, Idaho, near Yellowstone National Park. It was established in 1998. The park holds over 8 species of wildlife indigenous to the Greater Yellowstone Ecosystem. Other attractions in the park include a small amusement park and a petting zoo. Yellowstone Bear World is the only wildlife park in the United States where guests can bottle feed bear cubs.