iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove module and try-catch (#701) 

* Add new module for mocks comparison.

* Add sources for testing.

* Changes on testCase.

* Enter some tests for mockito.

* More tests for Mockito.

* Even more tests.

* Add the rest of the mocking libraries.

* Javadoc on test.

* Test bare bones for EasyMock.

* Fist kind of test and setup.

* Add tests using EasyMock with a change on LoginService.

* Create LoginControllerTest.java

* Test setup

* [JMockit] No method called test.

* [JMockit] Two methods called test.

* [JMockit] One method called test.

* [JMockit] Exception mock test

* [JMockit] Mocked object to pass around test.

* [JMockit] Custom matcher test.

* [JMockit] Partial mocking test.

* [JMockit] Fix with IDE.

* Not stubs. Mocks. MOCKS!!!

* Remove unnecesary import.

* Use correct encoding. Was having problems with buildings.

* Remove failing module.

* Create new module mocks and move mock-comparisons there.

* Add jmockit module.

* Add model class.

* Add collaborator class.

* Add performer class.

* Add performer test.

* Fix

* Add interface for tests.

* Test for any.

* Test for with.

* Test for null.

* Test for times.

* Test for arg that.

* Test for result and returns.

* Test for delegate.

* Add verifications to any tests.

* Add verifications to with test.

* Add verification examples to methods using null.

* Add verifications to methods using times.

* Formatting.

* Compress tests and fix one test.

* Adding new article to readme.

* [BAEL-178] Add collaborator for advanced article.

* [BAEL-178] Add link to readme.

* [BAEL-178] Add test for mockUp.

* [BAEL-178] Add test for invoke method.

* [BAEL-178] Add constructors and tests for mockup for constructors.

* [BAEL-178] Add private fields and more test for deencapsulation.

* [BAEL-178] Add inner class and test for instantiating inner classes.

* [BAEL-178] Multimocks.

* [BAEL-178] Add test for expectation reusing.

* [BAEL-178] Move test class to tests folders.

* Add postgresql dependency.

* Add test and config with properties.

* [BAEL-114] Add new project for JPA with JNDI.

* [BAEL-114] Config without xml.

* [BAEL-114] Bring part of Foo, FooServie and FooDao.

* [BAEL-114] Show all foos.

* [BAEL-114] Readme.

* [BAEL-114] Undo changes on main jpa project.

* [BAEL-114] Remove unnecesary dependencies.

* [BAEL-114] Add tomcat config.

* [BAEL-114] Fixes.

* Add tests for Optional streams.

* Add Java 9 version of the test.

* Rename and move to new core-java-9 module.

* Move contents from spring-jpa-jndi to spring-jpa and make necessary changes.

* Do not use try-catch on configuration.
This commit is contained in:
Álvaro Fernández González 2016-09-26 14:01:52 +02:00 committed by Grzegorz Piwowarek
parent eae09bb13a
commit 52911fede4
16 changed files with 36 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-jpa-jndi/.gitignore vendored
View File

@ -1,13 +0,0 @@
*.class
#folders#
/target
/neoDb*
/data
/src/main/webapp/WEB-INF/classes
*/META-INF/*
# Packaged files #
*.jar
*.war
*.ear

7
spring-jpa-jndi/README.md
View File

@ -1,7 +0,0 @@
=========
## Spring JPA using JNDI Project
### Relevant Articles:
- [Spring Persistence (Hibernate and JPA) with a JNDI datasource](http://www.baeldung.com/spring-jpa-fndi)

145
spring-jpa-jndi/pom.xml
View File

@ -1,145 +0,0 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId>
<artifactId>spring-jpa-jndi</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>spring-jpa-jndi</name>
<dependencies>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<!-- web -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${javax.servlet.jstl.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${javax.servlet.servlet-api.version}</version>
</dependency>
<!-- persistence -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>${spring-data-jpa.version}</version>
</dependency>
<!-- validation -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>2.2.5</version>
</dependency>
</dependencies>
<build>
<finalName>spring-jpa-jndi</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<!-- Spring -->
<org.springframework.version>4.3.2.RELEASE</org.springframework.version>
<javassist.version>3.20.0-GA</javassist.version>
<!-- web -->
<javax.servlet.jstl.version>1.2</javax.servlet.jstl.version>
<javax.servlet.servlet-api.version>2.5</javax.servlet.servlet-api.version>
<!-- persistence -->
<hibernate.version>4.3.11.Final</hibernate.version>
<spring-data-jpa.version>1.8.2.RELEASE</spring-data-jpa.version>
<h2.version>1.4.192</h2.version>
<!-- logging -->
<org.slf4j.version>1.7.13</org.slf4j.version>
<logback.version>1.1.3</logback.version>
<!-- various -->
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
<!-- maven plugins -->
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<maven-war-plugin.version>2.4</maven-war-plugin.version>
<!-- <maven-war-plugin.version>2.6</maven-war-plugin.version> -->
</properties>
</project>

22
spring-jpa-jndi/src/main/java/org/baeldung/persistence/dao/FooDao.java
View File

@ -1,22 +0,0 @@
package org.baeldung.persistence.dao;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.baeldung.persistence.model.Foo;
import org.springframework.stereotype.Repository;
@Repository
public class FooDao {
@PersistenceContext
private EntityManager entityManager;
@SuppressWarnings("unchecked")
public List<Foo> findAll() {
return entityManager.createQuery("from " + Foo.class.getName()).getResultList();
}
}

34
spring-jpa-jndi/src/main/java/org/baeldung/persistence/model/Foo.java
View File

@ -1,34 +0,0 @@
package org.baeldung.persistence.model;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
@Entity
public class Foo {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "ID")
private long id;
@Column(name = "NAME")
private String name;
public long getId() {
return id;
}
public void setId(final int id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(final String name) {
this.name = name;
}
}

22
spring-jpa-jndi/src/main/java/org/baeldung/persistence/service/FooService.java
View File

@ -1,22 +0,0 @@
package org.baeldung.persistence.service;
import java.util.List;
import org.baeldung.persistence.dao.FooDao;
import org.baeldung.persistence.model.Foo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
@Transactional
public class FooService {
@Autowired
private FooDao dao;
public List<Foo> findAll() {
return dao.findAll();
}
}

20
spring-jpa-jndi/src/main/resources/logback.xml
View File

@ -1,20 +0,0 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
</pattern>
</encoder>
</appender>
<logger name="org.springframework" level="WARN" />
<logger name="org.springframework.transaction" level="WARN" />
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
<root level="INFO">
<appender-ref ref="STDOUT" />
</root>
</configuration>

33
spring-jpa/pom.xml
View File

@ -4,6 +4,7 @@
<groupId>com.baeldung</groupId>
<artifactId>spring-jpa</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>spring-jpa</name>
@ -21,6 +22,11 @@
<artifactId>spring-context</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<!-- persistence -->
@ -73,6 +79,18 @@
<artifactId>javax.el-api</artifactId>
<version>2.2.5</version>
</dependency>
<!-- web -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${javax.servlet.jstl.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${javax.servlet.servlet-api.version}</version>
</dependency>
<!-- utils -->
@ -147,6 +165,16 @@
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -197,6 +225,10 @@
<mysql-connector-java.version>5.1.38</mysql-connector-java.version>
<spring-data-jpa.version>1.10.2.RELEASE</spring-data-jpa.version>
<h2.version>1.4.192</h2.version>
<!-- web -->
<javax.servlet.jstl.version>1.2</javax.servlet.jstl.version>
<javax.servlet.servlet-api.version>2.5</javax.servlet.servlet-api.version>
<!-- logging -->
<org.slf4j.version>1.7.13</org.slf4j.version>
@ -224,6 +256,7 @@
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
<maven-war-plugin.version>2.4</maven-war-plugin.version>
<!-- <maven-war-plugin.version>2.6</maven-war-plugin.version> -->
</properties>

10
spring-jpa-jndi/src/main/java/org/baeldung/config/PersistenceJNDIConfig.java → spring-jpa/src/main/java/org/baeldung/config/PersistenceJNDIConfig.java
View File

@ -36,7 +36,7 @@ public class PersistenceJNDIConfig {
}
@Bean
public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
public LocalContainerEntityManagerFactoryBean entityManagerFactory() throws NamingException {
final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
em.setDataSource(dataSource());
em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
@ -46,12 +46,8 @@ public class PersistenceJNDIConfig {
}
@Bean
public DataSource dataSource() {
try {
return (DataSource) new JndiTemplate().lookup(env.getProperty("jdbc.url"));
} catch (NamingException e) {
throw new IllegalArgumentException("Error looking up JNDI datasource", e);
}
public DataSource dataSource() throws NamingException {
return (DataSource) new JndiTemplate().lookup(env.getProperty("jdbc.url"));
}
@Bean

0
spring-jpa-jndi/src/main/java/org/baeldung/config/SpringWebConfig.java → spring-jpa/src/main/java/org/baeldung/config/SpringWebConfig.java
View File

0
spring-jpa-jndi/src/main/java/org/baeldung/config/WebInitializer.java → spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java
View File

0
spring-jpa-jndi/src/main/java/org/baeldung/web/MainController.java → spring-jpa/src/main/java/org/baeldung/web/MainController.java
View File

0
spring-jpa-jndi/src/main/resources/context.xml → spring-jpa/src/main/resources/context.xml
View File

0
spring-jpa-jndi/src/main/resources/persistence-jndi.properties → spring-jpa/src/main/resources/persistence-jndi.properties
View File

0
spring-jpa-jndi/src/main/resources/server.xml → spring-jpa/src/main/resources/server.xml
View File

0
spring-jpa-jndi/src/main/webapp/WEB-INF/views/jsp/index.jsp → spring-jpa/src/main/webapp/WEB-INF/views/jsp/index.jsp
View File