Merge branch 'master' of https://github.com/eugenp/tutorials

core-java-modules/core-java-date-operations-1/src/test/java/com/baeldung/date/DateDiffUnitTest.java

@@ -1,6 +1,8 @@
 package com.baeldung.date;
 
-import static org.junit.Assert.assertEquals;
+import org.joda.time.Days;
+import org.joda.time.Minutes;
+import org.junit.Test;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -16,7 +18,7 @@ import java.util.Locale;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import static org.junit.Assert.*;
 
 public class DateDiffUnitTest {
 
@@ -29,18 +31,39 @@ public class DateDiffUnitTest {
         long diffInMillies = Math.abs(secondDate.getTime() - firstDate.getTime());
         long diff = TimeUnit.DAYS.convert(diffInMillies, TimeUnit.MILLISECONDS);
 
-        assertEquals(diff, 6);
+        assertEquals(6, diff);
     }
 
     @Test
-    public void givenTwoDatesInJava8_whenDifferentiating_thenWeGetSix() {
-        LocalDate now = LocalDate.now();
-        LocalDate sixDaysBehind = now.minusDays(6);
+    public void givenTwoDatesInJava8_whenUsingPeriodGetDays_thenWorks() {
+        LocalDate aDate = LocalDate.of(2020, 9, 11);
+        LocalDate sixDaysBehind = aDate.minusDays(6);
 
-        Period period = Period.between(now, sixDaysBehind);
+        Period period = Period.between(aDate, sixDaysBehind);
         int diff = Math.abs(period.getDays());
 
-        assertEquals(diff, 6);
+        assertEquals(6, diff);
+    }
+
+    @Test
+    public void givenTwoDatesInJava8_whenUsingPeriodGetDays_thenDoesNotWork() {
+        LocalDate aDate = LocalDate.of(2020, 9, 11);
+        LocalDate sixtyDaysBehind = aDate.minusDays(60);
+        Period period = Period.between(aDate, sixtyDaysBehind);
+        int diff = Math.abs(period.getDays());
+        //not equals
+        assertNotEquals(60, diff);
+    }
+
+    @Test
+    public void givenTwoDatesInJava8_whenUsingPeriod_thenWeGet0Year1Month29Days() {
+        LocalDate aDate = LocalDate.of(2020, 9, 11);
+        LocalDate sixtyDaysBehind = aDate.minusDays(60);
+        Period period = Period.between(aDate, sixtyDaysBehind);
+        int years = Math.abs(period.getYears());
+        int months = Math.abs(period.getMonths());
+        int days = Math.abs(period.getDays());
+        assertArrayEquals(new int[] { 0, 1, 29 }, new int[] { years, months, days });
     }
 
     @Test
@@ -51,7 +74,7 @@ public class DateDiffUnitTest {
         Duration duration = Duration.between(now, sixMinutesBehind);
         long diff = Math.abs(duration.toMinutes());
 
-        assertEquals(diff, 6);
+        assertEquals(6, diff);
     }
 
     @Test
@@ -61,7 +84,7 @@ public class DateDiffUnitTest {
 
         long diff = ChronoUnit.SECONDS.between(now, tenSecondsLater);
 
-        assertEquals(diff, 10);
+        assertEquals(10, diff);
     }
 
     @Test
@@ -69,9 +92,9 @@ public class DateDiffUnitTest {
         LocalDateTime ldt = LocalDateTime.now();
         ZonedDateTime now = ldt.atZone(ZoneId.of("America/Montreal"));
         ZonedDateTime sixDaysBehind = now.withZoneSameInstant(ZoneId.of("Asia/Singapore"))
-            .minusDays(6);
+                                         .minusDays(6);
         long diff = ChronoUnit.DAYS.between(sixDaysBehind, now);
-        assertEquals(diff, 6);
+        assertEquals(6, diff);
     }
 
     @Test
@@ -81,7 +104,7 @@ public class DateDiffUnitTest {
 
         long diff = now.until(tenSecondsLater, ChronoUnit.SECONDS);
 
-        assertEquals(diff, 10);
+        assertEquals(10, diff);
     }
 
     @Test
@@ -89,10 +112,9 @@ public class DateDiffUnitTest {
         org.joda.time.LocalDate now = org.joda.time.LocalDate.now();
         org.joda.time.LocalDate sixDaysBehind = now.minusDays(6);
 
-        org.joda.time.Period period = new org.joda.time.Period(now, sixDaysBehind);
-        long diff = Math.abs(period.getDays());
+        long diff = Math.abs(Days.daysBetween(now, sixDaysBehind).getDays());
 
-        assertEquals(diff, 6);
+        assertEquals(6, diff);
     }
 
     @Test
@@ -100,8 +122,9 @@ public class DateDiffUnitTest {
         org.joda.time.LocalDateTime now = org.joda.time.LocalDateTime.now();
         org.joda.time.LocalDateTime sixMinutesBehind = now.minusMinutes(6);
 
-        org.joda.time.Period period = new org.joda.time.Period(now, sixMinutesBehind);
-        long diff = Math.abs(period.getDays());
+        long diff = Math.abs(Minutes.minutesBetween(now, sixMinutesBehind).getMinutes());
+        assertEquals(6, diff);
+
     }
 
     @Test
@@ -111,6 +134,6 @@ public class DateDiffUnitTest {
 
         long diff = Math.abs(now.numDaysFrom(sixDaysBehind));
 
-        assertEquals(diff, 6);
+        assertEquals(6, diff);
     }
-}
+}

