Merge remote-tracking branch 'upstream/master'

core-java-modules/core-java-lang-2/pom.xml

@@ -15,6 +15,11 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+        </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>

core-java-modules/core-java-lang-2/src/main/java/com/baeldung/methodmultiplereturnvalues/MultipleReturnValuesUsingApacheCommonsPair.java

@@ -0,0 +1,20 @@
+package com.baeldung.methodmultiplereturnvalues;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.Comparator;
+import java.util.List;
+
+class MultipleReturnValuesUsingApacheCommonsPair {
+
+    static ImmutablePair<Coordinates, Double> getMostDistantPoint(
+      List<Coordinates> coordinatesList,
+      Coordinates target) {
+        return coordinatesList.stream()
+          .map(coordinates -> ImmutablePair.of(coordinates, coordinates.calculateDistance(target)))
+          .max(Comparator.comparingDouble(Pair::getRight))
+          .get();
+
+    }
+}

core-java-modules/core-java-lang-2/src/main/java/com/baeldung/methodmultiplereturnvalues/MultipleReturnValuesUsingApacheCommonsTriple.java

@@ -0,0 +1,23 @@
+package com.baeldung.methodmultiplereturnvalues;
+
+import org.apache.commons.lang3.tuple.ImmutableTriple;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+class MultipleReturnValuesUsingApacheCommonsTriple {
+
+    static ImmutableTriple<Double, Double, Double> getMinAvgMaxTriple(
+      List<Coordinates> coordinatesList,
+      Coordinates target) {
+
+        List<Double> distanceList = coordinatesList.stream()
+          .map(coordinates -> coordinates.calculateDistance(target))
+          .collect(Collectors.toList());
+        Double minDistance = distanceList.stream().mapToDouble(Double::doubleValue).min().getAsDouble();
+        Double avgDistance = distanceList.stream().mapToDouble(Double::doubleValue).average().orElse(0.0D);
+        Double maxDistance = distanceList.stream().mapToDouble(Double::doubleValue).max().getAsDouble();
+
+        return ImmutableTriple.of(minDistance, avgDistance, maxDistance);
+    }
+}

core-java-modules/core-java-lang-2/src/test/java/com/baeldung/methodmultiplereturnvalues/MultipleReturnValuesUsingApacheCommonsPairUnitTest.java

