Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
9beb269
Groundwork
ToofastTurnip Apr 9, 2018
6396f69
Merge pull request #1 from ToofastTurnip/master
JoeHendricks415 Apr 9, 2018
0fa99cf
added a few tables, sitll not done
ahsonali Apr 9, 2018
184144d
AccountController getAll, more AccountService methods added
ToofastTurnip Apr 10, 2018
0d1000e
More controller methods added
ToofastTurnip Apr 10, 2018
dca0bab
Testing utilities made
ToofastTurnip Apr 10, 2018
bbf3379
Merge pull request #2 from ToofastTurnip/master
JoeHendricks415 Apr 10, 2018
40f7041
Service Tests
ToofastTurnip Apr 11, 2018
de4d800
Controller tests made plus dumb tweaks
ToofastTurnip Apr 11, 2018
9d4be66
Added Customer and Address models
Apr 11, 2018
5022ac0
Merge branch 'master' into master
JoeHendricks415 Apr 11, 2018
2bda4b3
Merge pull request #3 from ToofastTurnip/master
JoeHendricks415 Apr 11, 2018
0d454d8
Merge https://github.com/JoeHendricks415/ZipperBank
ahsonali Apr 11, 2018
380c256
created tables, but have to touch base with group
ahsonali Apr 11, 2018
ea70333
added customer section with added enums
Apr 12, 2018
7e691b4
fix attempt
ToofastTurnip Apr 12, 2018
c80e77b
Merge https://github.com/JoeHendricks415/ZipperBank
ToofastTurnip Apr 12, 2018
567c1e1
Customer Service Tests and direction fix
ToofastTurnip Apr 12, 2018
5beed4d
Customer tests complete
ToofastTurnip Apr 12, 2018
eaad8a0
bill section
Apr 12, 2018
c50ba6c
Merge branch 'master' into master
JoeHendricks415 Apr 12, 2018
e9e31f9
Merge pull request #4 from ToofastTurnip/master
JoeHendricks415 Apr 12, 2018
bbfe24a
Customer model test
ToofastTurnip Apr 12, 2018
6292111
Bill tests, address started
ToofastTurnip Apr 12, 2018
4daee3d
Address tests
ToofastTurnip Apr 12, 2018
43ba6dd
Account tests starded
ToofastTurnip Apr 12, 2018
fb69765
Account tests finished and methods unnoted
ToofastTurnip Apr 12, 2018
58a70cb
Merge branch 'master' of https://github.com/ToofastTurnip/ZipperBank
ToofastTurnip Apr 12, 2018
033ffba
tables
ahsonali Apr 12, 2018
59b7c10
commit before ahson table
Apr 12, 2018
878225d
Merge pull request #5 from ahsonali/master
JoeHendricks415 Apr 12, 2018
51bea12
BillServiceTests started
ToofastTurnip Apr 12, 2018
41db69e
worked on bills
Apr 12, 2018
b7c5968
Merge branch 'master' into master
JoeHendricks415 Apr 12, 2018
a7f99c0
Merge pull request #6 from ToofastTurnip/master
JoeHendricks415 Apr 12, 2018
fe8e88c
DeleteBillByBillId/Test
ToofastTurnip Apr 12, 2018
186c8c0
Service delete methods and tests
ToofastTurnip Apr 13, 2018
05214de
deposits and withdrawals almost done
Apr 13, 2018
222f3f5
Merge branch 'master' into master
JoeHendricks415 Apr 13, 2018
4b54989
Merge pull request #7 from ToofastTurnip/master
JoeHendricks415 Apr 13, 2018
6b0b733
fix
Apr 13, 2018
5989fdb
fix
Apr 13, 2018
bc0fcb7
Deposit model tests
ToofastTurnip Apr 13, 2018
99a7ad5
Deposit service and controller tests
ToofastTurnip Apr 13, 2018
8908b2f
Deposit test map fix/test name fix
ToofastTurnip Apr 13, 2018
ed7f96d
Finishing up merge
Apr 13, 2018
d36a81e
Merge branch 'master' into master
JoeHendricks415 Apr 13, 2018
a801413
Merge pull request #8 from ToofastTurnip/master
JoeHendricks415 Apr 13, 2018
fc8acb2
Delete tests, improved find by account method
ToofastTurnip Apr 15, 2018
47c255c
Added simple security and fixed H2
ToofastTurnip Apr 16, 2018
5c3a15c
Merge pull request #9 from ToofastTurnip/master
JoeHendricks415 Apr 16, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 10 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>io.zipcoder</groupId>
Expand Down Expand Up @@ -43,12 +43,20 @@
<artifactId>hsqldb</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.194</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
apply plugin: 'java'
apply plugin: 'maven'

group = 'io.pivotal.workshop'
version = '1.0-SNAPSHOT'

description = """simple-spring-webapp Maven Webapp"""

sourceCompatibility = 1.8
targetCompatibility = 1.8