hazelcast/src/main/resources/hazelcast.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.7.xsd"
-           xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast xmlns="http://www.hazelcast.com/schema/config"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+                               http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
     <network>
         <port auto-increment="true" port-count="20">5701</port>
         <join>
-            <multicast enabled="false">
-	        </multicast>
-	      	<tcp-ip enabled="true">
-	        	<member>machine1</member>
-		        <member>localhost</member>
-	      	</tcp-ip>
+            <multicast enabled="false"/>
+            <tcp-ip enabled="true">
+                <member>machine1</member>
+                <member>localhost</member>
+            </tcp-ip>
         </join>
     </network>
 </hazelcast>

quarkus/pom.xml

@@ -99,6 +99,8 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire-plugin.version}</version>
                 <configuration>
+                    <forkCount>1</forkCount>
+                    <reuseForks>true</reuseForks>
                     <systemProperties>
                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                     </systemProperties>

spring-5-security-oauth/pom.xml

@@ -32,6 +32,10 @@
             <groupId>org.thymeleaf.extras</groupId>
             <artifactId>thymeleaf-extras-springsecurity5</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jersey</artifactId>
+        </dependency>
 
         <!-- oauth2 -->
         <dependency>
@@ -63,7 +67,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-	
+
     <properties>
         <start-class>com.baeldung.oauth2.SpringOAuthApplication</start-class>
     </properties>

spring-5-security-oauth/src/main/java/com/baeldung/jersey/JerseyApplication.java

@@ -0,0 +1,13 @@
+package com.baeldung.jersey;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
+
+@SpringBootApplication
+@PropertySource("classpath:jersey-application.properties")
+public class JerseyApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(JerseyApplication.class, args);
+    }
+}

spring-5-security-oauth/src/main/java/com/baeldung/jersey/JerseyResource.java

@@ -0,0 +1,30 @@
+package com.baeldung.jersey;
+
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.core.OAuth2AuthenticatedPrincipal;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.SecurityContext;
+
+@Path("/")
+public class JerseyResource {
+    @GET
+    @Path("login")
+    @Produces(MediaType.TEXT_HTML)
+    public String login() {
+        return "Log in with <a href=\"/oauth2/authorization/github\">GitHub</a>";
+    }
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String home(@Context SecurityContext securityContext) {
+        OAuth2AuthenticationToken authenticationToken = (OAuth2AuthenticationToken) securityContext.getUserPrincipal();
+        OAuth2AuthenticatedPrincipal authenticatedPrincipal = authenticationToken.getPrincipal();
+        String userName = authenticatedPrincipal.getAttribute("login");
+        return "Hello " + userName;
+    }
+}

