From 81dd273e11795ea45b2aff17a282556da71b1c29 Mon Sep 17 00:00:00 2001 From: Ivan Paolillo Date: Fri, 22 Jul 2016 10:37:03 +0200 Subject: [PATCH 01/41] Add JSONForms example --- json/src/main/webapp/index.html | 27 +++++++++++++++++++++++++++ json/src/main/webapp/js/app.js | 15 +++++++++++++++ json/src/main/webapp/js/schema.js | 27 +++++++++++++++++++++++++++ json/src/main/webapp/js/ui-schema.js | 22 ++++++++++++++++++++++ json/src/main/webapp/package.json | 11 +++++++++++ 5 files changed, 102 insertions(+) create mode 100644 json/src/main/webapp/index.html create mode 100644 json/src/main/webapp/js/app.js create mode 100644 json/src/main/webapp/js/schema.js create mode 100644 json/src/main/webapp/js/ui-schema.js create mode 100644 json/src/main/webapp/package.json diff --git a/json/src/main/webapp/index.html b/json/src/main/webapp/index.html new file mode 100644 index 0000000000..5c41c8a173 --- /dev/null +++ b/json/src/main/webapp/index.html @@ -0,0 +1,27 @@ + + + + Introduction to JSONForms + + + + + + +
+
+
+
+
+

Introduction to JSONForms