repositories {

maven { url "http://repo.maven.apache.org/maven2" }
}
dependencies {
compile group: 'org.springframework', name: 'spring-webmvc', version:'5.0.1.RELEASE'
compile group: 'org.springframework', name: 'spring-context', version:'5.0.1.RELEASE'
compile group: 'org.springframework', name: 'spring-aop', version:'5.0.1.RELEASE'
compile group: 'org.springframework', name: 'spring-web', version:'5.0.1.RELEASE'

compile group: 'org.thymeleaf', name: 'thymeleaf', version:'3.0.9.RELEASE'
compile group: 'org.thymeleaf', name: 'thymeleaf-spring5', version:'3.0.9.RELEASE'

compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25'
compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.2.3'

providedCompile group: 'javax.servlet', name: 'servlet-api', version:'3.1.0'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.pivotal.workshop</groupId>
<artifactId>simple-spring-webapp</artifactId>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
<name>simple-spring-webapp Maven Webapp</name>
<url>http://maven.apache.org</url>
<parent>
<groupId>io.pivotal.education.boot</groupId>
<artifactId>parentProject</artifactId>
<version>1.0.a.RELEASE</version>
<relativePath>../../</relativePath>
</parent>
<properties>

<!-- Generic properties -->
<java.version>1.8</java.version>

<!-- Web -->
<servlet.version>3.1.0</servlet.version>

<!-- Spring -->
<spring-framework.version>5.0.1.RELEASE</spring-framework.version>

<!-- Thymeleaf -->
<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>

<!-- Logging -->
<slf4j.version>1.7.25</slf4j.version>
<logback.version>1.2.3</logback.version>
</properties>

<dependencies>

<!-- Spring MVC -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring-framework.version}</version>
</dependency>

<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>${thymeleaf.version}</version>
</dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf-spring5</artifactId>
<version>${thymeleaf.version}</version>
</dependency>


<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>

<!-- Other Web dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<finalName>simple-spring-webapp</finalName>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = 'simple-spring-webapp'
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package io.pivotal.workshop.web;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;

@Controller
public class SimpleController{

Logger log = LoggerFactory.getLogger(SimpleController.class);

@RequestMapping("/")
public ModelAndView index(){
log.debug("About to redirect...");
return new ModelAndView("redirect:/showMessage");
}

@RequestMapping(value="/showMessage",method = RequestMethod.GET)
public ModelAndView helloWorld(){
final String message = "Simple Spring MVC Web App with Thymeleaf and Spring 5";
log.debug("Showing the Message: " + message);
ModelAndView model = new ModelAndView("showMessage");
model.addObject("message", message);
return model;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<logger name="io.pivotal.workshop" level="DEBUG"/>
<logger name="org.thymeleaf" level="OFF"/>

<root level="INFO">
<appender-ref ref="STDOUT" />
</root>
</configuration>
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">


<!--
Performs the actual initialization work for the root application context.
Useful for all the Spring beans like Services, Repositories, etc.
-->


</beans>
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>

<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">

<!--
DispatcherServlet creates its own WebApplicationContext and the handlers/controllers/view-resolvers are managed
by this context.
-->

<context:component-scan base-package="io.pivotal.workshop.web" />

<!-- Useful when only JSP is required. The javax.servlet.jsp:avax.servlet.jsp-api:2.3.1 dendency is necessary-->
<!--
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/WEB-INF/view/"/>
<property name="suffix" value=".jsp"/>
</bean>
-->

<!-- Thymeleaf Configuration -->
<bean id="templateResolver" class="org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver">
<property name="prefix" value="/WEB-INF/view/" />
<property name="suffix" value=".html" />
<property name="templateMode" value="HTML5" />
</bean>

<bean id="templateEngine" class="org.thymeleaf.spring5.SpringTemplateEngine">
<property name="templateResolver" ref="templateResolver" />
<property name="enableSpringELCompiler" value="true" />
</bean>

<bean id="viewResolver" class="org.thymeleaf.spring5.view.ThymeleafViewResolver">
<property name="templateEngine" ref="templateEngine" />
</bean>

</beans>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!DOCTYPE html>

<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<title>Welcome</title>
</head>
<body>
<p>This page never will show up</p>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!DOCTYPE html>

<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<title>Welcome</title>
</head>
<body style="font-family: Verdana, sans-serif;">
<h2><p th:text="${message}"/></h2>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd" >

<web-app>
<display-name>Simple Spring Web Application</display-name>

<!-- ContextLoaderListener creates a root web-application-context for the web-application and puts it in the ServletContext.
This context can be used to load and unload the spring-managed beans ir-respective of what technology is being used in
the controller layer(Struts or Spring MVC).
-->

<!--
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>

<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/applicationContext.xml</param-value>
</context-param>
-->

<!--
DispatcherServlet creates its own WebApplicationContext and the handlers/controllers/view-resolvers are managed
by this context.
-->
<servlet>
<servlet-name>dispatcherServlet</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<!--
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/dispatcherServlet-servlet.xml</param-value>
</init-param>
-->
<load-on-startup>1</load-on-startup>
</servlet>

<servlet-mapping>
<servlet-name>dispatcherServlet</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>

</web-app>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
buildscript {
ext {
springBootVersion = '2.0.0.M7'
}
repositories {
mavenCentral()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
}
}

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'

version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8

repositories {
mavenCentral()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
}


dependencies {
compile('org.springframework.boot:spring-boot-starter-web')

// SOLUTION: XML response
// compile('com.fasterxml.jackson.dataformat:jackson-dataformat-xml')

testCompile('org.springframework.boot:spring-boot-starter-test')
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip
Loading