spring-5-security-oauth/src/main/java/com/baeldung/jersey/RestConfig.java

@@ -0,0 +1,11 @@
+package com.baeldung.jersey;
+
+import org.glassfish.jersey.server.ResourceConfig;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RestConfig extends ResourceConfig {
+    public RestConfig() {
+        register(JerseyResource.class);
+    }
+}

spring-5-security-oauth/src/main/java/com/baeldung/jersey/SecurityConfig.java

@@ -0,0 +1,21 @@
+package com.baeldung.jersey;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http
+          .authorizeRequests()
+          .antMatchers("/login")
+          .permitAll()
+          .anyRequest()
+          .authenticated()
+          .and()
+          .oauth2Login()
+          .loginPage("/login");
+    }
+}

spring-5-security-oauth/src/main/resources/jersey-application.properties

@@ -0,0 +1,3 @@
+server.port=8083
+spring.security.oauth2.client.registration.github.client-id=<your-client-id>
+spring.security.oauth2.client.registration.github.client-secret=<your-client-secret>

spring-5-security-oauth/src/test/java/com/baeldung/jersey/JerseyResourceUnitTest.java

@@ -0,0 +1,72 @@
+package com.baeldung.jersey;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.net.URI;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+import static org.springframework.http.MediaType.TEXT_HTML;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+@TestPropertySource(properties = "spring.security.oauth2.client.registration.github.client-id:test-id")
+public class JerseyResourceUnitTest {
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+    @LocalServerPort
+    private int port;
+
+    private String basePath;
+
+    @Before
+    public void setup() {
+        basePath = "http://localhost:" + port + "/";
+    }
+
+    @Test
+    public void whenUserIsUnauthenticated_thenTheyAreRedirectedToLoginPage() {
+        ResponseEntity<Object> response = restTemplate.getForEntity(basePath, Object.class);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.FOUND);
+        assertThat(response.getBody()).isNull();
+
+        URI redirectLocation = response.getHeaders().getLocation();
+        assertThat(redirectLocation).isNotNull();
+        assertThat(redirectLocation.toString()).isEqualTo(basePath + "login");
+    }
+
+    @Test
+    public void whenUserAttemptsToLogin_thenAuthorizationPathIsReturned() {
+        ResponseEntity<String> response = restTemplate.getForEntity(basePath + "login", String.class);
+        assertThat(response.getHeaders().getContentType()).isEqualTo(TEXT_HTML);
+        assertThat(response.getBody()).isEqualTo("Log in with <a href=\"/oauth2/authorization/github\">GitHub</a>");
+    }
+
+    @Test
+    public void whenUserAccessesAuthorizationEndpoint_thenTheyAresRedirectedToProvider() {
+        ResponseEntity<String> response = restTemplate.getForEntity(basePath + "oauth2/authorization/github", String.class);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.FOUND);
+        assertThat(response.getBody()).isNull();
+
+        URI redirectLocation = response.getHeaders().getLocation();
+        assertThat(redirectLocation).isNotNull();
+        assertThat(redirectLocation.getHost()).isEqualTo("github.com");
+        assertThat(redirectLocation.getPath()).isEqualTo("/login/oauth/authorize");
+
+        String redirectionQuery = redirectLocation.getQuery();
+        assertThat(redirectionQuery.contains("response_type=code"));
+        assertThat(redirectionQuery.contains("client_id=test-id"));
+        assertThat(redirectionQuery.contains("scope=read:user"));
+    }
+}

spring-5-security/src/main/java/com/baeldung/inmemory/InMemoryNoOpAuthWebSecurityConfigurer.java

@@ -0,0 +1,29 @@
+package com.baeldung.inmemory;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+//@Configuration
+public class InMemoryNoOpAuthWebSecurityConfigurer extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+        auth.inMemoryAuthentication()
+            .withUser("spring")
+            .password("{noop}secret")
+            .roles("USER");
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.authorizeRequests()
+            .antMatchers("/private/**")
+            .authenticated()
+            .antMatchers("/public/**")
+            .permitAll()
+            .and()
+            .httpBasic();
+    }
+}