+
+
+ Bound data: {{data}} + +
+
+
+
+
+ + diff --git a/json/src/main/webapp/js/app.js b/json/src/main/webapp/js/app.js new file mode 100644 index 0000000000..484637bef4 --- /dev/null +++ b/json/src/main/webapp/js/app.js @@ -0,0 +1,15 @@ +'use strict'; + +var app = angular.module('jsonforms-intro', ['jsonforms']); +app.controller('MyController', ['$scope', 'Schema', 'UISchema', function($scope, Schema, UISchema) { + + $scope.schema = Schema; + + $scope.uiSchema = UISchema; + + $scope.data = { + "id": 1, + "name": "Lampshade", + "price": 1.85 + }; +}]); diff --git a/json/src/main/webapp/js/schema.js b/json/src/main/webapp/js/schema.js new file mode 100644 index 0000000000..34025868b9 --- /dev/null +++ b/json/src/main/webapp/js/schema.js @@ -0,0 +1,27 @@ +'use strict'; + +var app = angular.module('jsonforms-intro'); +app.value('Schema', + { + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Product", + "description": "A product from the catalog", + "type": "object", + "properties": { + "id": { + "description": "The unique identifier for a product", + "type": "integer" + }, + "name": { + "description": "Name of the product", + "type": "string" + }, + "price": { + "type": "number", + "minimum": 0, + "exclusiveMinimum": true + } + }, + "required": ["id", "name", "price"] + } +); diff --git a/json/src/main/webapp/js/ui-schema.js b/json/src/main/webapp/js/ui-schema.js new file mode 100644 index 0000000000..aea5ac79c0 --- /dev/null +++ b/json/src/main/webapp/js/ui-schema.js @@ -0,0 +1,22 @@ +'use strict'; + +var app = angular.module('jsonforms-intro'); +app.value('UISchema', + { + "type": "HorizontalLayout", + "elements": [ + { + "type": "Control", + "scope": { "$ref": "#/properties/id" } + }, + { + "type": "Control", + "scope": { "$ref": "#/properties/name" } + }, + { + "type": "Control", + "scope": { "$ref": "#/properties/price" } + }, + ] + } +); diff --git a/json/src/main/webapp/package.json b/json/src/main/webapp/package.json new file mode 100644 index 0000000000..66eb42d00e --- /dev/null +++ b/json/src/main/webapp/package.json @@ -0,0 +1,11 @@ +{ + "name": "jsonforms-intro", + "description": "Introduction to JSONForms", + "version": "0.0.1", + "license": "MIT", + "dependencies": { + "typings": "0.6.5", + "jsonforms": "0.0.19", + "bootstrap": "3.3.6" + } +} \ No newline at end of file From 644a7d23a450786222573e640c8aff6f1a77a7ab Mon Sep 17 00:00:00 2001 From: chernykhalexander Date: Sun, 24 Jul 2016 00:43:52 +0300 Subject: [PATCH 02/41] added module cdiexample --- cdiexample/pom.xml | 52 +++++++++++++++++++ .../com/baeldung/interceptor/Audited.java | 12 +++++ .../interceptor/AuditedInterceptor.java | 20 +++++++ .../com/baeldung/service/SuperService.java | 11 ++++ .../spring/aspect/SpringTestAspect.java | 19 +++++++ .../spring/configuration/AppConfig.java | 21 ++++++++ .../spring/service/SpringSuperService.java | 8 +++ .../src/main/resources/META-INF/beans.xml | 8 +++ .../baeldung/test/SpringTestInterceptor.java | 25 +++++++++ .../com/baeldung/test/TestInterceptor.java | 19 +++++++ 10 files changed, 195 insertions(+) create mode 100644 cdiexample/pom.xml create mode 100644 cdiexample/src/main/java/com/baeldung/interceptor/Audited.java create mode 100644 cdiexample/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java create mode 100644 cdiexample/src/main/java/com/baeldung/service/SuperService.java create mode 100644 cdiexample/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java create mode 100644 cdiexample/src/main/java/com/baeldung/spring/configuration/AppConfig.java create mode 100644 cdiexample/src/main/java/com/baeldung/spring/service/SpringSuperService.java create mode 100644 cdiexample/src/main/resources/META-INF/beans.xml create mode 100644 cdiexample/src/test/java/com/baeldung/test/SpringTestInterceptor.java create mode 100644 cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java diff --git a/cdiexample/pom.xml b/cdiexample/pom.xml new file mode 100644 index 0000000000..042d22a6e9 --- /dev/null +++ b/cdiexample/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + com.baeldung + cdiexample + 1.0-SNAPSHOT + + 4.3.1.RELEASE + + + + + org.jboss.weld.se + weld-se-core + 2.3.5.Final + + + + junit + junit + 4.12 + + + + org.springframework + spring-core + ${spring.version} + + + + org.springframework + spring-context + ${spring.version} + + + + org.springframework + spring-test + ${spring.version} + test + + + + org.aspectj + aspectjweaver + 1.8.9 + + + \ No newline at end of file diff --git a/cdiexample/src/main/java/com/baeldung/interceptor/Audited.java b/cdiexample/src/main/java/com/baeldung/interceptor/Audited.java new file mode 100644 index 0000000000..4065450b09 --- /dev/null +++ b/cdiexample/src/main/java/com/baeldung/interceptor/Audited.java @@ -0,0 +1,12 @@ +package com.baeldung.interceptor; + +import javax.interceptor.InterceptorBinding; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@InterceptorBinding +@Target( {ElementType.METHOD, ElementType.TYPE } ) +@Retention(RetentionPolicy.RUNTIME ) +public @interface Audited {} diff --git a/cdiexample/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java b/cdiexample/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java new file mode 100644 index 0000000000..6501c60ad0 --- /dev/null +++ b/cdiexample/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java @@ -0,0 +1,20 @@ +package com.baeldung.interceptor; + +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; +import java.lang.reflect.Method; + +@Audited @Interceptor +public class AuditedInterceptor { + @AroundInvoke + public Object auditMethod(InvocationContext ctx) throws Exception { + Object[] parameters = ctx.getParameters(); + Method method= ctx.getMethod(); + String param = (String) parameters[0]; + System.out.println("Method "+method.getName()+" invoked with parameter "+param); + Object result = ctx.proceed(); + System.out.println("Method "+method.getName()+" exit"); + return result; + } +} diff --git a/cdiexample/src/main/java/com/baeldung/service/SuperService.java b/cdiexample/src/main/java/com/baeldung/service/SuperService.java new file mode 100644 index 0000000000..5309c80b10 --- /dev/null +++ b/cdiexample/src/main/java/com/baeldung/service/SuperService.java @@ -0,0 +1,11 @@ +package com.baeldung.service; + +import com.baeldung.interceptor.Audited; + +public class SuperService { + @Audited + public String deliverService(String uid) { + System.out.println("Service delivered for uid:" + uid); + return uid; + } +} diff --git a/cdiexample/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java b/cdiexample/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java new file mode 100644 index 0000000000..ab3036285e --- /dev/null +++ b/cdiexample/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java @@ -0,0 +1,19 @@ +package com.baeldung.spring.aspect; + +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; + +@Aspect +public class SpringTestAspect { + @Around("execution(* com.baeldung.spring.service.SpringSuperService.*(..))") + public Object advice(ProceedingJoinPoint jp) throws Throwable { + String methodName = jp.getSignature().getName(); + System.out.println("Call to "+methodName); + Object obj = jp.proceed(); + System.out.println("Method called successfully: "+methodName); + return obj; + } +} diff --git a/cdiexample/src/main/java/com/baeldung/spring/configuration/AppConfig.java b/cdiexample/src/main/java/com/baeldung/spring/configuration/AppConfig.java new file mode 100644 index 0000000000..e8dbf264b5 --- /dev/null +++ b/cdiexample/src/main/java/com/baeldung/spring/configuration/AppConfig.java @@ -0,0 +1,21 @@ +package com.baeldung.spring.configuration; + +import com.baeldung.spring.aspect.SpringTestAspect; +import com.baeldung.spring.service.SpringSuperService; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.EnableAspectJAutoProxy; + +@Configuration +@EnableAspectJAutoProxy +public class AppConfig { + @Bean + public SpringSuperService springSuperService() { + return new SpringSuperService(); + } + + @Bean + public SpringTestAspect springTestAspect(){ + return new SpringTestAspect(); + } +} diff --git a/cdiexample/src/main/java/com/baeldung/spring/service/SpringSuperService.java b/cdiexample/src/main/java/com/baeldung/spring/service/SpringSuperService.java new file mode 100644 index 0000000000..5b96a24390 --- /dev/null +++ b/cdiexample/src/main/java/com/baeldung/spring/service/SpringSuperService.java @@ -0,0 +1,8 @@ +package com.baeldung.spring.service; + +public class SpringSuperService { + public String getInfoFromService(String code){ + System.out.println("Doing calculations"); + return code; + } +} diff --git a/cdiexample/src/main/resources/META-INF/beans.xml b/cdiexample/src/main/resources/META-INF/beans.xml new file mode 100644 index 0000000000..d41b35e7d9 --- /dev/null +++ b/cdiexample/src/main/resources/META-INF/beans.xml @@ -0,0 +1,8 @@ + + + com.baeldung.interceptor.AuditedInterceptor + + \ No newline at end of file diff --git a/cdiexample/src/test/java/com/baeldung/test/SpringTestInterceptor.java b/cdiexample/src/test/java/com/baeldung/test/SpringTestInterceptor.java new file mode 100644 index 0000000000..6085187ecd --- /dev/null +++ b/cdiexample/src/test/java/com/baeldung/test/SpringTestInterceptor.java @@ -0,0 +1,25 @@ +package com.baeldung.test; + +import com.baeldung.spring.configuration.AppConfig; +import com.baeldung.spring.service.SpringSuperService; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.inject.Inject; + +@RunWith(SpringRunner.class) +@ContextConfiguration(classes = {AppConfig.class}) +public class SpringTestInterceptor { + @Inject + SpringSuperService springSuperService; + + @Test + public void givenService_whenServiceAndAspectExecuted_thenOk(){ + String code = "123456"; + String result = springSuperService.getInfoFromService(code); + Assert.assertEquals(code,result); + } +} diff --git a/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java b/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java new file mode 100644 index 0000000000..1ed0d99748 --- /dev/null +++ b/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java @@ -0,0 +1,19 @@ +package com.baeldung.test; + +import com.baeldung.service.SuperService; +import org.jboss.weld.environment.se.Weld; +import org.jboss.weld.environment.se.WeldContainer; +import org.junit.Assert; +import org.junit.Test; + +public class TestInterceptor { + @Test + public void givenTheService_whenMethodAndInterceptorExecuted_thenOK() { + Weld weld = new Weld(); + WeldContainer container = weld.initialize(); + SuperService superService = container.instance().select(SuperService.class).get(); + String code = "123456"; + superService.deliverService(code); + Assert.assertEquals("123456",code); + } +} From 6db9efda2131a298e89bcc81954fb53475556091 Mon Sep 17 00:00:00 2001 From: chernykhalexander Date: Sun, 24 Jul 2016 00:59:23 +0300 Subject: [PATCH 03/41] package name refactoring --- .../main/java/com/baeldung/{ => cdi}/interceptor/Audited.java | 2 +- .../baeldung/{ => cdi}/interceptor/AuditedInterceptor.java | 2 +- .../java/com/baeldung/{ => cdi}/service/SuperService.java | 4 ++-- cdiexample/src/main/resources/META-INF/beans.xml | 2 +- .../src/test/java/com/baeldung/test/TestInterceptor.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename cdiexample/src/main/java/com/baeldung/{ => cdi}/interceptor/Audited.java (90%) rename cdiexample/src/main/java/com/baeldung/{ => cdi}/interceptor/AuditedInterceptor.java (94%) rename cdiexample/src/main/java/com/baeldung/{ => cdi}/service/SuperService.java (69%) diff --git a/cdiexample/src/main/java/com/baeldung/interceptor/Audited.java b/cdiexample/src/main/java/com/baeldung/cdi/interceptor/Audited.java similarity index 90% rename from cdiexample/src/main/java/com/baeldung/interceptor/Audited.java rename to cdiexample/src/main/java/com/baeldung/cdi/interceptor/Audited.java index 4065450b09..459a1c35da 100644 --- a/cdiexample/src/main/java/com/baeldung/interceptor/Audited.java +++ b/cdiexample/src/main/java/com/baeldung/cdi/interceptor/Audited.java @@ -1,4 +1,4 @@ -package com.baeldung.interceptor; +package com.baeldung.cdi.interceptor; import javax.interceptor.InterceptorBinding; import java.lang.annotation.ElementType; diff --git a/cdiexample/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java b/cdiexample/src/main/java/com/baeldung/cdi/interceptor/AuditedInterceptor.java similarity index 94% rename from cdiexample/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java rename to cdiexample/src/main/java/com/baeldung/cdi/interceptor/AuditedInterceptor.java index 6501c60ad0..53a3af7091 100644 --- a/cdiexample/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java +++ b/cdiexample/src/main/java/com/baeldung/cdi/interceptor/AuditedInterceptor.java @@ -1,4 +1,4 @@ -package com.baeldung.interceptor; +package com.baeldung.cdi.interceptor; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; diff --git a/cdiexample/src/main/java/com/baeldung/service/SuperService.java b/cdiexample/src/main/java/com/baeldung/cdi/service/SuperService.java similarity index 69% rename from cdiexample/src/main/java/com/baeldung/service/SuperService.java rename to cdiexample/src/main/java/com/baeldung/cdi/service/SuperService.java index 5309c80b10..cbf22fd803 100644 --- a/cdiexample/src/main/java/com/baeldung/service/SuperService.java +++ b/cdiexample/src/main/java/com/baeldung/cdi/service/SuperService.java @@ -1,6 +1,6 @@ -package com.baeldung.service; +package com.baeldung.cdi.service; -import com.baeldung.interceptor.Audited; +import com.baeldung.cdi.interceptor.Audited; public class SuperService { @Audited diff --git a/cdiexample/src/main/resources/META-INF/beans.xml b/cdiexample/src/main/resources/META-INF/beans.xml index d41b35e7d9..0a68bbf29d 100644 --- a/cdiexample/src/main/resources/META-INF/beans.xml +++ b/cdiexample/src/main/resources/META-INF/beans.xml @@ -3,6 +3,6 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_2.xsd"> - com.baeldung.interceptor.AuditedInterceptor + com.baeldung.cdi.interceptor.AuditedInterceptor \ No newline at end of file diff --git a/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java b/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java index 1ed0d99748..d32890869c 100644 --- a/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java +++ b/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java @@ -1,6 +1,6 @@ package com.baeldung.test; -import com.baeldung.service.SuperService; +import com.baeldung.cdi.service.SuperService; import org.jboss.weld.environment.se.Weld; import org.jboss.weld.environment.se.WeldContainer; import org.junit.Assert; From b60a8c3d7e693977a057fe7151bd57d687da26cd Mon Sep 17 00:00:00 2001 From: bdragan Date: Sun, 31 Jul 2016 23:14:26 +0200 Subject: [PATCH 04/41] Hibernate second-level cache. --- spring-jpa/pom.xml | 11 +++ .../baeldung/config/PersistenceJPAConfig.java | 2 + .../config/PersistenceJPAConfigL2Cache.java | 84 +++++++++++++++++++ .../org/baeldung/persistence/model/Foo.java | 14 ++-- spring-jpa/src/main/resources/jpaConfig.xml | 2 + .../main/resources/persistence-h2.properties | 13 +++ .../persistence-multiple-db.properties | 2 + .../resources/persistence-mysql.properties | 2 + .../src/test/java/META-INF/persistence.xml | 2 + .../SecondLevelCacheIntegrationTest.java | 84 +++++++++++++++++++ 10 files changed, 207 insertions(+), 9 deletions(-) create mode 100644 spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java create mode 100644 spring-jpa/src/main/resources/persistence-h2.properties create mode 100644 spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index 25dd960435..2c189bde4b 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -29,6 +29,11 @@ hibernate-entitymanager ${hibernate.version} + + org.hibernate + hibernate-ehcache + ${hibernate.version} + xml-apis xml-apis @@ -50,6 +55,11 @@ spring-data-jpa ${spring-data-jpa.version} + + com.h2database + h2 + ${h2.version} + @@ -186,6 +196,7 @@ 4.3.11.Final 5.1.38 1.8.2.RELEASE + 1.4.192 1.7.13 diff --git a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java index c9358190e7..010eb5b8a1 100644 --- a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java +++ b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java @@ -78,6 +78,8 @@ public class PersistenceJPAConfig { final Properties hibernateProperties = new Properties(); hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto")); hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect")); + hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", env.getProperty("hibernate.cache.use_second_level_cache")); + hibernateProperties.setProperty("hibernate.cache.use_query_cache", env.getProperty("hibernate.cache.use_query_cache")); // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true"); return hibernateProperties; } diff --git a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java new file mode 100644 index 0000000000..3ca0dbf5e4 --- /dev/null +++ b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java @@ -0,0 +1,84 @@ +package org.baeldung.config; + +import com.google.common.base.Preconditions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.core.env.Environment; +import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.jdbc.datasource.DriverManagerDataSource; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import javax.persistence.EntityManagerFactory; +import javax.sql.DataSource; +import java.util.Properties; + +@Configuration +@EnableTransactionManagement +@PropertySource({ "classpath:persistence-h2.properties" }) +@ComponentScan({ "org.baeldung.persistence" }) +@EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao") +public class PersistenceJPAConfigL2Cache { + + @Autowired + private Environment env; + + public PersistenceJPAConfigL2Cache() { + super(); + } + + // beans + + @Bean + public LocalContainerEntityManagerFactoryBean entityManagerFactory() { + final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); + em.setDataSource(dataSource()); + em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" }); + + final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); + em.setJpaVendorAdapter(vendorAdapter); + em.setJpaProperties(additionalProperties()); + + return em; + } + + @Bean + public DataSource dataSource() { + final DriverManagerDataSource dataSource = new DriverManagerDataSource(); + dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName"))); + dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url"))); + dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user"))); + + return dataSource; + } + + @Bean + public PlatformTransactionManager transactionManager(final EntityManagerFactory emf) { + final JpaTransactionManager transactionManager = new JpaTransactionManager(); + transactionManager.setEntityManagerFactory(emf); + return transactionManager; + } + + @Bean + public PersistenceExceptionTranslationPostProcessor exceptionTranslation() { + return new PersistenceExceptionTranslationPostProcessor(); + } + + final Properties additionalProperties() { + final Properties hibernateProperties = new Properties(); + hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto")); + hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect")); + hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", env.getProperty("hibernate.cache.use_second_level_cache")); + hibernateProperties.setProperty("hibernate.cache.use_query_cache", env.getProperty("hibernate.cache.use_query_cache")); + hibernateProperties.setProperty("hibernate.cache.region.factory_class", env.getProperty("hibernate.cache.region.factory_class")); + return hibernateProperties; + } + +} \ No newline at end of file diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java b/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java index 585cefb159..209ab081de 100644 --- a/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java +++ b/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java @@ -1,17 +1,13 @@ package org.baeldung.persistence.model; +import org.hibernate.annotations.CacheConcurrencyStrategy; + +import javax.persistence.*; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; - @Entity +@Cacheable +@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class Foo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/spring-jpa/src/main/resources/jpaConfig.xml b/spring-jpa/src/main/resources/jpaConfig.xml index 1f0b8d899f..5afc0af94d 100644 --- a/spring-jpa/src/main/resources/jpaConfig.xml +++ b/spring-jpa/src/main/resources/jpaConfig.xml @@ -21,6 +21,8 @@ ${hibernate.hbm2ddl.auto} ${hibernate.dialect} + ${hibernate.cache.use_second_level_cache} + ${hibernate.cache.use_query_cache} diff --git a/spring-jpa/src/main/resources/persistence-h2.properties b/spring-jpa/src/main/resources/persistence-h2.properties new file mode 100644 index 0000000000..d195af5ec9 --- /dev/null +++ b/spring-jpa/src/main/resources/persistence-h2.properties @@ -0,0 +1,13 @@ +# jdbc.X +jdbc.driverClassName=org.h2.Driver +jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1 +jdbc.user=sa +# jdbc.pass= + +# hibernate.X +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.show_sql=false +hibernate.hbm2ddl.auto=create-drop +hibernate.cache.use_second_level_cache=true +hibernate.cache.use_query_cache=true +hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory \ No newline at end of file diff --git a/spring-jpa/src/main/resources/persistence-multiple-db.properties b/spring-jpa/src/main/resources/persistence-multiple-db.properties index d59956ba03..1a0d99c704 100644 --- a/spring-jpa/src/main/resources/persistence-multiple-db.properties +++ b/spring-jpa/src/main/resources/persistence-multiple-db.properties @@ -9,3 +9,5 @@ jdbc.pass=tutorialmy5ql hibernate.dialect=org.hibernate.dialect.MySQL5Dialect hibernate.show_sql=false hibernate.hbm2ddl.auto=create-drop +hibernate.cache.use_second_level_cache=false +hibernate.cache.use_query_cache=false \ No newline at end of file diff --git a/spring-jpa/src/main/resources/persistence-mysql.properties b/spring-jpa/src/main/resources/persistence-mysql.properties index c4de4ceb80..12b4c93d80 100644 --- a/spring-jpa/src/main/resources/persistence-mysql.properties +++ b/spring-jpa/src/main/resources/persistence-mysql.properties @@ -8,3 +8,5 @@ jdbc.pass=tutorialmy5ql hibernate.dialect=org.hibernate.dialect.MySQL5Dialect hibernate.show_sql=false hibernate.hbm2ddl.auto=create-drop +hibernate.cache.use_second_level_cache=false +hibernate.cache.use_query_cache=false \ No newline at end of file diff --git a/spring-jpa/src/test/java/META-INF/persistence.xml b/spring-jpa/src/test/java/META-INF/persistence.xml index e528491795..ba0d2377d1 100644 --- a/spring-jpa/src/test/java/META-INF/persistence.xml +++ b/spring-jpa/src/test/java/META-INF/persistence.xml @@ -10,6 +10,8 @@ + + diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java new file mode 100644 index 0000000000..f97f53b82c --- /dev/null +++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java @@ -0,0 +1,84 @@ +package org.baeldung.persistence.service; + +import net.sf.ehcache.CacheManager; +import org.baeldung.config.PersistenceJPAConfigL2Cache; +import org.baeldung.persistence.model.Bar; +import org.baeldung.persistence.model.Foo; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.support.TransactionTemplate; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; + +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static org.hamcrest.Matchers.greaterThan; +import static org.junit.Assert.assertThat; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { PersistenceJPAConfigL2Cache.class }, loader = AnnotationConfigContextLoader.class) +public class SecondLevelCacheIntegrationTest { + + @PersistenceContext + private EntityManager entityManager; + @Autowired + private FooService fooService; + @Autowired + private PlatformTransactionManager platformTransactionManager; + + @Before + public final void before() { + entityManager.getEntityManagerFactory().getCache().evictAll(); + } + + @Test + public final void givenEntityIsLoaded_thenItIsCached() { + final Foo foo = new Foo(randomAlphabetic(6)); + fooService.create(foo); + fooService.findOne(foo.getId()); + final int size = CacheManager.ALL_CACHE_MANAGERS.get(0) + .getCache("org.baeldung.persistence.model.Foo").getSize(); + assertThat(size, greaterThan(0)); + } + + @Test + public final void givenBarIsUpdatedInNativeQuery_thenFoosAreNotEvicted() { + final Foo foo = new Foo(randomAlphabetic(6)); + fooService.create(foo); + fooService.findOne(foo.getId()); + + new TransactionTemplate(platformTransactionManager).execute(status -> { + final Bar bar = new Bar(randomAlphabetic(6)); + entityManager.persist(bar); + final Query nativeQuery = entityManager.createNativeQuery("update BAR set NAME = :updatedName where ID = :id"); + nativeQuery.setParameter("updatedName", "newName"); + nativeQuery.setParameter("id", bar.getId()); + nativeQuery.unwrap(org.hibernate.SQLQuery.class).addSynchronizedEntityClass(Bar.class); + return nativeQuery.executeUpdate(); + }); + + final int size = CacheManager.ALL_CACHE_MANAGERS.get(0) + .getCache("org.baeldung.persistence.model.Foo").getSize(); + assertThat(size, greaterThan(0)); + } + + @Test + public final void givenCacheableQueryIsExecuted_thenItIsCached() { + new TransactionTemplate(platformTransactionManager).execute(status -> { + return entityManager.createQuery("select f from Foo f") + .setHint("org.hibernate.cacheable", true) + .getResultList(); + }); + + final int size = CacheManager.ALL_CACHE_MANAGERS.get(0) + .getCache("org.hibernate.cache.internal.StandardQueryCache").getSize(); + assertThat(size, greaterThan(0)); + } +} From acf7ec2e2ba381d0a064151ec926ebccdca28853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20R=C3=A4del?= Date: Wed, 3 Aug 2016 23:29:18 +0200 Subject: [PATCH 05/41] First version of secured demo-server, keystore Makefile included. --- spring-security-x509/keystore/Makefile | 76 +++++++++++++++++++ spring-security-x509/server/pom.xml | 58 ++++++++++++++ .../spring/security/x509/UserResource.java | 20 +++++ .../x509/X509AuthenticationServer.java | 12 +++ .../src/main/resources/application.properties | 8 ++ .../src/main/resources/templates/user.html | 9 +++ .../x509/X509AuthenticationServerTests.java | 16 ++++ 7 files changed, 199 insertions(+) create mode 100644 spring-security-x509/keystore/Makefile create mode 100644 spring-security-x509/server/pom.xml create mode 100644 spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/UserResource.java create mode 100644 spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java create mode 100644 spring-security-x509/server/src/main/resources/application.properties create mode 100644 spring-security-x509/server/src/main/resources/templates/user.html create mode 100644 spring-security-x509/server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java diff --git a/spring-security-x509/keystore/Makefile b/spring-security-x509/keystore/Makefile new file mode 100644 index 0000000000..62f2e1395e --- /dev/null +++ b/spring-security-x509/keystore/Makefile @@ -0,0 +1,76 @@ +PASSWORD=changeit +KEYSTORE=keystore.jks +HOSTNAME=localhost +# CN = Common Name +# OU = Organization Unit +# O = Organization Name +# L = Locality Name +# ST = State Name +# C = Country (2-letter Country Code) +# E = Email +DNAME_CA='CN=Baeldung CA,OU=baeldung.com,O=Baeldung,L=SomeCity,ST=SomeState,C=CC' +# For server certificates, the Common Name (CN) must be the hostname +DNAME_HOST='CN=$(HOSTNAME),OU=baeldung.com,O=Baeldung,L=SomeCity,ST=SomeState,C=CC' +TRUSTSTORE=truststore.jks +CLIENTNAME=cid + +all: clean create-keystore add-host create-truststore add-client + +create-keystore: + # Generate a certificate authority (CA) + keytool -genkey -alias ca \ + -keyalg RSA -keysize 4096 -sigalg SHA512withRSA -keypass $(PASSWORD) \ + -validity 3650 -dname $(DNAME_CA) \ + -keystore $(KEYSTORE) -storepass $(PASSWORD) + +add-host: + # Generate a host certificate + keytool -genkey -alias $(HOSTNAME) \ + -keyalg RSA -keysize 4096 -sigalg SHA512withRSA -keypass $(PASSWORD) \ + -validity 3650 -dname $(DNAME_HOST) \ + -keystore $(KEYSTORE) -storepass $(PASSWORD) + # Generate a host certificate signing request + keytool -certreq -alias $(HOSTNAME) \ + -keyalg RSA -keysize 4096 -sigalg SHA512withRSA \ + -validity 3650 -file "$(HOSTNAME).csr" \ + -keystore $(KEYSTORE) -storepass $(PASSWORD) + # Generate signed certificate with the certificate authority + keytool -gencert -alias ca \ + -validity 3650 -sigalg SHA512withRSA \ + -infile "$(HOSTNAME).csr" -outfile "$(HOSTNAME).crt" -rfc \ + -keystore $(KEYSTORE) -storepass $(PASSWORD) + # Import signed certificate into the keystore + keytool -import -trustcacerts -alias $(HOSTNAME) \ + -file "$(HOSTNAME).crt" \ + -keystore $(KEYSTORE) -storepass $(PASSWORD) + +create-truststore: + # Export certificate authority into truststore + keytool -export -alias ca -file ca.crt \ + -keystore $(KEYSTORE) -storepass $(PASSWORD) + keytool -import -trustcacerts -noprompt -alias ca -file ca.crt \ + -keystore $(TRUSTSTORE) -storepass $(PASSWORD) + +add-client: + # Generate client certificate + keytool -genkey -alias $(CLIENTNAME) \ + -keyalg RSA -keysize 4096 -sigalg SHA512withRSA -keypass $(PASSWORD) \ + -validity 3650 -dname $(DNAME_HOST) \ + -keystore $(TRUSTSTORE) -storepass $(PASSWORD) + # Generate a host certificate signing request + keytool -certreq -alias $(CLIENTNAME) \ + -keyalg RSA -keysize 4096 -sigalg SHA512withRSA \ + -validity 3650 -file "$(CLIENTNAME).csr" \ + -keystore $(TRUSTSTORE) -storepass $(PASSWORD) + # Generate signed certificate with the certificate authority + keytool -gencert -alias ca \ + -validity 3650 -sigalg SHA512withRSA \ + -infile "$(CLIENTNAME).csr" -outfile "$(CLIENTNAME).crt" -rfc \ + -keystore $(KEYSTORE) -storepass $(PASSWORD) + # Import signed certificate into the truststore + keytool -import -trustcacerts -alias $(CLIENTNAME) \ + -file "$(CLIENTNAME).crt" \ + -keystore $(TRUSTSTORE) -storepass $(PASSWORD) + +clean: + rm -f $(KEYSTORE) *.csr *.crt $(TRUSTSTORE) diff --git a/spring-security-x509/server/pom.xml b/spring-security-x509/server/pom.xml new file mode 100644 index 0000000000..eabd0364ef --- /dev/null +++ b/spring-security-x509/server/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + + com.baeldung.spring.security + server + 0.0.1-SNAPSHOT + jar + + server + Spring x.509 Authentication Demo + + + org.springframework.boot + spring-boot-starter-parent + 1.4.0.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/UserResource.java b/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/UserResource.java new file mode 100644 index 0000000000..90c8897d8f --- /dev/null +++ b/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/UserResource.java @@ -0,0 +1,20 @@ +package com.baeldung.spring.security.x509; + +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.security.Principal; + +@Controller +public class UserResource { + + @RequestMapping(value = "/user") + public String user(Model model, Principal principal) { + UserDetails currentUser = (UserDetails) ((Authentication) principal).getPrincipal(); + model.addAttribute("username", currentUser.getUsername()); + return "user"; + } +} diff --git a/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java b/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java new file mode 100644 index 0000000000..ab7719df0f --- /dev/null +++ b/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java @@ -0,0 +1,12 @@ +package com.baeldung.spring.security.x509; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class X509AuthenticationServer { + + public static void main(String[] args) { + SpringApplication.run(X509AuthenticationServer.class, args); + } +} diff --git a/spring-security-x509/server/src/main/resources/application.properties b/spring-security-x509/server/src/main/resources/application.properties new file mode 100644 index 0000000000..89a234b1ac --- /dev/null +++ b/spring-security-x509/server/src/main/resources/application.properties @@ -0,0 +1,8 @@ +server.ssl.key-store=../keystore/keystore.jks +server.ssl.key-store-password=${PASSWORD} +server.ssl.key-alias=localhost +server.ssl.key-password=${PASSWORD} +server.ssl.enabled=true +server.port=8443 +security.user.name=Admin +security.user.password=admin \ No newline at end of file diff --git a/spring-security-x509/server/src/main/resources/templates/user.html b/spring-security-x509/server/src/main/resources/templates/user.html new file mode 100644 index 0000000000..0be84680fe --- /dev/null +++ b/spring-security-x509/server/src/main/resources/templates/user.html @@ -0,0 +1,9 @@ + + + + X.509 Authentication Demo + + +

Hello !

+ + \ No newline at end of file diff --git a/spring-security-x509/server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java b/spring-security-x509/server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java new file mode 100644 index 0000000000..f08916c80b --- /dev/null +++ b/spring-security-x509/server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java @@ -0,0 +1,16 @@ +package com.baeldung.spring.security.x509; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class X509AuthenticationServerTests { + + @Test + public void contextLoads() { + } + +} From 8dc92aa09ccc2f5882436867be55f0d1c7028e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20R=C3=A4del?= Date: Thu, 4 Aug 2016 17:54:02 +0200 Subject: [PATCH 06/41] Working demo to demonstrate keystore creation and SSL. --- .../basic-secured-server/pom.xml | 58 +++++++++++++++++++ .../spring/security/x509/UserController.java | 19 ++++++ .../x509/X509AuthenticationServer.java | 11 ++++ .../src/main/resources/application.properties | 8 +++ .../src/main/resources/templates/user.html | 9 +++ .../x509/X509AuthenticationServerTests.java | 14 +++++ spring-security-x509/keystore/Makefile | 24 +++++--- ...{UserResource.java => UserController.java} | 0 8 files changed, 134 insertions(+), 9 deletions(-) create mode 100644 spring-security-x509/basic-secured-server/pom.xml create mode 100644 spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/UserController.java create mode 100644 spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java create mode 100644 spring-security-x509/basic-secured-server/src/main/resources/application.properties create mode 100644 spring-security-x509/basic-secured-server/src/main/resources/templates/user.html create mode 100644 spring-security-x509/basic-secured-server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java rename spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/{UserResource.java => UserController.java} (100%) diff --git a/spring-security-x509/basic-secured-server/pom.xml b/spring-security-x509/basic-secured-server/pom.xml new file mode 100644 index 0000000000..e8a65a02cf --- /dev/null +++ b/spring-security-x509/basic-secured-server/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + + com.baeldung.spring.security + basic-secured-server + 0.0.1-SNAPSHOT + jar + + basic-secured-server + Spring x.509 Authentication Demo + + + org.springframework.boot + spring-boot-starter-parent + 1.4.0.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/UserController.java b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/UserController.java new file mode 100644 index 0000000000..dfe000a3d0 --- /dev/null +++ b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/UserController.java @@ -0,0 +1,19 @@ +package com.baeldung.spring.security.x509; + +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.security.Principal; + +@Controller +public class UserController { + @RequestMapping(value = "/user") + public String user(Model model, Principal principal) { + UserDetails currentUser = (UserDetails) ((Authentication) principal).getPrincipal(); + model.addAttribute("username", currentUser.getUsername()); + return "user"; + } +} diff --git a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java new file mode 100644 index 0000000000..02a3bf45d6 --- /dev/null +++ b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java @@ -0,0 +1,11 @@ +package com.baeldung.spring.security.x509; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class X509AuthenticationServer { + public static void main(String[] args) { + SpringApplication.run(X509AuthenticationServer.class, args); + } +} diff --git a/spring-security-x509/basic-secured-server/src/main/resources/application.properties b/spring-security-x509/basic-secured-server/src/main/resources/application.properties new file mode 100644 index 0000000000..1eed9cbbb0 --- /dev/null +++ b/spring-security-x509/basic-secured-server/src/main/resources/application.properties @@ -0,0 +1,8 @@ +server.ssl.key-store=../keystore/keystore.jks +server.ssl.key-store-password=${PASSWORD} +server.ssl.key-alias=${HOSTNAME} +server.ssl.key-password=${PASSWORD} +server.ssl.enabled=true +server.port=8443 +security.user.name=Admin +security.user.password=admin \ No newline at end of file diff --git a/spring-security-x509/basic-secured-server/src/main/resources/templates/user.html b/spring-security-x509/basic-secured-server/src/main/resources/templates/user.html new file mode 100644 index 0000000000..81159e757a --- /dev/null +++ b/spring-security-x509/basic-secured-server/src/main/resources/templates/user.html @@ -0,0 +1,9 @@ + + + +X.509 Authentication Demo + + +

Hello !

+ + \ No newline at end of file diff --git a/spring-security-x509/basic-secured-server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java b/spring-security-x509/basic-secured-server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java new file mode 100644 index 0000000000..0b9a11552a --- /dev/null +++ b/spring-security-x509/basic-secured-server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java @@ -0,0 +1,14 @@ +package com.baeldung.spring.security.x509; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class X509AuthenticationServerTests { + @Test + public void contextLoads() { + } +} diff --git a/spring-security-x509/keystore/Makefile b/spring-security-x509/keystore/Makefile index 62f2e1395e..7f0c5e3077 100644 --- a/spring-security-x509/keystore/Makefile +++ b/spring-security-x509/keystore/Makefile @@ -1,6 +1,7 @@ PASSWORD=changeit KEYSTORE=keystore.jks HOSTNAME=localhost +CLIENTNAME=cid # CN = Common Name # OU = Organization Unit # O = Organization Name @@ -11,14 +12,14 @@ HOSTNAME=localhost DNAME_CA='CN=Baeldung CA,OU=baeldung.com,O=Baeldung,L=SomeCity,ST=SomeState,C=CC' # For server certificates, the Common Name (CN) must be the hostname DNAME_HOST='CN=$(HOSTNAME),OU=baeldung.com,O=Baeldung,L=SomeCity,ST=SomeState,C=CC' +DNAME_CLIENT='CN=$(CLIENTNAME),OU=baeldung.com,O=Baeldung,L=SomeCity,ST=SomeState,C=CC' TRUSTSTORE=truststore.jks -CLIENTNAME=cid all: clean create-keystore add-host create-truststore add-client create-keystore: # Generate a certificate authority (CA) - keytool -genkey -alias ca \ + keytool -genkey -alias ca -ext BC=ca:true \ -keyalg RSA -keysize 4096 -sigalg SHA512withRSA -keypass $(PASSWORD) \ -validity 3650 -dname $(DNAME_CA) \ -keystore $(KEYSTORE) -storepass $(PASSWORD) @@ -30,7 +31,7 @@ add-host: -validity 3650 -dname $(DNAME_HOST) \ -keystore $(KEYSTORE) -storepass $(PASSWORD) # Generate a host certificate signing request - keytool -certreq -alias $(HOSTNAME) \ + keytool -certreq -alias $(HOSTNAME) -ext BC=ca:true \ -keyalg RSA -keysize 4096 -sigalg SHA512withRSA \ -validity 3650 -file "$(HOSTNAME).csr" \ -keystore $(KEYSTORE) -storepass $(PASSWORD) @@ -44,10 +45,14 @@ add-host: -file "$(HOSTNAME).crt" \ -keystore $(KEYSTORE) -storepass $(PASSWORD) -create-truststore: - # Export certificate authority into truststore - keytool -export -alias ca -file ca.crt \ +export-authority: + # Export certificate authority + keytool -export -alias ca -file ca.crt -rfc \ -keystore $(KEYSTORE) -storepass $(PASSWORD) + + +create-truststore: export-authority + # Import certificate authority into a new truststore keytool -import -trustcacerts -noprompt -alias ca -file ca.crt \ -keystore $(TRUSTSTORE) -storepass $(PASSWORD) @@ -55,10 +60,10 @@ add-client: # Generate client certificate keytool -genkey -alias $(CLIENTNAME) \ -keyalg RSA -keysize 4096 -sigalg SHA512withRSA -keypass $(PASSWORD) \ - -validity 3650 -dname $(DNAME_HOST) \ + -validity 3650 -dname $(DNAME_CLIENT) \ -keystore $(TRUSTSTORE) -storepass $(PASSWORD) # Generate a host certificate signing request - keytool -certreq -alias $(CLIENTNAME) \ + keytool -certreq -alias $(CLIENTNAME) -ext BC=ca:true \ -keyalg RSA -keysize 4096 -sigalg SHA512withRSA \ -validity 3650 -file "$(CLIENTNAME).csr" \ -keystore $(TRUSTSTORE) -storepass $(PASSWORD) @@ -73,4 +78,5 @@ add-client: -keystore $(TRUSTSTORE) -storepass $(PASSWORD) clean: - rm -f $(KEYSTORE) *.csr *.crt $(TRUSTSTORE) + # Remove generated artifacts + find . ! -name Makefile -type f -exec rm -f {} \; diff --git a/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/UserResource.java b/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/UserController.java similarity index 100% rename from spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/UserResource.java rename to spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/UserController.java From 4f1c0651c6bac826933b035681c9fe2806a56a80 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 5 Aug 2016 02:10:48 +0200 Subject: [PATCH 07/41] Add JsonForms example --- json/src/main/webapp/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/json/src/main/webapp/package.json b/json/src/main/webapp/package.json index 66eb42d00e..cb7a96797c 100644 --- a/json/src/main/webapp/package.json +++ b/json/src/main/webapp/package.json @@ -4,8 +4,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "typings": "0.6.5", - "jsonforms": "0.0.19", - "bootstrap": "3.3.6" + "typings": "0.6.5", + "jsonforms": "0.0.19", + "bootstrap": "3.3.6" } } \ No newline at end of file From cc9370e8ff446759f6d4a304a650bb591de16e9c Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 5 Aug 2016 02:41:23 +0200 Subject: [PATCH 08/41] Add JSONForms example --- json/src/main/webapp/package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/json/src/main/webapp/package.json b/json/src/main/webapp/package.json index cb7a96797c..2f2d6c9ffa 100644 --- a/json/src/main/webapp/package.json +++ b/json/src/main/webapp/package.json @@ -1,11 +1,11 @@ -{ - "name": "jsonforms-intro", - "description": "Introduction to JSONForms", - "version": "0.0.1", - "license": "MIT", - "dependencies": { - "typings": "0.6.5", - "jsonforms": "0.0.19", - "bootstrap": "3.3.6" - } +{ + "name": "jsonforms-intro", + "description": "Introduction to JSONForms", + "version": "0.0.1", + "license": "MIT", + "dependencies": { + "typings": "0.6.5", + "jsonforms": "0.0.19", + "bootstrap": "3.3.6" + } } \ No newline at end of file From ffa78dc1758525d6856ae325c3b9b031be0f2a10 Mon Sep 17 00:00:00 2001 From: chernykhalexander Date: Sat, 6 Aug 2016 22:59:54 +0300 Subject: [PATCH 09/41] remove old module --- cdiexample/pom.xml | 52 ------------------- .../com/baeldung/cdi/interceptor/Audited.java | 12 ----- .../cdi/interceptor/AuditedInterceptor.java | 20 ------- .../baeldung/cdi/service/SuperService.java | 11 ---- .../spring/aspect/SpringTestAspect.java | 19 ------- .../spring/configuration/AppConfig.java | 21 -------- .../spring/service/SpringSuperService.java | 8 --- .../src/main/resources/META-INF/beans.xml | 8 --- .../baeldung/test/SpringTestInterceptor.java | 25 --------- .../com/baeldung/test/TestInterceptor.java | 19 ------- 10 files changed, 195 deletions(-) delete mode 100644 cdiexample/pom.xml delete mode 100644 cdiexample/src/main/java/com/baeldung/cdi/interceptor/Audited.java delete mode 100644 cdiexample/src/main/java/com/baeldung/cdi/interceptor/AuditedInterceptor.java delete mode 100644 cdiexample/src/main/java/com/baeldung/cdi/service/SuperService.java delete mode 100644 cdiexample/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java delete mode 100644 cdiexample/src/main/java/com/baeldung/spring/configuration/AppConfig.java delete mode 100644 cdiexample/src/main/java/com/baeldung/spring/service/SpringSuperService.java delete mode 100644 cdiexample/src/main/resources/META-INF/beans.xml delete mode 100644 cdiexample/src/test/java/com/baeldung/test/SpringTestInterceptor.java delete mode 100644 cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java diff --git a/cdiexample/pom.xml b/cdiexample/pom.xml deleted file mode 100644 index 042d22a6e9..0000000000 --- a/cdiexample/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - com.baeldung - cdiexample - 1.0-SNAPSHOT - - 4.3.1.RELEASE - - - - - org.jboss.weld.se - weld-se-core - 2.3.5.Final - - - - junit - junit - 4.12 - - - - org.springframework - spring-core - ${spring.version} - - - - org.springframework - spring-context - ${spring.version} - - - - org.springframework - spring-test - ${spring.version} - test - - - - org.aspectj - aspectjweaver - 1.8.9 - - - \ No newline at end of file diff --git a/cdiexample/src/main/java/com/baeldung/cdi/interceptor/Audited.java b/cdiexample/src/main/java/com/baeldung/cdi/interceptor/Audited.java deleted file mode 100644 index 459a1c35da..0000000000 --- a/cdiexample/src/main/java/com/baeldung/cdi/interceptor/Audited.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.baeldung.cdi.interceptor; - -import javax.interceptor.InterceptorBinding; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@InterceptorBinding -@Target( {ElementType.METHOD, ElementType.TYPE } ) -@Retention(RetentionPolicy.RUNTIME ) -public @interface Audited {} diff --git a/cdiexample/src/main/java/com/baeldung/cdi/interceptor/AuditedInterceptor.java b/cdiexample/src/main/java/com/baeldung/cdi/interceptor/AuditedInterceptor.java deleted file mode 100644 index 53a3af7091..0000000000 --- a/cdiexample/src/main/java/com/baeldung/cdi/interceptor/AuditedInterceptor.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baeldung.cdi.interceptor; - -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import java.lang.reflect.Method; - -@Audited @Interceptor -public class AuditedInterceptor { - @AroundInvoke - public Object auditMethod(InvocationContext ctx) throws Exception { - Object[] parameters = ctx.getParameters(); - Method method= ctx.getMethod(); - String param = (String) parameters[0]; - System.out.println("Method "+method.getName()+" invoked with parameter "+param); - Object result = ctx.proceed(); - System.out.println("Method "+method.getName()+" exit"); - return result; - } -} diff --git a/cdiexample/src/main/java/com/baeldung/cdi/service/SuperService.java b/cdiexample/src/main/java/com/baeldung/cdi/service/SuperService.java deleted file mode 100644 index cbf22fd803..0000000000 --- a/cdiexample/src/main/java/com/baeldung/cdi/service/SuperService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.baeldung.cdi.service; - -import com.baeldung.cdi.interceptor.Audited; - -public class SuperService { - @Audited - public String deliverService(String uid) { - System.out.println("Service delivered for uid:" + uid); - return uid; - } -} diff --git a/cdiexample/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java b/cdiexample/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java deleted file mode 100644 index ab3036285e..0000000000 --- a/cdiexample/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.spring.aspect; - -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; - -@Aspect -public class SpringTestAspect { - @Around("execution(* com.baeldung.spring.service.SpringSuperService.*(..))") - public Object advice(ProceedingJoinPoint jp) throws Throwable { - String methodName = jp.getSignature().getName(); - System.out.println("Call to "+methodName); - Object obj = jp.proceed(); - System.out.println("Method called successfully: "+methodName); - return obj; - } -} diff --git a/cdiexample/src/main/java/com/baeldung/spring/configuration/AppConfig.java b/cdiexample/src/main/java/com/baeldung/spring/configuration/AppConfig.java deleted file mode 100644 index e8dbf264b5..0000000000 --- a/cdiexample/src/main/java/com/baeldung/spring/configuration/AppConfig.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung.spring.configuration; - -import com.baeldung.spring.aspect.SpringTestAspect; -import com.baeldung.spring.service.SpringSuperService; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.EnableAspectJAutoProxy; - -@Configuration -@EnableAspectJAutoProxy -public class AppConfig { - @Bean - public SpringSuperService springSuperService() { - return new SpringSuperService(); - } - - @Bean - public SpringTestAspect springTestAspect(){ - return new SpringTestAspect(); - } -} diff --git a/cdiexample/src/main/java/com/baeldung/spring/service/SpringSuperService.java b/cdiexample/src/main/java/com/baeldung/spring/service/SpringSuperService.java deleted file mode 100644 index 5b96a24390..0000000000 --- a/cdiexample/src/main/java/com/baeldung/spring/service/SpringSuperService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.spring.service; - -public class SpringSuperService { - public String getInfoFromService(String code){ - System.out.println("Doing calculations"); - return code; - } -} diff --git a/cdiexample/src/main/resources/META-INF/beans.xml b/cdiexample/src/main/resources/META-INF/beans.xml deleted file mode 100644 index 0a68bbf29d..0000000000 --- a/cdiexample/src/main/resources/META-INF/beans.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - com.baeldung.cdi.interceptor.AuditedInterceptor - - \ No newline at end of file diff --git a/cdiexample/src/test/java/com/baeldung/test/SpringTestInterceptor.java b/cdiexample/src/test/java/com/baeldung/test/SpringTestInterceptor.java deleted file mode 100644 index 6085187ecd..0000000000 --- a/cdiexample/src/test/java/com/baeldung/test/SpringTestInterceptor.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.baeldung.test; - -import com.baeldung.spring.configuration.AppConfig; -import com.baeldung.spring.service.SpringSuperService; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.inject.Inject; - -@RunWith(SpringRunner.class) -@ContextConfiguration(classes = {AppConfig.class}) -public class SpringTestInterceptor { - @Inject - SpringSuperService springSuperService; - - @Test - public void givenService_whenServiceAndAspectExecuted_thenOk(){ - String code = "123456"; - String result = springSuperService.getInfoFromService(code); - Assert.assertEquals(code,result); - } -} diff --git a/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java b/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java deleted file mode 100644 index d32890869c..0000000000 --- a/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.test; - -import com.baeldung.cdi.service.SuperService; -import org.jboss.weld.environment.se.Weld; -import org.jboss.weld.environment.se.WeldContainer; -import org.junit.Assert; -import org.junit.Test; - -public class TestInterceptor { - @Test - public void givenTheService_whenMethodAndInterceptorExecuted_thenOK() { - Weld weld = new Weld(); - WeldContainer container = weld.initialize(); - SuperService superService = container.instance().select(SuperService.class).get(); - String code = "123456"; - superService.deliverService(code); - Assert.assertEquals("123456",code); - } -} From bd3580585b20eb7b2829db01b8d8520d09a8d10d Mon Sep 17 00:00:00 2001 From: chernykhalexander Date: Sat, 6 Aug 2016 23:03:58 +0300 Subject: [PATCH 10/41] added cdi vs spring aspectj module --- cdi/pom.xml | 52 +++++++++++++++++++ .../com/baeldung/interceptor/Audited.java | 12 +++++ .../interceptor/AuditedInterceptor.java | 19 +++++++ .../com/baeldung/service/SuperService.java | 10 ++++ .../spring/aspect/SpringTestAspect.java | 26 ++++++++++ .../spring/configuration/AppConfig.java | 29 +++++++++++ .../spring/service/SpringSuperService.java | 7 +++ cdi/src/main/resources/META-INF/beans.xml | 8 +++ .../com/baeldung/test/TestInterceptor.java | 42 +++++++++++++++ .../baeldung/test/TestSpringInterceptor.java | 38 ++++++++++++++ 10 files changed, 243 insertions(+) create mode 100644 cdi/pom.xml create mode 100644 cdi/src/main/java/com/baeldung/interceptor/Audited.java create mode 100644 cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java create mode 100644 cdi/src/main/java/com/baeldung/service/SuperService.java create mode 100644 cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java create mode 100644 cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java create mode 100644 cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java create mode 100644 cdi/src/main/resources/META-INF/beans.xml create mode 100644 cdi/src/test/java/com/baeldung/test/TestInterceptor.java create mode 100644 cdi/src/test/java/com/baeldung/test/TestSpringInterceptor.java diff --git a/cdi/pom.xml b/cdi/pom.xml new file mode 100644 index 0000000000..2a9d32188b --- /dev/null +++ b/cdi/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + com.baeldung + cdi + 1.0-SNAPSHOT + + 4.3.1.RELEASE + + + + + junit + junit + 4.12 + + + + org.springframework + spring-core + ${spring.version} + + + + org.springframework + spring-context + ${spring.version} + + + + org.springframework + spring-test + ${spring.version} + test + + + + org.aspectj + aspectjweaver + 1.8.9 + + + + org.jboss.weld.se + weld-se-core + 2.3.5.Final + + + \ No newline at end of file diff --git a/cdi/src/main/java/com/baeldung/interceptor/Audited.java b/cdi/src/main/java/com/baeldung/interceptor/Audited.java new file mode 100644 index 0000000000..4065450b09 --- /dev/null +++ b/cdi/src/main/java/com/baeldung/interceptor/Audited.java @@ -0,0 +1,12 @@ +package com.baeldung.interceptor; + +import javax.interceptor.InterceptorBinding; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@InterceptorBinding +@Target( {ElementType.METHOD, ElementType.TYPE } ) +@Retention(RetentionPolicy.RUNTIME ) +public @interface Audited {} diff --git a/cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java b/cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java new file mode 100644 index 0000000000..46ab9b33c8 --- /dev/null +++ b/cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java @@ -0,0 +1,19 @@ +package com.baeldung.interceptor; + +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; +import java.lang.reflect.Method; + +@Audited @Interceptor +public class AuditedInterceptor { + public static boolean calledBefore = false; + public static boolean calledAfter = false; + @AroundInvoke + public Object auditMethod(InvocationContext ctx) throws Exception { + calledBefore = true; + Object result = ctx.proceed(); + calledAfter = true; + return result; + } +} diff --git a/cdi/src/main/java/com/baeldung/service/SuperService.java b/cdi/src/main/java/com/baeldung/service/SuperService.java new file mode 100644 index 0000000000..e1e57a4e0d --- /dev/null +++ b/cdi/src/main/java/com/baeldung/service/SuperService.java @@ -0,0 +1,10 @@ +package com.baeldung.service; + +import com.baeldung.interceptor.Audited; + +public class SuperService { + @Audited + public String deliverService(String uid) { + return uid; + } +} diff --git a/cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java b/cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java new file mode 100644 index 0000000000..8c2ff2600b --- /dev/null +++ b/cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java @@ -0,0 +1,26 @@ +package com.baeldung.spring.aspect; + +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.inject.Inject; +import java.util.List; + +@Aspect +public class SpringTestAspect { + @Autowired + private List accumulator; + + @Around("execution(* com.baeldung.spring.service.SpringSuperService.*(..))") + public Object advice(ProceedingJoinPoint jp) throws Throwable { + String methodName = jp.getSignature().getName(); + accumulator.add("Call to "+methodName); + Object obj = jp.proceed(); + accumulator.add("Method called successfully: "+methodName); + return obj; + } +} diff --git a/cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java b/cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java new file mode 100644 index 0000000000..6cfc8f8743 --- /dev/null +++ b/cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java @@ -0,0 +1,29 @@ +package com.baeldung.spring.configuration; + +import com.baeldung.spring.aspect.SpringTestAspect; +import com.baeldung.spring.service.SpringSuperService; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.EnableAspectJAutoProxy; + +import java.util.ArrayList; +import java.util.List; + +@Configuration +@EnableAspectJAutoProxy +public class AppConfig { + @Bean + public SpringSuperService springSuperService() { + return new SpringSuperService(); + } + + @Bean + public SpringTestAspect springTestAspect(){ + return new SpringTestAspect(); + } + + @Bean + public List getAccumulator(){ + return new ArrayList(); + } +} diff --git a/cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java b/cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java new file mode 100644 index 0000000000..72dbd1c006 --- /dev/null +++ b/cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java @@ -0,0 +1,7 @@ +package com.baeldung.spring.service; + +public class SpringSuperService { + public String getInfoFromService(String code){ + return code; + } +} diff --git a/cdi/src/main/resources/META-INF/beans.xml b/cdi/src/main/resources/META-INF/beans.xml new file mode 100644 index 0000000000..d41b35e7d9 --- /dev/null +++ b/cdi/src/main/resources/META-INF/beans.xml @@ -0,0 +1,8 @@ + + + com.baeldung.interceptor.AuditedInterceptor + + \ No newline at end of file diff --git a/cdi/src/test/java/com/baeldung/test/TestInterceptor.java b/cdi/src/test/java/com/baeldung/test/TestInterceptor.java new file mode 100644 index 0000000000..d1b851c94f --- /dev/null +++ b/cdi/src/test/java/com/baeldung/test/TestInterceptor.java @@ -0,0 +1,42 @@ +package com.baeldung.test; + +import com.baeldung.interceptor.Audited; +import com.baeldung.interceptor.AuditedInterceptor; +import com.baeldung.service.SuperService; +import org.jboss.weld.environment.se.Weld; +import org.jboss.weld.environment.se.WeldContainer; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InterceptionType; +import javax.enterprise.inject.spi.Interceptor; +import javax.enterprise.util.AnnotationLiteral; + +import static javafx.beans.binding.Bindings.select; + +public class TestInterceptor { + Weld weld; + WeldContainer container; + @Before + public void init(){ + weld = new Weld(); + container = weld.initialize(); + } + + @After + public void shutdown(){ + weld.shutdown(); + } + + @Test + public void givenTheService_whenMethodAndInterceptorExecuted_thenOK() { + SuperService superService = container.select(SuperService.class).get(); + String code = "123456"; + superService.deliverService(code); + Assert.assertTrue(AuditedInterceptor.calledBefore); + Assert.assertTrue(AuditedInterceptor.calledAfter); + } +} diff --git a/cdi/src/test/java/com/baeldung/test/TestSpringInterceptor.java b/cdi/src/test/java/com/baeldung/test/TestSpringInterceptor.java new file mode 100644 index 0000000000..b5aedd4b76 --- /dev/null +++ b/cdi/src/test/java/com/baeldung/test/TestSpringInterceptor.java @@ -0,0 +1,38 @@ +package com.baeldung.test; + +import com.baeldung.spring.configuration.AppConfig; +import com.baeldung.spring.service.SpringSuperService; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestExecutionListeners; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; +import org.springframework.test.context.support.DirtiesContextTestExecutionListener; +import org.springframework.test.context.transaction.TransactionalTestExecutionListener; + +import javax.inject.Inject; +import java.util.List; + +import static org.hamcrest.CoreMatchers.is; + +@RunWith(SpringRunner.class) +@ContextConfiguration(classes = {AppConfig.class}) +public class TestSpringInterceptor { + @Autowired + SpringSuperService springSuperService; + + @Autowired + private List accumulator; + + @Test + public void givenService_whenServiceAndAspectExecuted_thenOk(){ + String code = "123456"; + String result = springSuperService.getInfoFromService(code); + Assert.assertThat(accumulator.size(), is(2)); + Assert.assertThat(accumulator.get(0),is("Call to getInfoFromService")); + Assert.assertThat(accumulator.get(1),is("Method called successfully: getInfoFromService")); + } +} From 3c769436274858563d2196d83c8ccd57d2d0c42f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20R=C3=A4del?= Date: Mon, 8 Aug 2016 01:55:42 +0200 Subject: [PATCH 11/41] Added second version to authenticate with client certificates. --- .../spring/security/x509/UserController.java | 2 + .../x509/X509AuthenticationServer.java | 39 ++++++++++++++- .../src/main/resources/application.properties | 5 +- .../{server => client-auth-server}/pom.xml | 6 +-- .../spring/security/x509/UserController.java | 5 +- .../x509/X509AuthenticationServer.java | 47 +++++++++++++++++++ .../src/main/resources/application.properties | 7 ++- .../src/main/resources/templates/user.html | 4 +- .../x509/X509AuthenticationServerTests.java | 2 - spring-security-x509/keystore/Makefile | 6 +++ .../x509/X509AuthenticationServer.java | 12 ----- 11 files changed, 110 insertions(+), 25 deletions(-) rename spring-security-x509/{server => client-auth-server}/pom.xml (92%) rename spring-security-x509/{server => client-auth-server}/src/main/java/com/baeldung/spring/security/x509/UserController.java (82%) create mode 100644 spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java rename spring-security-x509/{server => client-auth-server}/src/main/resources/application.properties (50%) rename spring-security-x509/{server => client-auth-server}/src/main/resources/templates/user.html (51%) rename spring-security-x509/{server => client-auth-server}/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java (99%) delete mode 100644 spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java diff --git a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/UserController.java b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/UserController.java index dfe000a3d0..af1c103739 100644 --- a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/UserController.java +++ b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/UserController.java @@ -1,5 +1,6 @@ package com.baeldung.spring.security.x509; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Controller; @@ -10,6 +11,7 @@ import java.security.Principal; @Controller public class UserController { + @PreAuthorize("hasAuthority('ROLE_USER')") @RequestMapping(value = "/user") public String user(Model model, Principal principal) { UserDetails currentUser = (UserDetails) ((Authentication) principal).getPrincipal(); diff --git a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java index 02a3bf45d6..41e88686fb 100644 --- a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java +++ b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java @@ -1,11 +1,48 @@ package com.baeldung.spring.security.x509; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; @SpringBootApplication -public class X509AuthenticationServer { +@EnableWebSecurity +@EnableGlobalMethodSecurity(prePostEnabled = true) +public class X509AuthenticationServer extends WebSecurityConfigurerAdapter { + public static void main(String[] args) { SpringApplication.run(X509AuthenticationServer.class, args); } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests().anyRequest().authenticated() + .and() + .x509().subjectPrincipalRegex("CN=(.*?)(?:,|$)").userDetailsService(userDetailsService()); + } + + @Bean + public UserDetailsService userDetailsService() { + return new UserDetailsService() { + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + if (username.equals("cid")) { + return new User(username, "", AuthorityUtils.commaSeparatedStringToAuthorityList("ROLE_USER")); + } + throw new UsernameNotFoundException("User not found!"); + } + }; + } } diff --git a/spring-security-x509/basic-secured-server/src/main/resources/application.properties b/spring-security-x509/basic-secured-server/src/main/resources/application.properties index 1eed9cbbb0..294c7d9c6b 100644 --- a/spring-security-x509/basic-secured-server/src/main/resources/application.properties +++ b/spring-security-x509/basic-secured-server/src/main/resources/application.properties @@ -5,4 +5,7 @@ server.ssl.key-password=${PASSWORD} server.ssl.enabled=true server.port=8443 security.user.name=Admin -security.user.password=admin \ No newline at end of file +security.user.password=admin +server.ssl.trust-store=../keystore/truststore.jks +server.ssl.trust-store-password=${PASSWORD} +server.ssl.client-auth=need \ No newline at end of file diff --git a/spring-security-x509/server/pom.xml b/spring-security-x509/client-auth-server/pom.xml similarity index 92% rename from spring-security-x509/server/pom.xml rename to spring-security-x509/client-auth-server/pom.xml index eabd0364ef..8b902ee63f 100644 --- a/spring-security-x509/server/pom.xml +++ b/spring-security-x509/client-auth-server/pom.xml @@ -4,12 +4,12 @@ 4.0.0 com.baeldung.spring.security - server + client-auth-server 0.0.1-SNAPSHOT jar - server - Spring x.509 Authentication Demo + client-auth-server + Spring x.509 Client Authentication Demo org.springframework.boot diff --git a/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/UserController.java b/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/UserController.java similarity index 82% rename from spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/UserController.java rename to spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/UserController.java index 90c8897d8f..af1c103739 100644 --- a/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/UserController.java +++ b/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/UserController.java @@ -1,5 +1,6 @@ package com.baeldung.spring.security.x509; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Controller; @@ -9,8 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import java.security.Principal; @Controller -public class UserResource { - +public class UserController { + @PreAuthorize("hasAuthority('ROLE_USER')") @RequestMapping(value = "/user") public String user(Model model, Principal principal) { UserDetails currentUser = (UserDetails) ((Authentication) principal).getPrincipal(); diff --git a/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java b/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java new file mode 100644 index 0000000000..462c984555 --- /dev/null +++ b/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java @@ -0,0 +1,47 @@ +package com.baeldung.spring.security.x509; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; + +@SpringBootApplication +@EnableWebSecurity +@EnableGlobalMethodSecurity(prePostEnabled = true) +public class X509AuthenticationServer extends WebSecurityConfigurerAdapter { + public static void main(String[] args) { + SpringApplication.run(X509AuthenticationServer.class, args); + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests().anyRequest().authenticated() + .and() + .x509().subjectPrincipalRegex("CN=(.*?)(?:,|$)").userDetailsService(userDetailsService()); + } + + @Bean + public UserDetailsService userDetailsService() { + return new UserDetailsService() { + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + if (username.equals("cid")) { + return new User(username, "", AuthorityUtils.commaSeparatedStringToAuthorityList("ROLE_USER")); + } + throw new UsernameNotFoundException("User not found!"); + } + }; + } +} diff --git a/spring-security-x509/server/src/main/resources/application.properties b/spring-security-x509/client-auth-server/src/main/resources/application.properties similarity index 50% rename from spring-security-x509/server/src/main/resources/application.properties rename to spring-security-x509/client-auth-server/src/main/resources/application.properties index 89a234b1ac..294c7d9c6b 100644 --- a/spring-security-x509/server/src/main/resources/application.properties +++ b/spring-security-x509/client-auth-server/src/main/resources/application.properties @@ -1,8 +1,11 @@ server.ssl.key-store=../keystore/keystore.jks server.ssl.key-store-password=${PASSWORD} -server.ssl.key-alias=localhost +server.ssl.key-alias=${HOSTNAME} server.ssl.key-password=${PASSWORD} server.ssl.enabled=true server.port=8443 security.user.name=Admin -security.user.password=admin \ No newline at end of file +security.user.password=admin +server.ssl.trust-store=../keystore/truststore.jks +server.ssl.trust-store-password=${PASSWORD} +server.ssl.client-auth=need \ No newline at end of file diff --git a/spring-security-x509/server/src/main/resources/templates/user.html b/spring-security-x509/client-auth-server/src/main/resources/templates/user.html similarity index 51% rename from spring-security-x509/server/src/main/resources/templates/user.html rename to spring-security-x509/client-auth-server/src/main/resources/templates/user.html index 0be84680fe..a04ec6b406 100644 --- a/spring-security-x509/server/src/main/resources/templates/user.html +++ b/spring-security-x509/client-auth-server/src/main/resources/templates/user.html @@ -1,9 +1,9 @@ - X.509 Authentication Demo +X.509 Authentication Demo -

Hello !

+

Hello !

\ No newline at end of file diff --git a/spring-security-x509/server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java b/spring-security-x509/client-auth-server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java similarity index 99% rename from spring-security-x509/server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java rename to spring-security-x509/client-auth-server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java index f08916c80b..0b9a11552a 100644 --- a/spring-security-x509/server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java +++ b/spring-security-x509/client-auth-server/src/test/java/com/baeldung/spring/security/x509/X509AuthenticationServerTests.java @@ -8,9 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest public class X509AuthenticationServerTests { - @Test public void contextLoads() { } - } diff --git a/spring-security-x509/keystore/Makefile b/spring-security-x509/keystore/Makefile index 7f0c5e3077..5321be9de3 100644 --- a/spring-security-x509/keystore/Makefile +++ b/spring-security-x509/keystore/Makefile @@ -2,6 +2,7 @@ PASSWORD=changeit KEYSTORE=keystore.jks HOSTNAME=localhost CLIENTNAME=cid + # CN = Common Name # OU = Organization Unit # O = Organization Name @@ -76,6 +77,11 @@ add-client: keytool -import -trustcacerts -alias $(CLIENTNAME) \ -file "$(CLIENTNAME).crt" \ -keystore $(TRUSTSTORE) -storepass $(PASSWORD) + # Export private certificate for importing into a browser + keytool -importkeystore -srcalias $(CLIENTNAME) \ + -srckeystore $(TRUSTSTORE) -srcstorepass $(PASSWORD) \ + -destkeystore "$(CLIENTNAME).p12" -deststorepass $(PASSWORD) \ + -deststoretype PKCS12 clean: # Remove generated artifacts diff --git a/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java b/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java deleted file mode 100644 index ab7719df0f..0000000000 --- a/spring-security-x509/server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.baeldung.spring.security.x509; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class X509AuthenticationServer { - - public static void main(String[] args) { - SpringApplication.run(X509AuthenticationServer.class, args); - } -} From fba9f8f81aed790730885d7f5a23dcc055c118e5 Mon Sep 17 00:00:00 2001 From: Christian Raedel Date: Mon, 8 Aug 2016 03:02:47 +0200 Subject: [PATCH 12/41] Fixed indentation and removed empty lines. --- spring-security-x509/basic-secured-server/pom.xml | 2 -- .../security/x509/X509AuthenticationServer.java | 5 ----- .../src/main/resources/application.properties | 5 +---- .../src/main/resources/templates/user.html | 14 +++++++------- spring-security-x509/client-auth-server/pom.xml | 2 -- .../security/x509/X509AuthenticationServer.java | 4 ---- .../src/main/resources/templates/user.html | 14 +++++++------- 7 files changed, 15 insertions(+), 31 deletions(-) diff --git a/spring-security-x509/basic-secured-server/pom.xml b/spring-security-x509/basic-secured-server/pom.xml index e8a65a02cf..ce35990b21 100644 --- a/spring-security-x509/basic-secured-server/pom.xml +++ b/spring-security-x509/basic-secured-server/pom.xml @@ -53,6 +53,4 @@ - - diff --git a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java index 41e88686fb..ee81cf3ad5 100644 --- a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java +++ b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java @@ -1,14 +1,10 @@ package com.baeldung.spring.security.x509; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.core.authority.AuthorityUtils; @@ -21,7 +17,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) public class X509AuthenticationServer extends WebSecurityConfigurerAdapter { - public static void main(String[] args) { SpringApplication.run(X509AuthenticationServer.class, args); } diff --git a/spring-security-x509/basic-secured-server/src/main/resources/application.properties b/spring-security-x509/basic-secured-server/src/main/resources/application.properties index 294c7d9c6b..1eed9cbbb0 100644 --- a/spring-security-x509/basic-secured-server/src/main/resources/application.properties +++ b/spring-security-x509/basic-secured-server/src/main/resources/application.properties @@ -5,7 +5,4 @@ server.ssl.key-password=${PASSWORD} server.ssl.enabled=true server.port=8443 security.user.name=Admin -security.user.password=admin -server.ssl.trust-store=../keystore/truststore.jks -server.ssl.trust-store-password=${PASSWORD} -server.ssl.client-auth=need \ No newline at end of file +security.user.password=admin \ No newline at end of file diff --git a/spring-security-x509/basic-secured-server/src/main/resources/templates/user.html b/spring-security-x509/basic-secured-server/src/main/resources/templates/user.html index 81159e757a..3e36d7b644 100644 --- a/spring-security-x509/basic-secured-server/src/main/resources/templates/user.html +++ b/spring-security-x509/basic-secured-server/src/main/resources/templates/user.html @@ -1,9 +1,9 @@ - -X.509 Authentication Demo - - -

Hello !

- - \ No newline at end of file + + X.509 Authentication Demo + + +

Hello !

+ + diff --git a/spring-security-x509/client-auth-server/pom.xml b/spring-security-x509/client-auth-server/pom.xml index 8b902ee63f..5cdf1f8859 100644 --- a/spring-security-x509/client-auth-server/pom.xml +++ b/spring-security-x509/client-auth-server/pom.xml @@ -53,6 +53,4 @@ - - diff --git a/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java b/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java index 462c984555..7d8413589e 100644 --- a/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java +++ b/spring-security-x509/client-auth-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java @@ -1,14 +1,10 @@ package com.baeldung.spring.security.x509; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.core.authority.AuthorityUtils; diff --git a/spring-security-x509/client-auth-server/src/main/resources/templates/user.html b/spring-security-x509/client-auth-server/src/main/resources/templates/user.html index a04ec6b406..a35b18bacc 100644 --- a/spring-security-x509/client-auth-server/src/main/resources/templates/user.html +++ b/spring-security-x509/client-auth-server/src/main/resources/templates/user.html @@ -1,9 +1,9 @@ - -X.509 Authentication Demo - - -

Hello !

- - \ No newline at end of file + + X.509 Authentication Demo + + +

Hello !

+ + From 3c31664ea0576676f94d08b0950f467508668911 Mon Sep 17 00:00:00 2001 From: sbalachandran Date: Sun, 7 Aug 2016 22:06:57 -0400 Subject: [PATCH 13/41] Updated with Hystrix integration to spring app --- .../java/com/baeldung/hystrix/AppConfig.java | 13 +++++++++++++ .../com/baeldung/hystrix/CommandHelloWorld.java | 0 .../com/baeldung/hystrix/HystrixAspect.java | 7 +++++++ .../baeldung/hystrix/HystrixCircuitBreaker.java | 7 +++++++ .../com/baeldung/hystrix/HystrixController.java | 17 +++++++++++++++++ .../hystrix/RemoteServiceSimulator.java | 15 --------------- .../hystrix/RemoteServiceTestCommand.java | 0 .../hystrix/RemoteServiceTestSimulator.java | 0 .../baeldung/hystrix/SpringExistingClient.java | 7 +++++++ .../src/main/resources/application.properties | 0 10 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 hystrix/src/main/java/com/baeldung/hystrix/AppConfig.java rename hystrix/src/{test => main}/java/com/baeldung/hystrix/CommandHelloWorld.java (100%) create mode 100644 hystrix/src/main/java/com/baeldung/hystrix/HystrixAspect.java create mode 100644 hystrix/src/main/java/com/baeldung/hystrix/HystrixCircuitBreaker.java create mode 100644 hystrix/src/main/java/com/baeldung/hystrix/HystrixController.java delete mode 100644 hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceSimulator.java rename hystrix/src/{test => main}/java/com/baeldung/hystrix/RemoteServiceTestCommand.java (100%) rename hystrix/src/{test => main}/java/com/baeldung/hystrix/RemoteServiceTestSimulator.java (100%) create mode 100644 hystrix/src/main/java/com/baeldung/hystrix/SpringExistingClient.java create mode 100644 hystrix/src/main/resources/application.properties diff --git a/hystrix/src/main/java/com/baeldung/hystrix/AppConfig.java b/hystrix/src/main/java/com/baeldung/hystrix/AppConfig.java new file mode 100644 index 0000000000..8102428e9a --- /dev/null +++ b/hystrix/src/main/java/com/baeldung/hystrix/AppConfig.java @@ -0,0 +1,13 @@ +package com.baeldung.hystrix; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; + +@SpringBootApplication +public class AppConfig { + + public static void main(String[] args) { + SpringApplication.run(AppConfig.class, args); + } +} diff --git a/hystrix/src/test/java/com/baeldung/hystrix/CommandHelloWorld.java b/hystrix/src/main/java/com/baeldung/hystrix/CommandHelloWorld.java similarity index 100% rename from hystrix/src/test/java/com/baeldung/hystrix/CommandHelloWorld.java rename to hystrix/src/main/java/com/baeldung/hystrix/CommandHelloWorld.java diff --git a/hystrix/src/main/java/com/baeldung/hystrix/HystrixAspect.java b/hystrix/src/main/java/com/baeldung/hystrix/HystrixAspect.java new file mode 100644 index 0000000000..2ea0163ab1 --- /dev/null +++ b/hystrix/src/main/java/com/baeldung/hystrix/HystrixAspect.java @@ -0,0 +1,7 @@ +package com.baeldung.hystrix; + +/** + * Created by sbalachandran on 8/5/2016. + */ +public class HystrixAspect { +} diff --git a/hystrix/src/main/java/com/baeldung/hystrix/HystrixCircuitBreaker.java b/hystrix/src/main/java/com/baeldung/hystrix/HystrixCircuitBreaker.java new file mode 100644 index 0000000000..9377d83495 --- /dev/null +++ b/hystrix/src/main/java/com/baeldung/hystrix/HystrixCircuitBreaker.java @@ -0,0 +1,7 @@ +package com.baeldung.hystrix; + +/** + * Created by sbalachandran on 8/5/2016. + */ +public class HystrixCircuitBreaker { +} diff --git a/hystrix/src/main/java/com/baeldung/hystrix/HystrixController.java b/hystrix/src/main/java/com/baeldung/hystrix/HystrixController.java new file mode 100644 index 0000000000..a8ca0adef2 --- /dev/null +++ b/hystrix/src/main/java/com/baeldung/hystrix/HystrixController.java @@ -0,0 +1,17 @@ +package com.baeldung.hystrix; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HystrixController { + + @Autowired + private SpringExistingClient client; + + @RequestMapping("/") + public String index() throws InterruptedException{ + return client.invokeRemoteService(); + } +} diff --git a/hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceSimulator.java b/hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceSimulator.java deleted file mode 100644 index 3efd579d84..0000000000 --- a/hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceSimulator.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung.hystrix; - - -public class RemoteServiceSimulator { - - public String checkSomething(final long timeout) throws InterruptedException { - - System.out.print(String.format("Waiting %sms. ", timeout)); - - // to simulate a real world delay in processing. - Thread.sleep(timeout); - - return "Done waiting."; - } -} diff --git a/hystrix/src/test/java/com/baeldung/hystrix/RemoteServiceTestCommand.java b/hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceTestCommand.java similarity index 100% rename from hystrix/src/test/java/com/baeldung/hystrix/RemoteServiceTestCommand.java rename to hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceTestCommand.java diff --git a/hystrix/src/test/java/com/baeldung/hystrix/RemoteServiceTestSimulator.java b/hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceTestSimulator.java similarity index 100% rename from hystrix/src/test/java/com/baeldung/hystrix/RemoteServiceTestSimulator.java rename to hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceTestSimulator.java diff --git a/hystrix/src/main/java/com/baeldung/hystrix/SpringExistingClient.java b/hystrix/src/main/java/com/baeldung/hystrix/SpringExistingClient.java new file mode 100644 index 0000000000..b08f61a777 --- /dev/null +++ b/hystrix/src/main/java/com/baeldung/hystrix/SpringExistingClient.java @@ -0,0 +1,7 @@ +package com.baeldung.hystrix; + +/** + * Created by sbalachandran on 8/5/2016. + */ +public class SpringExistingClient { +} diff --git a/hystrix/src/main/resources/application.properties b/hystrix/src/main/resources/application.properties new file mode 100644 index 0000000000..e69de29bb2 From bc38da4f43861225bb3e96f3d7c6df04f588138c Mon Sep 17 00:00:00 2001 From: sbalachandran Date: Sun, 7 Aug 2016 22:11:59 -0400 Subject: [PATCH 14/41] added missing new files --- hystrix/pom.xml | 35 +++++++- .../java/com/baeldung/hystrix/AppConfig.java | 9 ++- .../com/baeldung/hystrix/HystrixAspect.java | 80 ++++++++++++++++++- .../hystrix/HystrixCircuitBreaker.java | 12 ++- .../hystrix/SpringExistingClient.java | 16 +++- .../src/main/resources/application.properties | 8 ++ .../baeldung/hystrix/HystrixTimeoutTest.java | 77 ++++++++++++++++-- 7 files changed, 217 insertions(+), 20 deletions(-) diff --git a/hystrix/pom.xml b/hystrix/pom.xml index 0ec5fa0411..381adfbcd5 100644 --- a/hystrix/pom.xml +++ b/hystrix/pom.xml @@ -6,9 +6,15 @@ com.baeldung hystrix 1.0 - hystrix + + org.springframework.boot + spring-boot-starter-parent + 1.4.0.RELEASE + + + @@ -32,12 +38,35 @@ + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-aop + + com.netflix.hystrix hystrix-core ${hystrix-core.version} + + com.netflix.hystrix + hystrix-metrics-event-stream + 1.3.16 + + + + + com.netflix.rxjava rxjava-core @@ -62,6 +91,10 @@ + + org.springframework.boot + spring-boot-maven-plugin + org.apache.maven.plugins maven-compiler-plugin diff --git a/hystrix/src/main/java/com/baeldung/hystrix/AppConfig.java b/hystrix/src/main/java/com/baeldung/hystrix/AppConfig.java index 8102428e9a..8b11ac99c3 100644 --- a/hystrix/src/main/java/com/baeldung/hystrix/AppConfig.java +++ b/hystrix/src/main/java/com/baeldung/hystrix/AppConfig.java @@ -1,8 +1,10 @@ package com.baeldung.hystrix; +import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServlet; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.ApplicationContext; +import org.springframework.boot.web.servlet.ServletRegistrationBean; +import org.springframework.context.annotation.Bean; @SpringBootApplication public class AppConfig { @@ -10,4 +12,9 @@ public class AppConfig { public static void main(String[] args) { SpringApplication.run(AppConfig.class, args); } + + @Bean + public ServletRegistrationBean adminServletRegistrationBean() { + return new ServletRegistrationBean(new HystrixMetricsStreamServlet(), "/hystrix.stream"); + } } diff --git a/hystrix/src/main/java/com/baeldung/hystrix/HystrixAspect.java b/hystrix/src/main/java/com/baeldung/hystrix/HystrixAspect.java index 2ea0163ab1..c2e4af8edb 100644 --- a/hystrix/src/main/java/com/baeldung/hystrix/HystrixAspect.java +++ b/hystrix/src/main/java/com/baeldung/hystrix/HystrixAspect.java @@ -1,7 +1,81 @@ package com.baeldung.hystrix; -/** - * Created by sbalachandran on 8/5/2016. - */ +import com.netflix.hystrix.*; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +@Component +@Aspect public class HystrixAspect { + + private HystrixCommand.Setter config; + private HystrixCommandProperties.Setter commandProperties; + private HystrixThreadPoolProperties.Setter threadPoolProperties; + + @Around("@annotation(com.baeldung.hystrix.HystrixCircuitBreaker)") + public Object circuitBreakerAround(final ProceedingJoinPoint aJoinPoint) { + return new RemoteServiceCommand(config, aJoinPoint).execute(); + } + + @PostConstruct + private void setup() { + this.config = HystrixCommand.Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(groupKey)); + this.config = config.andCommandKey(HystrixCommandKey.Factory.asKey(key)); + + this.commandProperties = HystrixCommandProperties.Setter(); + this.commandProperties.withExecutionTimeoutInMilliseconds(executionTimeout); + this.commandProperties.withCircuitBreakerSleepWindowInMilliseconds(sleepWindow); + + this.threadPoolProperties= HystrixThreadPoolProperties.Setter(); + this.threadPoolProperties.withMaxQueueSize(maxThreadCount).withCoreSize(coreThreadCount).withMaxQueueSize(queueCount); + + this.config.andCommandPropertiesDefaults(commandProperties); + this.config.andThreadPoolPropertiesDefaults(threadPoolProperties); + } + + private static class RemoteServiceCommand extends HystrixCommand { + + private final ProceedingJoinPoint joinPoint; + + RemoteServiceCommand(final Setter config, final ProceedingJoinPoint joinPoint) { + super(config); + this.joinPoint = joinPoint; + } + + @Override + protected String run() throws Exception { + try { + return (String) joinPoint.proceed(); + } catch (final Throwable th) { + throw new Exception(th); + } + + } + } + + @Value("${remoteservice.command.execution.timeout}") + private int executionTimeout; + + @Value("${remoteservice.command.sleepwindow}") + private int sleepWindow; + + @Value("${remoteservice.command.threadpool.maxsize}") + private int maxThreadCount; + + @Value("${remoteservice.command.threadpool.coresize}") + private int coreThreadCount; + + @Value("${remoteservice.command.task.queue.size}") + private int queueCount; + + @Value("${remoteservice.command.group.key}") + private String groupKey; + + @Value("${remoteservice.command.key}") + private String key; } diff --git a/hystrix/src/main/java/com/baeldung/hystrix/HystrixCircuitBreaker.java b/hystrix/src/main/java/com/baeldung/hystrix/HystrixCircuitBreaker.java index 9377d83495..e7c0694a7b 100644 --- a/hystrix/src/main/java/com/baeldung/hystrix/HystrixCircuitBreaker.java +++ b/hystrix/src/main/java/com/baeldung/hystrix/HystrixCircuitBreaker.java @@ -1,7 +1,11 @@ package com.baeldung.hystrix; -/** - * Created by sbalachandran on 8/5/2016. - */ -public class HystrixCircuitBreaker { +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface HystrixCircuitBreaker { } diff --git a/hystrix/src/main/java/com/baeldung/hystrix/SpringExistingClient.java b/hystrix/src/main/java/com/baeldung/hystrix/SpringExistingClient.java index b08f61a777..fab8e611d4 100644 --- a/hystrix/src/main/java/com/baeldung/hystrix/SpringExistingClient.java +++ b/hystrix/src/main/java/com/baeldung/hystrix/SpringExistingClient.java @@ -1,7 +1,17 @@ package com.baeldung.hystrix; -/** - * Created by sbalachandran on 8/5/2016. - */ +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component("springClient") public class SpringExistingClient { + + @Value("${remoteservice.timeout}") + private int remoteServiceDelay; + + @HystrixCircuitBreaker + public String invokeRemoteService() throws InterruptedException{ + return new RemoteServiceTestSimulator(remoteServiceDelay).execute(); + } + } diff --git a/hystrix/src/main/resources/application.properties b/hystrix/src/main/resources/application.properties index e69de29bb2..abde975550 100644 --- a/hystrix/src/main/resources/application.properties +++ b/hystrix/src/main/resources/application.properties @@ -0,0 +1,8 @@ +remoteservice.command.group.key=RemoteServiceGroup +remoteservice.command.key=RemoteServiceKey +remoteservice.command.execution.timeout=10000 +remoteservice.command.threadpool.coresize=5 +remoteservice.command.threadpool.maxsize=10 +remoteservice.command.task.queue.size=5 +remoteservice.command.sleepwindow=5000 +remoteservice.timeout=5000 \ No newline at end of file diff --git a/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java b/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java index 773c76536f..9f067a0764 100644 --- a/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java +++ b/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java @@ -9,13 +9,15 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import java.util.concurrent.ExecutionException; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; public class HystrixTimeoutTest { - private static HystrixCommand.Setter config; - private static HystrixCommandProperties.Setter commandProperties = HystrixCommandProperties.Setter(); + private HystrixCommand.Setter config; + private HystrixCommandProperties.Setter commandProperties ; @Rule @@ -23,6 +25,7 @@ public class HystrixTimeoutTest { @Before public void setup() { + commandProperties = HystrixCommandProperties.Setter(); config = HystrixCommand .Setter .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroup1")); @@ -34,29 +37,87 @@ public class HystrixTimeoutTest { } @Test - public void givenTimeoutEqualTo100_andDefaultSettings_thenReturnSuccess() throws InterruptedException { + public void givenServiceTimeoutEqualTo100_andDefaultSettings_thenReturnSuccess() throws InterruptedException { assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(100)).execute(), equalTo("Success")); } @Test - public void givenTimeoutEqualTo10000_andDefaultSettings_thenExpectHystrixRuntimeException() throws InterruptedException { + public void givenServiceTimeoutEqualTo10000_andDefaultSettings_thenExpectHRE() throws InterruptedException { exception.expect(HystrixRuntimeException.class); new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(10_000)).execute(); } @Test - public void givenTimeoutEqualTo5000_andExecutionTimeoutEqualTo10000_thenReturnSuccess() throws InterruptedException { + public void givenServiceTimeoutEqualTo5000_andExecutionTimeoutEqualTo10000_thenReturnSuccess() + throws InterruptedException { commandProperties.withExecutionTimeoutInMilliseconds(10_000); config.andCommandPropertiesDefaults(commandProperties); - assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(5_000)).execute(), equalTo("Success")); + assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(5_000)).execute(), + equalTo("Success")); } @Test - public void givenTimeoutEqualTo15000_andExecutionTimeoutEqualTo10000_thenExpectHystrixRuntimeException() throws InterruptedException { + public void givenServiceTimeoutEqualTo15000_andExecutionTimeoutEqualTo5000_thenExpectHRE() + throws InterruptedException { exception.expect(HystrixRuntimeException.class); - commandProperties.withExecutionTimeoutInMilliseconds(10_000); + commandProperties.withExecutionTimeoutInMilliseconds(5_000); config.andCommandPropertiesDefaults(commandProperties); new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(15_000)).execute(); } + @Test + public void givenServiceTimeoutEqual_andExecutionTimeout_andThreadPool_thenReturnSuccess() + throws InterruptedException { + commandProperties.withExecutionTimeoutInMilliseconds(10_000); + config.andCommandPropertiesDefaults(commandProperties); + config.andThreadPoolPropertiesDefaults(HystrixThreadPoolProperties.Setter() + .withMaxQueueSize(10) + .withCoreSize(3) + .withQueueSizeRejectionThreshold(10)); + assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(9_000)).execute(), + equalTo("Success")); + } + + @Test + public void givenCircuitBreakerSetup_thenReturnSuccess() throws InterruptedException { + + commandProperties.withExecutionTimeoutInMilliseconds(1000); + + commandProperties.withCircuitBreakerSleepWindowInMilliseconds(4000); + commandProperties.withExecutionIsolationStrategy( + HystrixCommandProperties.ExecutionIsolationStrategy.THREAD); + commandProperties.withCircuitBreakerEnabled(true); + commandProperties.withCircuitBreakerRequestVolumeThreshold(1); + + config.andCommandPropertiesDefaults(commandProperties); + + config.andThreadPoolPropertiesDefaults(HystrixThreadPoolProperties.Setter() + .withMaxQueueSize(1) + .withCoreSize(1) + .withQueueSizeRejectionThreshold(1)); + + assertThat(this.invokeRemoteService(10000), equalTo(null)); + assertThat(this.invokeRemoteService(10000), equalTo(null)); + assertThat(this.invokeRemoteService(500), equalTo(null)); + Thread.sleep(5000); + + assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(500)).execute(), + equalTo("Success")); + assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(500)).execute(), + equalTo("Success")); + assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(500)).execute(), + equalTo("Success")); + } + + public String invokeRemoteService(long timeout) throws InterruptedException{ + String response = null; + try{ + response = new RemoteServiceTestCommand(config, + new RemoteServiceTestSimulator(timeout)).execute(); + }catch(HystrixRuntimeException ex){ + System.out.println("ex = " + ex); + } + return response; + } + } From 640166999ac32c87fd2f919bd8f727242c771874 Mon Sep 17 00:00:00 2001 From: sbalachandran Date: Sun, 7 Aug 2016 22:24:14 -0400 Subject: [PATCH 15/41] fixed failing unit tests --- .../com/baeldung/hystrix/RemoteServiceTestSimulator.java | 2 +- .../test/java/com/baeldung/hystrix/HystrixTimeoutTest.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceTestSimulator.java b/hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceTestSimulator.java index 54c626a67a..d302166ea8 100644 --- a/hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceTestSimulator.java +++ b/hystrix/src/main/java/com/baeldung/hystrix/RemoteServiceTestSimulator.java @@ -1,7 +1,7 @@ package com.baeldung.hystrix; -class RemoteServiceTestSimulator { +public class RemoteServiceTestSimulator { private long wait; diff --git a/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java b/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java index 9f067a0764..c9ddd98367 100644 --- a/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java +++ b/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java @@ -52,7 +52,7 @@ public class HystrixTimeoutTest { throws InterruptedException { commandProperties.withExecutionTimeoutInMilliseconds(10_000); config.andCommandPropertiesDefaults(commandProperties); - assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(5_000)).execute(), + assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(500)).execute(), equalTo("Success")); } @@ -74,7 +74,7 @@ public class HystrixTimeoutTest { .withMaxQueueSize(10) .withCoreSize(3) .withQueueSizeRejectionThreshold(10)); - assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(9_000)).execute(), + assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(500)).execute(), equalTo("Success")); } @@ -98,7 +98,6 @@ public class HystrixTimeoutTest { assertThat(this.invokeRemoteService(10000), equalTo(null)); assertThat(this.invokeRemoteService(10000), equalTo(null)); - assertThat(this.invokeRemoteService(500), equalTo(null)); Thread.sleep(5000); assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(500)).execute(), From f8e67f8dd58f61f2602247e7237b074e2dcdebdb Mon Sep 17 00:00:00 2001 From: Kevin Gilmore Date: Sun, 7 Aug 2016 21:43:06 -0500 Subject: [PATCH 16/41] BAEL-202: Asynchronous Operations in Couchbase --- .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 49502 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 + couchbase-sdk-async/.springBeans | 15 ++ couchbase-sdk-async/mvnw | 233 ++++++++++++++++++ couchbase-sdk-async/mvnw.cmd | 145 +++++++++++ couchbase-sdk-async/pom.xml | 102 ++++++++ .../com/baeldung/couchbase/person/Person.java | 89 +++++++ .../couchbase/person/PersonCrudService.java | 26 ++ .../person/PersonDocumentConverter.java | 31 +++ .../couchbase/person/RegistrationService.java | 29 +++ .../service/AbstractBucketService.java | 27 ++ .../service/AbstractCrudService.java | 174 +++++++++++++ .../couchbase/service/BucketService.java | 8 + .../couchbase/service/ClusterService.java | 8 + .../couchbase/service/ClusterServiceImpl.java | 36 +++ .../couchbase/service/CouchbaseEntity.java | 9 + .../couchbase/service/CrudService.java | 26 ++ .../service/JsonDocumentConverter.java | 10 + .../service/TutorialBucketService.java | 32 +++ .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 17 ++ .../baeldung/couchbase/IntegrationTest.java | 13 + .../couchbase/IntegrationTestConfig.java | 9 + .../person/PersonCrudServiceTest.java | 220 +++++++++++++++++ .../couchbase/service/ClusterServiceTest.java | 34 +++ 25 files changed, 1294 insertions(+) create mode 100644 couchbase-sdk-async/.mvn/wrapper/maven-wrapper.jar create mode 100644 couchbase-sdk-async/.mvn/wrapper/maven-wrapper.properties create mode 100644 couchbase-sdk-async/.springBeans create mode 100755 couchbase-sdk-async/mvnw create mode 100644 couchbase-sdk-async/mvnw.cmd create mode 100644 couchbase-sdk-async/pom.xml create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/Person.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/PersonCrudService.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/PersonDocumentConverter.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/RegistrationService.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/AbstractBucketService.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/AbstractCrudService.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/BucketService.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/ClusterService.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/ClusterServiceImpl.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/CouchbaseEntity.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/CrudService.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/JsonDocumentConverter.java create mode 100644 couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/TutorialBucketService.java create mode 100644 couchbase-sdk-async/src/main/resources/application.properties create mode 100644 couchbase-sdk-async/src/main/resources/logback.xml create mode 100644 couchbase-sdk-async/src/test/java/com/baeldung/couchbase/IntegrationTest.java create mode 100644 couchbase-sdk-async/src/test/java/com/baeldung/couchbase/IntegrationTestConfig.java create mode 100644 couchbase-sdk-async/src/test/java/com/baeldung/couchbase/person/PersonCrudServiceTest.java create mode 100644 couchbase-sdk-async/src/test/java/com/baeldung/couchbase/service/ClusterServiceTest.java diff --git a/couchbase-sdk-async/.mvn/wrapper/maven-wrapper.jar b/couchbase-sdk-async/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..5fd4d5023f1463b5ba3970e33c460c1eb26d748d GIT binary patch literal 49502 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%0A$pwhjXzyA0ZzErH{1@M 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 OJOEd-=rxTO#Qy`$*1Hh^ literal 0 HcmV?d00001 diff --git a/couchbase-sdk-async/.mvn/wrapper/maven-wrapper.properties b/couchbase-sdk-async/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..eb91947648 --- /dev/null +++ b/couchbase-sdk-async/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip \ No newline at end of file diff --git a/couchbase-sdk-async/.springBeans b/couchbase-sdk-async/.springBeans new file mode 100644 index 0000000000..ff32b84d3b --- /dev/null +++ b/couchbase-sdk-async/.springBeans @@ -0,0 +1,15 @@ + + + 1 + + + + + + + + + + + + diff --git a/couchbase-sdk-async/mvnw b/couchbase-sdk-async/mvnw new file mode 100755 index 0000000000..a1ba1bf554 --- /dev/null +++ b/couchbase-sdk-async/mvnw @@ -0,0 +1,233 @@ +#!/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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 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 + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + 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 Migwn, 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)`" + # TODO classpath? +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 + +# 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"` +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + local basedir=$(pwd) + local wdir=$(pwd) + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + wdir=$(cd "$wdir/.."; pwd) + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# 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} "$@" diff --git a/couchbase-sdk-async/mvnw.cmd b/couchbase-sdk-async/mvnw.cmd new file mode 100644 index 0000000000..2b934e89dd --- /dev/null +++ b/couchbase-sdk-async/mvnw.cmd @@ -0,0 +1,145 @@ +@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 http://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 Maven2 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 key stroke 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 enable echoing my 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 + +set MAVEN_CMD_LINE_ARGS=%* + +@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="".\.mvn\wrapper\maven-wrapper.jar"" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +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% \ No newline at end of file diff --git a/couchbase-sdk-async/pom.xml b/couchbase-sdk-async/pom.xml new file mode 100644 index 0000000000..9062ef8e15 --- /dev/null +++ b/couchbase-sdk-async/pom.xml @@ -0,0 +1,102 @@ + + + 4.0.0 + com.baeldung + couchbase-sdk-async + 0.1-SNAPSHOT + jar + couchbase-sdk-async + Couchbase SDK Asynchronous Operations + + + + + com.couchbase.client + java-client + ${couchbase.client.version} + + + + + org.springframework + spring-context + ${spring-framework.version} + + + org.springframework + spring-context-support + ${spring-framework.version} + + + + + org.slf4j + slf4j-api + ${org.slf4j.version} + compile + + + ch.qos.logback + logback-classic + ${logback.version} + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + + + + + org.springframework + spring-test + ${spring-framework.version} + test + + + junit + junit + ${junit.version} + test + + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + test + + + + + + + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + + + + 1.7 + UTF-8 + 2.2.6 + 4.2.4.RELEASE + 1.1.3 + 1.7.12 + 4.11 + 3.4 + + + diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/Person.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/Person.java new file mode 100644 index 0000000000..bf248c3999 --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/Person.java @@ -0,0 +1,89 @@ +package com.baeldung.couchbase.person; + +import com.baeldung.couchbase.service.CouchbaseEntity; + +public class Person implements CouchbaseEntity { + + private String id; + private String type; + private String name; + private String homeTown; + + Person() {} + + public Person(Builder b) { + this.id = b.id; + this.type = b.type; + this.name = b.name; + this.homeTown = b.homeTown; + } + + @Override + public String getId() { + return id; + } + + @Override + public void setId(String id) { + this.id = id; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getHomeTown() { + return homeTown; + } + + public void setHomeTown(String homeTown) { + this.homeTown = homeTown; + } + + public static class Builder { + private String id; + private String type; + private String name; + private String homeTown; + + public static Builder newInstance() { + return new Builder(); + } + + public Person build() { + return new Person(this); + } + + public Builder id(String id) { + this.id = id; + return this; + } + + public Builder type(String type) { + this.type = type; + return this; + } + + public Builder name(String name) { + this.name = name; + return this; + } + + public Builder homeTown(String homeTown) { + this.homeTown = homeTown; + return this; + } + } +} diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/PersonCrudService.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/PersonCrudService.java new file mode 100644 index 0000000000..d5302bd6db --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/PersonCrudService.java @@ -0,0 +1,26 @@ +package com.baeldung.couchbase.person; + +import javax.annotation.PostConstruct; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; + +import com.baeldung.couchbase.service.AbstractCrudService; +import com.baeldung.couchbase.service.BucketService; + +@Service +public class PersonCrudService extends AbstractCrudService { + + @Autowired + public PersonCrudService( + @Qualifier("TutorialBucketService") BucketService bucketService, + PersonDocumentConverter converter) { + super(bucketService, converter); + } + + @PostConstruct + private void init() { + loadBucket(); + } +} diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/PersonDocumentConverter.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/PersonDocumentConverter.java new file mode 100644 index 0000000000..cfb20a2bfb --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/PersonDocumentConverter.java @@ -0,0 +1,31 @@ +package com.baeldung.couchbase.person; + +import org.springframework.stereotype.Service; + +import com.baeldung.couchbase.service.JsonDocumentConverter; +import com.couchbase.client.java.document.JsonDocument; +import com.couchbase.client.java.document.json.JsonObject; + +@Service +public class PersonDocumentConverter implements JsonDocumentConverter { + + @Override + public JsonDocument toDocument(Person p) { + JsonObject content = JsonObject.empty() + .put("type", "Person") + .put("name", p.getName()) + .put("homeTown", p.getHomeTown()); + return JsonDocument.create(p.getId(), content); + } + + @Override + public Person fromDocument(JsonDocument doc) { + JsonObject content = doc.content(); + Person p = new Person(); + p.setId(doc.id()); + p.setType("Person"); + p.setName(content.getString("name")); + p.setHomeTown(content.getString("homeTown")); + return p; + } +} diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/RegistrationService.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/RegistrationService.java new file mode 100644 index 0000000000..53af1c4041 --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/person/RegistrationService.java @@ -0,0 +1,29 @@ +package com.baeldung.couchbase.person; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.couchbase.client.core.CouchbaseException; + +@Service +public class RegistrationService { + + @Autowired + private PersonCrudService crud; + + public void registerNewPerson(String name, String homeTown) { + Person person = new Person(); + person.setName(name); + person.setHomeTown(homeTown); + crud.create(person); + } + + public Person findRegistrant(String id) { + try{ + return crud.read(id); + } + catch(CouchbaseException e) { + return crud.readFromReplica(id); + } + } +} diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/AbstractBucketService.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/AbstractBucketService.java new file mode 100644 index 0000000000..08acf5deed --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/AbstractBucketService.java @@ -0,0 +1,27 @@ +package com.baeldung.couchbase.service; + +import com.couchbase.client.java.Bucket; + +public abstract class AbstractBucketService implements BucketService { + + private ClusterService clusterService; + + private Bucket bucket; + + protected void openBucket() { + bucket = clusterService.openBucket(getBucketName(), getBucketPassword()); + } + + protected abstract String getBucketName(); + + protected abstract String getBucketPassword(); + + public AbstractBucketService(ClusterService clusterService) { + this.clusterService = clusterService; + } + + @Override + public Bucket getBucket() { + return bucket; + } + } diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/AbstractCrudService.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/AbstractCrudService.java new file mode 100644 index 0000000000..ce95074015 --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/AbstractCrudService.java @@ -0,0 +1,174 @@ +package com.baeldung.couchbase.service; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.couchbase.client.core.BackpressureException; +import com.couchbase.client.core.time.Delay; +import com.couchbase.client.java.AsyncBucket; +import com.couchbase.client.java.Bucket; +import com.couchbase.client.java.ReplicaMode; +import com.couchbase.client.java.document.JsonDocument; +import com.couchbase.client.java.util.retry.RetryBuilder; + +import rx.Observable; +import rx.functions.Action1; +import rx.functions.Func1; + +public abstract class AbstractCrudService implements CrudService { + + private static final Logger logger = LoggerFactory.getLogger(AbstractCrudService.class); + + private BucketService bucketService; + private Bucket bucket; + private JsonDocumentConverter converter; + + public AbstractCrudService(BucketService bucketService, JsonDocumentConverter converter) { + this.bucketService = bucketService; + this.converter = converter; + } + + protected void loadBucket() { + bucket = bucketService.getBucket(); + } + + @Override + public void create(T t) { + if(t.getId() == null) { + t.setId(UUID.randomUUID().toString()); + } + JsonDocument doc = converter.toDocument(t); + bucket.insert(doc); + } + + @Override + public T read(String id) { + JsonDocument doc = bucket.get(id); + return (doc == null ? null : converter.fromDocument(doc)); + } + + @Override + public T readFromReplica(String id) { + List docs = bucket.getFromReplica(id, ReplicaMode.FIRST); + return (docs.isEmpty() ? null : converter.fromDocument(docs.get(0))); + } + + @Override + public void update(T t) { + JsonDocument doc = converter.toDocument(t); + bucket.upsert(doc); + } + + @Override + public void delete(String id) { + bucket.remove(id); + } + + @Override + public List readBulk(Iterable ids) { + final AsyncBucket asyncBucket = bucket.async(); + Observable asyncOperation = Observable + .from(ids) + .flatMap(new Func1>() { + public Observable call(String key) { + return asyncBucket.get(key); + } + }); + + final List items = new ArrayList(); + try { + asyncOperation.toBlocking() + .forEach(new Action1() { + public void call(JsonDocument doc) { + T item = converter.fromDocument(doc); + items.add(item); + } + }); + } catch (Exception e) { + logger.error("Error during bulk get", e); + } + + return items; + } + + @Override + public void createBulk(Iterable items) { + final AsyncBucket asyncBucket = bucket.async(); + Observable + .from(items) + .flatMap(new Func1>() { + @SuppressWarnings("unchecked") + @Override + public Observable call(final T t) { + if(t.getId() == null) { + t.setId(UUID.randomUUID().toString()); + } + JsonDocument doc = converter.toDocument(t); + return asyncBucket.insert(doc) + .retryWhen(RetryBuilder + .anyOf(BackpressureException.class) + .delay(Delay.exponential(TimeUnit.MILLISECONDS, 100)) + .max(10) + .build()); + } + }) + .last() + .toBlocking() + .single(); + } + + @Override + public void updateBulk(Iterable items) { + final AsyncBucket asyncBucket = bucket.async(); + Observable + .from(items) + .flatMap(new Func1>() { + @SuppressWarnings("unchecked") + @Override + public Observable call(final T t) { + JsonDocument doc = converter.toDocument(t); + return asyncBucket.upsert(doc) + .retryWhen(RetryBuilder + .anyOf(BackpressureException.class) + .delay(Delay.exponential(TimeUnit.MILLISECONDS, 100)) + .max(10) + .build()); + } + }) + .last() + .toBlocking() + .single(); + } + + @Override + public void deleteBulk(Iterable ids) { + final AsyncBucket asyncBucket = bucket.async(); + Observable + .from(ids) + .flatMap(new Func1>() { + @SuppressWarnings("unchecked") + @Override + public Observable call(String key) { + return asyncBucket.remove(key) + .retryWhen(RetryBuilder + .anyOf(BackpressureException.class) + .delay(Delay.exponential(TimeUnit.MILLISECONDS, 100)) + .max(10) + .build()); + } + }) + .last() + .toBlocking() + .single(); + } + + @Override + public boolean exists(String id) { + return bucket.exists(id); + } +} diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/BucketService.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/BucketService.java new file mode 100644 index 0000000000..df9156d87d --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/BucketService.java @@ -0,0 +1,8 @@ +package com.baeldung.couchbase.service; + +import com.couchbase.client.java.Bucket; + +public interface BucketService { + + Bucket getBucket(); +} diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/ClusterService.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/ClusterService.java new file mode 100644 index 0000000000..437ec00ff4 --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/ClusterService.java @@ -0,0 +1,8 @@ +package com.baeldung.couchbase.service; + +import com.couchbase.client.java.Bucket; + +public interface ClusterService { + + Bucket openBucket(String name, String password); +} diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/ClusterServiceImpl.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/ClusterServiceImpl.java new file mode 100644 index 0000000000..c8ff56269d --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/ClusterServiceImpl.java @@ -0,0 +1,36 @@ +package com.baeldung.couchbase.service; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import javax.annotation.PostConstruct; + +import org.springframework.stereotype.Service; + +import com.couchbase.client.java.Bucket; +import com.couchbase.client.java.Cluster; +import com.couchbase.client.java.CouchbaseCluster; +import com.couchbase.client.java.env.CouchbaseEnvironment; +import com.couchbase.client.java.env.DefaultCouchbaseEnvironment; + +@Service +public class ClusterServiceImpl implements ClusterService { + + private Cluster cluster; + private Map buckets = new ConcurrentHashMap<>(); + + @PostConstruct + private void init() { + CouchbaseEnvironment env = DefaultCouchbaseEnvironment.create(); + cluster = CouchbaseCluster.create(env, "localhost"); + } + + @Override + synchronized public Bucket openBucket(String name, String password) { + if(!buckets.containsKey(name)) { + Bucket bucket = cluster.openBucket(name, password); + buckets.put(name, bucket); + } + return buckets.get(name); + } +} diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/CouchbaseEntity.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/CouchbaseEntity.java new file mode 100644 index 0000000000..4d2500197b --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/CouchbaseEntity.java @@ -0,0 +1,9 @@ +package com.baeldung.couchbase.service; + +public interface CouchbaseEntity { + + String getId(); + + void setId(String id); + +} diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/CrudService.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/CrudService.java new file mode 100644 index 0000000000..e0f0831abb --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/CrudService.java @@ -0,0 +1,26 @@ +package com.baeldung.couchbase.service; + +import java.util.List; + +public interface CrudService { + + void create(T t); + + T read(String id); + + T readFromReplica(String id); + + void update(T t); + + void delete(String id); + + List readBulk(Iterable ids); + + void createBulk(Iterable items); + + void updateBulk(Iterable items); + + void deleteBulk(Iterable ids); + + boolean exists(String id); +} diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/JsonDocumentConverter.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/JsonDocumentConverter.java new file mode 100644 index 0000000000..87331d2a17 --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/JsonDocumentConverter.java @@ -0,0 +1,10 @@ +package com.baeldung.couchbase.service; + +import com.couchbase.client.java.document.JsonDocument; + +public interface JsonDocumentConverter { + + JsonDocument toDocument(T t); + + T fromDocument(JsonDocument doc); +} diff --git a/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/TutorialBucketService.java b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/TutorialBucketService.java new file mode 100644 index 0000000000..2e40321272 --- /dev/null +++ b/couchbase-sdk-async/src/main/java/com/baeldung/couchbase/service/TutorialBucketService.java @@ -0,0 +1,32 @@ +package com.baeldung.couchbase.service; + +import javax.annotation.PostConstruct; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; + +@Service +@Qualifier("TutorialBucketService") +public class TutorialBucketService extends AbstractBucketService { + + @PostConstruct + void init() { + openBucket(); + } + + @Autowired + public TutorialBucketService(ClusterService clusterService) { + super(clusterService); + } + + @Override + protected String getBucketName() { + return "baeldung-tutorial"; + } + + @Override + protected String getBucketPassword() { + return ""; + } +} diff --git a/couchbase-sdk-async/src/main/resources/application.properties b/couchbase-sdk-async/src/main/resources/application.properties new file mode 100644 index 0000000000..e69de29bb2 diff --git a/couchbase-sdk-async/src/main/resources/logback.xml b/couchbase-sdk-async/src/main/resources/logback.xml new file mode 100644 index 0000000000..efcc6fb4c7 --- /dev/null +++ b/couchbase-sdk-async/src/main/resources/logback.xml @@ -0,0 +1,17 @@ + + + + + web - %date [%thread] %-5level %logger{36} - %message%n + + + + + + + + + + + + \ No newline at end of file diff --git a/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/IntegrationTest.java b/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/IntegrationTest.java new file mode 100644 index 0000000000..d1cc807f7a --- /dev/null +++ b/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/IntegrationTest.java @@ -0,0 +1,13 @@ +package com.baeldung.couchbase; + +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestExecutionListeners; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { IntegrationTestConfig.class }) +@TestExecutionListeners(listeners = { DependencyInjectionTestExecutionListener.class }) +public abstract class IntegrationTest { +} diff --git a/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/IntegrationTestConfig.java b/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/IntegrationTestConfig.java new file mode 100644 index 0000000000..d593aac52d --- /dev/null +++ b/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/IntegrationTestConfig.java @@ -0,0 +1,9 @@ +package com.baeldung.couchbase; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan(basePackages={"com.baeldung.couchbase"}) +public class IntegrationTestConfig { +} diff --git a/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/person/PersonCrudServiceTest.java b/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/person/PersonCrudServiceTest.java new file mode 100644 index 0000000000..3da282492c --- /dev/null +++ b/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/person/PersonCrudServiceTest.java @@ -0,0 +1,220 @@ +package com.baeldung.couchbase.person; + +import static org.junit.Assert.*; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import javax.annotation.PostConstruct; + +import org.apache.commons.lang3.RandomStringUtils; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; + +import com.baeldung.couchbase.IntegrationTest; +import com.baeldung.couchbase.service.BucketService; +import com.couchbase.client.java.Bucket; +import com.couchbase.client.java.document.JsonDocument; + +public class PersonCrudServiceTest extends IntegrationTest { + + @Autowired + private PersonCrudService personService; + + @Autowired + @Qualifier("TutorialBucketService") + private BucketService bucketService; + + @Autowired + private PersonDocumentConverter converter; + + private Bucket bucket; + + @PostConstruct + private void init() { + bucket = bucketService.getBucket(); + } + + @Test + public final void givenRandomPerson_whenCreate_thenPersonPersisted() { + //create person + Person person = randomPerson(); + personService.create(person); + + //check results + assertNotNull(person.getId()); + assertNotNull(bucket.get(person.getId())); + + //cleanup + bucket.remove(person.getId()); + } + + @Test + public final void givenId_whenRead_thenReturnsPerson() { + //create and insert person document + String id = insertRandomPersonDocument().id(); + + //read person and check results + assertNotNull(personService.read(id)); + + //cleanup + bucket.remove(id); + } + + @Test + public final void givenNewHometown_whenUpdate_thenNewHometownPersisted() { + //create and insert person document + JsonDocument doc = insertRandomPersonDocument(); + + //update person + Person expected = converter.fromDocument(doc); + String updatedHomeTown = RandomStringUtils.randomAlphabetic(12); + expected.setHomeTown(updatedHomeTown); + personService.update(expected); + + //check results + JsonDocument actual = bucket.get(expected.getId()); + assertNotNull(actual); + assertNotNull(actual.content()); + assertEquals(expected.getHomeTown(), actual.content().getString("homeTown")); + + //cleanup + bucket.remove(expected.getId()); + } + + @Test + public final void givenRandomPerson_whenDelete_thenPersonNotInBucket() { + //create and insert person document + String id = insertRandomPersonDocument().id(); + + //delete person and check results + personService.delete(id); + assertNull(bucket.get(id)); + } + + @Test + public final void givenIds_whenReadBulk_thenReturnsOnlyPersonsWithMatchingIds() { + List ids = new ArrayList<>(); + + //add some person documents + for(int i=0; i<5; i++) { + ids.add(insertRandomPersonDocument().id()); + } + + //perform bulk read + List persons = personService.readBulk(ids); + + //check results + for(Person person : persons) { + assertTrue(ids.contains(person.getId())); + } + + //cleanup + for(String id : ids) { + bucket.remove(id); + } + } + + @Test + public final void givenPersons_whenInsertBulk_thenPersonsAreInserted() { + + //create some persons + List persons = new ArrayList<>(); + for(int i=0; i<5; i++) { + persons.add(randomPerson()); + } + + //perform bulk insert + personService.createBulk(persons); + + //check results + for(Person person : persons) { + assertNotNull(bucket.get(person.getId())); + } + + //cleanup + for(Person person : persons) { + bucket.remove(person.getId()); + } + } + + @Test + public final void givenPersons_whenUpdateBulk_thenPersonsAreUpdated() { + + List ids = new ArrayList<>(); + + //add some person documents + for(int i=0; i<5; i++) { + ids.add(insertRandomPersonDocument().id()); + } + + //load persons from Couchbase + List persons = new ArrayList<>(); + for(String id : ids) { + persons.add(converter.fromDocument(bucket.get(id))); + } + + //modify persons + for(Person person : persons) { + person.setHomeTown(RandomStringUtils.randomAlphabetic(10)); + } + + //perform bulk update + personService.updateBulk(persons); + + //check results + for(Person person : persons) { + JsonDocument doc = bucket.get(person.getId()); + assertEquals(person.getName(), doc.content().getString("name")); + assertEquals(person.getHomeTown(), doc.content().getString("homeTown")); + } + + //cleanup + for(String id : ids) { + bucket.remove(id); + } + } + + @Test + public void givenIds_whenDeleteBulk_thenPersonsAreDeleted() { + + List ids = new ArrayList<>(); + + //add some person documents + for(int i=0; i<5; i++) { + ids.add(insertRandomPersonDocument().id()); + } + + //perform bulk delete + personService.deleteBulk(ids); + + //check results + for(String id : ids) { + assertNull(bucket.get(id)); + } + + } + + private JsonDocument insertRandomPersonDocument() { + Person expected = randomPersonWithId(); + JsonDocument doc = converter.toDocument(expected); + return bucket.insert(doc); + } + + private Person randomPerson() { + return Person.Builder.newInstance() + .name(RandomStringUtils.randomAlphabetic(10)) + .homeTown(RandomStringUtils.randomAlphabetic(10)) + .build(); + } + + private Person randomPersonWithId() { + return Person.Builder.newInstance() + .id(UUID.randomUUID().toString()) + .name(RandomStringUtils.randomAlphabetic(10)) + .homeTown(RandomStringUtils.randomAlphabetic(10)) + .build(); + } +} diff --git a/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/service/ClusterServiceTest.java b/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/service/ClusterServiceTest.java new file mode 100644 index 0000000000..7795f41c93 --- /dev/null +++ b/couchbase-sdk-async/src/test/java/com/baeldung/couchbase/service/ClusterServiceTest.java @@ -0,0 +1,34 @@ +package com.baeldung.couchbase.service; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestExecutionListeners; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; + +import com.baeldung.couchbase.IntegrationTest; +import com.baeldung.couchbase.IntegrationTestConfig; +import com.couchbase.client.java.Bucket; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { IntegrationTestConfig.class }) +@TestExecutionListeners(listeners = { DependencyInjectionTestExecutionListener.class }) +public class ClusterServiceTest extends IntegrationTest { + + @Autowired + private ClusterService couchbaseService; + + private Bucket defaultBucket; + + @Test + public void whenOpenBucket_thenBucketIsNotNull() throws Exception { + defaultBucket = couchbaseService.openBucket("default", ""); + assertNotNull(defaultBucket); + assertFalse(defaultBucket.isClosed()); + defaultBucket.close(); + } +} From 8a034563866dfffab8477611b63d5ca24eb08ed9 Mon Sep 17 00:00:00 2001 From: bdragan Date: Sun, 31 Jul 2016 23:14:26 +0200 Subject: [PATCH 17/41] Hibernate second-level cache. --- spring-jpa/pom.xml | 11 +++ .../baeldung/config/PersistenceJPAConfig.java | 2 + .../config/PersistenceJPAConfigL2Cache.java | 84 +++++++++++++++++++ .../org/baeldung/persistence/model/Foo.java | 14 ++-- spring-jpa/src/main/resources/jpaConfig.xml | 2 + .../main/resources/persistence-h2.properties | 13 +++ .../persistence-multiple-db.properties | 2 + .../resources/persistence-mysql.properties | 2 + .../src/test/java/META-INF/persistence.xml | 2 + .../SecondLevelCacheIntegrationTest.java | 84 +++++++++++++++++++ 10 files changed, 207 insertions(+), 9 deletions(-) create mode 100644 spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java create mode 100644 spring-jpa/src/main/resources/persistence-h2.properties create mode 100644 spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index 25dd960435..2c189bde4b 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -29,6 +29,11 @@ hibernate-entitymanager ${hibernate.version} + + org.hibernate + hibernate-ehcache + ${hibernate.version} + xml-apis xml-apis @@ -50,6 +55,11 @@ spring-data-jpa ${spring-data-jpa.version} + + com.h2database + h2 + ${h2.version} + @@ -186,6 +196,7 @@ 4.3.11.Final 5.1.38 1.8.2.RELEASE + 1.4.192 1.7.13 diff --git a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java index c9358190e7..010eb5b8a1 100644 --- a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java +++ b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java @@ -78,6 +78,8 @@ public class PersistenceJPAConfig { final Properties hibernateProperties = new Properties(); hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto")); hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect")); + hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", env.getProperty("hibernate.cache.use_second_level_cache")); + hibernateProperties.setProperty("hibernate.cache.use_query_cache", env.getProperty("hibernate.cache.use_query_cache")); // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true"); return hibernateProperties; } diff --git a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java new file mode 100644 index 0000000000..3ca0dbf5e4 --- /dev/null +++ b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java @@ -0,0 +1,84 @@ +package org.baeldung.config; + +import com.google.common.base.Preconditions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.core.env.Environment; +import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.jdbc.datasource.DriverManagerDataSource; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import javax.persistence.EntityManagerFactory; +import javax.sql.DataSource; +import java.util.Properties; + +@Configuration +@EnableTransactionManagement +@PropertySource({ "classpath:persistence-h2.properties" }) +@ComponentScan({ "org.baeldung.persistence" }) +@EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao") +public class PersistenceJPAConfigL2Cache { + + @Autowired + private Environment env; + + public PersistenceJPAConfigL2Cache() { + super(); + } + + // beans + + @Bean + public LocalContainerEntityManagerFactoryBean entityManagerFactory() { + final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); + em.setDataSource(dataSource()); + em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" }); + + final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); + em.setJpaVendorAdapter(vendorAdapter); + em.setJpaProperties(additionalProperties()); + + return em; + } + + @Bean + public DataSource dataSource() { + final DriverManagerDataSource dataSource = new DriverManagerDataSource(); + dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName"))); + dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url"))); + dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user"))); + + return dataSource; + } + + @Bean + public PlatformTransactionManager transactionManager(final EntityManagerFactory emf) { + final JpaTransactionManager transactionManager = new JpaTransactionManager(); + transactionManager.setEntityManagerFactory(emf); + return transactionManager; + } + + @Bean + public PersistenceExceptionTranslationPostProcessor exceptionTranslation() { + return new PersistenceExceptionTranslationPostProcessor(); + } + + final Properties additionalProperties() { + final Properties hibernateProperties = new Properties(); + hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto")); + hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect")); + hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", env.getProperty("hibernate.cache.use_second_level_cache")); + hibernateProperties.setProperty("hibernate.cache.use_query_cache", env.getProperty("hibernate.cache.use_query_cache")); + hibernateProperties.setProperty("hibernate.cache.region.factory_class", env.getProperty("hibernate.cache.region.factory_class")); + return hibernateProperties; + } + +} \ No newline at end of file diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java b/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java index 585cefb159..209ab081de 100644 --- a/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java +++ b/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java @@ -1,17 +1,13 @@ package org.baeldung.persistence.model; +import org.hibernate.annotations.CacheConcurrencyStrategy; + +import javax.persistence.*; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; - @Entity +@Cacheable +@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class Foo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/spring-jpa/src/main/resources/jpaConfig.xml b/spring-jpa/src/main/resources/jpaConfig.xml index 1f0b8d899f..5afc0af94d 100644 --- a/spring-jpa/src/main/resources/jpaConfig.xml +++ b/spring-jpa/src/main/resources/jpaConfig.xml @@ -21,6 +21,8 @@ ${hibernate.hbm2ddl.auto} ${hibernate.dialect} + ${hibernate.cache.use_second_level_cache} + ${hibernate.cache.use_query_cache} diff --git a/spring-jpa/src/main/resources/persistence-h2.properties b/spring-jpa/src/main/resources/persistence-h2.properties new file mode 100644 index 0000000000..d195af5ec9 --- /dev/null +++ b/spring-jpa/src/main/resources/persistence-h2.properties @@ -0,0 +1,13 @@ +# jdbc.X +jdbc.driverClassName=org.h2.Driver +jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1 +jdbc.user=sa +# jdbc.pass= + +# hibernate.X +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.show_sql=false +hibernate.hbm2ddl.auto=create-drop +hibernate.cache.use_second_level_cache=true +hibernate.cache.use_query_cache=true +hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory \ No newline at end of file diff --git a/spring-jpa/src/main/resources/persistence-multiple-db.properties b/spring-jpa/src/main/resources/persistence-multiple-db.properties index d59956ba03..1a0d99c704 100644 --- a/spring-jpa/src/main/resources/persistence-multiple-db.properties +++ b/spring-jpa/src/main/resources/persistence-multiple-db.properties @@ -9,3 +9,5 @@ jdbc.pass=tutorialmy5ql hibernate.dialect=org.hibernate.dialect.MySQL5Dialect hibernate.show_sql=false hibernate.hbm2ddl.auto=create-drop +hibernate.cache.use_second_level_cache=false +hibernate.cache.use_query_cache=false \ No newline at end of file diff --git a/spring-jpa/src/main/resources/persistence-mysql.properties b/spring-jpa/src/main/resources/persistence-mysql.properties index c4de4ceb80..12b4c93d80 100644 --- a/spring-jpa/src/main/resources/persistence-mysql.properties +++ b/spring-jpa/src/main/resources/persistence-mysql.properties @@ -8,3 +8,5 @@ jdbc.pass=tutorialmy5ql hibernate.dialect=org.hibernate.dialect.MySQL5Dialect hibernate.show_sql=false hibernate.hbm2ddl.auto=create-drop +hibernate.cache.use_second_level_cache=false +hibernate.cache.use_query_cache=false \ No newline at end of file diff --git a/spring-jpa/src/test/java/META-INF/persistence.xml b/spring-jpa/src/test/java/META-INF/persistence.xml index e528491795..ba0d2377d1 100644 --- a/spring-jpa/src/test/java/META-INF/persistence.xml +++ b/spring-jpa/src/test/java/META-INF/persistence.xml @@ -10,6 +10,8 @@ + + diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java new file mode 100644 index 0000000000..f97f53b82c --- /dev/null +++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java @@ -0,0 +1,84 @@ +package org.baeldung.persistence.service; + +import net.sf.ehcache.CacheManager; +import org.baeldung.config.PersistenceJPAConfigL2Cache; +import org.baeldung.persistence.model.Bar; +import org.baeldung.persistence.model.Foo; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.support.TransactionTemplate; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; + +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static org.hamcrest.Matchers.greaterThan; +import static org.junit.Assert.assertThat; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { PersistenceJPAConfigL2Cache.class }, loader = AnnotationConfigContextLoader.class) +public class SecondLevelCacheIntegrationTest { + + @PersistenceContext + private EntityManager entityManager; + @Autowired + private FooService fooService; + @Autowired + private PlatformTransactionManager platformTransactionManager; + + @Before + public final void before() { + entityManager.getEntityManagerFactory().getCache().evictAll(); + } + + @Test + public final void givenEntityIsLoaded_thenItIsCached() { + final Foo foo = new Foo(randomAlphabetic(6)); + fooService.create(foo); + fooService.findOne(foo.getId()); + final int size = CacheManager.ALL_CACHE_MANAGERS.get(0) + .getCache("org.baeldung.persistence.model.Foo").getSize(); + assertThat(size, greaterThan(0)); + } + + @Test + public final void givenBarIsUpdatedInNativeQuery_thenFoosAreNotEvicted() { + final Foo foo = new Foo(randomAlphabetic(6)); + fooService.create(foo); + fooService.findOne(foo.getId()); + + new TransactionTemplate(platformTransactionManager).execute(status -> { + final Bar bar = new Bar(randomAlphabetic(6)); + entityManager.persist(bar); + final Query nativeQuery = entityManager.createNativeQuery("update BAR set NAME = :updatedName where ID = :id"); + nativeQuery.setParameter("updatedName", "newName"); + nativeQuery.setParameter("id", bar.getId()); + nativeQuery.unwrap(org.hibernate.SQLQuery.class).addSynchronizedEntityClass(Bar.class); + return nativeQuery.executeUpdate(); + }); + + final int size = CacheManager.ALL_CACHE_MANAGERS.get(0) + .getCache("org.baeldung.persistence.model.Foo").getSize(); + assertThat(size, greaterThan(0)); + } + + @Test + public final void givenCacheableQueryIsExecuted_thenItIsCached() { + new TransactionTemplate(platformTransactionManager).execute(status -> { + return entityManager.createQuery("select f from Foo f") + .setHint("org.hibernate.cacheable", true) + .getResultList(); + }); + + final int size = CacheManager.ALL_CACHE_MANAGERS.get(0) + .getCache("org.hibernate.cache.internal.StandardQueryCache").getSize(); + assertThat(size, greaterThan(0)); + } +} From 009e0045e28ed9c383aefa461b9dccb9c7ac0241 Mon Sep 17 00:00:00 2001 From: Zeger Hendrikse Date: Mon, 8 Aug 2016 13:48:41 +0200 Subject: [PATCH 18/41] Replaced tab with spaces --- .../src/test/java/META-INF/persistence.xml | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/spring-jpa/src/test/java/META-INF/persistence.xml b/spring-jpa/src/test/java/META-INF/persistence.xml index ba0d2377d1..5cf5ccf359 100644 --- a/spring-jpa/src/test/java/META-INF/persistence.xml +++ b/spring-jpa/src/test/java/META-INF/persistence.xml @@ -1,18 +1,17 @@ - - org.baeldung.persistence.model.Foo - org.baeldung.persistence.model.Bar - - - - - - - - - - - - + + org.baeldung.persistence.model.Foo + org.baeldung.persistence.model.Bar + + + + + + + + + + + From 1121a6ca2985a5395d16076303dfe62351020265 Mon Sep 17 00:00:00 2001 From: Sergey Petunin Date: Mon, 8 Aug 2016 19:13:44 +0500 Subject: [PATCH 19/41] Core threadpool implementation examples (#588) --- .../com/baeldung/threadpool/CountingTask.java | 22 +++ .../com/baeldung/threadpool/TreeNode.java | 19 +++ .../threadpool/CoreThreadPoolTest.java | 146 ++++++++++++++++++ 3 files changed, 187 insertions(+) create mode 100644 core-java-8/src/main/java/com/baeldung/threadpool/CountingTask.java create mode 100644 core-java-8/src/main/java/com/baeldung/threadpool/TreeNode.java create mode 100644 core-java-8/src/test/java/com/baeldung/threadpool/CoreThreadPoolTest.java diff --git a/core-java-8/src/main/java/com/baeldung/threadpool/CountingTask.java b/core-java-8/src/main/java/com/baeldung/threadpool/CountingTask.java new file mode 100644 index 0000000000..05aa14c5ae --- /dev/null +++ b/core-java-8/src/main/java/com/baeldung/threadpool/CountingTask.java @@ -0,0 +1,22 @@ +package com.baeldung.threadpool; + +import java.util.concurrent.ForkJoinTask; +import java.util.concurrent.RecursiveTask; +import java.util.stream.Collectors; + +public class CountingTask extends RecursiveTask { + + private final TreeNode node; + + public CountingTask(TreeNode node) { + this.node = node; + } + + @Override + protected Integer compute() { + return node.value + node.children.stream() + .map(childNode -> new CountingTask(childNode).fork()) + .collect(Collectors.summingInt(ForkJoinTask::join)); + } + +} diff --git a/core-java-8/src/main/java/com/baeldung/threadpool/TreeNode.java b/core-java-8/src/main/java/com/baeldung/threadpool/TreeNode.java new file mode 100644 index 0000000000..72b1f756a8 --- /dev/null +++ b/core-java-8/src/main/java/com/baeldung/threadpool/TreeNode.java @@ -0,0 +1,19 @@ +package com.baeldung.threadpool; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +public class TreeNode { + + int value; + + Set children; + + public TreeNode(int value, TreeNode... children) { + this.value = value; + this.children = new HashSet<>(); + this.children.addAll(Arrays.asList(children)); + } + +} diff --git a/core-java-8/src/test/java/com/baeldung/threadpool/CoreThreadPoolTest.java b/core-java-8/src/test/java/com/baeldung/threadpool/CoreThreadPoolTest.java new file mode 100644 index 0000000000..df336f4a93 --- /dev/null +++ b/core-java-8/src/test/java/com/baeldung/threadpool/CoreThreadPoolTest.java @@ -0,0 +1,146 @@ +package com.baeldung.threadpool; + +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class CoreThreadPoolTest { + + @Test(timeout = 1000) + public void whenCallingExecuteWithRunnable_thenRunnableIsExecuted() throws InterruptedException { + + CountDownLatch lock = new CountDownLatch(1); + + Executor executor = Executors.newSingleThreadExecutor(); + executor.execute(() -> { + System.out.println("Hello World"); + lock.countDown(); + }); + + lock.await(1000, TimeUnit.MILLISECONDS); + } + + @Test + public void whenUsingExecutorServiceAndFuture_thenCanWaitOnFutureResult() throws InterruptedException, ExecutionException { + + ExecutorService executorService = Executors.newFixedThreadPool(10); + Future future = executorService.submit(() -> "Hello World"); + String result = future.get(); + + assertEquals("Hello World", result); + + } + + @Test + public void whenUsingFixedThreadPool_thenCoreAndMaximumThreadSizeAreTheSame() { + + ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(2); + executor.submit(() -> { + Thread.sleep(1000); + return null; + }); + executor.submit(() -> { + Thread.sleep(1000); + return null; + }); + executor.submit(() -> { + Thread.sleep(1000); + return null; + }); + + assertEquals(2, executor.getPoolSize()); + assertEquals(1, executor.getQueue().size()); + + } + + @Test + public void whenUsingCachedThreadPool_thenPoolSizeGrowsUnbounded() { + ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newCachedThreadPool(); + executor.submit(() -> { + Thread.sleep(1000); + return null; + }); + executor.submit(() -> { + Thread.sleep(1000); + return null; + }); + executor.submit(() -> { + Thread.sleep(1000); + return null; + }); + + assertEquals(3, executor.getPoolSize()); + assertEquals(0, executor.getQueue().size()); + + } + + @Test(timeout = 1000) + public void whenUsingSingleThreadPool_thenTasksExecuteSequentially() throws InterruptedException { + + CountDownLatch lock = new CountDownLatch(2); + AtomicInteger counter = new AtomicInteger(); + + ExecutorService executor = Executors.newSingleThreadExecutor(); + executor.submit(() -> { + counter.set(1); + lock.countDown(); + }); + executor.submit(() -> { + counter.compareAndSet(1, 2); + lock.countDown(); + }); + + lock.await(1000, TimeUnit.MILLISECONDS); + assertEquals(2, counter.get()); + + } + + @Test(timeout = 1000) + public void whenSchedulingTask_thenTaskExecutesWithinGivenPeriod() throws InterruptedException { + + CountDownLatch lock = new CountDownLatch(1); + + ScheduledExecutorService executor = Executors.newScheduledThreadPool(5); + executor.schedule(() -> { + System.out.println("Hello World"); + lock.countDown(); + }, 500, TimeUnit.MILLISECONDS); + + lock.await(1000, TimeUnit.MILLISECONDS); + + } + + @Test(timeout = 1000) + public void whenSchedulingTaskWithFixedPeriod_thenTaskExecutesMultipleTimes() throws InterruptedException { + + CountDownLatch lock = new CountDownLatch(3); + + ScheduledExecutorService executor = Executors.newScheduledThreadPool(5); + ScheduledFuture future = executor.scheduleAtFixedRate(() -> { + System.out.println("Hello World"); + lock.countDown(); + }, 500, 100, TimeUnit.MILLISECONDS); + + lock.await(); + future.cancel(true); + + } + + @Test + public void whenUsingForkJoinPool_thenSumOfTreeElementsIsCalculatedCorrectly() { + + TreeNode tree = new TreeNode(5, + new TreeNode(3), new TreeNode(2, + new TreeNode(2), new TreeNode(8))); + + ForkJoinPool forkJoinPool = ForkJoinPool.commonPool(); + int sum = forkJoinPool.invoke(new CountingTask(tree)); + + assertEquals(20, sum); + } + + +} From 2327379d916dccb0bf9da91de6fcb6c93ebc6634 Mon Sep 17 00:00:00 2001 From: Sergey Petunin Date: Mon, 8 Aug 2016 22:22:01 +0600 Subject: [PATCH 20/41] Added Guava thread pool examples (#589) --- .../ExitingExecutorServiceExample.java | 29 ++++++++++ .../threadpool/GuavaThreadPoolTest.java | 56 +++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 core-java-8/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java create mode 100644 core-java-8/src/test/java/com/baeldung/threadpool/GuavaThreadPoolTest.java diff --git a/core-java-8/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java b/core-java-8/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java new file mode 100644 index 0000000000..4775fde930 --- /dev/null +++ b/core-java-8/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java @@ -0,0 +1,29 @@ +package com.baeldung.threadpool; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +import com.google.common.util.concurrent.MoreExecutors; + +/** + * This class demonstrates the usage of Guava's exiting executor services that keep the VM from hanging. + * Without the exiting executor service, the task would hang indefinitely. + * This behaviour cannot be demonstrated in JUnit tests, as JUnit kills the VM after the tests. + */ +public class ExitingExecutorServiceExample { + + public static void main(String... args) { + + ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(5); + ExecutorService executorService = MoreExecutors.getExitingExecutorService(executor, 100, TimeUnit.MILLISECONDS); + + executorService.submit(() -> { + while (true) { + } + }); + + } + +} diff --git a/core-java-8/src/test/java/com/baeldung/threadpool/GuavaThreadPoolTest.java b/core-java-8/src/test/java/com/baeldung/threadpool/GuavaThreadPoolTest.java new file mode 100644 index 0000000000..92e0f9a8cb --- /dev/null +++ b/core-java-8/src/test/java/com/baeldung/threadpool/GuavaThreadPoolTest.java @@ -0,0 +1,56 @@ +package com.baeldung.threadpool; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; + +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class GuavaThreadPoolTest { + + @Test + public void whenExecutingTaskWithDirectExecutor_thenTheTaskIsExecutedInTheCurrentThread() { + + Executor executor = MoreExecutors.directExecutor(); + + AtomicBoolean executed = new AtomicBoolean(); + + executor.execute(() -> { + try { + Thread.sleep(500); + } catch (InterruptedException e) { + e.printStackTrace(); + } + executed.set(true); + }); + + assertTrue(executed.get()); + } + + @Test + public void whenJoiningFuturesWithAllAsList_thenCombinedFutureCompletesAfterAllFuturesComplete() throws ExecutionException, InterruptedException { + + ExecutorService executorService = Executors.newCachedThreadPool(); + ListeningExecutorService listeningExecutorService = MoreExecutors.listeningDecorator(executorService); + + ListenableFuture future1 = listeningExecutorService.submit(() -> "Hello"); + ListenableFuture future2 = listeningExecutorService.submit(() -> "World"); + + String greeting = Futures.allAsList(future1, future2).get() + .stream() + .collect(Collectors.joining(" ")); + assertEquals("Hello World", greeting); + + } + +} From 6e08121f6158b691308089917ee47ac182575215 Mon Sep 17 00:00:00 2001 From: Alex Theedom Date: Mon, 8 Aug 2016 20:42:44 +0100 Subject: [PATCH 21/41] Add a few more tests --- .../StudentDirectory/pom.xml | 3 + .../rest/StudentDirectoryRestController.java | 5 +- .../web/service/StudentServiceTest.java | 97 +++++++++++++------ 3 files changed, 77 insertions(+), 28 deletions(-) diff --git a/spring-rest-angular-pagination/StudentDirectory/pom.xml b/spring-rest-angular-pagination/StudentDirectory/pom.xml index 8dab851ef2..7a0f3e7b31 100644 --- a/spring-rest-angular-pagination/StudentDirectory/pom.xml +++ b/spring-rest-angular-pagination/StudentDirectory/pom.xml @@ -66,6 +66,7 @@ angular-spring-rest-sample + org.apache.maven.plugins maven-compiler-plugin @@ -74,6 +75,7 @@ 1.8 + org.apache.maven.plugins maven-war-plugin @@ -81,6 +83,7 @@ false + diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java b/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java index 5ff24ec0f2..b655d401a5 100644 --- a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java +++ b/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java @@ -4,18 +4,21 @@ import org.baeldung.web.service.StudentService; import org.baeldung.web.vo.Student; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import static org.springframework.http.MediaType.APPLICATION_JSON; + @RestController public class StudentDirectoryRestController { @Autowired private StudentService service; - @RequestMapping(value = "/student/get", params = { "page", "size" }, method = RequestMethod.GET) + @RequestMapping(value = "/student/get", params = { "page", "size" }, method = RequestMethod.GET, produces = "application/json") public Page findPaginated(@RequestParam("page") int page, @RequestParam("size") int size){ Page resultPage = service.findPaginated(page, size); diff --git a/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java b/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java index 3e476bf0d0..55855c4c7d 100644 --- a/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java +++ b/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java @@ -1,7 +1,14 @@ package org.baeldung.web.service; +import static io.restassured.RestAssured.given; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsCollectionContaining.hasItems; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.StringContains.containsString; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.springframework.http.MediaType.APPLICATION_JSON; +import static org.springframework.util.Assert.isTrue; import org.apache.commons.lang3.RandomStringUtils; import org.baeldung.web.main.Application; @@ -9,41 +16,77 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.TestRestTemplate; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; import io.restassured.RestAssured; import io.restassured.response.Response; +import org.springframework.web.client.RestTemplate; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = Application.class) -@WebAppConfiguration -@IntegrationTest("server.port:8080") -public class StudentServiceTest{ +@WebAppConfiguration +@IntegrationTest("server.port:8888") +public class StudentServiceTest { - private String getURL() { - return "/StudentDirectory/student/get"; + private static final String ENDPOINT = "http://localhost:8080/StudentDirectory/student/get"; + + @Test + public void givenRequestForStudents_whenPageIsOne_expectContainsNames() { + given().params("page", "1", "size", "2").get(ENDPOINT) + .then() + .assertThat().body("content.name", hasItems("Bryan", "Ben")); + } + + @Test + public void givenRequestForStudents_whenSizeIsTwo_expectTwoItems() { + given().params("page", "1", "size", "2").get(ENDPOINT) + .then() + .assertThat().body("size", equalTo(2)); + } + + @Test + public void givenRequestForStudents_whenSizeIsTwo_expectNumberOfElementsTwo() { + given().params("page", "1", "size", "2").get(ENDPOINT) + .then() + .assertThat().body("numberOfElements", equalTo(2)); + } + + @Test + public void givenRequestForStudents_whenResourcesAreRetrievedPaged_thenExpect200() { + given().params("page", "1", "size", "2").get(ENDPOINT) + .then() + .statusCode(200); + } + + @Test + public void givenRequestForStudents_whenPageOfResourcesAreRetrievedOutOfBounds_thenExpect500() { + given().params("page", "1000", "size", "2").get(ENDPOINT) + .then() + .statusCode(500); + } + + @Test + public void givenRequestForStudents_whenPageNotValid_thenExpect500() { + given().params("page", RandomStringUtils.randomNumeric(5), "size", "2").get(ENDPOINT) + .then() + .statusCode(500); + } + + @Test + public void givenResourcesExist_whenFirstPageIsRetrieved_thenPageContainsResources() { + given().params("page", "1", "size", "2").get(ENDPOINT) + .then() + .assertThat().body("first", equalTo(true)); + } + + @Test + public void givenRequestForStudents_whenPageIsFive_expectFiveItems() { + given().params("page", "1", "size", "5").get(ENDPOINT) + .then() + .body("content.studentId.max()", equalTo("5")); } - - @Test - public void whenResourcesAreRetrievedPaged_then200IsReceived(){ - Response response = RestAssured.given().get(getURL()+ "?page=0&size=2").andReturn(); - - assertTrue(response.getStatusCode() == 200 ); - } - - @Test - public void whenPageOfResourcesAreRetrievedOutOfBounds_then404IsReceived(){ - String url = getURL()+ "?page=" + RandomStringUtils.randomNumeric(5) + "&size=2"; - Response response = RestAssured.given().get(url); - - assertTrue(response.getStatusCode() == 500 ); - } - - @Test - public void givenResourcesExist_whenFirstPageIsRetrieved_thenPageContainsResources(){ - Response response = RestAssured.given().get(getURL() + "?page=1&size=2" ); - assertFalse(response.getBody().jsonPath().getList("content").isEmpty() ); - } - } From d273566d4ad493a9f4f81b005fe227526bf64fc8 Mon Sep 17 00:00:00 2001 From: Alex Theedom Date: Mon, 8 Aug 2016 20:57:23 +0100 Subject: [PATCH 22/41] Move project up one level --- .../{StudentDirectory => }/pom.xml | 0 .../org/baeldung/mock/MockStudentData.java | 0 .../MyResourceNotFoundException.java | 0 .../org/baeldung/web/main/Application.java | 0 .../rest/StudentDirectoryRestController.java | 0 .../org/baeldung/web/service/IOperations.java | 0 .../baeldung/web/service/StudentService.java | 0 .../web/service/StudentServiceImpl.java | 0 .../java/org/baeldung/web/vo/Student.java | 0 .../src/main/resources/application.properties | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/index.html | 0 .../src/main/webapp/view/app.js | 0 .../web/service/StudentServiceTest.java | 34 ++++++------------- 14 files changed, 11 insertions(+), 23 deletions(-) rename spring-rest-angular-pagination/{StudentDirectory => }/pom.xml (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/java/org/baeldung/mock/MockStudentData.java (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/java/org/baeldung/web/main/Application.java (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/java/org/baeldung/web/service/IOperations.java (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/java/org/baeldung/web/service/StudentService.java (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/java/org/baeldung/web/service/StudentServiceImpl.java (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/java/org/baeldung/web/vo/Student.java (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/resources/application.properties (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/webapp/WEB-INF/web.xml (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/webapp/index.html (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/main/webapp/view/app.js (100%) rename spring-rest-angular-pagination/{StudentDirectory => }/src/test/java/org/baeldung/web/service/StudentServiceTest.java (79%) diff --git a/spring-rest-angular-pagination/StudentDirectory/pom.xml b/spring-rest-angular-pagination/pom.xml similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/pom.xml rename to spring-rest-angular-pagination/pom.xml diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/mock/MockStudentData.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/mock/MockStudentData.java similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/mock/MockStudentData.java rename to spring-rest-angular-pagination/src/main/java/org/baeldung/mock/MockStudentData.java diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/main/Application.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/main/Application.java similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/main/Application.java rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/main/Application.java diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/IOperations.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/IOperations.java similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/IOperations.java rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/IOperations.java diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/StudentService.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/StudentService.java similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/StudentService.java rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/StudentService.java diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/StudentServiceImpl.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/StudentServiceImpl.java similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/StudentServiceImpl.java rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/StudentServiceImpl.java diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/vo/Student.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/vo/Student.java similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/vo/Student.java rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/vo/Student.java diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties b/spring-rest-angular-pagination/src/main/resources/application.properties similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties rename to spring-rest-angular-pagination/src/main/resources/application.properties diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/webapp/WEB-INF/web.xml b/spring-rest-angular-pagination/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/webapp/WEB-INF/web.xml rename to spring-rest-angular-pagination/src/main/webapp/WEB-INF/web.xml diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/webapp/index.html b/spring-rest-angular-pagination/src/main/webapp/index.html similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/webapp/index.html rename to spring-rest-angular-pagination/src/main/webapp/index.html diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/webapp/view/app.js b/spring-rest-angular-pagination/src/main/webapp/view/app.js similarity index 100% rename from spring-rest-angular-pagination/StudentDirectory/src/main/webapp/view/app.js rename to spring-rest-angular-pagination/src/main/webapp/view/app.js diff --git a/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java b/spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java similarity index 79% rename from spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java rename to spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java index 55855c4c7d..da3a36cf7a 100644 --- a/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java +++ b/spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java @@ -1,30 +1,17 @@ package org.baeldung.web.service; -import static io.restassured.RestAssured.given; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.IsCollectionContaining.hasItems; -import static org.hamcrest.core.IsEqual.equalTo; -import static org.hamcrest.core.StringContains.containsString; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.springframework.http.MediaType.APPLICATION_JSON; -import static org.springframework.util.Assert.isTrue; - import org.apache.commons.lang3.RandomStringUtils; import org.baeldung.web.main.Application; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.boot.test.TestRestTemplate; -import org.springframework.http.HttpHeaders; -import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; -import io.restassured.RestAssured; -import io.restassured.response.Response; -import org.springframework.web.client.RestTemplate; +import static io.restassured.RestAssured.given; +import static org.hamcrest.core.IsCollectionContaining.hasItems; +import static org.hamcrest.core.IsEqual.equalTo; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = Application.class) @@ -32,7 +19,7 @@ import org.springframework.web.client.RestTemplate; @IntegrationTest("server.port:8888") public class StudentServiceTest { - private static final String ENDPOINT = "http://localhost:8080/StudentDirectory/student/get"; + private static final String ENDPOINT = "http://localhost:8888/StudentDirectory/student/get"; @Test public void givenRequestForStudents_whenPageIsOne_expectContainsNames() { @@ -76,6 +63,13 @@ public class StudentServiceTest { .statusCode(500); } + @Test + public void givenRequestForStudents_whenPageIsFive_expectFiveItems() { + given().params("page", "1", "size", "5").get(ENDPOINT) + .then() + .body("content.studentId.max()", equalTo("5")); + } + @Test public void givenResourcesExist_whenFirstPageIsRetrieved_thenPageContainsResources() { given().params("page", "1", "size", "2").get(ENDPOINT) @@ -83,10 +77,4 @@ public class StudentServiceTest { .assertThat().body("first", equalTo(true)); } - @Test - public void givenRequestForStudents_whenPageIsFive_expectFiveItems() { - given().params("page", "1", "size", "5").get(ENDPOINT) - .then() - .body("content.studentId.max()", equalTo("5")); - } } From 1e6efa68dde54ab63c9fe7a8f62942e5c0bb598d Mon Sep 17 00:00:00 2001 From: Alex Theedom Date: Mon, 8 Aug 2016 20:58:00 +0100 Subject: [PATCH 23/41] Add pagination module to parent POM --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index e82b964900..9be9e1ef25 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,7 @@ spring-quartz spring-spel spring-rest + spring-rest-angular-pagination spring-rest-docs spring-cloud-config From ce0fb8907629df66821163b3dfcbcca861e90d99 Mon Sep 17 00:00:00 2001 From: eugenp Date: Mon, 8 Aug 2016 22:58:26 +0300 Subject: [PATCH 24/41] 2 new simple conversion tests --- .../java/io/JavaReaderToXUnitTest.java | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/core-java/src/test/java/org/baeldung/java/io/JavaReaderToXUnitTest.java b/core-java/src/test/java/org/baeldung/java/io/JavaReaderToXUnitTest.java index 7a4c7366eb..3c574f1e5c 100644 --- a/core-java/src/test/java/org/baeldung/java/io/JavaReaderToXUnitTest.java +++ b/core-java/src/test/java/org/baeldung/java/io/JavaReaderToXUnitTest.java @@ -1,5 +1,8 @@ package org.baeldung.java.io; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileWriter; @@ -187,10 +190,24 @@ public class JavaReaderToXUnitTest { targetStream.close(); } + @Test + public void givenUsingCommonsIO_whenConvertingReaderIntoInputStream_thenCorrect() throws IOException { + String initialString = "With Commons IO"; + final Reader initialReader = new StringReader(initialString); + + final InputStream targetStream = IOUtils.toInputStream(IOUtils.toString(initialReader)); + + final String finalString = IOUtils.toString(targetStream); + assertThat(finalString, equalTo(initialString)); + + initialReader.close(); + targetStream.close(); + } + // tests - Reader to InputStream with encoding @Test - public void givenUsingPlainJava_whenConvertingReaderIntoInputStreamWithCharset_thenCorrect() throws IOException { + public void givenUsingPlainJava_whenConvertingReaderIntoInputStreamWithCharset() throws IOException { final Reader initialReader = new StringReader("With Java"); final char[] charBuffer = new char[8 * 1024]; @@ -225,4 +242,17 @@ public class JavaReaderToXUnitTest { targetStream.close(); } + @Test + public void givenUsingCommonsIO_whenConvertingReaderIntoInputStreamWithEncoding_thenCorrect() throws IOException { + String initialString = "With Commons IO"; + final Reader initialReader = new StringReader(initialString); + final InputStream targetStream = IOUtils.toInputStream(IOUtils.toString(initialReader), Charsets.UTF_8); + + String finalString = IOUtils.toString(targetStream, Charsets.UTF_8); + assertThat(finalString, equalTo(initialString)); + + initialReader.close(); + targetStream.close(); + } + } From f2f2b487827db06933c793204cdf55f34ad0890c Mon Sep 17 00:00:00 2001 From: Sergey Petunin Date: Tue, 9 Aug 2016 18:56:35 +0600 Subject: [PATCH 25/41] Optimized the TreeNode constructor (#590) --- .../src/main/java/com/baeldung/threadpool/TreeNode.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core-java-8/src/main/java/com/baeldung/threadpool/TreeNode.java b/core-java-8/src/main/java/com/baeldung/threadpool/TreeNode.java index 72b1f756a8..9b43152074 100644 --- a/core-java-8/src/main/java/com/baeldung/threadpool/TreeNode.java +++ b/core-java-8/src/main/java/com/baeldung/threadpool/TreeNode.java @@ -1,9 +1,9 @@ package com.baeldung.threadpool; -import java.util.Arrays; -import java.util.HashSet; import java.util.Set; +import com.google.common.collect.Sets; + public class TreeNode { int value; @@ -12,8 +12,7 @@ public class TreeNode { public TreeNode(int value, TreeNode... children) { this.value = value; - this.children = new HashSet<>(); - this.children.addAll(Arrays.asList(children)); + this.children = Sets.newHashSet(children); } } From 2d61ab0615255376c538275a0b917b590851e53e Mon Sep 17 00:00:00 2001 From: bdragan Date: Tue, 9 Aug 2016 21:49:36 +0200 Subject: [PATCH 26/41] Upgraded Hibernate to 5.2.2.Final version. --- spring-jpa/pom.xml | 6 +++--- .../persistence/service/JpaMultipleDBIntegrationTest.java | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index 2c189bde4b..5acdae7765 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -189,13 +189,13 @@ - 4.2.5.RELEASE + 4.3.2.RELEASE 3.20.0-GA - 4.3.11.Final + 5.2.2.Final 5.1.38 - 1.8.2.RELEASE + 1.10.2.RELEASE 1.4.192 diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/JpaMultipleDBIntegrationTest.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/JpaMultipleDBIntegrationTest.java index e036a4f3c1..7e6b2722fa 100644 --- a/spring-jpa/src/test/java/org/baeldung/persistence/service/JpaMultipleDBIntegrationTest.java +++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/JpaMultipleDBIntegrationTest.java @@ -2,6 +2,7 @@ package org.baeldung.persistence.service; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; import org.baeldung.config.ProductConfig; import org.baeldung.config.UserConfig; @@ -57,10 +58,13 @@ public class JpaMultipleDBIntegrationTest { user2.setAge(10); try { user2 = userRepository.save(user2); + userRepository.flush(); + fail("DataIntegrityViolationException should be thrown!"); } catch (final DataIntegrityViolationException e) { + // Expected + } catch (final Exception e) { + fail("DataIntegrityViolationException should be thrown, instead got: " + e); } - - assertNull(userRepository.findOne(user2.getId())); } @Test From 60a097624dd5f416c4cfb7295964e3519afaf0f2 Mon Sep 17 00:00:00 2001 From: bdragan Date: Tue, 9 Aug 2016 22:01:43 +0200 Subject: [PATCH 27/41] Fixed a merge error. --- .../src/test/java/META-INF/persistence.xml | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/spring-jpa/src/test/java/META-INF/persistence.xml b/spring-jpa/src/test/java/META-INF/persistence.xml index ba0d2377d1..922aedbc39 100644 --- a/spring-jpa/src/test/java/META-INF/persistence.xml +++ b/spring-jpa/src/test/java/META-INF/persistence.xml @@ -1,18 +1,20 @@ - - - org.baeldung.persistence.model.Foo - org.baeldung.persistence.model.Bar - - - - - - - - - - - - + + + org.baeldung.persistence.model.Foo + org.baeldung.persistence.model.Bar + + + + + + + + + + + + From fa68a02d60f238899120a94402639aa073e90241 Mon Sep 17 00:00:00 2001 From: Alex Theedom Date: Tue, 9 Aug 2016 23:58:55 +0100 Subject: [PATCH 28/41] Minor changes after review --- hystrix/pom.xml | 2 +- .../java/com/baeldung/hystrix/HystrixTimeoutTest.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hystrix/pom.xml b/hystrix/pom.xml index 381adfbcd5..ef443ebd15 100644 --- a/hystrix/pom.xml +++ b/hystrix/pom.xml @@ -21,7 +21,7 @@ 1.8 - 1.4.10 + 1.5.4 0.20.7 diff --git a/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java b/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java index c9ddd98367..34eb334b32 100644 --- a/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java +++ b/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutTest.java @@ -1,16 +1,15 @@ package com.baeldung.hystrix; -import com.netflix.hystrix.*; -import com.netflix.hystrix.collapser.RequestCollapserFactory; +import com.netflix.hystrix.HystrixCommand; +import com.netflix.hystrix.HystrixCommandGroupKey; +import com.netflix.hystrix.HystrixCommandProperties; +import com.netflix.hystrix.HystrixThreadPoolProperties; import com.netflix.hystrix.exception.HystrixRuntimeException; -import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import java.util.concurrent.ExecutionException; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -48,7 +47,7 @@ public class HystrixTimeoutTest { } @Test - public void givenServiceTimeoutEqualTo5000_andExecutionTimeoutEqualTo10000_thenReturnSuccess() + public void givenServiceTimeoutEqualTo500_andExecutionTimeoutEqualTo10000_thenReturnSuccess() throws InterruptedException { commandProperties.withExecutionTimeoutInMilliseconds(10_000); config.andCommandPropertiesDefaults(commandProperties); From 87d260ce4643c99ea241251215294adb309ebfc1 Mon Sep 17 00:00:00 2001 From: maibin Date: Tue, 9 Aug 2016 21:50:45 -0700 Subject: [PATCH 29/41] Logging using Spring MVC Handler Interceptor (#549) * Expression-Based Access Control PermitAll, hasRole, hasAnyRole etc. I modified classes regards to Security * Added test cases for Spring Security Expressions * Handler Interceptor - logging example --- .../java/org/baeldung/spring/WebConfig.java | 6 ++ .../web/interceptor/LoggerInterceptor.java | 74 +++++++++++++++++++ .../src/main/resources/webSecurityConfig.xml | 4 + 3 files changed, 84 insertions(+) create mode 100644 spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/LoggerInterceptor.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java b/spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java index 3e5d6435b3..e1a83eeeb5 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java @@ -1,10 +1,12 @@ package org.baeldung.spring; +import org.baeldung.web.interceptor.LoggerInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.view.InternalResourceViewResolver; @@ -35,4 +37,8 @@ public class WebConfig extends WebMvcConfigurerAdapter { registry.addViewController("/homepage.html"); } + @Override + public void addInterceptors(final InterceptorRegistry registry) { + registry.addInterceptor(new LoggerInterceptor()); + } } \ No newline at end of file diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/LoggerInterceptor.java b/spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/LoggerInterceptor.java new file mode 100644 index 0000000000..f4aa2ff4f5 --- /dev/null +++ b/spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/LoggerInterceptor.java @@ -0,0 +1,74 @@ +package org.baeldung.web.interceptor; + +import java.util.Enumeration; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; + +import com.google.common.base.Strings; + +public class LoggerInterceptor extends HandlerInterceptorAdapter { + + private static Logger log = LoggerFactory.getLogger(LoggerInterceptor.class); + + /** Executed before actual handler is executed **/ + @Override + public boolean preHandle(final HttpServletRequest request, final HttpServletResponse response, final Object handler) throws Exception { + log.info("[preHandle][" + request + "]" + "[" + request.getMethod() + "]" + request.getRequestURI() + getParameters(request)); + return true; + } + + /** Executed before after handler is executed **/ + @Override + public void postHandle(final HttpServletRequest request, final HttpServletResponse response, final Object handler, + final ModelAndView modelAndView) throws Exception { + log.info("[postHandle][" + request + "]"); + } + + /** Executed after complete request is finished **/ + @Override + public void afterCompletion(final HttpServletRequest request, final HttpServletResponse response, final Object handler, final Exception ex) + throws Exception { + if (ex != null) + ex.printStackTrace(); + log.info("[afterCompletion][" + request + "][exception: " + ex + "]"); + } + + private String getParameters(final HttpServletRequest request) { + final StringBuffer posted = new StringBuffer(); + final Enumeration e = request.getParameterNames(); + if (e != null) + posted.append("?"); + while (e.hasMoreElements()) { + if (posted.length() > 1) + posted.append("&"); + final String curr = (String) e.nextElement(); + posted.append(curr + "="); + if (curr.contains("password") || curr.contains("answer") || curr.contains("pwd")) { + posted.append("*****"); + } else { + posted.append(request.getParameter(curr)); + } + } + + final String ip = request.getHeader("X-FORWARDED-FOR"); + final String ipAddr = (ip == null) ? getRemoteAddr(request) : ip; + if (!Strings.isNullOrEmpty(ipAddr)) + posted.append("&_psip=" + ipAddr); + return posted.toString(); + } + + private String getRemoteAddr(final HttpServletRequest request) { + final String ipFromHeader = request.getHeader("X-FORWARDED-FOR"); + if (ipFromHeader != null && ipFromHeader.length() > 0) { + log.debug("ip from proxy - X-FORWARDED-FOR : " + ipFromHeader); + return ipFromHeader; + } + return request.getRemoteAddr(); + } +} diff --git a/spring-security-rest-full/src/main/resources/webSecurityConfig.xml b/spring-security-rest-full/src/main/resources/webSecurityConfig.xml index d6ba952dfd..be6b4d0c27 100644 --- a/spring-security-rest-full/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-full/src/main/resources/webSecurityConfig.xml @@ -32,5 +32,9 @@ + + \ No newline at end of file From 31d9e1bef60b3ec03a0d9b9fe23aa424c10ac074 Mon Sep 17 00:00:00 2001 From: Nancy Bosecker Date: Tue, 9 Aug 2016 21:51:06 -0700 Subject: [PATCH 30/41] Added jackson/gson updates (#552) --- .../org/baeldung/gson/entities/ActorGson.java | 48 +++++++++++++++ .../org/baeldung/gson/entities/Movie.java | 46 ++++++++++++++ .../gson/entities/MovieWithNullValue.java | 45 ++++++++++++++ .../serialization/ActorGsonDeserializer.java | 52 ++++++++++++++++ .../serialization/ActorGsonSerializer.java | 34 +++++++++++ .../deserialization/GsonDeserializeTest.java | 38 ++++++++++++ .../gson/serialization/GsonSerializeTest.java | 51 ++++++++++++++++ .../jackson/entities/ActorJackson.java | 55 +++++++++++++++++ .../org/baeldung/jackson/entities/Movie.java | 50 ++++++++++++++++ .../jackson/entities/MovieWithNullValue.java | 47 +++++++++++++++ .../serialization/ActorJacksonSerializer.java | 31 ++++++++++ .../JacksonDeserializeTest.java | 42 +++++++++++++ .../serialization/JacksonSerializeTest.java | 60 +++++++++++++++++++ 13 files changed, 599 insertions(+) create mode 100644 gson/src/main/java/org/baeldung/gson/entities/ActorGson.java create mode 100644 gson/src/main/java/org/baeldung/gson/entities/Movie.java create mode 100644 gson/src/main/java/org/baeldung/gson/entities/MovieWithNullValue.java create mode 100644 gson/src/main/java/org/baeldung/gson/serialization/ActorGsonDeserializer.java create mode 100644 gson/src/main/java/org/baeldung/gson/serialization/ActorGsonSerializer.java create mode 100644 gson/src/test/java/org/baeldung/gson/deserialization/GsonDeserializeTest.java create mode 100644 gson/src/test/java/org/baeldung/gson/serialization/GsonSerializeTest.java create mode 100644 jackson/src/main/java/org/baeldung/jackson/entities/ActorJackson.java create mode 100644 jackson/src/main/java/org/baeldung/jackson/entities/Movie.java create mode 100644 jackson/src/main/java/org/baeldung/jackson/entities/MovieWithNullValue.java create mode 100644 jackson/src/main/java/org/baeldung/jackson/serialization/ActorJacksonSerializer.java create mode 100644 jackson/src/test/java/org/baeldung/jackson/deserialization/JacksonDeserializeTest.java create mode 100644 jackson/src/test/java/org/baeldung/jackson/serialization/JacksonSerializeTest.java diff --git a/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java b/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java new file mode 100644 index 0000000000..d2c0a8782c --- /dev/null +++ b/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java @@ -0,0 +1,48 @@ +package org.baeldung.gson.entities; + +import java.util.Date; +import java.util.List; + +public class ActorGson { + + @Override + public String toString() { + return "ActorGson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]"; + } + + private String imdbId; + private Date dateOfBirth; + private List filmography; + + public String getImdbId() { + return imdbId; + } + + public void setImdbId(String imdbId) { + this.imdbId = imdbId; + } + + public Date getDateOfBirth() { + return dateOfBirth; + } + + public void setDateOfBirth(Date dateOfBirth) { + this.dateOfBirth = dateOfBirth; + } + + public List getFilmography() { + return filmography; + } + + public void setFilmography(List filmography) { + this.filmography = filmography; + } + + public ActorGson(String imdbId, Date dateOfBirth, List filmography) { + super(); + this.imdbId = imdbId; + this.dateOfBirth = dateOfBirth; + this.filmography = filmography; + } + +} \ No newline at end of file diff --git a/gson/src/main/java/org/baeldung/gson/entities/Movie.java b/gson/src/main/java/org/baeldung/gson/entities/Movie.java new file mode 100644 index 0000000000..d7a46cd146 --- /dev/null +++ b/gson/src/main/java/org/baeldung/gson/entities/Movie.java @@ -0,0 +1,46 @@ +package org.baeldung.gson.entities; + +import java.util.List; + +public class Movie { + + @Override + public String toString() { + return "Movie [imdbId=" + imdbId + ", director=" + director + ", actors=" + actors + "]"; + } + + private String imdbId; + private String director; + private List actors; + + public Movie(String imdbID, String director, List actors) { + super(); + this.imdbId = imdbID; + this.director = director; + this.actors = actors; + } + + public String getImdbID() { + return imdbId; + } + + public void setImdbID(String imdbID) { + this.imdbId = imdbID; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public List getActors() { + return actors; + } + + public void setActors(List actors) { + this.actors = actors; + } +} \ No newline at end of file diff --git a/gson/src/main/java/org/baeldung/gson/entities/MovieWithNullValue.java b/gson/src/main/java/org/baeldung/gson/entities/MovieWithNullValue.java new file mode 100644 index 0000000000..227e7dc2be --- /dev/null +++ b/gson/src/main/java/org/baeldung/gson/entities/MovieWithNullValue.java @@ -0,0 +1,45 @@ +package org.baeldung.gson.entities; + +import java.util.List; + +import com.google.gson.annotations.Expose; + +public class MovieWithNullValue { + + @Expose + private String imdbId; + private String director; + @Expose + private List actors; + + public MovieWithNullValue(String imdbID, String director, List actors) { + super(); + this.imdbId = imdbID; + this.director = director; + this.actors = actors; + } + + public String getImdbID() { + return imdbId; + } + + public void setImdbID(String imdbID) { + this.imdbId = imdbID; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public List getActors() { + return actors; + } + + public void setActors(List actors) { + this.actors = actors; + } +} \ No newline at end of file diff --git a/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonDeserializer.java b/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonDeserializer.java new file mode 100644 index 0000000000..59ac49a847 --- /dev/null +++ b/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonDeserializer.java @@ -0,0 +1,52 @@ +package org.baeldung.gson.serialization; + +import java.lang.reflect.Type; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.TimeZone; +import java.util.stream.Collectors; + +import org.baeldung.gson.entities.ActorGson; + +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; + +public class ActorGsonDeserializer implements JsonDeserializer { + + private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + + @Override + public ActorGson deserialize(JsonElement json, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException { + + JsonObject jsonObject = json.getAsJsonObject(); + + JsonElement jsonImdbId = jsonObject.get("imdbId"); + JsonElement jsonDateOfBirth = jsonObject.get("dateOfBirth"); + JsonArray jsonFilmography = jsonObject.getAsJsonArray("filmography"); + + ArrayList filmList = new ArrayList(); + if (jsonFilmography != null) { + for (int i = 0; i < jsonFilmography.size(); i++) { + filmList.add(jsonFilmography.get(i).getAsString()); + } + } + + ActorGson actorGson = null; + try { + actorGson = new ActorGson(jsonImdbId.getAsString(), sdf.parse(jsonDateOfBirth.getAsString()), filmList); + } catch (ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return actorGson; + } +} \ No newline at end of file diff --git a/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonSerializer.java b/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonSerializer.java new file mode 100644 index 0000000000..09788cd65a --- /dev/null +++ b/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonSerializer.java @@ -0,0 +1,34 @@ +package org.baeldung.gson.serialization; + +import java.lang.reflect.Type; +import java.text.SimpleDateFormat; +import java.util.List; +import java.util.stream.Collectors; + +import org.baeldung.gson.entities.ActorGson; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; + +public class ActorGsonSerializer implements JsonSerializer { + + private SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); + + @Override + public JsonElement serialize(ActorGson actor, Type type, JsonSerializationContext jsonSerializationContext) { + + JsonObject actorJsonObj = new JsonObject(); + actorJsonObj.addProperty("IMDB Code", actor.getImdbId()); + actorJsonObj.addProperty("Date Of Birth", actor.getDateOfBirth() != null ? sdf.format(actor.getDateOfBirth()) : null); + actorJsonObj.addProperty("N° Film: ", actor.getFilmography() != null ? actor.getFilmography().size() : null); + actorJsonObj.addProperty("filmography", actor.getFilmography() != null ? convertFilmography(actor.getFilmography()) : null); + + return actorJsonObj; + } + + private String convertFilmography(List filmography) { + return filmography.stream().collect(Collectors.joining("-")); + } +} \ No newline at end of file diff --git a/gson/src/test/java/org/baeldung/gson/deserialization/GsonDeserializeTest.java b/gson/src/test/java/org/baeldung/gson/deserialization/GsonDeserializeTest.java new file mode 100644 index 0000000000..61197546b0 --- /dev/null +++ b/gson/src/test/java/org/baeldung/gson/deserialization/GsonDeserializeTest.java @@ -0,0 +1,38 @@ +package org.baeldung.gson.deserialization; + +import java.text.ParseException; +import org.baeldung.gson.entities.ActorGson; +import org.baeldung.gson.entities.Movie; +import org.baeldung.gson.serialization.ActorGsonDeserializer; +import org.junit.Assert; +import org.junit.Test; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +public class GsonDeserializeTest { + + @Test + public void whenSimpleDeserialize_thenCorrect() throws ParseException { + + String jsonInput = "{\"imdbId\":\"tt0472043\",\"actors\":" + "[{\"imdbId\":\"nm2199632\",\"dateOfBirth\":\"1982-09-21T12:00:00+01:00\",\"filmography\":" + "[\"Apocalypto\",\"Beatdown\",\"Wind Walkers\"]}]}"; + + Movie outputMovie = new Gson().fromJson(jsonInput, Movie.class); + + String expectedOutput = "Movie [imdbId=tt0472043, director=null, actors=[ActorGson [imdbId=nm2199632, dateOfBirth=Tue Sep 21 04:00:00 PDT 1982, filmography=[Apocalypto, Beatdown, Wind Walkers]]]]"; + Assert.assertEquals(outputMovie.toString(), expectedOutput); + } + + @Test + public void whenCustomDeserialize_thenCorrect() throws ParseException { + + String jsonInput = "{\"imdbId\":\"tt0472043\",\"actors\":" + "[{\"imdbId\":\"nm2199632\",\"dateOfBirth\":\"1982-09-21T12:00:00+01:00\",\"filmography\":" + "[\"Apocalypto\",\"Beatdown\",\"Wind Walkers\"]}]}"; + + Gson gson = new GsonBuilder().registerTypeAdapter(ActorGson.class, new ActorGsonDeserializer()).create(); + + Movie outputMovie = gson.fromJson(jsonInput, Movie.class); + + String expectedOutput = "Movie [imdbId=tt0472043, director=null, actors=[ActorGson [imdbId=nm2199632, dateOfBirth=Tue Sep 21 12:00:00 PDT 1982, filmography=[Apocalypto, Beatdown, Wind Walkers]]]]"; + Assert.assertEquals(outputMovie.toString(), expectedOutput); + } +} diff --git a/gson/src/test/java/org/baeldung/gson/serialization/GsonSerializeTest.java b/gson/src/test/java/org/baeldung/gson/serialization/GsonSerializeTest.java new file mode 100644 index 0000000000..0d44b6c9d3 --- /dev/null +++ b/gson/src/test/java/org/baeldung/gson/serialization/GsonSerializeTest.java @@ -0,0 +1,51 @@ +package org.baeldung.gson.serialization; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Arrays; + +import org.baeldung.gson.entities.ActorGson; +import org.baeldung.gson.entities.Movie; +import org.baeldung.gson.entities.MovieWithNullValue; +import org.baeldung.gson.serialization.ActorGsonDeserializer; +import org.baeldung.gson.serialization.ActorGsonSerializer; +import org.junit.Assert; +import org.junit.Test; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonParser; + +public class GsonSerializeTest { + + @Test + public void whenSimpleSerialize_thenCorrect() throws ParseException { + + SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); + + ActorGson rudyYoungblood = new ActorGson("nm2199632", sdf.parse("21-09-1982"), Arrays.asList("Apocalypto", "Beatdown", "Wind Walkers")); + Movie movie = new Movie("tt0472043", "Mel Gibson", Arrays.asList(rudyYoungblood)); + + String expectedOutput = "{\"imdbId\":\"tt0472043\",\"director\":\"Mel Gibson\",\"actors\":[{\"imdbId\":\"nm2199632\",\"dateOfBirth\":\"Sep 21, 1982 12:00:00 AM\",\"filmography\":[\"Apocalypto\",\"Beatdown\",\"Wind Walkers\"]}]}"; + Assert.assertEquals(new Gson().toJson(movie), expectedOutput); + } + + @Test + public void whenCustomSerialize_thenCorrect() throws ParseException { + Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation().serializeNulls().disableHtmlEscaping().registerTypeAdapter(ActorGson.class, new ActorGsonSerializer()).create(); + + SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); + + ActorGson rudyYoungblood = new ActorGson("nm2199632", sdf.parse("21-09-1982"), Arrays.asList("Apocalypto", "Beatdown", "Wind Walkers")); + MovieWithNullValue movieWithNullValue = new MovieWithNullValue(null, "Mel Gibson", Arrays.asList(rudyYoungblood)); + + String expectedOutput = new GsonBuilder() + .setPrettyPrinting() + .serializeNulls() + .disableHtmlEscaping() + .create() + .toJson(new JsonParser() + .parse("{\"imdbId\":null,\"actors\":[{\"IMDB Code\":\"nm2199632\",\"Date Of Birth\":\"21-09-1982\",\"N° Film: \":3,\"filmography\":\"Apocalypto-Beatdown-Wind Walkers\"}]}")); + Assert.assertEquals(gson.toJson(movieWithNullValue), expectedOutput); + } +} diff --git a/jackson/src/main/java/org/baeldung/jackson/entities/ActorJackson.java b/jackson/src/main/java/org/baeldung/jackson/entities/ActorJackson.java new file mode 100644 index 0000000000..7d9d6549c0 --- /dev/null +++ b/jackson/src/main/java/org/baeldung/jackson/entities/ActorJackson.java @@ -0,0 +1,55 @@ +package org.baeldung.jackson.entities; + +import java.util.Date; +import java.util.List; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +public class ActorJackson { + + private String imdbId; + private Date dateOfBirth; + private List filmography; + + public String getImdbId() { + return imdbId; + } + + public void setImdbId(String imdbId) { + this.imdbId = imdbId; + } + + public Date getDateOfBirth() { + return dateOfBirth; + } + + public void setDateOfBirth(Date dateOfBirth) { + this.dateOfBirth = dateOfBirth; + } + + public List getFilmography() { + return filmography; + } + + public void setFilmography(List filmography) { + this.filmography = filmography; + } + + public ActorJackson(String imdbId, Date dateOfBirth, List filmography) { + super(); + this.imdbId = imdbId; + this.dateOfBirth = dateOfBirth; + this.filmography = filmography; + } + + public ActorJackson() { + + super(); + } + + @Override + public String toString() { + return "ActorJackson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]"; + } + +} diff --git a/jackson/src/main/java/org/baeldung/jackson/entities/Movie.java b/jackson/src/main/java/org/baeldung/jackson/entities/Movie.java new file mode 100644 index 0000000000..68b7464563 --- /dev/null +++ b/jackson/src/main/java/org/baeldung/jackson/entities/Movie.java @@ -0,0 +1,50 @@ +package org.baeldung.jackson.entities; + +import java.util.List; + +public class Movie { + + private String imdbId; + private String director; + private List actors; + + public Movie(String imdbId, String director, List actors) { + super(); + this.imdbId = imdbId; + this.director = director; + this.actors = actors; + } + + public Movie() { + super(); + } + + @Override + public String toString() { + return "Movie [imdbId=" + imdbId + ", director=" + director + ", actors=" + actors + "]"; + } + + public String getImdbId() { + return imdbId; + } + + public void setImdbId(String imdbId) { + this.imdbId = imdbId; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public List getActors() { + return actors; + } + + public void setActors(List actors) { + this.actors = actors; + } +} \ No newline at end of file diff --git a/jackson/src/main/java/org/baeldung/jackson/entities/MovieWithNullValue.java b/jackson/src/main/java/org/baeldung/jackson/entities/MovieWithNullValue.java new file mode 100644 index 0000000000..d04d37c947 --- /dev/null +++ b/jackson/src/main/java/org/baeldung/jackson/entities/MovieWithNullValue.java @@ -0,0 +1,47 @@ +package org.baeldung.jackson.entities; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.google.gson.annotations.Expose; + +public class MovieWithNullValue { + + private String imdbId; + + @JsonIgnore + private String director; + + private List actors; + + public MovieWithNullValue(String imdbID, String director, List actors) { + super(); + this.imdbId = imdbID; + this.director = director; + this.actors = actors; + } + + public String getImdbID() { + return imdbId; + } + + public void setImdbID(String imdbID) { + this.imdbId = imdbID; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public List getActors() { + return actors; + } + + public void setActors(List actors) { + this.actors = actors; + } +} \ No newline at end of file diff --git a/jackson/src/main/java/org/baeldung/jackson/serialization/ActorJacksonSerializer.java b/jackson/src/main/java/org/baeldung/jackson/serialization/ActorJacksonSerializer.java new file mode 100644 index 0000000000..c33cf59482 --- /dev/null +++ b/jackson/src/main/java/org/baeldung/jackson/serialization/ActorJacksonSerializer.java @@ -0,0 +1,31 @@ +package org.baeldung.jackson.serialization; + +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.stream.Collectors; + +import org.baeldung.jackson.entities.ActorJackson; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; + +public class ActorJacksonSerializer extends StdSerializer { + + private SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); + + public ActorJacksonSerializer(Class t) { + super(t); + } + + @Override + public void serialize(ActorJackson actor, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { + + jsonGenerator.writeStartObject(); + jsonGenerator.writeStringField("imdbId", actor.getImdbId()); + jsonGenerator.writeObjectField("dateOfBirth", actor.getDateOfBirth() != null ? sdf.format(actor.getDateOfBirth()) : null); + jsonGenerator.writeNumberField("N° Film: ", actor.getFilmography() != null ? actor.getFilmography().size() : null); + jsonGenerator.writeStringField("filmography", actor.getFilmography().stream().collect(Collectors.joining("-"))); + jsonGenerator.writeEndObject(); + } +} \ No newline at end of file diff --git a/jackson/src/test/java/org/baeldung/jackson/deserialization/JacksonDeserializeTest.java b/jackson/src/test/java/org/baeldung/jackson/deserialization/JacksonDeserializeTest.java new file mode 100644 index 0000000000..a21762d24a --- /dev/null +++ b/jackson/src/test/java/org/baeldung/jackson/deserialization/JacksonDeserializeTest.java @@ -0,0 +1,42 @@ +package org.baeldung.jackson.deserialization; + +import java.io.IOException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import org.baeldung.jackson.entities.Movie; +import org.junit.Assert; +import org.junit.Test; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +public class JacksonDeserializeTest { + + @Test + public void whenSimpleDeserialize_thenCorrect() throws JsonParseException, JsonMappingException, IOException { + + String jsonInput = "{\"imdbId\":\"tt0472043\",\"actors\":[{\"imdbId\":\"nm2199632\",\"dateOfBirth\":\"1982-09-21T12:00:00+01:00\",\"filmography\":[\"Apocalypto\",\"Beatdown\",\"Wind Walkers\"]}]}"; + ObjectMapper mapper = new ObjectMapper(); + Movie movie = mapper.readValue(jsonInput, Movie.class); + + String expectedOutput = "Movie [imdbId=tt0472043, director=null, actors=[ActorJackson [imdbId=nm2199632, dateOfBirth=Tue Sep 21 04:00:00 PDT 1982, filmography=[Apocalypto, Beatdown, Wind Walkers]]]]"; + Assert.assertEquals(movie.toString(), expectedOutput); + } + + @Test + public void whenCustomDeserialize_thenCorrect() throws JsonParseException, JsonMappingException, IOException { + + String jsonInput = "{\"imdbId\":\"tt0472043\",\"director\":\"Mel Gibson\",\"actors\":[{\"imdbId\":\"nm2199632\",\"dateOfBirth\":\"1982-09-21T12:00:00+01:00\",\"filmography\":[\"Apocalypto\",\"Beatdown\",\"Wind Walkers\"]}]}"; + + ObjectMapper mapper = new ObjectMapper(); + final DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + mapper.setDateFormat(df); + + Movie movie = mapper.readValue(jsonInput, Movie.class); + + String expectedOutput = "Movie [imdbId=tt0472043, director=Mel Gibson, actors=[ActorJackson [imdbId=nm2199632, dateOfBirth=Tue Sep 21 12:00:00 PDT 1982, filmography=[Apocalypto, Beatdown, Wind Walkers]]]]"; + Assert.assertEquals(movie.toString(), expectedOutput); + } + +} diff --git a/jackson/src/test/java/org/baeldung/jackson/serialization/JacksonSerializeTest.java b/jackson/src/test/java/org/baeldung/jackson/serialization/JacksonSerializeTest.java new file mode 100644 index 0000000000..6c8aa90fae --- /dev/null +++ b/jackson/src/test/java/org/baeldung/jackson/serialization/JacksonSerializeTest.java @@ -0,0 +1,60 @@ +package org.baeldung.jackson.serialization; + +import java.io.IOException; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Arrays; + +import org.baeldung.jackson.entities.ActorJackson; +import org.baeldung.jackson.entities.Movie; +import org.baeldung.jackson.entities.MovieWithNullValue; +import org.baeldung.jackson.serialization.ActorJacksonSerializer; +import org.junit.Assert; +import org.junit.Test; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.module.SimpleModule; + +public class JacksonSerializeTest { + + @Test + public void whenSimpleSerialize_thenCorrect() throws JsonProcessingException, ParseException { + + SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); + + ActorJackson rudyYoungblood = new ActorJackson("nm2199632", sdf.parse("21-09-1982"), Arrays.asList("Apocalypto", "Beatdown", "Wind Walkers")); + Movie movie = new Movie("tt0472043", "Mel Gibson", Arrays.asList(rudyYoungblood)); + + ObjectMapper mapper = new ObjectMapper(); + String jsonResult = mapper.writeValueAsString(movie); + + String expectedOutput = "{\"imdbId\":\"tt0472043\",\"director\":\"Mel Gibson\",\"actors\":[{\"imdbId\":\"nm2199632\",\"dateOfBirth\":401439600000,\"filmography\":[\"Apocalypto\",\"Beatdown\",\"Wind Walkers\"]}]}"; + Assert.assertEquals(jsonResult, expectedOutput); + } + + @Test + public void whenCustomSerialize_thenCorrect() throws ParseException, IOException { + + SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); + + ActorJackson rudyYoungblood = new ActorJackson("nm2199632", sdf.parse("21-09-1982"), Arrays.asList("Apocalypto", "Beatdown", "Wind Walkers")); + MovieWithNullValue movieWithNullValue = new MovieWithNullValue(null, "Mel Gibson", Arrays.asList(rudyYoungblood)); + + SimpleModule module = new SimpleModule(); + module.addSerializer(new ActorJacksonSerializer(ActorJackson.class)); + ObjectMapper mapper = new ObjectMapper(); + + String jsonResult = mapper.registerModule(module).writer(new DefaultPrettyPrinter()).writeValueAsString(movieWithNullValue); + + Object json = mapper.readValue("{\"actors\":[{\"imdbId\":\"nm2199632\",\"dateOfBirth\":\"21-09-1982\",\"N° Film: \":3,\"filmography\":\"Apocalypto-Beatdown-Wind Walkers\"}],\"imdbID\":null}", Object.class); + String expectedOutput = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT).writeValueAsString(json); + + Assert.assertEquals(jsonResult, expectedOutput); + } +} From ee0e14e590b9f591fcec142547087826db145a08 Mon Sep 17 00:00:00 2001 From: PRITAM BANERJEE Date: Wed, 10 Aug 2016 02:36:14 -0700 Subject: [PATCH 31/41] Hibernate Criteria Query (#592) * BAEL-212 Contains: 1. Hibernate Criteria Query Classes 2. Hibernate Criteria Query Test * Updating the config file and the HibernateUtil class * Hibernate Criteria Queries Example * Hibernate Fetching : Eager Loading vs Lazy Loading * Hibernate Criteria Query files --- .../hibernate/criteria/model/Item.hbm.xml | 22 ++ .../hibernate/criteria/model/Item.java | 81 ++++++ .../criteria/util/HibernateUtil.java | 20 ++ .../criteria/view/ApplicationView.java | 253 ++++++++++++++++++ .../fetching/model/OrderDetail.hbm.xml | 26 ++ .../hibernate/fetching/model/OrderDetail.java | 73 +++++ .../hibernate/fetching/model/User.hbm.xml | 31 +++ .../hibernate/fetching/model/User.java | 96 +++++++ .../hibernate/fetching/model/UserLazy.hbm.xml | 31 +++ .../fetching/util/HibernateUtil.java | 35 +++ .../fetching/view/FetchingAppView.java | 115 ++++++++ .../src/main/resources/criteria.cfg.xml | 17 ++ .../resources/criteria_create_queries.sql | 7 + .../src/main/resources/fetching.cfg.xml | 16 ++ .../src/main/resources/fetchingLazy.cfg.xml | 16 ++ .../resources/fetching_create_queries.sql | 19 ++ .../src/main/resources/insert_statements.sql | 31 +++ .../criteria/HibernateCriteriaTest.java | 191 +++++++++++++ .../criteria/HibernateCriteriaTestRunner.java | 15 ++ .../criteria/HibernateCriteriaTestSuite.java | 11 + .../fetching/HibernateFetchingTest.java | 24 ++ .../fetching/HibernateFetchingTestRunner.java | 17 ++ .../fetching/HibernateFetchingTestSuite.java | 11 + .../src/test/java/criteria.cfg.xml | 16 ++ .../src/test/java/hibernate.cfg.xml | 36 --- 25 files changed, 1174 insertions(+), 36 deletions(-) create mode 100644 spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.hbm.xml create mode 100644 spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.java create mode 100644 spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java create mode 100644 spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java create mode 100644 spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/OrderDetail.hbm.xml create mode 100644 spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/OrderDetail.java create mode 100644 spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/User.hbm.xml create mode 100644 spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/User.java create mode 100644 spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/UserLazy.hbm.xml create mode 100644 spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/util/HibernateUtil.java create mode 100644 spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/view/FetchingAppView.java create mode 100644 spring-hibernate4/src/main/resources/criteria.cfg.xml create mode 100644 spring-hibernate4/src/main/resources/criteria_create_queries.sql create mode 100644 spring-hibernate4/src/main/resources/fetching.cfg.xml create mode 100644 spring-hibernate4/src/main/resources/fetchingLazy.cfg.xml create mode 100644 spring-hibernate4/src/main/resources/fetching_create_queries.sql create mode 100644 spring-hibernate4/src/main/resources/insert_statements.sql create mode 100644 spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTest.java create mode 100644 spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java create mode 100644 spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java create mode 100644 spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java create mode 100644 spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestRunner.java create mode 100644 spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestSuite.java create mode 100644 spring-hibernate4/src/test/java/criteria.cfg.xml delete mode 100644 spring-hibernate4/src/test/java/hibernate.cfg.xml diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.hbm.xml b/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.hbm.xml new file mode 100644 index 0000000000..9e0109aae2 --- /dev/null +++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.hbm.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.java b/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.java new file mode 100644 index 0000000000..b8b012c061 --- /dev/null +++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.java @@ -0,0 +1,81 @@ +package com.baeldung.hibernate.criteria.model; + +import java.io.Serializable; + +public class Item implements Serializable { + + private static final long serialVersionUID = 1L; + private Integer itemId; + private String itemName; + private String itemDescription; + private Integer itemPrice; + + // constructors + public Item() { + + } + + public Item(final Integer itemId, final String itemName, final String itemDescription) { + super(); + this.itemId = itemId; + this.itemName = itemName; + this.itemDescription = itemDescription; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((itemId == null) ? 0 : itemId.hashCode()); + return result; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final Item other = (Item) obj; + if (itemId == null) { + if (other.itemId != null) + return false; + } else if (!itemId.equals(other.itemId)) + return false; + return true; + } + + public Integer getItemId() { + return itemId; + } + + public void setItemId(final Integer itemId) { + this.itemId = itemId; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(final String itemName) { + this.itemName = itemName; + } + + public String getItemDescription() { + return itemDescription; + } + + public Integer getItemPrice() { + return itemPrice; + } + + public void setItemPrice(final Integer itemPrice) { + this.itemPrice = itemPrice; + } + + public void setItemDescription(final String itemDescription) { + this.itemDescription = itemDescription; + } +} diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java b/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java new file mode 100644 index 0000000000..57f32cfe50 --- /dev/null +++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java @@ -0,0 +1,20 @@ +package com.baeldung.hibernate.criteria.util; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.cfg.Configuration; + +public class HibernateUtil { + + @SuppressWarnings("deprecation") + public static Session getHibernateSession() { + + final SessionFactory sf = new Configuration() + .configure("criteria.cfg.xml").buildSessionFactory(); + + // factory = new Configuration().configure().buildSessionFactory(); + final Session session = sf.openSession(); + return session; + } + +} diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java b/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java new file mode 100644 index 0000000000..4db94f2ad7 --- /dev/null +++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java @@ -0,0 +1,253 @@ +/** + * ApplicationViewer is the class that starts the application + * First it creates the session object and then creates the + * criteria query. + * + * @author Pritam Banerjee + * @version 1.0 + * @since 07/20/2016 + */ + +package com.baeldung.hibernate.criteria.view; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.criterion.Criterion; +import org.hibernate.criterion.LogicalExpression; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; + +import com.baeldung.hibernate.criteria.model.Item; +import com.baeldung.hibernate.criteria.util.HibernateUtil; + +public class ApplicationView { + + // default Constructor + public ApplicationView() { + + } + + public boolean checkIfCriteriaTimeLower() { + final Session session = HibernateUtil.getHibernateSession(); + final Criteria cr = session.createCriteria(Item.class); + Transaction tx = null; + + // calculate the time taken by criteria + final long startTimeCriteria = System.nanoTime(); + cr.add(Restrictions.like("itemName", "%item One%")); + final List results = cr.list(); + final long endTimeCriteria = System.nanoTime(); + final long durationCriteria = (endTimeCriteria - startTimeCriteria) / 1000; + + // calculate the time taken by HQL + final long startTimeHQL = System.nanoTime(); + tx = session.beginTransaction(); + final List items = session.createQuery("FROM Item where itemName like '%item One%'").list(); + final long endTimeHQL = System.nanoTime(); + final long durationHQL = (endTimeHQL - startTimeHQL) / 1000; + + if (durationCriteria > durationHQL) { + return false; + } else { + return true; + } + } + + // To get items having price more than 1000 + public String[] greaterThanCriteria() { + final Session session = HibernateUtil.getHibernateSession(); + final Criteria cr = session.createCriteria(Item.class); + cr.add(Restrictions.gt("itemPrice", 1000)); + final List greaterThanItemsList = cr.list(); + final String greaterThanItems[] = new String[greaterThanItemsList.size()]; + for (int i = 0; i < greaterThanItemsList.size(); i++) { + greaterThanItems[i] = greaterThanItemsList.get(i).getItemName(); + } + session.close(); + return greaterThanItems; + } + + // To get items having price less than 1000 + public String[] lessThanCriteria() { + final Session session = HibernateUtil.getHibernateSession(); + final Criteria cr = session.createCriteria(Item.class); + cr.add(Restrictions.lt("itemPrice", 1000)); + final List lessThanItemsList = cr.list(); + final String lessThanItems[] = new String[lessThanItemsList.size()]; + for (int i = 0; i < lessThanItemsList.size(); i++) { + lessThanItems[i] = lessThanItemsList.get(i).getItemName(); + } + session.close(); + return lessThanItems; + } + + // To get items whose Name start with Chair + public String[] likeCriteria() { + final Session session = HibernateUtil.getHibernateSession(); + + final Criteria cr = session.createCriteria(Item.class); + cr.add(Restrictions.like("itemName", "%chair%")); + final List likeItemsList = cr.list(); + final String likeItems[] = new String[likeItemsList.size()]; + for (int i = 0; i < likeItemsList.size(); i++) { + likeItems[i] = likeItemsList.get(i).getItemName(); + } + session.close(); + return likeItems; + } + + // Case sensitive search + public String[] likeCaseCriteria() { + final Session session = HibernateUtil.getHibernateSession(); + final Criteria cr = session.createCriteria(Item.class); + cr.add(Restrictions.ilike("itemName", "%Chair%")); + final List ilikeItemsList = cr.list(); + final String ilikeItems[] = new String[ilikeItemsList.size()]; + for (int i = 0; i < ilikeItemsList.size(); i++) { + ilikeItems[i] = ilikeItemsList.get(i).getItemName(); + } + session.close(); + return ilikeItems; + } + + // To get records having itemPrice in between 100 and 200 + public String[] betweenCriteria() { + final Session session = HibernateUtil.getHibernateSession(); + final Criteria cr = session.createCriteria(Item.class); + // To get items having price more than 1000 + cr.add(Restrictions.between("itemPrice", 100, 200)); + final List betweenItemsList = cr.list(); + final String betweenItems[] = new String[betweenItemsList.size()]; + for (int i = 0; i < betweenItemsList.size(); i++) { + betweenItems[i] = betweenItemsList.get(i).getItemName(); + } + session.close(); + return betweenItems; + } + + // To check if the given property is null + public String[] nullCriteria() { + final Session session = HibernateUtil.getHibernateSession(); + final Criteria cr = session.createCriteria(Item.class); + cr.add(Restrictions.isNull("itemDescription")); + final List nullItemsList = cr.list(); + final String nullDescItems[] = new String[nullItemsList.size()]; + for (int i = 0; i < nullItemsList.size(); i++) { + nullDescItems[i] = nullItemsList.get(i).getItemName(); + } + session.close(); + return nullDescItems; + } + + // To check if the given property is not null + public String[] notNullCriteria() { + final Session session = HibernateUtil.getHibernateSession(); + final Criteria cr = session.createCriteria(Item.class); + cr.add(Restrictions.isNotNull("itemDescription")); + final List notNullItemsList = cr.list(); + final String notNullDescItems[] = new String[notNullItemsList.size()]; + for (int i = 0; i < notNullItemsList.size(); i++) { + notNullDescItems[i] = notNullItemsList.get(i).getItemName(); + } + session.close(); + return notNullDescItems; + } + + // Adding more than one expression in one cr + public String[] twoCriteria() { + final Session session = HibernateUtil.getHibernateSession(); + final Criteria cr = session.createCriteria(Item.class); + cr.add(Restrictions.isNull("itemDescription")); + cr.add(Restrictions.like("itemName", "chair%")); + final List notNullItemsList = cr.list(); + final String notNullDescItems[] = new String[notNullItemsList.size()]; + for (int i = 0; i < notNullItemsList.size(); i++) { + notNullDescItems[i] = notNullItemsList.get(i).getItemName(); + } + session.close(); + return notNullDescItems; + } + + // To get items matching with the above defined conditions joined + // with Logical AND + public String[] andLogicalCriteria() { + final Session session = HibernateUtil.getHibernateSession(); + final Criteria cr = session.createCriteria(Item.class); + final Criterion greaterThanPrice = Restrictions.gt("itemPrice", 1000); + final Criterion chairItems = Restrictions.like("itemName", "Chair%"); + final LogicalExpression andExample = Restrictions.and(greaterThanPrice, chairItems); + cr.add(andExample); + final List andItemsList = cr.list(); + final String andItems[] = new String[andItemsList.size()]; + for (int i = 0; i < andItemsList.size(); i++) { + andItems[i] = andItemsList.get(i).getItemName(); + } + session.close(); + return andItems; + } + + // To get items matching with the above defined conditions joined + // with Logical OR + public String[] orLogicalCriteria() { + final Session session = HibernateUtil.getHibernateSession(); + final Criteria cr = session.createCriteria(Item.class); + final Criterion greaterThanPrice = Restrictions.gt("itemPrice", 1000); + final Criterion chairItems = Restrictions.like("itemName", "Chair%"); + final LogicalExpression orExample = Restrictions.or(greaterThanPrice, chairItems); + cr.add(orExample); + final List orItemsList = cr.list(); + final String orItems[] = new String[orItemsList.size()]; + for (int i = 0; i < orItemsList.size(); i++) { + orItems[i] = orItemsList.get(i).getItemName(); + } + session.close(); + return orItems; + } + + // Sorting example + public String[] sortingCriteria() { + final Session session = HibernateUtil.getHibernateSession(); + final Criteria cr = session.createCriteria(Item.class); + cr.addOrder(Order.asc("itemName")); + cr.addOrder(Order.desc("itemPrice")).list(); + final List sortedItemsList = cr.list(); + final String sortedItems[] = new String[sortedItemsList.size()]; + for (int i = 0; i < sortedItemsList.size(); i++) { + sortedItems[i] = sortedItemsList.get(i).getItemName(); + } + session.close(); + return sortedItems; + } + + // Set projections Row Count + public Long[] projectionRowCount() { + final Session session = HibernateUtil.getHibernateSession(); + final List itemProjected = session.createCriteria(Item.class).setProjection(Projections.rowCount()) + .list(); + final Long projectedRowCount[] = new Long[itemProjected.size()]; + for (int i = 0; i < itemProjected.size(); i++) { + projectedRowCount[i] = itemProjected.get(i); + } + session.close(); + return projectedRowCount; + } + + // Set projections average of itemPrice + public Double[] projectionAverage() { + final Session session = HibernateUtil.getHibernateSession(); + final List avgItemPriceList = session.createCriteria(Item.class) + .setProjection(Projections.projectionList().add(Projections.avg("itemPrice"))).list(); + + final Double avgItemPrice[] = new Double[avgItemPriceList.size()]; + for (int i = 0; i < avgItemPriceList.size(); i++) { + avgItemPrice[i] = (Double) avgItemPriceList.get(i); + } + session.close(); + return avgItemPrice; + } + +} diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/OrderDetail.hbm.xml b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/OrderDetail.hbm.xml new file mode 100644 index 0000000000..e0b6516b47 --- /dev/null +++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/OrderDetail.hbm.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/OrderDetail.java b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/OrderDetail.java new file mode 100644 index 0000000000..19ed36eceb --- /dev/null +++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/OrderDetail.java @@ -0,0 +1,73 @@ +package com.baeldung.hibernate.fetching.model; + +import java.io.Serializable; +import java.sql.Date; + +public class OrderDetail implements Serializable{ + + private static final long serialVersionUID = 1L; + private Long orderId; + private Date orderDate; + private String orderDesc; + private User user; + + public OrderDetail(){ + + } + + public OrderDetail(Date orderDate, String orderDesc) { + super(); + this.orderDate = orderDate; + this.orderDesc = orderDesc; + } + + public Date getOrderDate() { + return orderDate; + } + public void setOrderDate(Date orderDate) { + this.orderDate = orderDate; + } + public String getOrderDesc() { + return orderDesc; + } + public void setOrderDesc(String orderDesc) { + this.orderDesc = orderDesc; + } + public User getUser() { + return user; + } + public void setUser(User user) { + this.user = user; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((orderId == null) ? 0 : orderId.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + OrderDetail other = (OrderDetail) obj; + if (orderId == null) { + if (other.orderId != null) + return false; + } else if (!orderId.equals(other.orderId)) + return false; + + return true; + } + public Long getOrderId() { + return orderId; + } + public void setOrderId(Long orderId) { + this.orderId = orderId; + } + +} diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/User.hbm.xml b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/User.hbm.xml new file mode 100644 index 0000000000..88882b973e --- /dev/null +++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/User.hbm.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/User.java b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/User.java new file mode 100644 index 0000000000..eb98b7d0f9 --- /dev/null +++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/User.java @@ -0,0 +1,96 @@ +package com.baeldung.hibernate.fetching.model; + +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +public class User implements Serializable { + + private static final long serialVersionUID = 1L; + private Long userId; + private String userName; + private String firstName; + private String lastName; + private Set orderDetail = new HashSet(); + + public User() { + + } + + public User(final Long userId, final String userName, final String firstName, final String lastName) { + super(); + this.userId = userId; + this.userName = userName; + this.firstName = firstName; + this.lastName = lastName; + + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((userId == null) ? 0 : userId.hashCode()); + return result; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final User other = (User) obj; + if (userId == null) { + if (other.userId != null) + return false; + } else if (!userId.equals(other.userId)) + return false; + return true; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(final Long userId) { + this.userId = userId; + } + + public String getUserName() { + return userName; + } + + public void setUserName(final String userName) { + this.userName = userName; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(final String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(final String lastName) { + this.lastName = lastName; + } + + public Set getOrderDetail() { + return orderDetail; + } + + public void setOrderDetail(Set orderDetail) { + this.orderDetail = orderDetail; + } + + + +} diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/UserLazy.hbm.xml b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/UserLazy.hbm.xml new file mode 100644 index 0000000000..2f941fe8b0 --- /dev/null +++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/UserLazy.hbm.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/util/HibernateUtil.java b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/util/HibernateUtil.java new file mode 100644 index 0000000000..c6b095dde2 --- /dev/null +++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/util/HibernateUtil.java @@ -0,0 +1,35 @@ +package com.baeldung.hibernate.fetching.util; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.cfg.Configuration; + +public class HibernateUtil { + private static SessionFactory factory; + + @SuppressWarnings("deprecation") + public static Session getHibernateSession(String fetchMethod) { + //two config files are there + //one with lazy loading enabled + //another lazy = false + SessionFactory sf = null; + if ("lazy".equals(fetchMethod)) { + sf = new Configuration().configure("fetchingLazy.cfg.xml").buildSessionFactory(); + } else { + + sf = new Configuration().configure("fetching.cfg.xml").buildSessionFactory(); + } + // fetching.cfg.xml is used for this example + final Session session = sf.openSession(); + return session; + } + + public static Session getHibernateSession() { + System.out.println("Loading eager"); + SessionFactory sf = null; + sf = new Configuration().configure("fetching.cfg.xml").buildSessionFactory(); + final Session session = sf.openSession(); + return session; + } + +} diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/view/FetchingAppView.java b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/view/FetchingAppView.java new file mode 100644 index 0000000000..5e4ab32d03 --- /dev/null +++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/view/FetchingAppView.java @@ -0,0 +1,115 @@ +package com.baeldung.hibernate.fetching.view; + +import java.sql.Date; +import java.util.List; +import java.util.Set; + +import org.hibernate.Hibernate; +import org.hibernate.Session; +import org.hibernate.Transaction; + + +import com.baeldung.hibernate.fetching.util.HibernateUtil; + +import com.baeldung.hibernate.fetching.model.OrderDetail; + +import com.baeldung.hibernate.fetching.model.User; + + +public class FetchingAppView { + + public FetchingAppView(){ + + } + + //lazily loaded + public boolean lazyLoaded(){ + final Session sessionLazy = HibernateUtil.getHibernateSession("lazy"); + List users = sessionLazy.createQuery("From User").list(); + User userLazyLoaded = new User(); + userLazyLoaded = users.get(3); + //since data is lazyloaded so data won't be initialized + Set orderDetailSet = userLazyLoaded.getOrderDetail(); + return (Hibernate.isInitialized(orderDetailSet)); + } + + //eagerly loaded + public boolean eagerLoaded(){ + final Session sessionEager = HibernateUtil.getHibernateSession(); + //data should be loaded in the following line + //also note the queries generated + List users =sessionEager.createQuery("From User").list(); + User userEagerLoaded = new User(); + userEagerLoaded = users.get(3); + Set orderDetailSet = userEagerLoaded.getOrderDetail(); + return (Hibernate.isInitialized(orderDetailSet)); + } + + + //creates test data + //call this method to create the data in the database + public void createTestData() { + + final Session session = HibernateUtil.getHibernateSession(); + + Transaction tx = null; + + tx = session.beginTransaction(); + final User user1 = new User(); + final User user2 = new User(); + final User user3 = new User(); + + user1.setFirstName("Priyam"); + user1.setLastName("Banerjee"); + user1.setUserName("priyambanerjee"); + session.save(user1); + + user2.setFirstName("Navneeta"); + user2.setLastName("Mukherjee"); + user2.setUserName("nmukh"); + session.save(user2); + + user3.setFirstName("Molly"); + user3.setLastName("Banerjee"); + user3.setUserName("mollyb"); + session.save(user3); + + final OrderDetail order1 = new OrderDetail(); + final OrderDetail order2 = new OrderDetail(); + final OrderDetail order3 = new OrderDetail(); + final OrderDetail order4 = new OrderDetail(); + final OrderDetail order5 = new OrderDetail(); + + order1.setOrderDesc("First Order"); + order1.setOrderDate(new Date(2014, 10, 12)); + order1.setUser(user1); + + order2.setOrderDesc("Second Order"); + order2.setOrderDate(new Date(2016, 10, 25)); + order2.setUser(user1); + + order3.setOrderDesc("Third Order"); + order3.setOrderDate(new Date(2015, 2, 17)); + order3.setUser(user2); + + order4.setOrderDesc("Fourth Order"); + order4.setOrderDate(new Date(2014, 10, 1)); + order4.setUser(user2); + + order5.setOrderDesc("Fifth Order"); + order5.setOrderDate(new Date(2014, 9, 11)); + order5.setUser(user3); + + + session.saveOrUpdate(order1); + session.saveOrUpdate(order2); + session.saveOrUpdate(order3); + session.saveOrUpdate(order4); + session.saveOrUpdate(order5); + + // session.saveOrUpdate(user1); + tx.commit(); + session.close(); + + } +} diff --git a/spring-hibernate4/src/main/resources/criteria.cfg.xml b/spring-hibernate4/src/main/resources/criteria.cfg.xml new file mode 100644 index 0000000000..a39a32e151 --- /dev/null +++ b/spring-hibernate4/src/main/resources/criteria.cfg.xml @@ -0,0 +1,17 @@ + + + + + + + com.mysql.jdbc.Driver + jdbc:mysql://localhost:3306/test + root + iamtheking + org.hibernate.dialect.MySQLDialect + true + + + \ No newline at end of file diff --git a/spring-hibernate4/src/main/resources/criteria_create_queries.sql b/spring-hibernate4/src/main/resources/criteria_create_queries.sql new file mode 100644 index 0000000000..3a627dd38c --- /dev/null +++ b/spring-hibernate4/src/main/resources/criteria_create_queries.sql @@ -0,0 +1,7 @@ +CREATE TABLE `item` ( + `ITEM_ID` int(11) NOT NULL AUTO_INCREMENT, + `ITEM_DESC` varchar(100) DEFAULT NULL, + `ITEM_PRICE` int(11) NOT NULL, + `ITEM_NAME` varchar(255) NOT NULL, + PRIMARY KEY (`ITEM_ID`) +) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=latin1; diff --git a/spring-hibernate4/src/main/resources/fetching.cfg.xml b/spring-hibernate4/src/main/resources/fetching.cfg.xml new file mode 100644 index 0000000000..1595c829cd --- /dev/null +++ b/spring-hibernate4/src/main/resources/fetching.cfg.xml @@ -0,0 +1,16 @@ + + + + + + com.mysql.jdbc.Driver + jdbc:mysql://localhost:3306/test + root + iamtheking + org.hibernate.dialect.MySQLDialect + + + + \ No newline at end of file diff --git a/spring-hibernate4/src/main/resources/fetchingLazy.cfg.xml b/spring-hibernate4/src/main/resources/fetchingLazy.cfg.xml new file mode 100644 index 0000000000..4c64b4deb6 --- /dev/null +++ b/spring-hibernate4/src/main/resources/fetchingLazy.cfg.xml @@ -0,0 +1,16 @@ + + + + + + com.mysql.jdbc.Driver + jdbc:mysql://localhost:3306/test + root + iamtheking + org.hibernate.dialect.MySQLDialect + + + + \ No newline at end of file diff --git a/spring-hibernate4/src/main/resources/fetching_create_queries.sql b/spring-hibernate4/src/main/resources/fetching_create_queries.sql new file mode 100644 index 0000000000..11a4239e0d --- /dev/null +++ b/spring-hibernate4/src/main/resources/fetching_create_queries.sql @@ -0,0 +1,19 @@ +CREATE TABLE `user` ( + `user_id` int(10) NOT NULL AUTO_INCREMENT, + `USERNAME` varchar(100) DEFAULT NULL, + `FIRST_NAME` varchar(255) NOT NULL, + `LAST_NAME` varchar(255) NOT NULL, + PRIMARY KEY (`user_id`) +) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=latin1 ; + + +CREATE TABLE `user_order` ( + `ORDER_ID` int(10) NOT NULL AUTO_INCREMENT, + `ORDER_DATE` date DEFAULT NULL, + `USER_ID` int(10) NOT NULL DEFAULT '0', + `ORDER_DESC` varchar(1024) DEFAULT NULL, + PRIMARY KEY (`ORDER_ID`,`USER_ID`), + KEY `USER_ID` (`USER_ID`), + CONSTRAINT `user_order_ibfk_1` FOREIGN KEY (`USER_ID`) REFERENCES `USER` (`user_id`) +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1; + diff --git a/spring-hibernate4/src/main/resources/insert_statements.sql b/spring-hibernate4/src/main/resources/insert_statements.sql new file mode 100644 index 0000000000..ae008f29bc --- /dev/null +++ b/spring-hibernate4/src/main/resources/insert_statements.sql @@ -0,0 +1,31 @@ +insert into item (item_id, item_name, item_desc, item_price) +values(1,'item One', 'test 1', 35.12); + +insert into item (item_id, item_name, item_desc, item_price) +values(2,'Pogo stick', 'Pogo stick', 466.12); +insert into item (item_id, item_name, item_desc, item_price) +values(3,'Raft', 'Raft', 345.12); + +insert into item (item_id, item_name, item_desc, item_price) +values(4,'Skate Board', 'Skating', 135.71); + +insert into item (item_id, item_name, item_desc, item_price) +values(5,'Umbrella', 'Umbrella for Rain', 619.25); + +insert into item (item_id, item_name, item_desc, item_price) +values(6,'Glue', 'Glue for home', 432.73); + +insert into item (item_id, item_name, item_desc, item_price) +values(7,'Paint', 'Paint for Room', 1311.40); + +insert into item (item_id, item_name, item_desc, item_price) +values(8,'Red paint', 'Red paint for room', 1135.71); + +insert into item (item_id, item_name, item_desc, item_price) +values(9,'Household Chairs', 'Chairs for house', 25.71); + +insert into item (item_id, item_name, item_desc, item_price) +values(10,'Office Chairs', 'Chairs for office', 395.98); + +insert into item (item_id, item_name, item_desc, item_price) +values(11,'Outdoor Chairs', 'Chairs for outdoor activities', 1234.36); diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTest.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTest.java new file mode 100644 index 0000000000..3bd8c5ee00 --- /dev/null +++ b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTest.java @@ -0,0 +1,191 @@ +package com.baeldung.hibernate.criteria; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertTrue; + +import java.util.List; + +import org.hibernate.Session; +import org.junit.Test; + +import com.baeldung.hibernate.criteria.model.Item; +import com.baeldung.hibernate.criteria.util.HibernateUtil; +import com.baeldung.hibernate.criteria.view.ApplicationView; + +public class HibernateCriteriaTest { + + final private ApplicationView av = new ApplicationView(); + + @Test + public void testPerformanceOfCriteria() { + assertTrue(av.checkIfCriteriaTimeLower()); + } + + @Test + public void testLikeCriteriaQuery() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedLikeList = session.createQuery("From Item where itemName like '%chair%'").list(); + final String expectedLikeItems[] = new String[expectedLikeList.size()]; + for (int i = 0; i < expectedLikeList.size(); i++) { + expectedLikeItems[i] = expectedLikeList.get(i).getItemName(); + } + session.close(); + assertArrayEquals(expectedLikeItems, av.likeCriteria()); + } + + @Test + public void testILikeCriteriaQuery() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedChairCaseList = session.createQuery("From Item where itemName like '%Chair%'").list(); + final String expectedChairCaseItems[] = new String[expectedChairCaseList.size()]; + for (int i = 0; i < expectedChairCaseList.size(); i++) { + expectedChairCaseItems[i] = expectedChairCaseList.get(i).getItemName(); + } + session.close(); + assertArrayEquals(expectedChairCaseItems, av.likeCaseCriteria()); + + } + + @Test + public void testNullCriteriaQuery() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedIsNullDescItemsList = session.createQuery("From Item where itemDescription is null") + .list(); + final String expectedIsNullDescItems[] = new String[expectedIsNullDescItemsList.size()]; + for (int i = 0; i < expectedIsNullDescItemsList.size(); i++) { + expectedIsNullDescItems[i] = expectedIsNullDescItemsList.get(i).getItemName(); + } + session.close(); + assertArrayEquals(expectedIsNullDescItems, av.nullCriteria()); + } + + @Test + public void testIsNotNullCriteriaQuery() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedIsNotNullDescItemsList = session + .createQuery("From Item where itemDescription is not null").list(); + final String expectedIsNotNullDescItems[] = new String[expectedIsNotNullDescItemsList.size()]; + for (int i = 0; i < expectedIsNotNullDescItemsList.size(); i++) { + expectedIsNotNullDescItems[i] = expectedIsNotNullDescItemsList.get(i).getItemName(); + } + session.close(); + assertArrayEquals(expectedIsNotNullDescItems, av.notNullCriteria()); + + } + + @Test + public void testAverageProjection() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedAvgProjItemsList = session.createQuery("Select avg(itemPrice) from Item item") + .list(); + + final Double expectedAvgProjItems[] = new Double[expectedAvgProjItemsList.size()]; + for (int i = 0; i < expectedAvgProjItemsList.size(); i++) { + expectedAvgProjItems[i] = expectedAvgProjItemsList.get(i); + } + session.close(); + assertArrayEquals(expectedAvgProjItems, av.projectionAverage()); + + } + + @Test + public void testRowCountProjection() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedCountProjItemsList = session.createQuery("Select count(*) from Item").list(); + final Long expectedCountProjItems[] = new Long[expectedCountProjItemsList.size()]; + for (int i = 0; i < expectedCountProjItemsList.size(); i++) { + expectedCountProjItems[i] = expectedCountProjItemsList.get(i); + } + session.close(); + assertArrayEquals(expectedCountProjItems, av.projectionRowCount()); + } + + @Test + public void testOrCriteriaQuery() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedOrCritItemsList = session + .createQuery("From Item where itemPrice>1000 or itemName like 'Chair%'").list(); + final String expectedOrCritItems[] = new String[expectedOrCritItemsList.size()]; + for (int i = 0; i < expectedOrCritItemsList.size(); i++) { + expectedOrCritItems[i] = expectedOrCritItemsList.get(i).getItemName(); + } + session.close(); + assertArrayEquals(expectedOrCritItems, av.orLogicalCriteria()); + } + + @Test + public void testAndCriteriaQuery() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedAndCritItemsList = session + .createQuery("From Item where itemPrice>1000 and itemName like 'Chair%'").list(); + final String expectedAndCritItems[] = new String[expectedAndCritItemsList.size()]; + for (int i = 0; i < expectedAndCritItemsList.size(); i++) { + expectedAndCritItems[i] = expectedAndCritItemsList.get(i).getItemName(); + } + session.close(); + assertArrayEquals(expectedAndCritItems, av.andLogicalCriteria()); + } + + @Test + public void testMultiCriteriaQuery() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedMultiCritItemsList = session + .createQuery("From Item where itemDescription is null and itemName like'chair%'").list(); + final String expectedMultiCritItems[] = new String[expectedMultiCritItemsList.size()]; + for (int i = 0; i < expectedMultiCritItemsList.size(); i++) { + expectedMultiCritItems[i] = expectedMultiCritItemsList.get(i).getItemName(); + } + session.close(); + assertArrayEquals(expectedMultiCritItems, av.twoCriteria()); + } + + @Test + public void testSortCriteriaQuery() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedSortCritItemsList = session + .createQuery("From Item order by itemName asc, itemPrice desc").list(); + final String expectedSortCritItems[] = new String[expectedSortCritItemsList.size()]; + for (int i = 0; i < expectedSortCritItemsList.size(); i++) { + expectedSortCritItems[i] = expectedSortCritItemsList.get(i).getItemName(); + } + session.close(); + assertArrayEquals(expectedSortCritItems, av.sortingCriteria()); + } + + @Test + public void testGreaterThanCriteriaQuery() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedGreaterThanList = session.createQuery("From Item where itemPrice>1000").list(); + final String expectedGreaterThanItems[] = new String[expectedGreaterThanList.size()]; + for (int i = 0; i < expectedGreaterThanList.size(); i++) { + expectedGreaterThanItems[i] = expectedGreaterThanList.get(i).getItemName(); + } + session.close(); + assertArrayEquals(expectedGreaterThanItems, av.greaterThanCriteria()); + } + + @Test + public void testLessThanCriteriaQuery() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedLessList = session.createQuery("From Item where itemPrice<1000").list(); + final String expectedLessThanItems[] = new String[expectedLessList.size()]; + for (int i = 0; i < expectedLessList.size(); i++) { + expectedLessThanItems[i] = expectedLessList.get(i).getItemName(); + } + session.close(); + assertArrayEquals(expectedLessThanItems, av.lessThanCriteria()); + } + + @Test + public void betweenCriteriaQuery() { + final Session session = HibernateUtil.getHibernateSession(); + final List expectedBetweenList = session.createQuery("From Item where itemPrice between 100 and 200") + .list(); + final String expectedPriceBetweenItems[] = new String[expectedBetweenList.size()]; + for (int i = 0; i < expectedBetweenList.size(); i++) { + expectedPriceBetweenItems[i] = expectedBetweenList.get(i).getItemName(); + } + session.close(); + assertArrayEquals(expectedPriceBetweenItems, av.betweenCriteria()); + } +} diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java new file mode 100644 index 0000000000..8341df9fcb --- /dev/null +++ b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java @@ -0,0 +1,15 @@ +package com.baeldung.hibernate.criteria; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; + +public class HibernateCriteriaTestRunner { + + public static void main(final String[] args) { + Result result = JUnitCore.runClasses(HibernateCriteriaTestSuite.class); + for (Failure failure : result.getFailures()) { + + } + } +} diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java new file mode 100644 index 0000000000..ab27a6ba82 --- /dev/null +++ b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java @@ -0,0 +1,11 @@ +package com.baeldung.hibernate.criteria; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({ HibernateCriteriaTest.class }) + +public class HibernateCriteriaTestSuite { + +} diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java new file mode 100644 index 0000000000..94ee8a3c79 --- /dev/null +++ b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java @@ -0,0 +1,24 @@ +package com.baeldung.hibernate.fetching; + +import static org.junit.Assert.*; + +import org.junit.Test; + +import com.baeldung.hibernate.fetching.view.FetchingAppView; + +public class HibernateFetchingTest { + + @Test + public void testLazyFetching() { + FetchingAppView fav = new FetchingAppView(); + fav.createTestData(); + assertFalse(fav.lazyLoaded()); + } + + @Test + public void testEagerFetching() { + FetchingAppView fav = new FetchingAppView(); + assertTrue(fav.eagerLoaded()); + } + +} diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestRunner.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestRunner.java new file mode 100644 index 0000000000..82cf7acc40 --- /dev/null +++ b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestRunner.java @@ -0,0 +1,17 @@ +package com.baeldung.hibernate.fetching; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; + +public class HibernateFetchingTestRunner { + + public static void main(final String[] args) { + + Result result = JUnitCore.runClasses(HibernateFetchingTestSuite.class); + for (Failure failure : result.getFailures()) { + + } + + } +} diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestSuite.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestSuite.java new file mode 100644 index 0000000000..b3f0aea620 --- /dev/null +++ b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestSuite.java @@ -0,0 +1,11 @@ +package com.baeldung.hibernate.fetching; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + + +@RunWith(Suite.class) +@Suite.SuiteClasses({ HibernateFetchingTest.class }) +public class HibernateFetchingTestSuite { + +} diff --git a/spring-hibernate4/src/test/java/criteria.cfg.xml b/spring-hibernate4/src/test/java/criteria.cfg.xml new file mode 100644 index 0000000000..653b5a188a --- /dev/null +++ b/spring-hibernate4/src/test/java/criteria.cfg.xml @@ -0,0 +1,16 @@ + + + + + + com.mysql.jdbc.Driver + jdbc:mysql://localhost:3306/test + root + iamtheking + org.hibernate.dialect.MySQLDialect + true + + + \ No newline at end of file diff --git a/spring-hibernate4/src/test/java/hibernate.cfg.xml b/spring-hibernate4/src/test/java/hibernate.cfg.xml deleted file mode 100644 index 2167eada16..0000000000 --- a/spring-hibernate4/src/test/java/hibernate.cfg.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - -com.mysql.jdbc.Driver -jdbc:mysql://localhost:3306/HIBERTEST2_TEST -root - - - -1 - - -org.hibernate.dialect.MySQLDialect - - -thread - - -org.hibernate.cache.internal.NoCacheProvider - - -true - - - - - - - From da2ef4f4e70b91179eae895a63042b8474d5589a Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 10 Aug 2016 11:48:21 +0200 Subject: [PATCH 32/41] Move hbm files to resources folder --- .../criteria/HibernateCriteriaTestRunner.java | 15 ------------ .../criteria/HibernateCriteriaTestSuite.java | 11 --------- .../fetching/HibernateFetchingTest.java | 24 ------------------- .../fetching/HibernateFetchingTestRunner.java | 17 ------------- .../fetching/HibernateFetchingTestSuite.java | 11 --------- .../hibernate/criteria/model/Item.hbm.xml | 0 .../test/{java => resources}/criteria.cfg.xml | 0 7 files changed, 78 deletions(-) delete mode 100644 spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java delete mode 100644 spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java delete mode 100644 spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java delete mode 100644 spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestRunner.java delete mode 100644 spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestSuite.java rename spring-hibernate4/src/{main/java => test/resources}/com/baeldung/hibernate/criteria/model/Item.hbm.xml (100%) rename spring-hibernate4/src/test/{java => resources}/criteria.cfg.xml (100%) diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java deleted file mode 100644 index 8341df9fcb..0000000000 --- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung.hibernate.criteria; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; - -public class HibernateCriteriaTestRunner { - - public static void main(final String[] args) { - Result result = JUnitCore.runClasses(HibernateCriteriaTestSuite.class); - for (Failure failure : result.getFailures()) { - - } - } -} diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java deleted file mode 100644 index ab27a6ba82..0000000000 --- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.baeldung.hibernate.criteria; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ HibernateCriteriaTest.class }) - -public class HibernateCriteriaTestSuite { - -} diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java deleted file mode 100644 index 94ee8a3c79..0000000000 --- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baeldung.hibernate.fetching; - -import static org.junit.Assert.*; - -import org.junit.Test; - -import com.baeldung.hibernate.fetching.view.FetchingAppView; - -public class HibernateFetchingTest { - - @Test - public void testLazyFetching() { - FetchingAppView fav = new FetchingAppView(); - fav.createTestData(); - assertFalse(fav.lazyLoaded()); - } - - @Test - public void testEagerFetching() { - FetchingAppView fav = new FetchingAppView(); - assertTrue(fav.eagerLoaded()); - } - -} diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestRunner.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestRunner.java deleted file mode 100644 index 82cf7acc40..0000000000 --- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestRunner.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung.hibernate.fetching; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; - -public class HibernateFetchingTestRunner { - - public static void main(final String[] args) { - - Result result = JUnitCore.runClasses(HibernateFetchingTestSuite.class); - for (Failure failure : result.getFailures()) { - - } - - } -} diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestSuite.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestSuite.java deleted file mode 100644 index b3f0aea620..0000000000 --- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTestSuite.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.baeldung.hibernate.fetching; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - - -@RunWith(Suite.class) -@Suite.SuiteClasses({ HibernateFetchingTest.class }) -public class HibernateFetchingTestSuite { - -} diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.hbm.xml b/spring-hibernate4/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml similarity index 100% rename from spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/model/Item.hbm.xml rename to spring-hibernate4/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml diff --git a/spring-hibernate4/src/test/java/criteria.cfg.xml b/spring-hibernate4/src/test/resources/criteria.cfg.xml similarity index 100% rename from spring-hibernate4/src/test/java/criteria.cfg.xml rename to spring-hibernate4/src/test/resources/criteria.cfg.xml From a0b086c4c3bf2af6ee71cc8972fdbc75cbbcff6f Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 10 Aug 2016 18:54:56 +0200 Subject: [PATCH 33/41] Refactor ActorGson --- .../org/baeldung/gson/entities/ActorGson.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java b/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java index d2c0a8782c..20640cf347 100644 --- a/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java +++ b/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java @@ -5,15 +5,18 @@ import java.util.List; public class ActorGson { - @Override - public String toString() { - return "ActorGson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]"; - } - private String imdbId; private Date dateOfBirth; private List filmography; + public ActorGson(String imdbId, Date dateOfBirth, List filmography) { + super(); + this.imdbId = imdbId; + this.dateOfBirth = dateOfBirth; + this.filmography = filmography; + } + + public String getImdbId() { return imdbId; } @@ -38,11 +41,8 @@ public class ActorGson { this.filmography = filmography; } - public ActorGson(String imdbId, Date dateOfBirth, List filmography) { - super(); - this.imdbId = imdbId; - this.dateOfBirth = dateOfBirth; - this.filmography = filmography; + @Override + public String toString() { + return "ActorGson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]"; } - } \ No newline at end of file From fa6f482f2a7acb558e47cf6ea9e413750369f058 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 10 Aug 2016 18:56:51 +0200 Subject: [PATCH 34/41] Refactor Gson examples --- .../org/baeldung/gson/entities/ActorGson.java | 9 +++++---- .../java/org/baeldung/gson/entities/Movie.java | 12 +++++++----- .../gson/entities/MovieWithNullValue.java | 5 +++-- .../serialization/ActorGsonDeserializer.java | 18 +++--------------- .../serialization/ActorGsonSerializer.java | 13 ++++++------- 5 files changed, 24 insertions(+), 33 deletions(-) diff --git a/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java b/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java index 20640cf347..5bbf776705 100644 --- a/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java +++ b/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java @@ -16,6 +16,10 @@ public class ActorGson { this.filmography = filmography; } + @Override + public String toString() { + return "ActorGson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]"; + } public String getImdbId() { return imdbId; @@ -41,8 +45,5 @@ public class ActorGson { this.filmography = filmography; } - @Override - public String toString() { - return "ActorGson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]"; - } + } \ No newline at end of file diff --git a/gson/src/main/java/org/baeldung/gson/entities/Movie.java b/gson/src/main/java/org/baeldung/gson/entities/Movie.java index d7a46cd146..ee688f228d 100644 --- a/gson/src/main/java/org/baeldung/gson/entities/Movie.java +++ b/gson/src/main/java/org/baeldung/gson/entities/Movie.java @@ -4,11 +4,6 @@ import java.util.List; public class Movie { - @Override - public String toString() { - return "Movie [imdbId=" + imdbId + ", director=" + director + ", actors=" + actors + "]"; - } - private String imdbId; private String director; private List actors; @@ -20,6 +15,11 @@ public class Movie { this.actors = actors; } + @Override + public String toString() { + return "Movie [imdbId=" + imdbId + ", director=" + director + ", actors=" + actors + "]"; + } + public String getImdbID() { return imdbId; } @@ -43,4 +43,6 @@ public class Movie { public void setActors(List actors) { this.actors = actors; } + + } \ No newline at end of file diff --git a/gson/src/main/java/org/baeldung/gson/entities/MovieWithNullValue.java b/gson/src/main/java/org/baeldung/gson/entities/MovieWithNullValue.java index 227e7dc2be..fe62d51ffb 100644 --- a/gson/src/main/java/org/baeldung/gson/entities/MovieWithNullValue.java +++ b/gson/src/main/java/org/baeldung/gson/entities/MovieWithNullValue.java @@ -1,14 +1,15 @@ package org.baeldung.gson.entities; -import java.util.List; - import com.google.gson.annotations.Expose; +import java.util.List; + public class MovieWithNullValue { @Expose private String imdbId; private String director; + @Expose private List actors; diff --git a/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonDeserializer.java b/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonDeserializer.java index 59ac49a847..70a03500d5 100644 --- a/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonDeserializer.java +++ b/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonDeserializer.java @@ -1,24 +1,12 @@ package org.baeldung.gson.serialization; +import com.google.gson.*; +import org.baeldung.gson.entities.ActorGson; + import java.lang.reflect.Type; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.ZoneId; import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.TimeZone; -import java.util.stream.Collectors; - -import org.baeldung.gson.entities.ActorGson; - -import com.google.gson.JsonArray; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; public class ActorGsonDeserializer implements JsonDeserializer { diff --git a/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonSerializer.java b/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonSerializer.java index 09788cd65a..8f2cd10f5a 100644 --- a/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonSerializer.java +++ b/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonSerializer.java @@ -1,16 +1,15 @@ package org.baeldung.gson.serialization; -import java.lang.reflect.Type; -import java.text.SimpleDateFormat; -import java.util.List; -import java.util.stream.Collectors; - -import org.baeldung.gson.entities.ActorGson; - import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; +import org.baeldung.gson.entities.ActorGson; + +import java.lang.reflect.Type; +import java.text.SimpleDateFormat; +import java.util.List; +import java.util.stream.Collectors; public class ActorGsonSerializer implements JsonSerializer { From 8a104053d6ed9845857ed365bb3e59d694512fcc Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 10 Aug 2016 19:06:35 +0200 Subject: [PATCH 35/41] Refactor Jackson examples --- .../jackson/entities/ActorJackson.java | 35 +++++++++---------- .../jackson/entities/MovieWithNullValue.java | 5 ++- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/jackson/src/main/java/org/baeldung/jackson/entities/ActorJackson.java b/jackson/src/main/java/org/baeldung/jackson/entities/ActorJackson.java index 7d9d6549c0..68cd6117d6 100644 --- a/jackson/src/main/java/org/baeldung/jackson/entities/ActorJackson.java +++ b/jackson/src/main/java/org/baeldung/jackson/entities/ActorJackson.java @@ -3,14 +3,28 @@ package org.baeldung.jackson.entities; import java.util.Date; import java.util.List; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - public class ActorJackson { private String imdbId; private Date dateOfBirth; private List filmography; + public ActorJackson() { + super(); + } + + public ActorJackson(String imdbId, Date dateOfBirth, List filmography) { + super(); + this.imdbId = imdbId; + this.dateOfBirth = dateOfBirth; + this.filmography = filmography; + } + + @Override + public String toString() { + return "ActorJackson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]"; + } + public String getImdbId() { return imdbId; } @@ -35,21 +49,4 @@ public class ActorJackson { this.filmography = filmography; } - public ActorJackson(String imdbId, Date dateOfBirth, List filmography) { - super(); - this.imdbId = imdbId; - this.dateOfBirth = dateOfBirth; - this.filmography = filmography; - } - - public ActorJackson() { - - super(); - } - - @Override - public String toString() { - return "ActorJackson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]"; - } - } diff --git a/jackson/src/main/java/org/baeldung/jackson/entities/MovieWithNullValue.java b/jackson/src/main/java/org/baeldung/jackson/entities/MovieWithNullValue.java index d04d37c947..23f5de2858 100644 --- a/jackson/src/main/java/org/baeldung/jackson/entities/MovieWithNullValue.java +++ b/jackson/src/main/java/org/baeldung/jackson/entities/MovieWithNullValue.java @@ -1,9 +1,8 @@ package org.baeldung.jackson.entities; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonIgnore; -import com.google.gson.annotations.Expose; + +import java.util.List; public class MovieWithNullValue { From 2817953d0b7d8546f461ebf831e52f4d6db7954a Mon Sep 17 00:00:00 2001 From: lor6 Date: Wed, 10 Aug 2016 22:05:35 +0300 Subject: [PATCH 36/41] Non transient exception (#593) * non transient data access exception examples * change to derby db * change to in memory derby db * delete failed test * fix invalidresource test * fix cleanupfailure test * more exception examples --- .../cause/Cause5NonTransientConfig.java | 75 +++++++++++++++++++ .../persistence-mysql-incorrect.properties | 10 +++ .../CannotGetJdbcConnectionExceptionTest.java | 31 ++++++++ .../CleanupFailureExceptionTest.java | 43 ----------- .../DataIntegrityExceptionTest.java | 20 +++++ .../DataRetrievalExceptionTest.java | 25 +++++++ 6 files changed, 161 insertions(+), 43 deletions(-) create mode 100644 spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java create mode 100644 spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties create mode 100644 spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/CannotGetJdbcConnectionExceptionTest.java delete mode 100644 spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/CleanupFailureExceptionTest.java diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java b/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java new file mode 100644 index 0000000000..6d5d998c5b --- /dev/null +++ b/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java @@ -0,0 +1,75 @@ +package org.baeldung.ex.nontransientexception.cause; + +import java.util.Properties; + +import javax.sql.DataSource; + +import org.apache.tomcat.dbcp.dbcp.BasicDataSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.core.env.Environment; +import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor; +import org.springframework.orm.hibernate4.HibernateTransactionManager; +import org.springframework.orm.hibernate4.LocalSessionFactoryBean; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import com.google.common.base.Preconditions; + +@Configuration +@EnableTransactionManagement +@PropertySource({ "classpath:persistence-mysql-incorrect.properties" }) +@ComponentScan({ "org.baeldung.persistence" }) +public class Cause5NonTransientConfig { + + @Autowired + private Environment env; + + public Cause5NonTransientConfig() { + super(); + } + + @Bean + public LocalSessionFactoryBean sessionFactory() { + final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean(); + sessionFactory.setDataSource(restDataSource()); + sessionFactory.setPackagesToScan(new String[] { "org.baeldung.persistence.model" }); + sessionFactory.setHibernateProperties(hibernateProperties()); + + return sessionFactory; + } + + @Bean + public DataSource restDataSource() { + final BasicDataSource dataSource = new BasicDataSource(); + dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName"))); + dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url"))); + dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user"))); + dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass"))); + + return dataSource; + } + + @Bean + public HibernateTransactionManager transactionManager() { + final HibernateTransactionManager txManager = new HibernateTransactionManager(); + txManager.setSessionFactory(sessionFactory().getObject()); + + return txManager; + } + + @Bean + public PersistenceExceptionTranslationPostProcessor exceptionTranslation() { + return new PersistenceExceptionTranslationPostProcessor(); + } + + final Properties hibernateProperties() { + final Properties hibernateProperties = new Properties(); + hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto")); + hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect")); + // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true"); + return hibernateProperties; + } +} diff --git a/spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties b/spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties new file mode 100644 index 0000000000..b5b8095104 --- /dev/null +++ b/spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties @@ -0,0 +1,10 @@ +# jdbc.X +jdbc.driverClassName=com.mysql.jdbc.Driver +jdbc.url=jdbc:mysql:3306://localhost/spring_hibernate4_exceptions?createDatabaseIfNotExist=true +jdbc.user=tutorialuser +jdbc.pass=tutorialmy5ql + +# hibernate.X +hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +hibernate.show_sql=false +hibernate.hbm2ddl.auto=create diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/CannotGetJdbcConnectionExceptionTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/CannotGetJdbcConnectionExceptionTest.java new file mode 100644 index 0000000000..7a1804ec49 --- /dev/null +++ b/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/CannotGetJdbcConnectionExceptionTest.java @@ -0,0 +1,31 @@ +package org.baeldung.ex.nontransientdataaccessexception; + +import javax.sql.DataSource; + +import org.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig; +import org.baeldung.ex.nontransientexception.cause.Cause5NonTransientConfig; +import org.baeldung.persistence.model.Foo; +import org.baeldung.persistence.service.IFooService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.jdbc.CannotGetJdbcConnectionException; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { Cause5NonTransientConfig.class }, loader = AnnotationConfigContextLoader.class) +public class CannotGetJdbcConnectionExceptionTest { + + @Autowired + private DataSource restDataSource; + + @Test(expected = CannotGetJdbcConnectionException.class) + public void whenJdbcUrlIncorrect_thenCannotGetJdbcConnectionException() { + JdbcTemplate jdbcTemplate = new JdbcTemplate(restDataSource); + jdbcTemplate.execute("select * from foo"); + } +} diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/CleanupFailureExceptionTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/CleanupFailureExceptionTest.java deleted file mode 100644 index 32897e9e35..0000000000 --- a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/CleanupFailureExceptionTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.baeldung.ex.nontransientdataaccessexception; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig; -import org.baeldung.persistence.model.Foo; -import org.baeldung.persistence.service.IFooService; -import org.hibernate.SessionFactory; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.CleanupFailureDataAccessException; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { Cause1NonTransientConfig.class }, loader = AnnotationConfigContextLoader.class) -public class CleanupFailureExceptionTest { - - private static final Logger LOG = Logger.getLogger(CleanupFailureExceptionTest.class.getName()); - - @Autowired - private SessionFactory sessionFactory; - - @Autowired - private IFooService fooService; - - @Test - public void whenCleanupAfterSaving_thenCleanupException() { - try { - final Foo fooEntity = new Foo("foo"); - fooService.create(fooEntity); - } finally { - try { - sessionFactory.close(); - } catch (final CleanupFailureDataAccessException exc) { - LOG.log(Level.SEVERE, exc.getMessage()); - } - } - } -} diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataIntegrityExceptionTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataIntegrityExceptionTest.java index aa504223f3..357eb168cd 100644 --- a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataIntegrityExceptionTest.java +++ b/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataIntegrityExceptionTest.java @@ -1,5 +1,7 @@ package org.baeldung.ex.nontransientdataaccessexception; +import javax.sql.DataSource; + import org.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig; import org.baeldung.persistence.model.Foo; import org.baeldung.persistence.service.IFooService; @@ -7,6 +9,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; @@ -18,9 +22,25 @@ public class DataIntegrityExceptionTest { @Autowired private IFooService fooService; + @Autowired + private DataSource restDataSource; + @Test(expected = DataIntegrityViolationException.class) public void whenSavingNullValue_thenDataIntegrityException() { final Foo fooEntity = new Foo(); fooService.create(fooEntity); } + + @Test(expected = DuplicateKeyException.class) + public void whenSavingDuplicateKeyValues_thenDuplicateKeyException() { + final JdbcTemplate jdbcTemplate = new JdbcTemplate(restDataSource); + + try { + jdbcTemplate.execute("insert into foo(id,name) values (1,'a')"); + jdbcTemplate.execute("insert into foo(id,name) values (1,'b')"); + } finally { + jdbcTemplate.execute("delete from foo where id=1"); + } + } + } diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataRetrievalExceptionTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataRetrievalExceptionTest.java index f5e24e3546..69b98b0539 100644 --- a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataRetrievalExceptionTest.java +++ b/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/DataRetrievalExceptionTest.java @@ -3,10 +3,13 @@ package org.baeldung.ex.nontransientdataaccessexception; import javax.sql.DataSource; import org.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig; +import org.baeldung.persistence.model.Foo; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataRetrievalFailureException; +import org.springframework.dao.IncorrectResultSizeDataAccessException; +import org.springframework.jdbc.IncorrectResultSetColumnCountException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -25,4 +28,26 @@ public class DataRetrievalExceptionTest { jdbcTemplate.queryForObject("select * from foo where id=3", Integer.class); } + + @Test(expected = IncorrectResultSetColumnCountException.class) + public void whenRetrievingMultipleColumns_thenIncorrectResultSetColumnCountException() { + final JdbcTemplate jdbcTemplate = new JdbcTemplate(restDataSource); + try { + jdbcTemplate.execute("insert into foo(id,name) values (1,'a')"); + jdbcTemplate.queryForList("select id,name from foo where id=1", Foo.class); + } finally { + jdbcTemplate.execute("delete from foo where id=1"); + } + } + + @Test(expected = IncorrectResultSizeDataAccessException.class) + public void whenRetrievingMultipleValues_thenIncorrectResultSizeException() { + final JdbcTemplate jdbcTemplate = new JdbcTemplate(restDataSource); + + jdbcTemplate.execute("insert into foo(name) values ('a')"); + jdbcTemplate.execute("insert into foo(name) values ('a')"); + + jdbcTemplate.queryForObject("select id from foo where name='a'", Integer.class); + } + } From 114571e3a34fa1e0916b9239339471777321cc1a Mon Sep 17 00:00:00 2001 From: jesus-dayo Date: Thu, 11 Aug 2016 09:44:32 +0800 Subject: [PATCH 37/41] Fix pagination --- .../StudentDirectory/src/main/resources/application.properties | 2 +- .../StudentDirectory/src/main/webapp/view/app.js | 1 + .../test/java/org/baeldung/web/service/StudentServiceTest.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties b/spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties index a9bf6ca218..e42588cee0 100644 --- a/spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties +++ b/spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties @@ -1 +1 @@ -server.contextPath=/StudentDirectory \ No newline at end of file +server.contextPath=/ \ No newline at end of file diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/webapp/view/app.js b/spring-rest-angular-pagination/StudentDirectory/src/main/webapp/view/app.js index 522c49c8cb..715b667cc9 100644 --- a/spring-rest-angular-pagination/StudentDirectory/src/main/webapp/view/app.js +++ b/spring-rest-angular-pagination/StudentDirectory/src/main/webapp/view/app.js @@ -17,6 +17,7 @@ app.controller('StudentCtrl', ['$scope','StudentService', function ($scope,Stude paginationPageSizes: [5, 10, 20], paginationPageSize: paginationOptions.pageSize, enableColumnMenus:false, + useExternalPagination: true, columnDefs: [ { name: 'studentId' }, { name: 'name' }, diff --git a/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java b/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java index 3e476bf0d0..c6c9539abd 100644 --- a/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java +++ b/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java @@ -22,7 +22,7 @@ import io.restassured.response.Response; public class StudentServiceTest{ private String getURL() { - return "/StudentDirectory/student/get"; + return "/student/get"; } @Test From 19b65ea960bae4a0140b1b7f6bcf93d271781813 Mon Sep 17 00:00:00 2001 From: jesus-dayo Date: Thu, 11 Aug 2016 09:53:49 +0800 Subject: [PATCH 38/41] merge test conflicts --- .../src/main/resources/application.properties | 2 +- spring-rest-angular-pagination/src/main/webapp/view/app.js | 1 + .../test/java/org/baeldung/web/service/StudentServiceTest.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-rest-angular-pagination/src/main/resources/application.properties b/spring-rest-angular-pagination/src/main/resources/application.properties index a9bf6ca218..e42588cee0 100644 --- a/spring-rest-angular-pagination/src/main/resources/application.properties +++ b/spring-rest-angular-pagination/src/main/resources/application.properties @@ -1 +1 @@ -server.contextPath=/StudentDirectory \ No newline at end of file +server.contextPath=/ \ No newline at end of file diff --git a/spring-rest-angular-pagination/src/main/webapp/view/app.js b/spring-rest-angular-pagination/src/main/webapp/view/app.js index 522c49c8cb..715b667cc9 100644 --- a/spring-rest-angular-pagination/src/main/webapp/view/app.js +++ b/spring-rest-angular-pagination/src/main/webapp/view/app.js @@ -17,6 +17,7 @@ app.controller('StudentCtrl', ['$scope','StudentService', function ($scope,Stude paginationPageSizes: [5, 10, 20], paginationPageSize: paginationOptions.pageSize, enableColumnMenus:false, + useExternalPagination: true, columnDefs: [ { name: 'studentId' }, { name: 'name' }, diff --git a/spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java b/spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java index da3a36cf7a..19fe77a1fd 100644 --- a/spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java +++ b/spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java @@ -19,7 +19,7 @@ import static org.hamcrest.core.IsEqual.equalTo; @IntegrationTest("server.port:8888") public class StudentServiceTest { - private static final String ENDPOINT = "http://localhost:8888/StudentDirectory/student/get"; + private static final String ENDPOINT = "http://localhost:8888/student/get"; @Test public void givenRequestForStudents_whenPageIsOne_expectContainsNames() { From 74509557a6a47f07b9751bc9a2f7b466d765eb59 Mon Sep 17 00:00:00 2001 From: jesus-dayo Date: Thu, 11 Aug 2016 10:04:27 +0800 Subject: [PATCH 39/41] remove StudentDirectory --- .../src/main/resources/application.properties | 1 - .../web/service/StudentServiceTest.java | 49 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties delete mode 100644 spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties b/spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties deleted file mode 100644 index e42588cee0..0000000000 --- a/spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -server.contextPath=/ \ No newline at end of file diff --git a/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java b/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java deleted file mode 100644 index c6c9539abd..0000000000 --- a/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.baeldung.web.service; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.apache.commons.lang3.RandomStringUtils; -import org.baeldung.web.main.Application; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -import io.restassured.RestAssured; -import io.restassured.response.Response; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) -@WebAppConfiguration -@IntegrationTest("server.port:8080") -public class StudentServiceTest{ - - private String getURL() { - return "/student/get"; - } - - @Test - public void whenResourcesAreRetrievedPaged_then200IsReceived(){ - Response response = RestAssured.given().get(getURL()+ "?page=0&size=2").andReturn(); - - assertTrue(response.getStatusCode() == 200 ); - } - - @Test - public void whenPageOfResourcesAreRetrievedOutOfBounds_then404IsReceived(){ - String url = getURL()+ "?page=" + RandomStringUtils.randomNumeric(5) + "&size=2"; - Response response = RestAssured.given().get(url); - - assertTrue(response.getStatusCode() == 500 ); - } - - @Test - public void givenResourcesExist_whenFirstPageIsRetrieved_thenPageContainsResources(){ - Response response = RestAssured.given().get(getURL() + "?page=1&size=2" ); - assertFalse(response.getBody().jsonPath().getList("content").isEmpty() ); - } - -} From 679dfa19426a4d29fe94e41502ef409895863c87 Mon Sep 17 00:00:00 2001 From: slavisa-baeldung Date: Thu, 11 Aug 2016 07:46:03 +0200 Subject: [PATCH 40/41] BAEL-124 - client auth --- pom.xml | 1 + .../basic-secured-server/pom.xml | 35 ++----------- .../src/main/resources/application.properties | 8 +-- .../src/main/resources/keystore.jks | Bin 0 -> 9310 bytes .../client-auth-server/pom.xml | 37 ++----------- .../src/main/resources/application.properties | 8 +-- .../src/main/resources/keystore.jks | Bin 0 -> 9310 bytes spring-security-x509/keystore/ca.crt | 28 ++++++++++ spring-security-x509/keystore/cid.crt | 28 ++++++++++ spring-security-x509/keystore/cid.csr | 25 +++++++++ spring-security-x509/keystore/cid.p12 | Bin 0 -> 5918 bytes .../keystore/create-keystore.bat | 24 +++++++++ spring-security-x509/keystore/keystore.jks | Bin 0 -> 9310 bytes spring-security-x509/keystore/localhost.crt | 28 ++++++++++ spring-security-x509/keystore/localhost.csr | 25 +++++++++ spring-security-x509/keystore/truststore.jks | Bin 0 -> 6855 bytes spring-security-x509/pom.xml | 49 ++++++++++++++++++ 17 files changed, 223 insertions(+), 73 deletions(-) create mode 100644 spring-security-x509/basic-secured-server/src/main/resources/keystore.jks create mode 100644 spring-security-x509/client-auth-server/src/main/resources/keystore.jks create mode 100644 spring-security-x509/keystore/ca.crt create mode 100644 spring-security-x509/keystore/cid.crt create mode 100644 spring-security-x509/keystore/cid.csr create mode 100644 spring-security-x509/keystore/cid.p12 create mode 100644 spring-security-x509/keystore/create-keystore.bat create mode 100644 spring-security-x509/keystore/keystore.jks create mode 100644 spring-security-x509/keystore/localhost.crt create mode 100644 spring-security-x509/keystore/localhost.csr create mode 100644 spring-security-x509/keystore/truststore.jks create mode 100644 spring-security-x509/pom.xml diff --git a/pom.xml b/pom.xml index e82b964900..5a327770a4 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,7 @@ spring-security-rest-custom spring-security-rest-digest-auth spring-security-rest-full + spring-security-x509 spring-thymeleaf spring-zuul jsf diff --git a/spring-security-x509/basic-secured-server/pom.xml b/spring-security-x509/basic-secured-server/pom.xml index ce35990b21..87fdd64727 100644 --- a/spring-security-x509/basic-secured-server/pom.xml +++ b/spring-security-x509/basic-secured-server/pom.xml @@ -3,7 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baeldung.spring.security basic-secured-server 0.0.1-SNAPSHOT jar @@ -12,39 +11,11 @@ Spring x.509 Authentication Demo - org.springframework.boot - spring-boot-starter-parent - 1.4.0.RELEASE - + com.baeldung + spring-security-x509 + 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/spring-security-x509/basic-secured-server/src/main/resources/application.properties b/spring-security-x509/basic-secured-server/src/main/resources/application.properties index 1eed9cbbb0..439e2071b9 100644 --- a/spring-security-x509/basic-secured-server/src/main/resources/application.properties +++ b/spring-security-x509/basic-secured-server/src/main/resources/application.properties @@ -1,7 +1,7 @@ -server.ssl.key-store=../keystore/keystore.jks -server.ssl.key-store-password=${PASSWORD} -server.ssl.key-alias=${HOSTNAME} -server.ssl.key-password=${PASSWORD} +server.ssl.key-store=classpath:keystore.jks +server.ssl.key-store-password=changeit +server.ssl.key-alias=localhost +server.ssl.key-password=changeit server.ssl.enabled=true server.port=8443 security.user.name=Admin diff --git a/spring-security-x509/basic-secured-server/src/main/resources/keystore.jks b/spring-security-x509/basic-secured-server/src/main/resources/keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..044a820c39524f1ef3c470105dbaa82b63af0493 GIT binary patch literal 9310 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 DeRHq; literal 0 HcmV?d00001 diff --git a/spring-security-x509/client-auth-server/pom.xml b/spring-security-x509/client-auth-server/pom.xml index 5cdf1f8859..56cef8ea07 100644 --- a/spring-security-x509/client-auth-server/pom.xml +++ b/spring-security-x509/client-auth-server/pom.xml @@ -1,9 +1,8 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baeldung.spring.security client-auth-server 0.0.1-SNAPSHOT jar @@ -12,39 +11,11 @@ Spring x.509 Client Authentication Demo - org.springframework.boot - spring-boot-starter-parent - 1.4.0.RELEASE - + com.baeldung + spring-security-x509 + 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/spring-security-x509/client-auth-server/src/main/resources/application.properties b/spring-security-x509/client-auth-server/src/main/resources/application.properties index 294c7d9c6b..174eba9f98 100644 --- a/spring-security-x509/client-auth-server/src/main/resources/application.properties +++ b/spring-security-x509/client-auth-server/src/main/resources/application.properties @@ -1,11 +1,11 @@ server.ssl.key-store=../keystore/keystore.jks -server.ssl.key-store-password=${PASSWORD} -server.ssl.key-alias=${HOSTNAME} -server.ssl.key-password=${PASSWORD} +server.ssl.key-store-password=changeit +server.ssl.key-alias=localhost +server.ssl.key-password=changeit server.ssl.enabled=true server.port=8443 security.user.name=Admin security.user.password=admin server.ssl.trust-store=../keystore/truststore.jks -server.ssl.trust-store-password=${PASSWORD} +server.ssl.trust-store-password=changeit server.ssl.client-auth=need \ No newline at end of file diff --git a/spring-security-x509/client-auth-server/src/main/resources/keystore.jks b/spring-security-x509/client-auth-server/src/main/resources/keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..044a820c39524f1ef3c470105dbaa82b63af0493 GIT binary patch literal 9310 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 DeRHq; literal 0 HcmV?d00001 diff --git a/spring-security-x509/keystore/ca.crt b/spring-security-x509/keystore/ca.crt new file mode 100644 index 0000000000..c700fee182 --- /dev/null +++ b/spring-security-x509/keystore/ca.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIFlTCCA32gAwIBAgIEAMem9DANBgkqhkiG9w0BAQ0FADB0MQswCQYDVQQGEwJDQzESMBAGA1UE +CBMJU29tZVN0YXRlMREwDwYDVQQHEwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNV +BAsTDGJhZWxkdW5nLmNvbTEUMBIGA1UEAxMLQmFlbGR1bmcgQ0EwHhcNMTYwODExMDUwNzE1WhcN +MjYwODA5MDUwNzE1WjB0MQswCQYDVQQGEwJDQzESMBAGA1UECBMJU29tZVN0YXRlMREwDwYDVQQH +EwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNVBAsTDGJhZWxkdW5nLmNvbTEUMBIG +A1UEAxMLQmFlbGR1bmcgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAOKgJkTPS +5sk5dFMQmJZEipBwOD/+znOsEz8ZeieMCE8FkQWYJkYrvxl597arzJyLbvOmwVO4tkAluQuPclZz +c5lt/Ji1iiF2h+w6ncc+gsae4l7LOR2ssn+hAvdbpzMdGdaELImG1/9ib7vJQQ1eLRydiT3qQI1r +0n75WNGbm59QNixxq8TWp3iEPToj1dgwswuggxlDVY1hJvXytFG/DVTImlzhsfifu3C9t5C3xrXt +MczYfciUoNPsNEe3mXqoVeV5CxbyKk5JLQBWJ17E0V1+BgAip3dWvEKF+eo0DIS6mt3s9+mRANH1 +ifOiXEIbCs3DZDouIVxBpHJj+rFpMH7jEazF8SGJ49BS1ZJyjrIn5b2ZVsFIUb3BlrcLiJd1+1LO +yVa0nw4Fu3OugRT7m9tlWT4N3kmh93UuOkuL9pQSc8bMsSU5xiGfOy9Eav79JNHSaFHvDz4AACtP +cgPRKw/5qDCsapNOWygNkNGXzh8DjrxhpUfvDxvoKUEVuSpNrm6/Yg1qBtu9MAD1S1pWBPjzaeGj +f5PFZXdnbxso4pm1P21IiwZmQrOWcFnxJG35jafvTW4wTpRX28clwiJaPCxnB7j3Yz0EJTIgfcYl +TcwdGWJ6MIqgT4d4IV4QD/P80yVa/c7DuwAj+vPv/gB5N33KKzXPjzXTsWI2yzg7OQIDAQABoy8w +LTAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBQVrfyce3nN/IDaDIpeXBWJyY9nqzANBgkqhkiG9w0B +AQ0FAAOCAgEAByUvnZ/ouTgObjA9Pu29zSoeZ3eWg3ha0PPBWLSFgwlj7IihUWJlPlXyDtoKw5tq +Mcw8/bXyqhMCY8wpqXWmAsOkkZnrrLFo9K0rBRcAs17xnLtHvPW5AQ2RANf61u/19N4VK4pW1JZp +kdWri6siN3rM9NnvcXQY3qHTM7rr25aL+mymEl20H1KK/yhRJ0xliA+U3fRDS2ktJaBc65D3FCho +3lZa/VXs+l85bPk3eQdNh63tuLATMWOTMuhUPVZ5UARSPFA0er/mlGfyKx3OrQHciLW8sm4l9j+x +uUR6Yg4SwVX3d9+UEPAA6N0QxYlxuIlenvNWVNcFiJpc4N+zRqZjhcBRsZfRpK1goJzerHg9W9CC +REdQaoFX5XVDc8YoOBbNHEeAfzaBJpfHxzpWb1etIytWkFUAOXmVy0lVHdYYo42XSjkrQejF3qDM +2R0A5oX04hYlCTFdemSzdkf8ff14oF9ToVQ7tmxS4Lm8Tok9J0rjMZ9MKyEgl5G3wDH1470xREeb +L7mdUeGFsEzlA3kuVkZmXQ8SOL+SCv+Y+GDu0ZJ+/r5NTXgp54dVUYjLOZJisqVvfiDZHcQE+pGP +UIuF0MGx+3l/WI/vFNrGKmsT0vhwQhqzbBpV7vawZm0ViQp+4KpiEuHrSrJX/tj/XDgUvOfHmGmj +kj3QlKyWfEU= +-----END CERTIFICATE----- diff --git a/spring-security-x509/keystore/cid.crt b/spring-security-x509/keystore/cid.crt new file mode 100644 index 0000000000..df5dd2d5a0 --- /dev/null +++ b/spring-security-x509/keystore/cid.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIFoDCCA4igAwIBAgIEGKkVGTANBgkqhkiG9w0BAQ0FADB0MQswCQYDVQQGEwJDQzESMBAGA1UE +CBMJU29tZVN0YXRlMREwDwYDVQQHEwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNV +BAsTDGJhZWxkdW5nLmNvbTEUMBIGA1UEAxMLQmFlbGR1bmcgQ0EwHhcNMTYwODExMDUwOTA3WhcN +MjYwODA5MDUwOTA3WjBsMQswCQYDVQQGEwJDQzESMBAGA1UECBMJU29tZVN0YXRlMREwDwYDVQQH +EwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNVBAsTDGJhZWxkdW5nLmNvbTEMMAoG +A1UEAxMDY2lkMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjlSWBNnCdPjZAU15rIWi +rId/Oop9cizRSUKc9ZLe/dRhfBBRVVD0IGhBIV+9yIIrcXicU0Ighp7yJP3gvRHma2KxwyGWYRwm +uqLfBzrFj9HuBIXuozPIKjSDEPhWtm2DrE/WtPJ5/srZQ92BLgtHqIB75beE39ry9i9HpobL+eLm +6MR9tGyfYpKaPeS8IfDT+3VpdBpIu+IGptPpegjGTSsVkiCyHTTXQKTM+QxdhERewzBJM69W2t/3 +A/WhqEVPC9/GhKvnPXcCw3zvvTntkQFnB/ArsJ/um6PfOkeI1WCu5QVJerQWVJXKwtGduhlxTPQ0 +UofwaZMTtGMiTi3zCciyOF0KrbFklDp+2cYDPc/AhQGy1/h8PCheP6Rh/T3acd8DRl3zpjA4zzdz +BIwFLF2+T2NySFUBXJFOrj96wFLh3lLlp9T3oP1aiLzGUC71aZIntc9JTri3pCP35UXe0hzuy3m7 +nJw7yh59W2+6sQgy66mSeD+DjNdIFNxsmu9bQ5mH97tWU9pAb32zAfq3S2syC2FnFU9qLYj4bdTd +sT9cUfZ/V1AdsaHsfyKerpU51d17csggtCQo4PrH8gr99CSX1Iq4oKy5gnom5v0Tcwe1K1eJW2JN +WIYJM1wuibTELF9yPsuNydhuRZdgT+cYaGaYtY+BnqYWro9PcmR+HdMCAwEAAaNCMEAwHwYDVR0j +BBgwFoAUFa38nHt5zfyA2gyKXlwVicmPZ6swHQYDVR0OBBYEFNUmq/xlPIaDQ42tKfmnZejN1gA0 +MA0GCSqGSIb3DQEBDQUAA4ICAQB1aAOdLB3/fgYAQfke4SUsiVkU91JRL3ec/kb92y0JNULrgEBH +wBJ71vwmNn/bzIzk7Iwa3mcoRCXtziYA9vbfzFDoDSOUt1cPc8W8Kn0BzbeHPYNnqgyIsmilCnd4 +dvrP5QtuG/ajy03Rj57M4XL5+S4uKwqFO9B3cTE1VjNLKkDThKL4rKf3gvR7wtx24dvOrRuD1C/D +u6QN/SfnYKXSb8fTMGwGuZLn6IYtGzrgfhQiZDZd/g7rSzne6tMHF3oMXVmeAU+etviN9A5Untat +cs9snOT/Ju0AKnUaOKvesIjdXpeuLl21ucdlTfsKQ+TZGwAPrDzjT4RLPA7lUk2hZ66DWg6mFfTn +JMzFdz2A5ea3mmPCErDdoxAfA9tjdaZRgQR/RUfmhU1DL2r3RNgCjQ5I9Bw2WjVWS+TepMd+u/6Q +Dujpi+LGArABavWYluOvd7p961lLYDxSPRmI4FTBEd+T1Iqz+uOu62MWWWxPm7NbBwjW71BQehuQ +JiWCRMYM6CyPrb8tQDljYj18t2I8H74qXWwOtGQUfmv+kqtlvDY4NesoHtavacTaDWy5a2pKF3rb +nhKpU1BKjHyjxvVG3V/aT2qhx6iwNWbKQM9BJDYCNwubBh0ydEzlRkC82OWjavkLBYk/uLqFhQt1 +Kr0YIYpOQiIb0RGxipCUWUjYbg== +-----END CERTIFICATE----- diff --git a/spring-security-x509/keystore/cid.csr b/spring-security-x509/keystore/cid.csr new file mode 100644 index 0000000000..24231f03e3 --- /dev/null +++ b/spring-security-x509/keystore/cid.csr @@ -0,0 +1,25 @@ +-----BEGIN NEW CERTIFICATE REQUEST----- +MIIE7zCCAtcCAQAwbDELMAkGA1UEBhMCQ0MxEjAQBgNVBAgTCVNvbWVTdGF0ZTERMA8GA1UEBxMI +U29tZUNpdHkxETAPBgNVBAoTCEJhZWxkdW5nMRUwEwYDVQQLEwxiYWVsZHVuZy5jb20xDDAKBgNV +BAMTA2NpZDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAI5UlgTZwnT42QFNeayFoqyH +fzqKfXIs0UlCnPWS3v3UYXwQUVVQ9CBoQSFfvciCK3F4nFNCIIae8iT94L0R5mtiscMhlmEcJrqi +3wc6xY/R7gSF7qMzyCo0gxD4VrZtg6xP1rTyef7K2UPdgS4LR6iAe+W3hN/a8vYvR6aGy/ni5ujE +fbRsn2KSmj3kvCHw0/t1aXQaSLviBqbT6XoIxk0rFZIgsh0010CkzPkMXYREXsMwSTOvVtrf9wP1 +oahFTwvfxoSr5z13AsN877057ZEBZwfwK7Cf7puj3zpHiNVgruUFSXq0FlSVysLRnboZcUz0NFKH +8GmTE7RjIk4t8wnIsjhdCq2xZJQ6ftnGAz3PwIUBstf4fDwoXj+kYf092nHfA0Zd86YwOM83cwSM +BSxdvk9jckhVAVyRTq4/esBS4d5S5afU96D9Woi8xlAu9WmSJ7XPSU64t6Qj9+VF3tIc7st5u5yc +O8oefVtvurEIMuupkng/g4zXSBTcbJrvW0OZh/e7VlPaQG99swH6t0trMgthZxVPai2I+G3U3bE/ +XFH2f1dQHbGh7H8inq6VOdXde3LIILQkKOD6x/IK/fQkl9SKuKCsuYJ6Jub9E3MHtStXiVtiTViG +CTNcLom0xCxfcj7LjcnYbkWXYE/nGGhmmLWPgZ6mFq6PT3Jkfh3TAgMBAAGgPjA8BgkqhkiG9w0B +CQ4xLzAtMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFNUmq/xlPIaDQ42tKfmnZejN1gA0MA0GCSqG +SIb3DQEBDQUAA4ICAQBRXQEVq/29w0iyGCmxqeGzxoBx3nprZJhgfGk1zFx8G4aEoDw6P/1Xs8fS +6ceIPIakUHOVuS2OQqLQ6Un9UNaOoE8vAk0T19Rfkb5cQSRb2GHnnxOefETCF9oaAN8mHO1Tt3wq +9+lzU0y428hI6APWYf2x/xJL3fo3YOFcHVD2AfY8os2kHDnyq4Aj0Rp0eHYR4OdYzPVGl6UEV0a3 +f24ypH9t2pXM/mLcaDBNeGTi5peFUGZYceGPOe6dGqWPJ4gpyRXMOWWNk6bSZgRfJzzk3IBnb53v +2B/AFR2OhYDVzy0xG4gwzap+v/RzeKofDr4pAnGgaB3h+oGfcIwvU6Wag66qEhIzsbpCK8ZPKqDq +G+4+JeWp8KKBgkecO5NgjZOn2Up9dAvKukBRWWIUA6nCsKN5wrTbzjeYCmE6oG19BHo9+fkskPMg +25X7vRu+xG0MNf0kkZGR1/boY6hX4l7EVpB/LYwDulhhAF/Ar48/HH/muGRJixOjhey7/yWaGQlv +T3XqOb06mJTMmmyKttjtBvnSY81gGhuwk76F07ihtF2VdXFUGMS5qurid16KiirhVtnDMyD1LxBc +R4miwwXxLyDfthKUk8y0I0BYr52ciqhfkNUPLKogD9TT1Jc1DgySHmYEAwhRqCEvl4o6HX9/KNdU +AU/i7WkKbXr4g4s8Dg== +-----END NEW CERTIFICATE REQUEST----- diff --git a/spring-security-x509/keystore/cid.p12 b/spring-security-x509/keystore/cid.p12 new file mode 100644 index 0000000000000000000000000000000000000000..1fde57bc6a9786d3bf600d7978677ddad8d40402 GIT binary patch literal 5918 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 literal 0 HcmV?d00001 diff --git a/spring-security-x509/keystore/create-keystore.bat b/spring-security-x509/keystore/create-keystore.bat new file mode 100644 index 0000000000..3c0293c04c --- /dev/null +++ b/spring-security-x509/keystore/create-keystore.bat @@ -0,0 +1,24 @@ +PASSWORD=changeit +KEYSTORE=keystore.jks +HOSTNAME=localhost +CLIENTNAME=cid + +# CN = Common Name +# OU = Organization Unit +# O = Organization Name +# L = Locality Name +# ST = State Name +# C = Country (2-letter Country Code) +# E = Email +DNAME_CA='CN=Baeldung CA,OU=baeldung.com,O=Baeldung,L=SomeCity,ST=SomeState,C=CC' +# For server certificates, the Common Name (CN) must be the hostname +DNAME_HOST='CN=$(HOSTNAME),OU=baeldung.com,O=Baeldung,L=SomeCity,ST=SomeState,C=CC' +DNAME_CLIENT='CN=$(CLIENTNAME),OU=baeldung.com,O=Baeldung,L=SomeCity,ST=SomeState,C=CC' +TRUSTSTORE=truststore.jks + + # Generate a certificate authority (CA) + keytool -genkey -alias ca -ext BC=ca:true \ + -keyalg RSA -keysize 4096 -sigalg SHA512withRSA -keypass $(PASSWORD) \ + -validity 3650 -dname $(DNAME_CA) \ + -keystore $(KEYSTORE) -storepass $(PASSWORD) + diff --git a/spring-security-x509/keystore/keystore.jks b/spring-security-x509/keystore/keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..044a820c39524f1ef3c470105dbaa82b63af0493 GIT binary patch literal 9310 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 DeRHq; literal 0 HcmV?d00001 diff --git a/spring-security-x509/keystore/localhost.crt b/spring-security-x509/keystore/localhost.crt new file mode 100644 index 0000000000..318deff26d --- /dev/null +++ b/spring-security-x509/keystore/localhost.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIFpjCCA46gAwIBAgIEODZ8OjANBgkqhkiG9w0BAQ0FADB0MQswCQYDVQQGEwJDQzESMBAGA1UE +CBMJU29tZVN0YXRlMREwDwYDVQQHEwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNV +BAsTDGJhZWxkdW5nLmNvbTEUMBIGA1UEAxMLQmFlbGR1bmcgQ0EwHhcNMTYwODExMDUwODEyWhcN +MjYwODA5MDUwODEyWjByMQswCQYDVQQGEwJDQzESMBAGA1UECBMJU29tZVN0YXRlMREwDwYDVQQH +EwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNVBAsTDGJhZWxkdW5nLmNvbTESMBAG +A1UEAxMJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAhDGBomd3CmNf +ahbnsaYaA1IQbXsGd+heb1e8c+diWggSg7r6xH90o43or+nQPk1g9VB8C/o79Ldhe+RI68aACWqC +iWTM72Z3mR9Cunyku8Xz9w1TUrLr394rWTXMglddBt1H9jzz5t0mXS/xv49aUhp7d/XGYEidK5Sd +YXWylMjv3K7a9KQVgcy3WH7mWiIJoytkMVRlSy/1Y43CVrgMiBSm2Vkp5CQBOWEsh9wEPl9yiu8N +SkqaW0cnfZFxwx6Wk+d07+Fu2dD2hpiFX0abyJj+1m1SE50ihHzvdV8jOAjrQwFsOOJOtGWZ3dZo +YGRQqStu06ytCUjikR1xyHyBBl3lcPqd1NBABYQ8ErL5EnqmN64hw75flKPGvnRIAqtSNeqVdJxO +yT3dZEVA2iHQq9rgPj6AnRmV+978OppVP4HAjJr/a3WqjpydpB0ztRhqf0Sv5aEkym36DKcp75Fd +01XT3Owo6AvAlrTeuT/lj6hqDo1VkWB7Gsh1vdHtEvApXE/cKtDPbC6tPFwBLQCdP7AUZoI56+mO +N7aHgmcWH8NZSl+PAvVMBeyn4lrNwDAH/ji/YVQCpShbiqSMa5pZbp+xlsmmZHgF6OCLSNO8Iw+d +mMvy7Il2PEsIHwNe5jbtMc2qrM9NaPch6iMbqlz6hr1lruWCVx+ay3cuR8v4IRUCAwEAAaNCMEAw +HwYDVR0jBBgwFoAUFa38nHt5zfyA2gyKXlwVicmPZ6swHQYDVR0OBBYEFNO0BwOkFM8qxa5sTugu +ciCr7O58MA0GCSqGSIb3DQEBDQUAA4ICAQAjRfbR75Trkvvr9JX7KZbauNji6CkVb7H7WQAwrulG +fMqyn5xhugq/QhAX6hN1hD1v+FM2hIX5aqI9Ic6ZUl+YyjzL4QnDXD8PZjH4z/wTZxWrnR7Z8nVJ +yw1rDB6CSyT8Fok944UXCIDDVk7xeHbXvW2jyURZFqLI34V6jGwN2tH9hJ9CycpBaRD1JkmvWPDm +atP9Br+GwStHpV2D7gchuzvwujwfil9ORte/+I8E6NyDteFdxbayid3IDOMbzvEw9NCqPbpOmga5 +8i2s6SYpIFYro4kWys3U900d8w6UwmZRA5cnWZR3h+BCu2lpUNPcVzYqRNrqKVd0Y9bvDTNx41SY +cOE57g2lMGNnHEvyW3Kzt+MXfcuyzcfoIb+kLHvOp+Q39GyE2oaHIWlcwmWDsn3o4Kod9iEoC931 +QQdsCi68CEfR2HzX7hzVFTUzJqfIjLNewjlMOXaInxVTuWLe5zE+1p/6AU7Iq2lhI+bgDFymGYyb +gtIgn+5X3djLZYyQG7M6HLMSx2ppB4i1kViQVq05+7mCBPcfHNLVafMJiMZR8L6xic77ZsAACHmQ +zITP1VkXnD+Zd3Mb5Vw+i90ZvC0RUiUz3wWbqfb6gke1TltEq4D25ptRtyoftgghYTgdCM9cBiNQ +4oYCEJdNyJjWiVWN92mnIXoACw3vMPPLtQ== +-----END CERTIFICATE----- diff --git a/spring-security-x509/keystore/localhost.csr b/spring-security-x509/keystore/localhost.csr new file mode 100644 index 0000000000..f267e931d1 --- /dev/null +++ b/spring-security-x509/keystore/localhost.csr @@ -0,0 +1,25 @@ +-----BEGIN NEW CERTIFICATE REQUEST----- +MIIE9TCCAt0CAQAwcjELMAkGA1UEBhMCQ0MxEjAQBgNVBAgTCVNvbWVTdGF0ZTERMA8GA1UEBxMI +U29tZUNpdHkxETAPBgNVBAoTCEJhZWxkdW5nMRUwEwYDVQQLEwxiYWVsZHVuZy5jb20xEjAQBgNV +BAMTCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIQxgaJndwpjX2oW +57GmGgNSEG17BnfoXm9XvHPnYloIEoO6+sR/dKON6K/p0D5NYPVQfAv6O/S3YXvkSOvGgAlqgolk +zO9md5kfQrp8pLvF8/cNU1Ky69/eK1k1zIJXXQbdR/Y88+bdJl0v8b+PWlIae3f1xmBInSuUnWF1 +spTI79yu2vSkFYHMt1h+5loiCaMrZDFUZUsv9WONwla4DIgUptlZKeQkATlhLIfcBD5fcorvDUpK +mltHJ32RccMelpPndO/hbtnQ9oaYhV9Gm8iY/tZtUhOdIoR873VfIzgI60MBbDjiTrRlmd3WaGBk +UKkrbtOsrQlI4pEdcch8gQZd5XD6ndTQQAWEPBKy+RJ6pjeuIcO+X5Sjxr50SAKrUjXqlXScTsk9 +3WRFQNoh0Kva4D4+gJ0Zlfve/DqaVT+BwIya/2t1qo6cnaQdM7UYan9Er+WhJMpt+gynKe+RXdNV +09zsKOgLwJa03rk/5Y+oag6NVZFgexrIdb3R7RLwKVxP3CrQz2wurTxcAS0AnT+wFGaCOevpjje2 +h4JnFh/DWUpfjwL1TAXsp+JazcAwB/44v2FUAqUoW4qkjGuaWW6fsZbJpmR4Bejgi0jTvCMPnZjL +8uyJdjxLCB8DXuY27THNqqzPTWj3IeojG6pc+oa9Za7lglcfmst3LkfL+CEVAgMBAAGgPjA8Bgkq +hkiG9w0BCQ4xLzAtMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFNO0BwOkFM8qxa5sTuguciCr7O58 +MA0GCSqGSIb3DQEBDQUAA4ICAQAWlQsaz2lN5uUU26QrlSWc9J1MjqRL4/XCT0lVkDFua7JOmTCJ +wowwLNFng2IKrrMmigEn/W2XnOMZBtBsKFp6WB8f9irCLrqfVRELKuHV7udNi1YlfCeQns0FgjI8 +Y/6uB43+rsqbpUkO86romTZSivc9szi8TDsJ84xutNNn8rS77Fzid4NQ4pZ/G5swn+PFVKBNWANL +J9rWkv8ld4hviRH0VS3ZuTOTL/8zfQlWFUGC7/FEH+1P1qWhHrFfj72E839226hIE/T96qnhbvBi +5W1dIjwux4JEpKN45+97boyPZitS/0T0URuKcJp+SILZjmOOrZfSnCWC5FkZmYjKIPUFg81lzWD7 +AxFRbjFF0XI6frbXLNVDAbpnhtCi88zT9rFWKKCwRnbZ4GfjmEWW2ITa+1Og9owY4iwW27zkhpTF +l/o5K7H4JrXCpoZcGVCu6MJFsQmSmsoTclgSljbQMVmJ53Bqq9pCtx18S8XvB+OXJpeDWlj9zvzv +WmuqCf9JNQb1UUOxpYfuyTRFCUODUV7kVWn3NLaAlJGtLJEUvw0H16JB6/u6JpXRPas/aOZXFRr7 +pW+PausdfGcniHKC//JvV/en/1OMHtrKZl1P8Ow2Uz4vy7H/Z1qIhXqm/qg1EkEUkEKmMG44fSne +LTyjagA8pzozPCfEg2v3w8vlAQ== +-----END NEW CERTIFICATE REQUEST----- diff --git a/spring-security-x509/keystore/truststore.jks b/spring-security-x509/keystore/truststore.jks new file mode 100644 index 0000000000000000000000000000000000000000..aaae3a6a209c5068da9fbdbcfc7b1c31653c0dc4 GIT binary patch literal 6855 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 Q7N?OpzYfrfq6w<_4^W>3!T + + 4.0.0 + + com.baeldung + spring-security-x509 + 0.0.1-SNAPSHOT + pom + + + basic-secured-server + client-auth-server + + + + org.springframework.boot + spring-boot-starter-parent + 1.4.0.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.springframework.boot + spring-boot-starter-test + test + + + From b6ef8de7002ebb7511af1274ea5fdb84a14ba3a8 Mon Sep 17 00:00:00 2001 From: Slavisa Baeldung Date: Thu, 11 Aug 2016 16:41:51 +0200 Subject: [PATCH 41/41] BAEL-124 - Minor refactors --- .../x509/X509AuthenticationServer.java | 21 ------------- .../src/main/resources/application.properties | 2 +- .../src/main/resources/keystore.jks | Bin 9310 -> 0 bytes spring-security-x509/keystore/ca.crt | 28 ------------------ spring-security-x509/keystore/cid.crt | 28 ------------------ spring-security-x509/keystore/cid.csr | 25 ---------------- spring-security-x509/keystore/cid.p12 | Bin 5918 -> 0 bytes .../keystore/create-keystore.bat | 24 --------------- spring-security-x509/keystore/localhost.crt | 28 ------------------ spring-security-x509/keystore/localhost.csr | 25 ---------------- spring-security-x509/keystore/truststore.jks | Bin 6855 -> 0 bytes 11 files changed, 1 insertion(+), 180 deletions(-) delete mode 100644 spring-security-x509/basic-secured-server/src/main/resources/keystore.jks delete mode 100644 spring-security-x509/keystore/ca.crt delete mode 100644 spring-security-x509/keystore/cid.crt delete mode 100644 spring-security-x509/keystore/cid.csr delete mode 100644 spring-security-x509/keystore/cid.p12 delete mode 100644 spring-security-x509/keystore/create-keystore.bat delete mode 100644 spring-security-x509/keystore/localhost.crt delete mode 100644 spring-security-x509/keystore/localhost.csr delete mode 100644 spring-security-x509/keystore/truststore.jks diff --git a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java index ee81cf3ad5..edcacfda15 100644 --- a/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java +++ b/spring-security-x509/basic-secured-server/src/main/java/com/baeldung/spring/security/x509/X509AuthenticationServer.java @@ -15,29 +15,8 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; @SpringBootApplication @EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) public class X509AuthenticationServer extends WebSecurityConfigurerAdapter { public static void main(String[] args) { SpringApplication.run(X509AuthenticationServer.class, args); } - - @Override - protected void configure(HttpSecurity http) throws Exception { - http.authorizeRequests().anyRequest().authenticated() - .and() - .x509().subjectPrincipalRegex("CN=(.*?)(?:,|$)").userDetailsService(userDetailsService()); - } - - @Bean - public UserDetailsService userDetailsService() { - return new UserDetailsService() { - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - if (username.equals("cid")) { - return new User(username, "", AuthorityUtils.commaSeparatedStringToAuthorityList("ROLE_USER")); - } - throw new UsernameNotFoundException("User not found!"); - } - }; - } } diff --git a/spring-security-x509/basic-secured-server/src/main/resources/application.properties b/spring-security-x509/basic-secured-server/src/main/resources/application.properties index 439e2071b9..f293d6712d 100644 --- a/spring-security-x509/basic-secured-server/src/main/resources/application.properties +++ b/spring-security-x509/basic-secured-server/src/main/resources/application.properties @@ -1,4 +1,4 @@ -server.ssl.key-store=classpath:keystore.jks +server.ssl.key-store=../keystore/keystore.jks server.ssl.key-store-password=changeit server.ssl.key-alias=localhost server.ssl.key-password=changeit diff --git a/spring-security-x509/basic-secured-server/src/main/resources/keystore.jks b/spring-security-x509/basic-secured-server/src/main/resources/keystore.jks deleted file mode 100644 index 044a820c39524f1ef3c470105dbaa82b63af0493..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9310 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 DeRHq; diff --git a/spring-security-x509/keystore/ca.crt b/spring-security-x509/keystore/ca.crt deleted file mode 100644 index c700fee182..0000000000 --- a/spring-security-x509/keystore/ca.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFlTCCA32gAwIBAgIEAMem9DANBgkqhkiG9w0BAQ0FADB0MQswCQYDVQQGEwJDQzESMBAGA1UE -CBMJU29tZVN0YXRlMREwDwYDVQQHEwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNV -BAsTDGJhZWxkdW5nLmNvbTEUMBIGA1UEAxMLQmFlbGR1bmcgQ0EwHhcNMTYwODExMDUwNzE1WhcN -MjYwODA5MDUwNzE1WjB0MQswCQYDVQQGEwJDQzESMBAGA1UECBMJU29tZVN0YXRlMREwDwYDVQQH -EwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNVBAsTDGJhZWxkdW5nLmNvbTEUMBIG -A1UEAxMLQmFlbGR1bmcgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAOKgJkTPS -5sk5dFMQmJZEipBwOD/+znOsEz8ZeieMCE8FkQWYJkYrvxl597arzJyLbvOmwVO4tkAluQuPclZz -c5lt/Ji1iiF2h+w6ncc+gsae4l7LOR2ssn+hAvdbpzMdGdaELImG1/9ib7vJQQ1eLRydiT3qQI1r -0n75WNGbm59QNixxq8TWp3iEPToj1dgwswuggxlDVY1hJvXytFG/DVTImlzhsfifu3C9t5C3xrXt -MczYfciUoNPsNEe3mXqoVeV5CxbyKk5JLQBWJ17E0V1+BgAip3dWvEKF+eo0DIS6mt3s9+mRANH1 -ifOiXEIbCs3DZDouIVxBpHJj+rFpMH7jEazF8SGJ49BS1ZJyjrIn5b2ZVsFIUb3BlrcLiJd1+1LO -yVa0nw4Fu3OugRT7m9tlWT4N3kmh93UuOkuL9pQSc8bMsSU5xiGfOy9Eav79JNHSaFHvDz4AACtP -cgPRKw/5qDCsapNOWygNkNGXzh8DjrxhpUfvDxvoKUEVuSpNrm6/Yg1qBtu9MAD1S1pWBPjzaeGj -f5PFZXdnbxso4pm1P21IiwZmQrOWcFnxJG35jafvTW4wTpRX28clwiJaPCxnB7j3Yz0EJTIgfcYl -TcwdGWJ6MIqgT4d4IV4QD/P80yVa/c7DuwAj+vPv/gB5N33KKzXPjzXTsWI2yzg7OQIDAQABoy8w -LTAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBQVrfyce3nN/IDaDIpeXBWJyY9nqzANBgkqhkiG9w0B -AQ0FAAOCAgEAByUvnZ/ouTgObjA9Pu29zSoeZ3eWg3ha0PPBWLSFgwlj7IihUWJlPlXyDtoKw5tq -Mcw8/bXyqhMCY8wpqXWmAsOkkZnrrLFo9K0rBRcAs17xnLtHvPW5AQ2RANf61u/19N4VK4pW1JZp -kdWri6siN3rM9NnvcXQY3qHTM7rr25aL+mymEl20H1KK/yhRJ0xliA+U3fRDS2ktJaBc65D3FCho -3lZa/VXs+l85bPk3eQdNh63tuLATMWOTMuhUPVZ5UARSPFA0er/mlGfyKx3OrQHciLW8sm4l9j+x -uUR6Yg4SwVX3d9+UEPAA6N0QxYlxuIlenvNWVNcFiJpc4N+zRqZjhcBRsZfRpK1goJzerHg9W9CC -REdQaoFX5XVDc8YoOBbNHEeAfzaBJpfHxzpWb1etIytWkFUAOXmVy0lVHdYYo42XSjkrQejF3qDM -2R0A5oX04hYlCTFdemSzdkf8ff14oF9ToVQ7tmxS4Lm8Tok9J0rjMZ9MKyEgl5G3wDH1470xREeb -L7mdUeGFsEzlA3kuVkZmXQ8SOL+SCv+Y+GDu0ZJ+/r5NTXgp54dVUYjLOZJisqVvfiDZHcQE+pGP -UIuF0MGx+3l/WI/vFNrGKmsT0vhwQhqzbBpV7vawZm0ViQp+4KpiEuHrSrJX/tj/XDgUvOfHmGmj -kj3QlKyWfEU= ------END CERTIFICATE----- diff --git a/spring-security-x509/keystore/cid.crt b/spring-security-x509/keystore/cid.crt deleted file mode 100644 index df5dd2d5a0..0000000000 --- a/spring-security-x509/keystore/cid.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFoDCCA4igAwIBAgIEGKkVGTANBgkqhkiG9w0BAQ0FADB0MQswCQYDVQQGEwJDQzESMBAGA1UE -CBMJU29tZVN0YXRlMREwDwYDVQQHEwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNV -BAsTDGJhZWxkdW5nLmNvbTEUMBIGA1UEAxMLQmFlbGR1bmcgQ0EwHhcNMTYwODExMDUwOTA3WhcN -MjYwODA5MDUwOTA3WjBsMQswCQYDVQQGEwJDQzESMBAGA1UECBMJU29tZVN0YXRlMREwDwYDVQQH -EwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNVBAsTDGJhZWxkdW5nLmNvbTEMMAoG -A1UEAxMDY2lkMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjlSWBNnCdPjZAU15rIWi -rId/Oop9cizRSUKc9ZLe/dRhfBBRVVD0IGhBIV+9yIIrcXicU0Ighp7yJP3gvRHma2KxwyGWYRwm -uqLfBzrFj9HuBIXuozPIKjSDEPhWtm2DrE/WtPJ5/srZQ92BLgtHqIB75beE39ry9i9HpobL+eLm -6MR9tGyfYpKaPeS8IfDT+3VpdBpIu+IGptPpegjGTSsVkiCyHTTXQKTM+QxdhERewzBJM69W2t/3 -A/WhqEVPC9/GhKvnPXcCw3zvvTntkQFnB/ArsJ/um6PfOkeI1WCu5QVJerQWVJXKwtGduhlxTPQ0 -UofwaZMTtGMiTi3zCciyOF0KrbFklDp+2cYDPc/AhQGy1/h8PCheP6Rh/T3acd8DRl3zpjA4zzdz -BIwFLF2+T2NySFUBXJFOrj96wFLh3lLlp9T3oP1aiLzGUC71aZIntc9JTri3pCP35UXe0hzuy3m7 -nJw7yh59W2+6sQgy66mSeD+DjNdIFNxsmu9bQ5mH97tWU9pAb32zAfq3S2syC2FnFU9qLYj4bdTd -sT9cUfZ/V1AdsaHsfyKerpU51d17csggtCQo4PrH8gr99CSX1Iq4oKy5gnom5v0Tcwe1K1eJW2JN -WIYJM1wuibTELF9yPsuNydhuRZdgT+cYaGaYtY+BnqYWro9PcmR+HdMCAwEAAaNCMEAwHwYDVR0j -BBgwFoAUFa38nHt5zfyA2gyKXlwVicmPZ6swHQYDVR0OBBYEFNUmq/xlPIaDQ42tKfmnZejN1gA0 -MA0GCSqGSIb3DQEBDQUAA4ICAQB1aAOdLB3/fgYAQfke4SUsiVkU91JRL3ec/kb92y0JNULrgEBH -wBJ71vwmNn/bzIzk7Iwa3mcoRCXtziYA9vbfzFDoDSOUt1cPc8W8Kn0BzbeHPYNnqgyIsmilCnd4 -dvrP5QtuG/ajy03Rj57M4XL5+S4uKwqFO9B3cTE1VjNLKkDThKL4rKf3gvR7wtx24dvOrRuD1C/D -u6QN/SfnYKXSb8fTMGwGuZLn6IYtGzrgfhQiZDZd/g7rSzne6tMHF3oMXVmeAU+etviN9A5Untat -cs9snOT/Ju0AKnUaOKvesIjdXpeuLl21ucdlTfsKQ+TZGwAPrDzjT4RLPA7lUk2hZ66DWg6mFfTn -JMzFdz2A5ea3mmPCErDdoxAfA9tjdaZRgQR/RUfmhU1DL2r3RNgCjQ5I9Bw2WjVWS+TepMd+u/6Q -Dujpi+LGArABavWYluOvd7p961lLYDxSPRmI4FTBEd+T1Iqz+uOu62MWWWxPm7NbBwjW71BQehuQ -JiWCRMYM6CyPrb8tQDljYj18t2I8H74qXWwOtGQUfmv+kqtlvDY4NesoHtavacTaDWy5a2pKF3rb -nhKpU1BKjHyjxvVG3V/aT2qhx6iwNWbKQM9BJDYCNwubBh0ydEzlRkC82OWjavkLBYk/uLqFhQt1 -Kr0YIYpOQiIb0RGxipCUWUjYbg== ------END CERTIFICATE----- diff --git a/spring-security-x509/keystore/cid.csr b/spring-security-x509/keystore/cid.csr deleted file mode 100644 index 24231f03e3..0000000000 --- a/spring-security-x509/keystore/cid.csr +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN NEW CERTIFICATE REQUEST----- -MIIE7zCCAtcCAQAwbDELMAkGA1UEBhMCQ0MxEjAQBgNVBAgTCVNvbWVTdGF0ZTERMA8GA1UEBxMI -U29tZUNpdHkxETAPBgNVBAoTCEJhZWxkdW5nMRUwEwYDVQQLEwxiYWVsZHVuZy5jb20xDDAKBgNV -BAMTA2NpZDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAI5UlgTZwnT42QFNeayFoqyH -fzqKfXIs0UlCnPWS3v3UYXwQUVVQ9CBoQSFfvciCK3F4nFNCIIae8iT94L0R5mtiscMhlmEcJrqi -3wc6xY/R7gSF7qMzyCo0gxD4VrZtg6xP1rTyef7K2UPdgS4LR6iAe+W3hN/a8vYvR6aGy/ni5ujE -fbRsn2KSmj3kvCHw0/t1aXQaSLviBqbT6XoIxk0rFZIgsh0010CkzPkMXYREXsMwSTOvVtrf9wP1 -oahFTwvfxoSr5z13AsN877057ZEBZwfwK7Cf7puj3zpHiNVgruUFSXq0FlSVysLRnboZcUz0NFKH -8GmTE7RjIk4t8wnIsjhdCq2xZJQ6ftnGAz3PwIUBstf4fDwoXj+kYf092nHfA0Zd86YwOM83cwSM -BSxdvk9jckhVAVyRTq4/esBS4d5S5afU96D9Woi8xlAu9WmSJ7XPSU64t6Qj9+VF3tIc7st5u5yc -O8oefVtvurEIMuupkng/g4zXSBTcbJrvW0OZh/e7VlPaQG99swH6t0trMgthZxVPai2I+G3U3bE/ -XFH2f1dQHbGh7H8inq6VOdXde3LIILQkKOD6x/IK/fQkl9SKuKCsuYJ6Jub9E3MHtStXiVtiTViG -CTNcLom0xCxfcj7LjcnYbkWXYE/nGGhmmLWPgZ6mFq6PT3Jkfh3TAgMBAAGgPjA8BgkqhkiG9w0B -CQ4xLzAtMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFNUmq/xlPIaDQ42tKfmnZejN1gA0MA0GCSqG -SIb3DQEBDQUAA4ICAQBRXQEVq/29w0iyGCmxqeGzxoBx3nprZJhgfGk1zFx8G4aEoDw6P/1Xs8fS -6ceIPIakUHOVuS2OQqLQ6Un9UNaOoE8vAk0T19Rfkb5cQSRb2GHnnxOefETCF9oaAN8mHO1Tt3wq -9+lzU0y428hI6APWYf2x/xJL3fo3YOFcHVD2AfY8os2kHDnyq4Aj0Rp0eHYR4OdYzPVGl6UEV0a3 -f24ypH9t2pXM/mLcaDBNeGTi5peFUGZYceGPOe6dGqWPJ4gpyRXMOWWNk6bSZgRfJzzk3IBnb53v -2B/AFR2OhYDVzy0xG4gwzap+v/RzeKofDr4pAnGgaB3h+oGfcIwvU6Wag66qEhIzsbpCK8ZPKqDq -G+4+JeWp8KKBgkecO5NgjZOn2Up9dAvKukBRWWIUA6nCsKN5wrTbzjeYCmE6oG19BHo9+fkskPMg -25X7vRu+xG0MNf0kkZGR1/boY6hX4l7EVpB/LYwDulhhAF/Ar48/HH/muGRJixOjhey7/yWaGQlv -T3XqOb06mJTMmmyKttjtBvnSY81gGhuwk76F07ihtF2VdXFUGMS5qurid16KiirhVtnDMyD1LxBc -R4miwwXxLyDfthKUk8y0I0BYr52ciqhfkNUPLKogD9TT1Jc1DgySHmYEAwhRqCEvl4o6HX9/KNdU -AU/i7WkKbXr4g4s8Dg== ------END NEW CERTIFICATE REQUEST----- diff --git a/spring-security-x509/keystore/cid.p12 b/spring-security-x509/keystore/cid.p12 deleted file mode 100644 index 1fde57bc6a9786d3bf600d7978677ddad8d40402..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5918 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 diff --git a/spring-security-x509/keystore/create-keystore.bat b/spring-security-x509/keystore/create-keystore.bat deleted file mode 100644 index 3c0293c04c..0000000000 --- a/spring-security-x509/keystore/create-keystore.bat +++ /dev/null @@ -1,24 +0,0 @@ -PASSWORD=changeit -KEYSTORE=keystore.jks -HOSTNAME=localhost -CLIENTNAME=cid - -# CN = Common Name -# OU = Organization Unit -# O = Organization Name -# L = Locality Name -# ST = State Name -# C = Country (2-letter Country Code) -# E = Email -DNAME_CA='CN=Baeldung CA,OU=baeldung.com,O=Baeldung,L=SomeCity,ST=SomeState,C=CC' -# For server certificates, the Common Name (CN) must be the hostname -DNAME_HOST='CN=$(HOSTNAME),OU=baeldung.com,O=Baeldung,L=SomeCity,ST=SomeState,C=CC' -DNAME_CLIENT='CN=$(CLIENTNAME),OU=baeldung.com,O=Baeldung,L=SomeCity,ST=SomeState,C=CC' -TRUSTSTORE=truststore.jks - - # Generate a certificate authority (CA) - keytool -genkey -alias ca -ext BC=ca:true \ - -keyalg RSA -keysize 4096 -sigalg SHA512withRSA -keypass $(PASSWORD) \ - -validity 3650 -dname $(DNAME_CA) \ - -keystore $(KEYSTORE) -storepass $(PASSWORD) - diff --git a/spring-security-x509/keystore/localhost.crt b/spring-security-x509/keystore/localhost.crt deleted file mode 100644 index 318deff26d..0000000000 --- a/spring-security-x509/keystore/localhost.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFpjCCA46gAwIBAgIEODZ8OjANBgkqhkiG9w0BAQ0FADB0MQswCQYDVQQGEwJDQzESMBAGA1UE -CBMJU29tZVN0YXRlMREwDwYDVQQHEwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNV -BAsTDGJhZWxkdW5nLmNvbTEUMBIGA1UEAxMLQmFlbGR1bmcgQ0EwHhcNMTYwODExMDUwODEyWhcN -MjYwODA5MDUwODEyWjByMQswCQYDVQQGEwJDQzESMBAGA1UECBMJU29tZVN0YXRlMREwDwYDVQQH -EwhTb21lQ2l0eTERMA8GA1UEChMIQmFlbGR1bmcxFTATBgNVBAsTDGJhZWxkdW5nLmNvbTESMBAG -A1UEAxMJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAhDGBomd3CmNf -ahbnsaYaA1IQbXsGd+heb1e8c+diWggSg7r6xH90o43or+nQPk1g9VB8C/o79Ldhe+RI68aACWqC -iWTM72Z3mR9Cunyku8Xz9w1TUrLr394rWTXMglddBt1H9jzz5t0mXS/xv49aUhp7d/XGYEidK5Sd -YXWylMjv3K7a9KQVgcy3WH7mWiIJoytkMVRlSy/1Y43CVrgMiBSm2Vkp5CQBOWEsh9wEPl9yiu8N -SkqaW0cnfZFxwx6Wk+d07+Fu2dD2hpiFX0abyJj+1m1SE50ihHzvdV8jOAjrQwFsOOJOtGWZ3dZo -YGRQqStu06ytCUjikR1xyHyBBl3lcPqd1NBABYQ8ErL5EnqmN64hw75flKPGvnRIAqtSNeqVdJxO -yT3dZEVA2iHQq9rgPj6AnRmV+978OppVP4HAjJr/a3WqjpydpB0ztRhqf0Sv5aEkym36DKcp75Fd -01XT3Owo6AvAlrTeuT/lj6hqDo1VkWB7Gsh1vdHtEvApXE/cKtDPbC6tPFwBLQCdP7AUZoI56+mO -N7aHgmcWH8NZSl+PAvVMBeyn4lrNwDAH/ji/YVQCpShbiqSMa5pZbp+xlsmmZHgF6OCLSNO8Iw+d -mMvy7Il2PEsIHwNe5jbtMc2qrM9NaPch6iMbqlz6hr1lruWCVx+ay3cuR8v4IRUCAwEAAaNCMEAw -HwYDVR0jBBgwFoAUFa38nHt5zfyA2gyKXlwVicmPZ6swHQYDVR0OBBYEFNO0BwOkFM8qxa5sTugu -ciCr7O58MA0GCSqGSIb3DQEBDQUAA4ICAQAjRfbR75Trkvvr9JX7KZbauNji6CkVb7H7WQAwrulG -fMqyn5xhugq/QhAX6hN1hD1v+FM2hIX5aqI9Ic6ZUl+YyjzL4QnDXD8PZjH4z/wTZxWrnR7Z8nVJ -yw1rDB6CSyT8Fok944UXCIDDVk7xeHbXvW2jyURZFqLI34V6jGwN2tH9hJ9CycpBaRD1JkmvWPDm -atP9Br+GwStHpV2D7gchuzvwujwfil9ORte/+I8E6NyDteFdxbayid3IDOMbzvEw9NCqPbpOmga5 -8i2s6SYpIFYro4kWys3U900d8w6UwmZRA5cnWZR3h+BCu2lpUNPcVzYqRNrqKVd0Y9bvDTNx41SY -cOE57g2lMGNnHEvyW3Kzt+MXfcuyzcfoIb+kLHvOp+Q39GyE2oaHIWlcwmWDsn3o4Kod9iEoC931 -QQdsCi68CEfR2HzX7hzVFTUzJqfIjLNewjlMOXaInxVTuWLe5zE+1p/6AU7Iq2lhI+bgDFymGYyb -gtIgn+5X3djLZYyQG7M6HLMSx2ppB4i1kViQVq05+7mCBPcfHNLVafMJiMZR8L6xic77ZsAACHmQ -zITP1VkXnD+Zd3Mb5Vw+i90ZvC0RUiUz3wWbqfb6gke1TltEq4D25ptRtyoftgghYTgdCM9cBiNQ -4oYCEJdNyJjWiVWN92mnIXoACw3vMPPLtQ== ------END CERTIFICATE----- diff --git a/spring-security-x509/keystore/localhost.csr b/spring-security-x509/keystore/localhost.csr deleted file mode 100644 index f267e931d1..0000000000 --- a/spring-security-x509/keystore/localhost.csr +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN NEW CERTIFICATE REQUEST----- -MIIE9TCCAt0CAQAwcjELMAkGA1UEBhMCQ0MxEjAQBgNVBAgTCVNvbWVTdGF0ZTERMA8GA1UEBxMI -U29tZUNpdHkxETAPBgNVBAoTCEJhZWxkdW5nMRUwEwYDVQQLEwxiYWVsZHVuZy5jb20xEjAQBgNV -BAMTCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIQxgaJndwpjX2oW -57GmGgNSEG17BnfoXm9XvHPnYloIEoO6+sR/dKON6K/p0D5NYPVQfAv6O/S3YXvkSOvGgAlqgolk -zO9md5kfQrp8pLvF8/cNU1Ky69/eK1k1zIJXXQbdR/Y88+bdJl0v8b+PWlIae3f1xmBInSuUnWF1 -spTI79yu2vSkFYHMt1h+5loiCaMrZDFUZUsv9WONwla4DIgUptlZKeQkATlhLIfcBD5fcorvDUpK -mltHJ32RccMelpPndO/hbtnQ9oaYhV9Gm8iY/tZtUhOdIoR873VfIzgI60MBbDjiTrRlmd3WaGBk -UKkrbtOsrQlI4pEdcch8gQZd5XD6ndTQQAWEPBKy+RJ6pjeuIcO+X5Sjxr50SAKrUjXqlXScTsk9 -3WRFQNoh0Kva4D4+gJ0Zlfve/DqaVT+BwIya/2t1qo6cnaQdM7UYan9Er+WhJMpt+gynKe+RXdNV -09zsKOgLwJa03rk/5Y+oag6NVZFgexrIdb3R7RLwKVxP3CrQz2wurTxcAS0AnT+wFGaCOevpjje2 -h4JnFh/DWUpfjwL1TAXsp+JazcAwB/44v2FUAqUoW4qkjGuaWW6fsZbJpmR4Bejgi0jTvCMPnZjL -8uyJdjxLCB8DXuY27THNqqzPTWj3IeojG6pc+oa9Za7lglcfmst3LkfL+CEVAgMBAAGgPjA8Bgkq -hkiG9w0BCQ4xLzAtMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFNO0BwOkFM8qxa5sTuguciCr7O58 -MA0GCSqGSIb3DQEBDQUAA4ICAQAWlQsaz2lN5uUU26QrlSWc9J1MjqRL4/XCT0lVkDFua7JOmTCJ -wowwLNFng2IKrrMmigEn/W2XnOMZBtBsKFp6WB8f9irCLrqfVRELKuHV7udNi1YlfCeQns0FgjI8 -Y/6uB43+rsqbpUkO86romTZSivc9szi8TDsJ84xutNNn8rS77Fzid4NQ4pZ/G5swn+PFVKBNWANL -J9rWkv8ld4hviRH0VS3ZuTOTL/8zfQlWFUGC7/FEH+1P1qWhHrFfj72E839226hIE/T96qnhbvBi -5W1dIjwux4JEpKN45+97boyPZitS/0T0URuKcJp+SILZjmOOrZfSnCWC5FkZmYjKIPUFg81lzWD7 -AxFRbjFF0XI6frbXLNVDAbpnhtCi88zT9rFWKKCwRnbZ4GfjmEWW2ITa+1Og9owY4iwW27zkhpTF -l/o5K7H4JrXCpoZcGVCu6MJFsQmSmsoTclgSljbQMVmJ53Bqq9pCtx18S8XvB+OXJpeDWlj9zvzv -WmuqCf9JNQb1UUOxpYfuyTRFCUODUV7kVWn3NLaAlJGtLJEUvw0H16JB6/u6JpXRPas/aOZXFRr7 -pW+PausdfGcniHKC//JvV/en/1OMHtrKZl1P8Ow2Uz4vy7H/Z1qIhXqm/qg1EkEUkEKmMG44fSne -LTyjagA8pzozPCfEg2v3w8vlAQ== ------END NEW CERTIFICATE REQUEST----- diff --git a/spring-security-x509/keystore/truststore.jks b/spring-security-x509/keystore/truststore.jks deleted file mode 100644 index aaae3a6a209c5068da9fbdbcfc7b1c31653c0dc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6855 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 Q7N?OpzYfrfq6w<_4^W>3!T