@@ -0,0 +1,34 @@
+package com.baeldung.methodmultiplereturnvalues;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MultipleReturnValuesUsingApacheCommonsPairUnitTest {
+
+    @Test
+    void whenUsingPair_thenMultipleFieldsAreReturned() {
+
+        List<Coordinates> coordinatesList = new ArrayList<>();
+        coordinatesList.add(new Coordinates(1, 1, "home"));
+        coordinatesList.add(new Coordinates(2, 2, "school"));
+        coordinatesList.add(new Coordinates(3, 3, "hotel"));
+
+        Coordinates target = new Coordinates(5, 5, "gym");
+
+        ImmutablePair<Coordinates, Double> mostDistantPoint = MultipleReturnValuesUsingApacheCommonsPair.getMostDistantPoint(coordinatesList, target);
+
+        assertEquals(1, mostDistantPoint.getLeft().getLongitude());
+        assertEquals(1, mostDistantPoint.getLeft().getLatitude());
+        assertEquals("home", mostDistantPoint.getLeft().getPlaceName());
+        assertEquals(5.66, BigDecimal.valueOf(mostDistantPoint.getRight()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+
+    }
+
+}

core-java-modules/core-java-lang-2/src/test/java/com/baeldung/methodmultiplereturnvalues/MultipleReturnValuesUsingApacheCommonsTripleUnitTest.java

@@ -0,0 +1,35 @@
+package com.baeldung.methodmultiplereturnvalues;
+
+import org.apache.commons.lang3.tuple.ImmutableTriple;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MultipleReturnValuesUsingApacheCommonsTripleUnitTest {
+
+    @Test
+    void whenUsingTriple_thenMultipleFieldsAreReturned() {
+
+        List<Coordinates> coordinatesList = new ArrayList<>();
+        coordinatesList.add(new Coordinates(1, 1, "home"));
+        coordinatesList.add(new Coordinates(2, 2, "school"));
+        coordinatesList.add(new Coordinates(3, 3, "hotel"));
+
+        Coordinates target = new Coordinates(5, 5, "gym");
+
+        ImmutableTriple<Double, Double, Double> minAvgMax = MultipleReturnValuesUsingApacheCommonsTriple.getMinAvgMaxTriple(coordinatesList, target);
+
+        assertEquals(2.83, scaleDouble(minAvgMax.left));   //min
+        assertEquals(4.24, scaleDouble(minAvgMax.middle)); //avg
+        assertEquals(5.66, scaleDouble(minAvgMax.right));  //max
+    }
+
+    private double scaleDouble(Double d) {
+        return BigDecimal.valueOf(d).setScale(2, RoundingMode.HALF_UP).doubleValue();
+    }
+}

open-liberty/pom.xml

@@ -0,0 +1,130 @@
+<?xml version='1.0' encoding='utf-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.baeldung</groupId>
+    <artifactId>open-liberty</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-web-api</artifactId>
+            <version>${version.jakarta.jakartaee-web-api}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile</groupId>
+            <artifactId>microprofile</artifactId>
+            <version>${version.microprofile}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>${version.derby}</version>
+        </dependency>
+
+        <!-- For tests -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${version.junit}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>yasson</artifactId>
+            <version>${version.yasson}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-client</artifactId>
+            <version>${version.cxf-rt-rs-client}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
+            <version>${version.javax.json}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-mp-client</artifactId>
+            <version>${version.cxf-rt-rs-mp-client}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <!-- Enable liberty-maven plugin -->
+            <plugin>
+                <groupId>io.openliberty.tools</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+                <version>${version.liberty-maven-plugin}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>${version.maven-dependency-plugin}</version>
+                <executions>
+                    <execution>
+                        <id>copy-derby-dependency</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeArtifactIds>derby</includeArtifactIds>
+                            <outputDirectory>${project.build.directory}/liberty/wlp/usr/shared/resources/</outputDirectory>
+                            <systemPropertyVariables>
+                                <liberty.test.port>${testServerHttpPort}</liberty.test.port>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${version.maven-war-plugin}</version>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <failOnMissingWebXml>false</failOnMissingWebXml>
+
+        <!-- versions -->
+        <version.jakarta.jakartaee-web-api>8.0.0</version.jakarta.jakartaee-web-api>
+        <version.microprofile>3.2</version.microprofile>
+        <version.derby>10.14.2.0</version.derby>
+        <version.liberty-maven-plugin>3.1</version.liberty-maven-plugin>
+        <version.maven-dependency-plugin>2.10</version.maven-dependency-plugin>
+        <version.maven-war-plugin>3.2.3</version.maven-war-plugin>
+        <version.junit>4.12</version.junit>
+        <version.yasson>1.0.5</version.yasson>
+        <version.cxf-rt-rs-client>3.2.6</version.cxf-rt-rs-client>
+        <version.javax.json>1.0.4</version.javax.json>
+        <version.cxf-rt-rs-mp-client>3.3.1</version.cxf-rt-rs-mp-client>
+
+        <!-- Liberty configuration -->
+        <liberty.var.app.context.root>openliberty</liberty.var.app.context.root>
+        <liberty.var.default.http.port>9080</liberty.var.default.http.port>
+        <liberty.var.default.https.port>9443</liberty.var.default.https.port>
+        <testServerHttpPort>7070</testServerHttpPort>
+    </properties>
+</project>

open-liberty/src/main/java/com/baeldung/openliberty/person/dao/PersonDao.java

@@ -0,0 +1,24 @@
+package com.baeldung.openliberty.person.dao;
+
+import javax.enterprise.context.RequestScoped;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import com.baeldung.openliberty.person.model.Person;
+
+@RequestScoped
+public class PersonDao {
+
+    @PersistenceContext(name = "jpa-unit")
+    private EntityManager em;
+
+    public Person createPerson(Person person) {
+        em.persist(person);
+        return person;
+    }
+
+    public Person readPerson(int personId) {
+        return em.find(Person.class, personId);
+    }
+
+}

open-liberty/src/main/java/com/baeldung/openliberty/person/model/Person.java

@@ -0,0 +1,58 @@
+package com.baeldung.openliberty.person.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+
+@Entity
+public class Person {
+    
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Id
+    private int id;
+    
+    private String username;
+    private String email;
+    
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+    
+    public void setUsername(String username) {
+        this.username = username;
+    }
+    
+    public String getEmail() {
+        return email;
+    }
+    
+    public void setEmail(String email) {
+        this.email = email;
+    }
+    
+    public Person(int id, @NotBlank String username, @Email String email) {
+        super();
+        this.id = id;
+        this.username = username;
+        this.email = email;
+    }
+    
+    public Person() {
+        super();
+    }
+
+    public String toString() {
+        return this.id + ":" +this.username;
+    }
+}

open-liberty/src/main/java/com/baeldung/openliberty/person/resource/PersonResource.java

@@ -0,0 +1,52 @@
+package com.baeldung.openliberty.person.resource;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import com.baeldung.openliberty.person.dao.PersonDao;
+import com.baeldung.openliberty.person.model.Person;
+
+@RequestScoped
+@Path("persons")
+public class PersonResource {
+
+    @Inject
+    private PersonDao personDao;
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public List<Person> getAllPersons() {
+        return Arrays.asList(new Person(1, "normanlewis", "normanlewis@email.com"));
+    }
+
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Transactional
+    public Response addPerson(Person person) {
+        personDao.createPerson(person);
+        String respMessage = "Person #" + person.getId() + " created successfully.";
+        return Response.status(Response.Status.CREATED).entity(respMessage).build();
+    }
+
+    @GET
+    @Path("{id}")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Transactional
+    public Person getPerson(@PathParam("id") int id) {
+        Person person = personDao.readPerson(id);
+        return person;
+    }
+}

open-liberty/src/main/java/com/baeldung/openliberty/rest/ApiApplication.java

@@ -0,0 +1,9 @@
+package com.baeldung.openliberty.rest;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/api")
+public class ApiApplication extends Application {
+
+}

open-liberty/src/main/java/com/baeldung/openliberty/rest/consumes/RestConsumer.java

@@ -0,0 +1,18 @@
+package com.baeldung.openliberty.rest.consumes;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+
+public class RestConsumer {
+
+    public static String consumeWithJsonb(String targetUrl) {
+        Client client = ClientBuilder.newClient();
+        Response response = client.target(targetUrl).request().get();
+        String result = response.readEntity(String.class);
+        response.close();
+        client.close();
+        return result;
+    }
+
+}

open-liberty/src/main/java/com/baeldung/openliberty/servlet/AppServlet.java

@@ -0,0 +1,27 @@
+package com.baeldung.openliberty.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(urlPatterns="/app")
+public class AppServlet extends HttpServlet {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String htmlOutput = "<html><h2>Hello! Welcome to Open Liberty</h2></html>";
+        response.getWriter().append(htmlOutput);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+        throws ServletException, IOException {
+        doGet(request, response);
+    }
+}

open-liberty/src/main/liberty/config/server.xml

@@ -0,0 +1,28 @@
+<server description="Baeldung Open Liberty server">
+    <featureManager>
+        <feature>mpHealth-2.0</feature>
+        <feature>servlet-4.0</feature>
+        <feature>jaxrs-2.1</feature>
+        <feature>jsonp-1.1</feature>
+        <feature>jsonb-1.0</feature>
+        <feature>cdi-2.0</feature>
+        <feature>jpa-2.2</feature>
+    </featureManager>
+
+    <webApplication location="open-liberty.war" contextRoot="/" />
+
+    <logging traceSpecification="com.ibm.ws.microprofile.health.*=all" hideMessage="SRVE9967W" />
+
+    <httpEndpoint host="*" httpPort="${default.http.port}" httpsPort="${default.https.port}" id="defaultHttpEndpoint" />
+
+    <library id="derbyJDBCLib">
+        <fileset dir="${shared.resource.dir}" includes="derby*.jar"/> 
+    </library>
+
+    <!-- Datasource Configuration -->
+    <dataSource id="jpadatasource" jndiName="jdbc/jpadatasource">
+        <jdbcDriver libraryRef="derbyJDBCLib" />
+        <properties.derby.embedded databaseName="libertyDB" createDatabase="create" />
+    </dataSource>
+
+</server>

open-liberty/src/main/resources/META-INF/persistence.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.2"
+    xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
+                        http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
+    <persistence-unit name="jpa-unit" transaction-type="JTA">
+        <jta-data-source>jdbc/jpadatasource</jta-data-source>
+        <properties>
+            <property name="eclipselink.ddl-generation" value="create-tables"/>
+            <property name="eclipselink.ddl-generation.output-mode" value="both" />
+        </properties>
+    </persistence-unit>
+</persistence>

open-liberty/src/test/java/com/baeldung/openliberty/RestClientTest.java

@@ -0,0 +1,40 @@
+package com.baeldung.openliberty;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.json.bind.JsonbBuilder;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.baeldung.openliberty.person.model.Person;
+import com.baeldung.openliberty.rest.consumes.RestConsumer;
+
+public class RestClientTest {
+
+    private static String BASE_URL;
+
+    private final String API_PERSON = "api/persons";
+
+    @BeforeClass
+    public static void oneTimeSetup() {
+        BASE_URL = "http://localhost:9080/"; 
+    }
+    
+    @Test
+    public void testSuite() {
+        //run the test only when liberty server is started
+        //this.whenConsumeWithJsonb_thenGetPerson();
+    }
+
+    public void whenConsumeWithJsonb_thenGetPerson() {
+        String url = BASE_URL + API_PERSON + "/1";
+        String result = RestConsumer.consumeWithJsonb(url);        
+
+        Person person = JsonbBuilder.create().fromJson(result, Person.class);
+        assertEquals(1, person.getId());
+        assertEquals("normanlewis", person.getUsername());
+        assertEquals("normanlewis@email.com", person.getEmail());
+    }
+
+}

pom.xml

@@ -538,6 +538,7 @@
 
                 <module>netflix-modules</module>
                 <module>ninja</module>
+                <module>open-liberty</module>
 
                 <module>oauth2-framework-impl</module>
                 <module>optaplanner</module>
@@ -1069,6 +1070,7 @@
 
                 <module>netflix-modules</module>
                 <module>ninja</module>
+                <module>open-liberty</module>
 
                 <module>oauth2-framework-impl</module>
                 <module>optaplanner</module>

spring-boot-bootstrap/src/main/resources/application-mysql.properties

@@ -1 +1,4 @@
-spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
+spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
+spring.application.name = spring-boot-bootstrap
+spring.datasource.username = ${SPRING_DATASOURCE_USER}
+spring.datasource.password = ${SPRING_DATASOURCE_PASSWORD}