spring-boot-modules/spring-boot-mvc-3/pom.xml

@@ -22,6 +22,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -37,4 +41,4 @@
         <commons-io.version>2.7</commons-io.version>
     </properties>
 
-</project>
+</project>

spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/springvalidation/ServletInitializer.java

@@ -0,0 +1,12 @@
+package com.baeldung.springvalidation;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+public class ServletInitializer extends SpringBootServletInitializer {
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(SpringValidationApplication.class);
+    }
+}

spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/springvalidation/SpringValidationApplication.java

@@ -0,0 +1,13 @@
+package com.baeldung.springvalidation;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringValidationApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringValidationApplication.class, args);
+    }
+
+}

spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/springvalidation/controller/UserAccountController.java

@@ -0,0 +1,44 @@
+package com.baeldung.springvalidation.controller;
+
+import javax.validation.Valid;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.baeldung.springvalidation.domain.UserAccount;
+import com.baeldung.springvalidation.interfaces.BasicInfo;
+
+@Controller
+public class UserAccountController {
+
+    @GetMapping("/getUserForm")
+    public String showUserForm(Model theModel) {
+        UserAccount theUser = new UserAccount();
+        theModel.addAttribute("useraccount", theUser);
+        return "userHome";
+    }
+
+    @RequestMapping(value = "/saveBasicInfo", method = RequestMethod.POST)
+    public String saveBasicInfo(@Valid @ModelAttribute("useraccount") UserAccount useraccount, BindingResult result, ModelMap model) {
+        if (result.hasErrors()) {
+            return "error";
+        }
+        return "success";
+    }
+
+    @RequestMapping(value = "/saveBasicInfoStep1", method = RequestMethod.POST)
+    public String saveBasicInfoStep1(@Validated(BasicInfo.class) @ModelAttribute("useraccount") UserAccount useraccount, BindingResult result, ModelMap model) {
+        if (result.hasErrors()) {
+            return "error";
+        }
+        return "success";
+    }
+
+}

spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/springvalidation/domain/UserAccount.java

@@ -0,0 +1,80 @@
+package com.baeldung.springvalidation.domain;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import com.baeldung.springvalidation.interfaces.AdvanceInfo;
+import com.baeldung.springvalidation.interfaces.BasicInfo;
+
+public class UserAccount {
+
+    @NotNull(groups = BasicInfo.class)
+    @Size(min = 4, max = 15, groups = BasicInfo.class)
+    private String password;
+
+    @NotBlank(groups = BasicInfo.class)
+    private String name;
+
+    @Min(value = 18, message = "Age should not be less than 18", groups = AdvanceInfo.class)
+    private int age;
+
+    @NotBlank(groups = AdvanceInfo.class)
+    private String phone;
+
+    @Valid
+    @NotNull(groups = AdvanceInfo.class)
+    private UserAddress useraddress;
+
+    public UserAddress getUseraddress() {
+        return useraddress;
+    }
+
+    public void setUseraddress(UserAddress useraddress) {
+        this.useraddress = useraddress;
+    }
+
+    public UserAccount() {
+
+    }
+
+    public UserAccount(String email, String password, String name, int age) {
+        this.password = password;
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+}

spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/springvalidation/domain/UserAddress.java

@@ -0,0 +1,17 @@
+package com.baeldung.springvalidation.domain;
+
+import javax.validation.constraints.NotBlank;
+public class UserAddress {
+    
+    @NotBlank
+    private String countryCode;
+    
+    public String getCountryCode() {
+        return countryCode;
+    }
+
+    public void setCountryCode(String countryCode) {
+        this.countryCode = countryCode;
+    }
+   
+}

spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/springvalidation/interfaces/AdvanceInfo.java

@@ -0,0 +1,6 @@
+package com.baeldung.springvalidation.interfaces;
+
+public interface AdvanceInfo {
+    // validation group marker interface
+
+}

spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/springvalidation/interfaces/BasicInfo.java

@@ -0,0 +1,6 @@
+package com.baeldung.springvalidation.interfaces;
+
+public interface BasicInfo {
+    // validation group marker interface
+
+}