Merge branch 'master' into master
This commit is contained in:
sheryllresulta
GitHub
commit
4554bb89de
11
README.md
11
README.md
@ -20,17 +20,22 @@ In additional to Spring, the following technologies are in focus: `core Java`, `
|
|||||||
|
|
||||||
Building the project
|
Building the project
|
||||||
====================
|
====================
|
||||||
To do the full build, do: `mvn install -Pdefault -Dgib.enabled=false`
|
To do the full build, do: `mvn clean install`
|
||||||
|
|
||||||
|
|
||||||
Building a single module
|
Building a single module
|
||||||
====================
|
====================
|
||||||
To build a specific module run the command: `mvn clean install -Dgib.enabled=false` in the module directory
|
To build a specific module run the command: `mvn clean install` in the module directory
|
||||||
|
|
||||||
|
|
||||||
Running a Spring Boot module
|
Running a Spring Boot module
|
||||||
====================
|
====================
|
||||||
To run a Spring Boot module run the command: `mvn spring-boot:run -Dgib.enabled=false` in the module directory
|
To run a Spring Boot module run the command: `mvn spring-boot:run` in the module directory
|
||||||
|
|
||||||
|
#Running Tests
|
||||||
|
|
||||||
|
The command `mvn clean install` will run the unit tests in a module.
|
||||||
|
To run the integration tests, use the command `mvn clean install -Pintegration-lite-first`
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -44,11 +44,6 @@
|
|||||||
<artifactId>spring-boot-configuration-processor</artifactId>
|
<artifactId>spring-boot-configuration-processor</artifactId>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
@ -68,16 +63,6 @@
|
|||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.olingo</groupId>
|
|
||||||
<artifactId>olingo-odata2-api</artifactId>
|
|
||||||
<version>${olingo2.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.olingo</groupId>
|
|
||||||
<artifactId>olingo-odata2-jpa-processor-api</artifactId>
|
|
||||||
<version>${olingo2.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.olingo</groupId>
|
<groupId>org.apache.olingo</groupId>
|
||||||
<artifactId>olingo-odata2-jpa-processor-core</artifactId>
|
<artifactId>olingo-odata2-jpa-processor-core</artifactId>
|
||||||
|
|||||||
@ -12,25 +12,104 @@ import javax.persistence.OneToMany;
|
|||||||
import javax.persistence.Table;
|
import javax.persistence.Table;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Data
|
@Table(name = "car_maker")
|
||||||
@Table(name="car_maker")
|
|
||||||
public class CarMaker {
|
public class CarMaker {
|
||||||
|
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy=GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@Column(name="name")
|
@Column(name = "name")
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
@OneToMany(mappedBy="maker",
|
@OneToMany(mappedBy = "maker", orphanRemoval = true, cascade = CascadeType.ALL)
|
||||||
orphanRemoval = true,
|
|
||||||
cascade=CascadeType.ALL)
|
|
||||||
private List<CarModel> models;
|
private List<CarModel> models;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the id
|
||||||
|
*/
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param id the id to set
|
||||||
|
*/
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the name
|
||||||
|
*/
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param name the name to set
|
||||||
|
*/
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the models
|
||||||
|
*/
|
||||||
|
public List<CarModel> getModels() {
|
||||||
|
return models;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param models the models to set
|
||||||
|
*/
|
||||||
|
public void setModels(List<CarModel> models) {
|
||||||
|
this.models = models;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see java.lang.Object#hashCode()
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
final int prime = 31;
|
||||||
|
int result = 1;
|
||||||
|
result = prime * result + ((id == null) ? 0 : id.hashCode());
|
||||||
|
result = prime * result + ((models == null) ? 0 : models.hashCode());
|
||||||
|
result = prime * result + ((name == null) ? 0 : name.hashCode());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see java.lang.Object#equals(java.lang.Object)
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null)
|
||||||
|
return false;
|
||||||
|
if (getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
CarMaker other = (CarMaker) obj;
|
||||||
|
if (id == null) {
|
||||||
|
if (other.id != null)
|
||||||
|
return false;
|
||||||
|
} else if (!id.equals(other.id))
|
||||||
|
return false;
|
||||||
|
if (models == null) {
|
||||||
|
if (other.models != null)
|
||||||
|
return false;
|
||||||
|
} else if (!models.equals(other.models))
|
||||||
|
return false;
|
||||||
|
if (name == null) {
|
||||||
|
if (other.name != null)
|
||||||
|
return false;
|
||||||
|
} else if (!name.equals(other.name))
|
||||||
|
return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
package org.baeldung.examples.olingo2.domain;
|
package org.baeldung.examples.olingo2.domain;
|
||||||
|
|
||||||
|
|
||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
import javax.persistence.FetchType;
|
import javax.persistence.FetchType;
|
||||||
import javax.persistence.GeneratedValue;
|
import javax.persistence.GeneratedValue;
|
||||||
@ -11,15 +10,12 @@ import javax.persistence.ManyToOne;
|
|||||||
import javax.persistence.Table;
|
import javax.persistence.Table;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Data
|
@Table(name = "car_model")
|
||||||
@Table(name="car_model")
|
|
||||||
public class CarModel {
|
public class CarModel {
|
||||||
|
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy=GenerationType.AUTO)
|
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@ -31,8 +27,133 @@ public class CarModel {
|
|||||||
@NotNull
|
@NotNull
|
||||||
private String sku;
|
private String sku;
|
||||||
|
|
||||||
@ManyToOne(optional=false, fetch= FetchType.LAZY)
|
@ManyToOne(optional = false, fetch = FetchType.LAZY)
|
||||||
@JoinColumn(name="maker_fk")
|
@JoinColumn(name = "maker_fk")
|
||||||
private CarMaker maker;
|
private CarMaker maker;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the id
|
||||||
|
*/
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param id the id to set
|
||||||
|
*/
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the name
|
||||||
|
*/
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param name the name to set
|
||||||
|
*/
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the year
|
||||||
|
*/
|
||||||
|
public Integer getYear() {
|
||||||
|
return year;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param year the year to set
|
||||||
|
*/
|
||||||
|
public void setYear(Integer year) {
|
||||||
|
this.year = year;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the sku
|
||||||
|
*/
|
||||||
|
public String getSku() {
|
||||||
|
return sku;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param sku the sku to set
|
||||||
|
*/
|
||||||
|
public void setSku(String sku) {
|
||||||
|
this.sku = sku;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the maker
|
||||||
|
*/
|
||||||
|
public CarMaker getMaker() {
|
||||||
|
return maker;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param maker the maker to set
|
||||||
|
*/
|
||||||
|
public void setMaker(CarMaker maker) {
|
||||||
|
this.maker = maker;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see java.lang.Object#hashCode()
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
final int prime = 31;
|
||||||
|
int result = 1;
|
||||||
|
result = prime * result + ((id == null) ? 0 : id.hashCode());
|
||||||
|
result = prime * result + ((maker == null) ? 0 : maker.hashCode());
|
||||||
|
result = prime * result + ((name == null) ? 0 : name.hashCode());
|
||||||
|
result = prime * result + ((sku == null) ? 0 : sku.hashCode());
|
||||||
|
result = prime * result + ((year == null) ? 0 : year.hashCode());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see java.lang.Object#equals(java.lang.Object)
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null)
|
||||||
|
return false;
|
||||||
|
if (getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
CarModel other = (CarModel) obj;
|
||||||
|
if (id == null) {
|
||||||
|
if (other.id != null)
|
||||||
|
return false;
|
||||||
|
} else if (!id.equals(other.id))
|
||||||
|
return false;
|
||||||
|
if (maker == null) {
|
||||||
|
if (other.maker != null)
|
||||||
|
return false;
|
||||||
|
} else if (!maker.equals(other.maker))
|
||||||
|
return false;
|
||||||
|
if (name == null) {
|
||||||
|
if (other.name != null)
|
||||||
|
return false;
|
||||||
|
} else if (!name.equals(other.name))
|
||||||
|
return false;
|
||||||
|
if (sku == null) {
|
||||||
|
if (other.sku != null)
|
||||||
|
return false;
|
||||||
|
} else if (!sku.equals(other.sku))
|
||||||
|
return false;
|
||||||
|
if (year == null) {
|
||||||
|
if (other.year != null)
|
||||||
|
return false;
|
||||||
|
} else if (!year.equals(other.year))
|
||||||
|
return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
server:
|
server:
|
||||||
port: 8180
|
port: 8080
|
||||||
|
|
||||||
spring:
|
spring:
|
||||||
jersey:
|
jersey:
|
||||||
|
|||||||
29
apache-olingo/olingo4/.gitignore
vendored
29
apache-olingo/olingo4/.gitignore
vendored
@ -1,29 +0,0 @@
|
|||||||
HELP.md
|
|
||||||
/target/
|
|
||||||
!.mvn/wrapper/maven-wrapper.jar
|
|
||||||
|
|
||||||
### STS ###
|
|
||||||
.apt_generated
|
|
||||||
.classpath
|
|
||||||
.factorypath
|
|
||||||
.project
|
|
||||||
.settings
|
|
||||||
.springBeans
|
|
||||||
.sts4-cache
|
|
||||||
|
|
||||||
### IntelliJ IDEA ###
|
|
||||||
.idea
|
|
||||||
*.iws
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
|
|
||||||
### NetBeans ###
|
|
||||||
/nbproject/private/
|
|
||||||
/nbbuild/
|
|
||||||
/dist/
|
|
||||||
/nbdist/
|
|
||||||
/.nb-gradle/
|
|
||||||
/build/
|
|
||||||
|
|
||||||
### VS Code ###
|
|
||||||
.vscode/
|
|
||||||
@ -1,95 +0,0 @@
|
|||||||
<?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>
|
|
||||||
<parent>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
|
||||||
<version>2.1.3.RELEASE</version>
|
|
||||||
<relativePath /> <!-- lookup parent from repository -->
|
|
||||||
</parent>
|
|
||||||
<groupId>org.baeldung.examples.olingo4</groupId>
|
|
||||||
<artifactId>olingo4-sample</artifactId>
|
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
|
||||||
<name>olingo4-sample</name>
|
|
||||||
<description>Sample Olingo 4 Project</description>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<java.version>1.8</java.version>
|
|
||||||
<odata.version>4.5.0</odata.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-configuration-processor</artifactId>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.h2database</groupId>
|
|
||||||
<artifactId>h2</artifactId>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.olingo</groupId>
|
|
||||||
<artifactId>odata-server-api</artifactId>
|
|
||||||
<version>${odata.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.olingo</groupId>
|
|
||||||
<artifactId>odata-server-core</artifactId>
|
|
||||||
<version>${odata.version}</version>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.olingo</groupId>
|
|
||||||
<artifactId>odata-commons-api</artifactId>
|
|
||||||
<version>${odata.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.olingo</groupId>
|
|
||||||
<artifactId>odata-commons-core</artifactId>
|
|
||||||
<version>${odata.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-beanutils</groupId>
|
|
||||||
<artifactId>commons-beanutils</artifactId>
|
|
||||||
<version>1.9.3</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4;
|
|
||||||
|
|
||||||
import org.apache.olingo.server.api.OData;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Default implementation for ODataFactory
|
|
||||||
* @author Philippe
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@Component
|
|
||||||
public class DefaultODataFactory implements ODataFactory {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OData newInstance() {
|
|
||||||
return OData.newInstance();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4;
|
|
||||||
|
|
||||||
import org.apache.olingo.server.api.OData;
|
|
||||||
|
|
||||||
public interface ODataFactory {
|
|
||||||
|
|
||||||
public OData newInstance();
|
|
||||||
}
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4;
|
|
||||||
|
|
||||||
import org.apache.olingo.server.api.ODataHttpHandler;
|
|
||||||
|
|
||||||
public interface ODataHttpHandlerFactory {
|
|
||||||
|
|
||||||
ODataHttpHandler newInstance();
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider;
|
|
||||||
import org.apache.olingo.server.api.OData;
|
|
||||||
import org.apache.olingo.server.api.ODataHttpHandler;
|
|
||||||
import org.apache.olingo.server.api.ServiceMetadata;
|
|
||||||
import org.apache.olingo.server.api.processor.Processor;
|
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
|
|
||||||
@Builder
|
|
||||||
public class ODataHttpHandlerFactoryImpl implements ODataHttpHandlerFactory {
|
|
||||||
|
|
||||||
|
|
||||||
private final ODataFactory odataFactory;
|
|
||||||
private final CsdlEdmProvider edmProvider;
|
|
||||||
private final List<Processor> processors;
|
|
||||||
|
|
||||||
public ODataHttpHandlerFactoryImpl(ODataFactory odataFactory,CsdlEdmProvider edmProvider, List<Processor> processors) {
|
|
||||||
this.odataFactory = odataFactory;
|
|
||||||
this.edmProvider = edmProvider;
|
|
||||||
this.processors = processors;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ODataHttpHandler newInstance() {
|
|
||||||
|
|
||||||
OData odata = odataFactory.newInstance();
|
|
||||||
ServiceMetadata metadata = odata.createServiceMetadata(edmProvider, Collections.emptyList());
|
|
||||||
ODataHttpHandler handler = odata.createHandler(metadata);
|
|
||||||
|
|
||||||
// Register all available processors
|
|
||||||
processors.forEach(p -> handler.register(p));
|
|
||||||
|
|
||||||
|
|
||||||
return handler;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.persistence.EntityManagerFactory;
|
|
||||||
import javax.servlet.http.HttpServlet;
|
|
||||||
|
|
||||||
import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider;
|
|
||||||
import org.apache.olingo.server.api.processor.Processor;
|
|
||||||
import org.baeldung.examples.olingo4.ODataHttpHandlerFactoryImpl.ODataHttpHandlerFactoryImplBuilder;
|
|
||||||
import org.springframework.boot.web.servlet.ServletRegistrationBean;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
public class ODataServiceConfiguration {
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public ServletRegistrationBean<HttpServlet> odataServletRegistration(ODataHttpHandlerFactory factory) {
|
|
||||||
ServletRegistrationBean<HttpServlet> srb =
|
|
||||||
new ServletRegistrationBean<>(new ODataServlet(factory), "/odata/*");
|
|
||||||
srb.setLoadOnStartup(1);
|
|
||||||
return srb;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public ODataHttpHandlerFactory httpHandlerFactory(CsdlEdmProvider edmProvider, ODataFactory odataFactory, List<Processor> processors) {
|
|
||||||
return new ODataHttpHandlerFactoryImplBuilder()
|
|
||||||
.edmProvider(edmProvider)
|
|
||||||
.odataFactory(odataFactory)
|
|
||||||
.processors(processors)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package org.baeldung.examples.olingo4;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import javax.persistence.EntityManager;
|
|
||||||
import javax.persistence.EntityManagerFactory;
|
|
||||||
import javax.persistence.EntityTransaction;
|
|
||||||
import javax.servlet.ServletException;
|
|
||||||
import javax.servlet.http.HttpServlet;
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
|
|
||||||
import org.apache.olingo.server.api.ODataHttpHandler;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author Philippe
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class ODataServlet extends HttpServlet {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
private final ODataHttpHandlerFactory odataHttpHandlerFactory;
|
|
||||||
|
|
||||||
|
|
||||||
public ODataServlet(ODataHttpHandlerFactory factory) {
|
|
||||||
this.odataHttpHandlerFactory = factory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
|
|
||||||
|
|
||||||
ODataHttpHandler handler = odataHttpHandlerFactory.newInstance();
|
|
||||||
handler.process(req, resp);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4;
|
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
|
|
||||||
@SpringBootApplication
|
|
||||||
public class Olingo4SampleApplication {
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.run(Olingo4SampleApplication.class, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4.domain;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.persistence.CascadeType;
|
|
||||||
import javax.persistence.Column;
|
|
||||||
import javax.persistence.Entity;
|
|
||||||
import javax.persistence.GeneratedValue;
|
|
||||||
import javax.persistence.GenerationType;
|
|
||||||
import javax.persistence.Id;
|
|
||||||
import javax.persistence.OneToMany;
|
|
||||||
import javax.persistence.Table;
|
|
||||||
import javax.validation.constraints.NotNull;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Data
|
|
||||||
@Table(name="car_maker")
|
|
||||||
public class CarMaker {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy=GenerationType.IDENTITY)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Column(name="name")
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
@OneToMany(mappedBy="maker",
|
|
||||||
orphanRemoval = true,
|
|
||||||
cascade=CascadeType.ALL)
|
|
||||||
private List<CarModel> models;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4.domain;
|
|
||||||
|
|
||||||
|
|
||||||
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;
|
|
||||||
import javax.persistence.Table;
|
|
||||||
import javax.validation.constraints.NotNull;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Data
|
|
||||||
@Table(name="car_model")
|
|
||||||
public class CarModel {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy=GenerationType.AUTO)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@NotNull
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
@NotNull
|
|
||||||
private Integer year;
|
|
||||||
|
|
||||||
@NotNull
|
|
||||||
private String sku;
|
|
||||||
|
|
||||||
@ManyToOne(optional=false, fetch= FetchType.EAGER )
|
|
||||||
@JoinColumn(name="maker_fk")
|
|
||||||
private CarMaker maker;
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4.edm;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import java.util.stream.Stream;
|
|
||||||
import java.sql.Time;
|
|
||||||
import java.util.AbstractMap.SimpleEntry;
|
|
||||||
|
|
||||||
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
public class EdmTypeMapper {
|
|
||||||
|
|
||||||
public EdmPrimitiveTypeKind java2edm(Class<?> clazz) {
|
|
||||||
EdmPrimitiveTypeKind result = java2edm.get(clazz);
|
|
||||||
if ( result == null ) {
|
|
||||||
throw new IllegalArgumentException("[E19] Unsupported class mapping: class=" + clazz);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Static map used generate attribute metadada based on Java types
|
|
||||||
static Map<Class<?>,EdmPrimitiveTypeKind> java2edm = Collections
|
|
||||||
.unmodifiableMap(Stream.of(
|
|
||||||
new SimpleEntry<>(Boolean.class,EdmPrimitiveTypeKind.Boolean),
|
|
||||||
new SimpleEntry<>(Byte.class,EdmPrimitiveTypeKind.SByte),
|
|
||||||
new SimpleEntry<>(Date.class,EdmPrimitiveTypeKind.Date),
|
|
||||||
new SimpleEntry<>(Time.class,EdmPrimitiveTypeKind.TimeOfDay),
|
|
||||||
new SimpleEntry<>(Number.class,EdmPrimitiveTypeKind.Decimal),
|
|
||||||
new SimpleEntry<>(Float.class,EdmPrimitiveTypeKind.Single),
|
|
||||||
new SimpleEntry<>(Double.class,EdmPrimitiveTypeKind.Double),
|
|
||||||
new SimpleEntry<>(UUID.class,EdmPrimitiveTypeKind.Guid),
|
|
||||||
new SimpleEntry<>(Short.class,EdmPrimitiveTypeKind.Int16),
|
|
||||||
new SimpleEntry<>(Integer.class,EdmPrimitiveTypeKind.Int32),
|
|
||||||
new SimpleEntry<>(Long.class,EdmPrimitiveTypeKind.Int64),
|
|
||||||
new SimpleEntry<>(String.class,EdmPrimitiveTypeKind.String)
|
|
||||||
|
|
||||||
).collect(Collectors.toMap((e)-> e.getKey(),(e)-> e.getValue())));
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,269 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4.edm;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import javax.persistence.EntityManagerFactory;
|
|
||||||
import javax.persistence.metamodel.Attribute.PersistentAttributeType;
|
|
||||||
import javax.persistence.metamodel.EntityType;
|
|
||||||
import javax.persistence.metamodel.Metamodel;
|
|
||||||
import javax.persistence.metamodel.PluralAttribute;
|
|
||||||
import javax.persistence.metamodel.SingularAttribute;
|
|
||||||
|
|
||||||
import org.apache.olingo.commons.api.edm.FullQualifiedName;
|
|
||||||
import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider;
|
|
||||||
import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainer;
|
|
||||||
import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainerInfo;
|
|
||||||
import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet;
|
|
||||||
import org.apache.olingo.commons.api.edm.provider.CsdlEntityType;
|
|
||||||
import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty;
|
|
||||||
import org.apache.olingo.commons.api.edm.provider.CsdlProperty;
|
|
||||||
import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef;
|
|
||||||
import org.apache.olingo.commons.api.edm.provider.CsdlSchema;
|
|
||||||
import org.apache.olingo.commons.api.ex.ODataException;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
public class JpaEdmProvider extends CsdlAbstractEdmProvider {
|
|
||||||
|
|
||||||
EntityManagerFactory emf;
|
|
||||||
|
|
||||||
//
|
|
||||||
private EdmTypeMapper typeMapper;
|
|
||||||
|
|
||||||
// Service Namespace
|
|
||||||
public static final String NAMESPACE = "Baeldung.OData";
|
|
||||||
|
|
||||||
// EDM Container
|
|
||||||
public static final String CONTAINER_NAME = "Cars";
|
|
||||||
public static final FullQualifiedName CONTAINER = new FullQualifiedName(NAMESPACE, CONTAINER_NAME);
|
|
||||||
|
|
||||||
// Caches of OData types by it fully qualified name
|
|
||||||
private Map<FullQualifiedName, CsdlEntityType> cdslName2Type = new HashMap<>();
|
|
||||||
|
|
||||||
public JpaEdmProvider(EntityManagerFactory emf, EdmTypeMapper mapper) {
|
|
||||||
this.emf = emf;
|
|
||||||
this.typeMapper = mapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider#getEntitySet(org.apache.olingo.commons.api.edm.FullQualifiedName, java.lang.String)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public CsdlEntitySet getEntitySet(FullQualifiedName entityContainer, String entitySetName) throws ODataException {
|
|
||||||
|
|
||||||
if (entityContainer.equals(CONTAINER)) {
|
|
||||||
|
|
||||||
EntityType<?> e = emf.getMetamodel()
|
|
||||||
.getEntities()
|
|
||||||
.stream()
|
|
||||||
.filter((ent) -> (ent.getName() + "s")
|
|
||||||
.equals(entitySetName))
|
|
||||||
.findFirst()
|
|
||||||
.orElse(null);
|
|
||||||
|
|
||||||
if (e != null) {
|
|
||||||
CsdlEntitySet entitySet = new CsdlEntitySet();
|
|
||||||
entitySet
|
|
||||||
.setName(entitySetName)
|
|
||||||
.setType(new FullQualifiedName(NAMESPACE, e.getName()));
|
|
||||||
return entitySet;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider#getEntityContainerInfo(org.apache.olingo.commons.api.edm.FullQualifiedName)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public CsdlEntityContainerInfo getEntityContainerInfo(FullQualifiedName entityContainerName) throws ODataException {
|
|
||||||
|
|
||||||
// This method is invoked when displaying the Service Document at e.g. http://localhost:8080/DemoService/DemoService.svc
|
|
||||||
if (entityContainerName == null || entityContainerName.equals(CONTAINER)) {
|
|
||||||
CsdlEntityContainerInfo entityContainerInfo = new CsdlEntityContainerInfo();
|
|
||||||
entityContainerInfo.setContainerName(CONTAINER);
|
|
||||||
return entityContainerInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider#getSchemas()
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public List<CsdlSchema> getSchemas() throws ODataException {
|
|
||||||
// create Schema
|
|
||||||
CsdlSchema schema = new CsdlSchema();
|
|
||||||
schema.setNamespace(NAMESPACE);
|
|
||||||
|
|
||||||
// add EntityTypes
|
|
||||||
List<CsdlEntityType> entityTypes = emf.getMetamodel()
|
|
||||||
.getEntities()
|
|
||||||
.stream()
|
|
||||||
.map((e) -> {
|
|
||||||
try {
|
|
||||||
return getEntityType(new FullQualifiedName(NAMESPACE, e.getName()));
|
|
||||||
} catch (ODataException oe) {
|
|
||||||
throw new RuntimeException(oe);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
|
|
||||||
schema.setEntityTypes(entityTypes);
|
|
||||||
|
|
||||||
// add EntityContainer
|
|
||||||
schema.setEntityContainer(getEntityContainer());
|
|
||||||
|
|
||||||
// finally
|
|
||||||
List<CsdlSchema> schemas = new ArrayList<CsdlSchema>();
|
|
||||||
schemas.add(schema);
|
|
||||||
|
|
||||||
return schemas;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider#getEntityContainer()
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public CsdlEntityContainer getEntityContainer() throws ODataException {
|
|
||||||
|
|
||||||
|
|
||||||
// add EntityTypes
|
|
||||||
List<CsdlEntitySet> entitySets = emf.getMetamodel()
|
|
||||||
.getEntities()
|
|
||||||
.stream()
|
|
||||||
.map((e) -> {
|
|
||||||
try {
|
|
||||||
// Here we use a simple mapping strategy to map entity types to entity set names:
|
|
||||||
return getEntitySet(CONTAINER, e.getName() + "s");
|
|
||||||
} catch (ODataException oe) {
|
|
||||||
throw new RuntimeException(oe);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
|
|
||||||
// create EntityContainer
|
|
||||||
CsdlEntityContainer entityContainer = new CsdlEntityContainer();
|
|
||||||
entityContainer.setName(CONTAINER_NAME);
|
|
||||||
entityContainer.setEntitySets(entitySets);
|
|
||||||
|
|
||||||
return entityContainer;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CsdlEntityType getEntityType(FullQualifiedName entityTypeName) throws ODataException {
|
|
||||||
|
|
||||||
CsdlEntityType result = cdslName2Type.get(entityTypeName);
|
|
||||||
if ( result != null ) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
Metamodel mm = emf.getMetamodel();
|
|
||||||
result = mm.getEntities()
|
|
||||||
.stream()
|
|
||||||
.filter(et -> entityTypeName.equals(new FullQualifiedName(NAMESPACE, et.getName())))
|
|
||||||
.map(et -> buildODataType(et))
|
|
||||||
.findFirst()
|
|
||||||
.orElse(null);
|
|
||||||
|
|
||||||
// save for future use
|
|
||||||
cdslName2Type.put(entityTypeName, result);
|
|
||||||
return result;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Maps a JPA type to its OData counterpart.
|
|
||||||
* @param et
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
protected CsdlEntityType buildODataType(EntityType<?> et) {
|
|
||||||
|
|
||||||
CsdlEntityType result = new CsdlEntityType();
|
|
||||||
result.setName(et.getName());
|
|
||||||
|
|
||||||
// Process simple properties
|
|
||||||
List<CsdlProperty> properties = et.getDeclaredSingularAttributes()
|
|
||||||
.stream()
|
|
||||||
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.BASIC)
|
|
||||||
.map(attr -> buildBasicAttribute(et, attr))
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
|
|
||||||
result.setProperties(properties);
|
|
||||||
|
|
||||||
// Process Ids
|
|
||||||
List<CsdlPropertyRef> ids = et.getDeclaredSingularAttributes()
|
|
||||||
.stream()
|
|
||||||
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.BASIC && attr.isId())
|
|
||||||
.map(attr -> buildRefAttribute(et, attr))
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
|
|
||||||
result.setKey(ids);
|
|
||||||
|
|
||||||
// Process 1:N navs
|
|
||||||
List<CsdlNavigationProperty> navs = et.getDeclaredPluralAttributes()
|
|
||||||
.stream()
|
|
||||||
.map(attr -> buildNavAttribute(et, attr))
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
result.setNavigationProperties(navs);
|
|
||||||
|
|
||||||
// Process N:1 navs
|
|
||||||
List<CsdlNavigationProperty> navs2 = et.getDeclaredSingularAttributes()
|
|
||||||
.stream()
|
|
||||||
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.MANY_TO_ONE)
|
|
||||||
.map(attr -> buildNavAttribute(et, attr))
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
|
|
||||||
result.getNavigationProperties().addAll(navs2);
|
|
||||||
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private CsdlProperty buildBasicAttribute(EntityType<?> et, SingularAttribute<?, ?> attr) {
|
|
||||||
|
|
||||||
CsdlProperty p = new CsdlProperty().setName(attr.getName())
|
|
||||||
.setType(typeMapper.java2edm(attr.getJavaType())
|
|
||||||
.getFullQualifiedName())
|
|
||||||
.setNullable(et.getDeclaredSingularAttribute(attr.getName())
|
|
||||||
.isOptional());
|
|
||||||
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
private CsdlPropertyRef buildRefAttribute(EntityType<?> et, SingularAttribute<?, ?> attr) {
|
|
||||||
|
|
||||||
CsdlPropertyRef p = new CsdlPropertyRef().setName(attr.getName());
|
|
||||||
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build NavProperty for 1:N or M:N associations
|
|
||||||
private CsdlNavigationProperty buildNavAttribute(EntityType<?> et, PluralAttribute<?, ?, ?> attr) {
|
|
||||||
|
|
||||||
CsdlNavigationProperty p = new CsdlNavigationProperty().setName(attr.getName())
|
|
||||||
.setType(new FullQualifiedName(NAMESPACE, attr.getBindableJavaType().getSimpleName()))
|
|
||||||
.setCollection(true)
|
|
||||||
.setNullable(false);
|
|
||||||
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build NavProperty for N:1 associations
|
|
||||||
private CsdlNavigationProperty buildNavAttribute(EntityType<?> et, SingularAttribute<?, ?> attr) {
|
|
||||||
|
|
||||||
CsdlNavigationProperty p = new CsdlNavigationProperty().setName(attr.getName())
|
|
||||||
.setType(new FullQualifiedName(NAMESPACE, attr.getBindableJavaType().getSimpleName()))
|
|
||||||
.setCollection(false)
|
|
||||||
.setNullable(attr.isOptional());
|
|
||||||
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,161 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4.processor;
|
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.net.URI;
|
|
||||||
import java.net.URISyntaxException;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.persistence.EntityManagerFactory;
|
|
||||||
import javax.persistence.metamodel.EntityType;
|
|
||||||
import javax.persistence.metamodel.SingularAttribute;
|
|
||||||
|
|
||||||
import org.apache.commons.beanutils.PropertyUtils;
|
|
||||||
import org.apache.olingo.commons.api.data.ContextURL;
|
|
||||||
import org.apache.olingo.commons.api.data.Entity;
|
|
||||||
import org.apache.olingo.commons.api.data.EntityCollection;
|
|
||||||
import org.apache.olingo.commons.api.data.Property;
|
|
||||||
import org.apache.olingo.commons.api.data.ValueType;
|
|
||||||
import org.apache.olingo.commons.api.edm.EdmEntitySet;
|
|
||||||
import org.apache.olingo.commons.api.edm.EdmEntityType;
|
|
||||||
import org.apache.olingo.commons.api.edm.EdmNavigationProperty;
|
|
||||||
import org.apache.olingo.commons.api.ex.ODataRuntimeException;
|
|
||||||
import org.apache.olingo.commons.api.format.ContentType;
|
|
||||||
import org.apache.olingo.commons.api.http.HttpHeader;
|
|
||||||
import org.apache.olingo.commons.api.http.HttpStatusCode;
|
|
||||||
import org.apache.olingo.server.api.OData;
|
|
||||||
import org.apache.olingo.server.api.ODataApplicationException;
|
|
||||||
import org.apache.olingo.server.api.ODataLibraryException;
|
|
||||||
import org.apache.olingo.server.api.ODataRequest;
|
|
||||||
import org.apache.olingo.server.api.ODataResponse;
|
|
||||||
import org.apache.olingo.server.api.ServiceMetadata;
|
|
||||||
import org.apache.olingo.server.api.processor.CountEntityCollectionProcessor;
|
|
||||||
import org.apache.olingo.server.api.processor.EntityCollectionProcessor;
|
|
||||||
import org.apache.olingo.server.api.serializer.EntityCollectionSerializerOptions;
|
|
||||||
import org.apache.olingo.server.api.serializer.ODataSerializer;
|
|
||||||
import org.apache.olingo.server.api.serializer.SerializerResult;
|
|
||||||
import org.apache.olingo.server.api.uri.UriInfo;
|
|
||||||
import org.apache.olingo.server.api.uri.UriParameter;
|
|
||||||
import org.apache.olingo.server.api.uri.UriResource;
|
|
||||||
import org.apache.olingo.server.api.uri.UriResourceEntitySet;
|
|
||||||
import org.baeldung.examples.olingo4.repository.RepositoryRegistry;
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
public class JpaEntityCollectionProcessor implements CountEntityCollectionProcessor {
|
|
||||||
|
|
||||||
private OData odata;
|
|
||||||
private ServiceMetadata serviceMetadata;
|
|
||||||
private EntityManagerFactory emf;
|
|
||||||
private RepositoryRegistry repositoryRegistry;
|
|
||||||
private JpaEntityMapper entityMapper;
|
|
||||||
|
|
||||||
public JpaEntityCollectionProcessor(EntityManagerFactory emf, RepositoryRegistry repositoryRegistry, JpaEntityMapper entityMapper) {
|
|
||||||
this.emf = emf;
|
|
||||||
this.repositoryRegistry = repositoryRegistry;
|
|
||||||
this.entityMapper = entityMapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void init(OData odata, ServiceMetadata serviceMetadata) {
|
|
||||||
this.odata = odata;
|
|
||||||
this.serviceMetadata = serviceMetadata;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void readEntityCollection(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
|
|
||||||
|
|
||||||
// 1st we have retrieve the requested EntitySet from the uriInfo object (representation of the parsed service URI)
|
|
||||||
List<UriResource> resourcePaths = uriInfo.getUriResourceParts();
|
|
||||||
UriResourceEntitySet uriResourceEntitySet = (UriResourceEntitySet) resourcePaths.get(0); // in our example, the first segment is the EntitySet
|
|
||||||
EdmEntitySet edmEntitySet = uriResourceEntitySet.getEntitySet();
|
|
||||||
|
|
||||||
// 2nd: fetch the data from backend for this requested EntitySetName
|
|
||||||
// it has to be delivered as EntitySet object
|
|
||||||
EntityCollection entitySet = getData(edmEntitySet, uriInfo);
|
|
||||||
|
|
||||||
// 3rd: create a serializer based on the requested format (json)
|
|
||||||
ODataSerializer serializer = odata.createSerializer(responseFormat);
|
|
||||||
|
|
||||||
// 4th: Now serialize the content: transform from the EntitySet object to InputStream
|
|
||||||
EdmEntityType edmEntityType = edmEntitySet.getEntityType();
|
|
||||||
ContextURL contextUrl = ContextURL.with()
|
|
||||||
.entitySet(edmEntitySet)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
final String id = request.getRawBaseUri() + "/" + edmEntitySet.getName();
|
|
||||||
EntityCollectionSerializerOptions opts = EntityCollectionSerializerOptions.with()
|
|
||||||
.id(id)
|
|
||||||
.contextURL(contextUrl)
|
|
||||||
.build();
|
|
||||||
SerializerResult serializerResult = serializer.entityCollection(serviceMetadata, edmEntityType, entitySet, opts);
|
|
||||||
InputStream serializedContent = serializerResult.getContent();
|
|
||||||
|
|
||||||
// Finally: configure the response object: set the body, headers and status code
|
|
||||||
response.setContent(serializedContent);
|
|
||||||
response.setStatusCode(HttpStatusCode.OK.getStatusCode());
|
|
||||||
response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void countEntityCollection(ODataRequest request, ODataResponse response, UriInfo uriInfo) throws ODataApplicationException, ODataLibraryException {
|
|
||||||
|
|
||||||
// 1st we have retrieve the requested EntitySet from the uriInfo object (representation of the parsed service URI)
|
|
||||||
List<UriResource> resourcePaths = uriInfo.getUriResourceParts();
|
|
||||||
UriResourceEntitySet uriResourceEntitySet = (UriResourceEntitySet) resourcePaths.get(0); // in our example, the first segment is the EntitySet
|
|
||||||
EdmEntitySet edmEntitySet = uriResourceEntitySet.getEntitySet();
|
|
||||||
|
|
||||||
// 2nd: fetch the data from backend for this requested EntitySetName
|
|
||||||
Long count = getCount(edmEntitySet, uriInfo);
|
|
||||||
|
|
||||||
// Finally: configure the response object: set the body, headers and status code
|
|
||||||
response.setContent(new ByteArrayInputStream(count.toString().getBytes()));
|
|
||||||
response.setStatusCode(HttpStatusCode.OK.getStatusCode());
|
|
||||||
response.setHeader(HttpHeader.CONTENT_TYPE, "text/plain");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper method to retrieve all entities of an entity set from an the backend database
|
|
||||||
* @param edmEntitySet
|
|
||||||
* @param uriInfo
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
protected EntityCollection getData(EdmEntitySet edmEntitySet, UriInfo uriInfo) {
|
|
||||||
|
|
||||||
EdmEntityType type = edmEntitySet.getEntityType();
|
|
||||||
JpaRepository<?, ?> repo = (JpaRepository<?, ?>)repositoryRegistry.getRepositoryForEntity(type);
|
|
||||||
EntityCollection result = new EntityCollection();
|
|
||||||
|
|
||||||
repo.findAll()
|
|
||||||
.stream()
|
|
||||||
.forEach((it) -> result.getEntities()
|
|
||||||
.add(entityMapper.map2entity(edmEntitySet, it)));
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper method to get the total size of an entity set
|
|
||||||
* @param edmEntitySet
|
|
||||||
* @param uriInfo
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
protected Long getCount(EdmEntitySet edmEntitySet, UriInfo uriInfo) {
|
|
||||||
|
|
||||||
EdmEntityType type = edmEntitySet.getEntityType();
|
|
||||||
JpaRepository<?, ?> repo = (JpaRepository<?, ?>)repositoryRegistry.getRepositoryForEntity(type);
|
|
||||||
EntityCollection result = new EntityCollection();
|
|
||||||
|
|
||||||
return repo.count();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,93 +0,0 @@
|
|||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package org.baeldung.examples.olingo4.processor;
|
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.net.URI;
|
|
||||||
import java.net.URISyntaxException;
|
|
||||||
|
|
||||||
import javax.persistence.EntityManagerFactory;
|
|
||||||
import javax.persistence.metamodel.EntityType;
|
|
||||||
|
|
||||||
import org.apache.commons.beanutils.PropertyUtils;
|
|
||||||
import org.apache.olingo.commons.api.data.Entity;
|
|
||||||
import org.apache.olingo.commons.api.data.Property;
|
|
||||||
import org.apache.olingo.commons.api.data.ValueType;
|
|
||||||
import org.apache.olingo.commons.api.edm.EdmEntitySet;
|
|
||||||
import org.apache.olingo.commons.api.ex.ODataRuntimeException;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>Helper class that converts a JPA entity into an OData entity using
|
|
||||||
* available metadata from the JPA's EntityManagerFactory.</p>
|
|
||||||
*
|
|
||||||
* @author Philippe
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@Component
|
|
||||||
public class JpaEntityMapper {
|
|
||||||
|
|
||||||
private EntityManagerFactory emf;
|
|
||||||
|
|
||||||
public JpaEntityMapper(EntityManagerFactory emf) {
|
|
||||||
this.emf = emf;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public Entity map2entity(EdmEntitySet edmEntitySet, Object entry) {
|
|
||||||
|
|
||||||
EntityType<?> et = emf.getMetamodel()
|
|
||||||
.entity(entry.getClass());
|
|
||||||
|
|
||||||
|
|
||||||
Entity e = new Entity();
|
|
||||||
try {
|
|
||||||
et.getDeclaredSingularAttributes().stream()
|
|
||||||
.forEach( (attr) -> {
|
|
||||||
if ( !attr.isAssociation()) {
|
|
||||||
Object v = getPropertyValue(entry,attr.getName());
|
|
||||||
Property p = new Property(null, attr.getName(),ValueType.PRIMITIVE,v);
|
|
||||||
e.addProperty(p);
|
|
||||||
|
|
||||||
if ( attr.isId()) {
|
|
||||||
e.setId(createId(edmEntitySet.getName(),v));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} catch (Exception ex) {
|
|
||||||
throw new ODataRuntimeException("[E141] Unable to create OData entity", ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
return e;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public Object getPropertyValue(Object entry, String name) {
|
|
||||||
try {
|
|
||||||
return PropertyUtils.getProperty(entry,name);
|
|
||||||
} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
|
|
||||||
throw new ODataRuntimeException("[E141] Unable to read property from entity, property=" + name, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPropertyValue(Object entry, String name,Object value) {
|
|
||||||
try {
|
|
||||||
PropertyUtils.setProperty(entry,name,value);
|
|
||||||
} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
|
|
||||||
throw new ODataRuntimeException("[E141] Unable to read property from entity, property=" + name, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private URI createId(String entitySetName, Object id) {
|
|
||||||
try {
|
|
||||||
return new URI(entitySetName + "(" + String.valueOf(id) + ")");
|
|
||||||
} catch (URISyntaxException e) {
|
|
||||||
throw new ODataRuntimeException("[E177] Unable to create URI", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,304 +0,0 @@
|
|||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package org.baeldung.examples.olingo4.processor;
|
|
||||||
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import javax.persistence.EntityManager;
|
|
||||||
import javax.persistence.EntityManagerFactory;
|
|
||||||
import javax.persistence.metamodel.SingularAttribute;
|
|
||||||
|
|
||||||
import org.apache.olingo.commons.api.data.ContextURL;
|
|
||||||
import org.apache.olingo.commons.api.data.Entity;
|
|
||||||
import org.apache.olingo.commons.api.edm.EdmEntitySet;
|
|
||||||
import org.apache.olingo.commons.api.edm.EdmEntityType;
|
|
||||||
import org.apache.olingo.commons.api.edm.EdmNavigationProperty;
|
|
||||||
import org.apache.olingo.commons.api.ex.ODataRuntimeException;
|
|
||||||
import org.apache.olingo.commons.api.format.ContentType;
|
|
||||||
import org.apache.olingo.commons.api.http.HttpHeader;
|
|
||||||
import org.apache.olingo.commons.api.http.HttpStatusCode;
|
|
||||||
import org.apache.olingo.server.api.OData;
|
|
||||||
import org.apache.olingo.server.api.ODataApplicationException;
|
|
||||||
import org.apache.olingo.server.api.ODataLibraryException;
|
|
||||||
import org.apache.olingo.server.api.ODataRequest;
|
|
||||||
import org.apache.olingo.server.api.ODataResponse;
|
|
||||||
import org.apache.olingo.server.api.ServiceMetadata;
|
|
||||||
import org.apache.olingo.server.api.processor.EntityProcessor;
|
|
||||||
import org.apache.olingo.server.api.serializer.EntitySerializerOptions;
|
|
||||||
import org.apache.olingo.server.api.serializer.ODataSerializer;
|
|
||||||
import org.apache.olingo.server.api.serializer.SerializerResult;
|
|
||||||
import org.apache.olingo.server.api.uri.UriInfo;
|
|
||||||
import org.apache.olingo.server.api.uri.UriParameter;
|
|
||||||
import org.apache.olingo.server.api.uri.UriResource;
|
|
||||||
import org.apache.olingo.server.api.uri.UriResourceEntitySet;
|
|
||||||
import org.apache.olingo.server.api.uri.UriResourceNavigation;
|
|
||||||
import org.baeldung.examples.olingo4.repository.EdmEntityRepository;
|
|
||||||
import org.baeldung.examples.olingo4.repository.RepositoryRegistry;
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* JpaEntityProcessor adapter.
|
|
||||||
* <p>This implementation is heavily based on the Tutorial available
|
|
||||||
* at Olingo's site. It is meant to be an starting point for an actual implementation.</p>
|
|
||||||
* <p>Please note that many features from a full-fledged are missing
|
|
||||||
* @author Philippe
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@Component
|
|
||||||
public class JpaEntityProcessor implements EntityProcessor {
|
|
||||||
|
|
||||||
private EntityManagerFactory emf;
|
|
||||||
private OData odata;
|
|
||||||
private ServiceMetadata serviceMetadata;
|
|
||||||
private RepositoryRegistry registry;
|
|
||||||
private JpaEntityMapper entityMapper;
|
|
||||||
|
|
||||||
public JpaEntityProcessor(EntityManagerFactory emf, RepositoryRegistry registry, JpaEntityMapper entityMapper) {
|
|
||||||
this.emf = emf;
|
|
||||||
this.registry = registry;
|
|
||||||
this.entityMapper = entityMapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.apache.olingo.server.api.processor.Processor#init(org.apache.olingo.server.api.OData, org.apache.olingo.server.api.ServiceMetadata)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void init(OData odata, ServiceMetadata serviceMetadata) {
|
|
||||||
this.odata = odata;
|
|
||||||
this.serviceMetadata = serviceMetadata;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.apache.olingo.server.api.processor.EntityProcessor#readEntity(org.apache.olingo.server.api.ODataRequest, org.apache.olingo.server.api.ODataResponse, org.apache.olingo.server.api.uri.UriInfo, org.apache.olingo.commons.api.format.ContentType)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void readEntity(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
|
|
||||||
|
|
||||||
// First, we have to figure out which entity is requested
|
|
||||||
List<UriResource> resourceParts = uriInfo.getUriResourceParts();
|
|
||||||
InputStream entityStream;
|
|
||||||
|
|
||||||
UriResourceEntitySet rootResourceEntitySet = (UriResourceEntitySet) resourceParts.get(0);
|
|
||||||
EdmEntitySet rootEntitySet = rootResourceEntitySet.getEntitySet();
|
|
||||||
List<UriParameter> rootPredicates = rootResourceEntitySet.getKeyPredicates();
|
|
||||||
|
|
||||||
if ( resourceParts.size() == 1 ) {
|
|
||||||
entityStream = readRootEntity(rootEntitySet,rootPredicates,responseFormat);
|
|
||||||
}
|
|
||||||
else if ( resourceParts.size() == 2 ) {
|
|
||||||
UriResource part = resourceParts.get(1);
|
|
||||||
if ( !(part instanceof UriResourceNavigation)) {
|
|
||||||
throw new ODataRuntimeException("[E103] part type not supported: class=" + part.getClass().getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
UriResourceNavigation navSegment = (UriResourceNavigation)part;
|
|
||||||
entityStream = readRelatedEntity(request, rootEntitySet,rootPredicates,navSegment.getProperty(),navSegment.getKeyPredicates(),responseFormat);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// For now, we'll only allow navigation just to directly linked navs
|
|
||||||
throw new ODataApplicationException("[E109] Multi-level navigation not supported", HttpStatusCode.NOT_IMPLEMENTED.getStatusCode(), Locale.ROOT);
|
|
||||||
}
|
|
||||||
|
|
||||||
//4. configure the response object
|
|
||||||
response.setContent(entityStream);
|
|
||||||
response.setStatusCode(HttpStatusCode.OK.getStatusCode());
|
|
||||||
response.setHeader(HttpHeader.CONTENT_TYPE, responseFormat.toContentTypeString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Lookup the EntitySet associated with an EntityType
|
|
||||||
// In our example, we assume we have only one entityset for each entity type
|
|
||||||
private EdmEntitySet entitySetFromType(EdmEntityType type) {
|
|
||||||
return serviceMetadata
|
|
||||||
.getEdm()
|
|
||||||
.getEntityContainer()
|
|
||||||
.getEntitySets()
|
|
||||||
.stream()
|
|
||||||
.filter((s) -> s.getEntityType().getName().equals(type.getName()))
|
|
||||||
.findFirst()
|
|
||||||
.orElseThrow(() -> new ODataRuntimeException("[E144] No entity set found for type " + type.getFullQualifiedName()));
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// private boolean isOne2ManyProperty(EdmEntityType entityType, EdmNavigationProperty property) {
|
|
||||||
// return entityType.getProperty(property.getName()) != null && property.isCollection();
|
|
||||||
//}
|
|
||||||
|
|
||||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
|
||||||
private InputStream readRootEntity(EdmEntitySet entitySet, List<UriParameter> keyPredicates,ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
|
|
||||||
EdmEntityType type = entitySet.getEntityType();
|
|
||||||
JpaRepository repo = registry.getRepositoryForEntity(type);
|
|
||||||
|
|
||||||
// Get key value
|
|
||||||
Long keyValue = getEntityKey(keyPredicates);
|
|
||||||
Optional<Object> entry = repo.findById(keyValue);
|
|
||||||
if ( !entry.isPresent()) {
|
|
||||||
throw new ODataApplicationException(
|
|
||||||
"[E116] NO entity found for the given key",
|
|
||||||
HttpStatusCode.NOT_FOUND.getStatusCode(),
|
|
||||||
Locale.ENGLISH);
|
|
||||||
}
|
|
||||||
|
|
||||||
Entity e = entityMapper.map2entity(entitySet, entry.get());
|
|
||||||
return serializeEntity(entitySet,e,responseFormat);
|
|
||||||
}
|
|
||||||
|
|
||||||
private InputStream serializeEntity(EdmEntitySet entitySet, Entity entity,ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
|
|
||||||
ContextURL contextUrl = ContextURL.with().entitySet(entitySet).build();
|
|
||||||
// expand and select currently not supported
|
|
||||||
EntitySerializerOptions options = EntitySerializerOptions
|
|
||||||
.with()
|
|
||||||
.contextURL(contextUrl)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
ODataSerializer serializer = odata.createSerializer(responseFormat);
|
|
||||||
|
|
||||||
SerializerResult serializerResult = serializer.entity(serviceMetadata, entitySet.getEntityType(), entity, options);
|
|
||||||
return serializerResult.getContent();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// @SuppressWarnings("unchecked")
|
|
||||||
// protected InputStream readRelatedEntities(EdmEntitySet rootEntitySet, List<UriParameter> rootPredicates, EdmNavigationProperty property, ContentType responseFormat) throws ODataApplicationException {
|
|
||||||
//
|
|
||||||
// Object jpaEntity = readJPAEntity(rootEntitySet, rootPredicates);
|
|
||||||
// try {
|
|
||||||
// Collection<Object> set = (Collection<Object>)PropertyUtils.getProperty(jpaEntity, property.getName());
|
|
||||||
// EdmEntitySet entitySet = entitySetFromType(property.getType());
|
|
||||||
// ContextURL contextUrl = ContextURL
|
|
||||||
// .with()
|
|
||||||
// .entitySet(entitySet)
|
|
||||||
// .build();
|
|
||||||
//
|
|
||||||
// EntityCollectionSerializerOptions options = EntityCollectionSerializerOptions
|
|
||||||
// .with()
|
|
||||||
// .contextURL(contextUrl)
|
|
||||||
// .build();
|
|
||||||
//
|
|
||||||
// EntityCollection result = new EntityCollection();
|
|
||||||
//
|
|
||||||
// set.stream()
|
|
||||||
// .map((o) -> this.entityMapper.map2entity(entitySet, o))
|
|
||||||
// .forEach((e) -> result.getEntities().add(e));
|
|
||||||
//
|
|
||||||
// ODataSerializer serializer = odata.createSerializer(responseFormat);
|
|
||||||
// SerializerResult serializerResult = serializer.entityCollection(serviceMetadata, property.getType(), result, options);
|
|
||||||
// return serializerResult.getContent();
|
|
||||||
// }
|
|
||||||
// catch(Exception ex) {
|
|
||||||
// throw new ODataRuntimeException("[E181] Error accessing database", ex);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
|
||||||
private InputStream readRelatedEntity(ODataRequest request, EdmEntitySet entitySet, List<UriParameter> rootPredicates, EdmNavigationProperty property, List<UriParameter> parentPredicates, ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
|
|
||||||
|
|
||||||
|
|
||||||
JpaRepository<Object,Object> repo = (JpaRepository<Object,Object>)registry.getRepositoryForEntity(entitySet.getEntityType());
|
|
||||||
EdmEntityRepository<Object> relatedRepo = (EdmEntityRepository<Object>)registry.getRepositoryForEntity(property.getType());
|
|
||||||
|
|
||||||
// We assume here that we have a bi-directional 1:N relationship, so we'll
|
|
||||||
// always have a property in the child entity that points to the parent
|
|
||||||
Class<?> rootClass = ((EdmEntityRepository)repo).getEntityClass();
|
|
||||||
Class<?> relatedClass = ((EdmEntityRepository)relatedRepo).getEntityClass();
|
|
||||||
|
|
||||||
SingularAttribute fk = emf.getMetamodel()
|
|
||||||
.entity(rootClass)
|
|
||||||
.getSingularAttributes()
|
|
||||||
.stream()
|
|
||||||
.filter((attr) -> {
|
|
||||||
boolean b = attr.isAssociation() && attr.getJavaType().isAssignableFrom(relatedClass);
|
|
||||||
return b;
|
|
||||||
})
|
|
||||||
.findFirst()
|
|
||||||
.orElse(null);
|
|
||||||
|
|
||||||
if ( fk == null ) {
|
|
||||||
throw new ODataRuntimeException("[E230] No singular attribute of child class '" + relatedClass.getName() + "' found" );
|
|
||||||
}
|
|
||||||
|
|
||||||
Long pkValue = getEntityKey(rootPredicates);
|
|
||||||
EntityManager em = this.emf.createEntityManager();
|
|
||||||
try {
|
|
||||||
// Read data from DB
|
|
||||||
Object root = em.find(rootClass, pkValue);
|
|
||||||
Object related = this.entityMapper.getPropertyValue(root, fk.getName());
|
|
||||||
|
|
||||||
EdmEntitySet relatedEntitySet = entitySetFromType(property.getType());
|
|
||||||
Entity e = entityMapper.map2entity(relatedEntitySet, related);
|
|
||||||
return serializeEntity(relatedEntitySet,e,responseFormat);
|
|
||||||
}
|
|
||||||
finally {
|
|
||||||
em.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// @SuppressWarnings("unchecked")
|
|
||||||
// private Object readJPAEntity(EdmEntitySet edmEntitySet, List<UriParameter> keyPredicates) throws ODataApplicationException {
|
|
||||||
// EdmEntityType type = edmEntitySet.getEntityType();
|
|
||||||
// JpaRepository<Object,Object> repo = (JpaRepository<Object,Object>)registry.getRepositoryForEntity(type);
|
|
||||||
//
|
|
||||||
// // Get key value
|
|
||||||
// Object keyValue = getEntityKey(type,keyPredicates);
|
|
||||||
// Object entry = repo
|
|
||||||
// .findById(keyValue)
|
|
||||||
// .orElseThrow(
|
|
||||||
// () -> new ODataApplicationException("[E116] NO entity found for the given key",
|
|
||||||
// HttpStatusCode.NOT_FOUND.getStatusCode(), Locale.ENGLISH));
|
|
||||||
//
|
|
||||||
// return entry;
|
|
||||||
// }
|
|
||||||
|
|
||||||
private Long getEntityKey(List<UriParameter> keyPredicates) {
|
|
||||||
|
|
||||||
if ( keyPredicates.size() > 1 ) {
|
|
||||||
throw new ODataRuntimeException("[E131] Composite keys are not supported");
|
|
||||||
}
|
|
||||||
|
|
||||||
// For now, we'll assume we only have numeric keys.
|
|
||||||
UriParameter keyParam = keyPredicates.get(0);
|
|
||||||
try {
|
|
||||||
return Long.parseLong(keyParam.getText());
|
|
||||||
}
|
|
||||||
catch(NumberFormatException nfe) {
|
|
||||||
throw new ODataRuntimeException("[E140] Invalid key value. Only numeric keys are supported by this service");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.apache.olingo.server.api.processor.EntityProcessor#createEntity(org.apache.olingo.server.api.ODataRequest, org.apache.olingo.server.api.ODataResponse, org.apache.olingo.server.api.uri.UriInfo, org.apache.olingo.commons.api.format.ContentType, org.apache.olingo.commons.api.format.ContentType)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void createEntity(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType requestFormat, ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.apache.olingo.server.api.processor.EntityProcessor#updateEntity(org.apache.olingo.server.api.ODataRequest, org.apache.olingo.server.api.ODataResponse, org.apache.olingo.server.api.uri.UriInfo, org.apache.olingo.commons.api.format.ContentType, org.apache.olingo.commons.api.format.ContentType)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void updateEntity(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType requestFormat, ContentType responseFormat) throws ODataApplicationException, ODataLibraryException {
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.apache.olingo.server.api.processor.EntityProcessor#deleteEntity(org.apache.olingo.server.api.ODataRequest, org.apache.olingo.server.api.ODataResponse, org.apache.olingo.server.api.uri.UriInfo)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void deleteEntity(ODataRequest request, ODataResponse response, UriInfo uriInfo) throws ODataApplicationException, ODataLibraryException {
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4.repository;
|
|
||||||
|
|
||||||
import org.baeldung.examples.olingo4.domain.CarMaker;
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
|
||||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
|
||||||
import org.springframework.stereotype.Repository;
|
|
||||||
|
|
||||||
@Repository
|
|
||||||
public interface CarMakerRepository extends EdmEntityRepository<CarMaker>, JpaRepository<CarMaker, Long>, JpaSpecificationExecutor<CarMaker> {
|
|
||||||
|
|
||||||
public default String getEdmEntityName() { return CarMaker.class.getSimpleName();}
|
|
||||||
@Override
|
|
||||||
default Class<CarMaker> getEntityClass() {
|
|
||||||
return CarMaker.class;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4.repository;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.baeldung.examples.olingo4.domain.CarModel;
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
|
||||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
|
||||||
import org.springframework.stereotype.Repository;
|
|
||||||
|
|
||||||
@Repository
|
|
||||||
public interface CarModelRepository extends EdmEntityRepository<CarModel>, JpaRepository<CarModel, Long>, JpaSpecificationExecutor<CarModel> {
|
|
||||||
|
|
||||||
public List<CarModel> findByMakerId(Long makerId);
|
|
||||||
|
|
||||||
public default String getEdmEntityName() { return CarModel.class.getSimpleName();}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
default Class<CarModel> getEntityClass() {
|
|
||||||
return CarModel.class;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package org.baeldung.examples.olingo4.repository;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author Philippe
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public interface EdmEntityRepository<E> {
|
|
||||||
|
|
||||||
public String getEdmEntityName();
|
|
||||||
public Class<E> getEntityClass();
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4.repository;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import org.apache.olingo.commons.api.edm.EdmEntityType;
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
public class RepositoryRegistry {
|
|
||||||
|
|
||||||
private Map<String,JpaRepository<?,?>> repositoriesByClassName = new HashMap<>();
|
|
||||||
|
|
||||||
public RepositoryRegistry(List<EdmEntityRepository<?>> allRepositories) {
|
|
||||||
|
|
||||||
allRepositories.stream()
|
|
||||||
.forEach((r) ->
|
|
||||||
repositoriesByClassName.put(r.getEdmEntityName(),(JpaRepository<?,?>)r));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public JpaRepository<?,?> getRepositoryForEntity(EdmEntityType entityType) {
|
|
||||||
JpaRepository<?,?> repo = repositoriesByClassName.get(entityType.getName());
|
|
||||||
return repo;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
server:
|
|
||||||
port: 8080
|
|
||||||
|
|
||||||
spring:
|
|
||||||
jpa:
|
|
||||||
show-sql: true
|
|
||||||
open-in-view: true
|
|
||||||
hibernate:
|
|
||||||
ddl-auto: update
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
insert into car_maker(id,name) values (1,'Special Motors');
|
|
||||||
insert into car_maker(id,name) values (2,'BWM');
|
|
||||||
insert into car_maker(id,name) values (3,'Dolores');
|
|
||||||
|
|
||||||
insert into car_model(id,maker_fk,name,sku,year) values(1,1,'Muze','SM001',2018);
|
|
||||||
insert into car_model(id,maker_fk,name,sku,year) values(2,1,'Empada','SM002',2008);
|
|
||||||
|
|
||||||
insert into car_model(id,maker_fk,name,sku,year) values(4,2,'BWM-100','BWM100',2008);
|
|
||||||
insert into car_model(id,maker_fk,name,sku,year) values(5,2,'BWM-200','BWM200',2009);
|
|
||||||
insert into car_model(id,maker_fk,name,sku,year) values(6,2,'BWM-300','BWM300',2008);
|
|
||||||
|
|
||||||
alter sequence hibernate_sequence restart with 100;
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
package org.baeldung.examples.olingo4;
|
|
||||||
|
|
||||||
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 Olingo4SampleApplicationTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void contextLoads() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
12
clojure/ring/.gitignore
vendored
Normal file
12
clojure/ring/.gitignore
vendored
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
/target
|
||||||
|
/classes
|
||||||
|
/checkouts
|
||||||
|
profiles.clj
|
||||||
|
pom.xml
|
||||||
|
pom.xml.asc
|
||||||
|
*.jar
|
||||||
|
*.class
|
||||||
|
/.lein-*
|
||||||
|
/.nrepl-port
|
||||||
|
.hgignore
|
||||||
|
.hg/
|
||||||
19
clojure/ring/README.md
Normal file
19
clojure/ring/README.md
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
# Clojure Ring Examples
|
||||||
|
|
||||||
|
This project acts as a set of examples for the Clojure Ring library.
|
||||||
|
|
||||||
|
## Runing the examples
|
||||||
|
|
||||||
|
The examples can all be run from the Leiningen REPL.
|
||||||
|
|
||||||
|
Firstly, start the REPL with `lein repl`. Then the examples can be executed with:
|
||||||
|
|
||||||
|
* `(run simple-handler)` - A simple handler that just echos a constant string to the client
|
||||||
|
* `(run check-ip-handler)` - A handler that echos the clients IP Address back to them
|
||||||
|
* `(run echo-handler)` - A handler that echos the value of the "input" parameter back
|
||||||
|
* `(run request-count-handler)` - A handler with a session that tracks how many times this session has requested this handler
|
||||||
|
|
||||||
|
In all cases, the handlers can be accessed on http://localhost:3000.
|
||||||
|
|
||||||
|
## Relevant Articles
|
||||||
|
- [Writing Clojure Webapps with Ring](https://www.baeldung.com/clojure-ring)
|
||||||
8
clojure/ring/project.clj
Normal file
8
clojure/ring/project.clj
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
(defproject baeldung-ring "0.1.0-SNAPSHOT"
|
||||||
|
:dependencies [[org.clojure/clojure "1.10.0"]
|
||||||
|
[ring/ring-core "1.7.1"]
|
||||||
|
[ring/ring-jetty-adapter "1.7.1"]
|
||||||
|
[ring/ring-devel "1.7.1"]]
|
||||||
|
:plugins [[lein-ring "0.12.5"]]
|
||||||
|
:ring {:handler ring.core/simple-handler}
|
||||||
|
:repl-options {:init-ns ring.core})
|
||||||
48
clojure/ring/src/ring/core.clj
Normal file
48
clojure/ring/src/ring/core.clj
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
(ns ring.core
|
||||||
|
(:use ring.adapter.jetty
|
||||||
|
[ring.middleware.content-type]
|
||||||
|
[ring.middleware.cookies]
|
||||||
|
[ring.middleware.params]
|
||||||
|
[ring.middleware.session]
|
||||||
|
[ring.middleware.session.cookie]
|
||||||
|
[ring.util.response]))
|
||||||
|
|
||||||
|
;; Handler that just echos back the string "Hello World"
|
||||||
|
(defn simple-handler [request]
|
||||||
|
{:status 200
|
||||||
|
:headers {"Content-Type" "text/plain"}
|
||||||
|
:body "Hello World"})
|
||||||
|
|
||||||
|
;; Handler that echos back the clients IP Address
|
||||||
|
;; This demonstrates building responses properly, and extracting values from the request
|
||||||
|
(defn check-ip-handler [request]
|
||||||
|
(content-type
|
||||||
|
(response (:remote-addr request))
|
||||||
|
"text/plain"))
|
||||||
|
|
||||||
|
;; Handler that echos back the incoming parameter "input"
|
||||||
|
;; This demonstrates middleware chaining and accessing parameters
|
||||||
|
(def echo-handler
|
||||||
|
(-> (fn [{params :params}]
|
||||||
|
(content-type
|
||||||
|
(response (get params "input"))
|
||||||
|
"text/plain"))
|
||||||
|
(wrap-params {:encoding "UTF-8"})
|
||||||
|
))
|
||||||
|
|
||||||
|
;; Handler that keeps track of how many times each session has accessed the service
|
||||||
|
;; This demonstrates cookies and sessions
|
||||||
|
(def request-count-handler
|
||||||
|
(-> (fn [{session :session}]
|
||||||
|
(let [count (:count session 0)
|
||||||
|
session (assoc session :count (inc count))]
|
||||||
|
(-> (response (str "You accessed this page " count " times."))
|
||||||
|
(assoc :session session))))
|
||||||
|
wrap-cookies
|
||||||
|
(wrap-session {:cookie-attrs {:max-age 3600}})
|
||||||
|
))
|
||||||
|
|
||||||
|
;; Run the provided handler on port 3000
|
||||||
|
(defn run
|
||||||
|
[h]
|
||||||
|
(run-jetty h {:port 3000}))
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
package com.baeldung.error;
|
||||||
|
|
||||||
|
public class ErrorGenerator {
|
||||||
|
public void throwException() throws Exception {
|
||||||
|
throw new Exception("checked");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void throwRuntimeException() {
|
||||||
|
throw new RuntimeException("unchecked");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void throwError() {
|
||||||
|
throw new Error("unchecked");
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,51 @@
|
|||||||
|
package com.baeldung.error;
|
||||||
|
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
public class ErrorGeneratorUnitTest {
|
||||||
|
|
||||||
|
private ErrorGenerator errorGenerator;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
errorGenerator = new ErrorGenerator();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenCheckedException_thenIsCaughtByCatchException() {
|
||||||
|
try {
|
||||||
|
errorGenerator.throwException();
|
||||||
|
} catch (Exception e) {
|
||||||
|
// caught! -> test pass
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenUncheckedException_thenIsCaughtByCatchException() {
|
||||||
|
try {
|
||||||
|
errorGenerator.throwRuntimeException();
|
||||||
|
} catch (Exception e) {
|
||||||
|
// caught! -> test pass
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(expected = Error.class)
|
||||||
|
public void whenError_thenIsNotCaughtByCatchException() {
|
||||||
|
try {
|
||||||
|
errorGenerator.throwError();
|
||||||
|
} catch (Exception e) {
|
||||||
|
Assert.fail(); // errors are not caught by catch exception
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenError_thenIsCaughtByCatchError() {
|
||||||
|
try {
|
||||||
|
errorGenerator.throwError();
|
||||||
|
} catch (Error e) {
|
||||||
|
// caught! -> test pass
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -75,7 +75,7 @@ public class Slf4jLogger implements System.Logger {
|
|||||||
if (!isLoggable(level)) {
|
if (!isLoggable(level)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String message = MessageFormat.format (format, params);
|
String message = MessageFormat.format(format, params);
|
||||||
|
|
||||||
switch (level) {
|
switch (level) {
|
||||||
case TRACE:
|
case TRACE:
|
||||||
|
|||||||
3
core-java-modules/core-java-lambdas/README.MD
Normal file
3
core-java-modules/core-java-lambdas/README.MD
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
### Relevant Articles
|
||||||
|
|
||||||
|
- [Why Do Local Variables Used in Lambdas Have to Be Final or Effectively Final?](https://www.baeldung.com/java-lambda-effectively-final-local-variables)
|
||||||
@ -5,6 +5,8 @@ import java.util.*
|
|||||||
interface Document {
|
interface Document {
|
||||||
|
|
||||||
@JvmDefault
|
@JvmDefault
|
||||||
|
fun getTypeDefault() = "document"
|
||||||
|
|
||||||
fun getType() = "document"
|
fun getType() = "document"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -23,9 +25,3 @@ class TextDocument : Document {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class XmlDocument(d : Document) : Document by d
|
class XmlDocument(d : Document) : Document by d
|
||||||
|
|
||||||
fun main() {
|
|
||||||
val myDocument = TextDocument()
|
|
||||||
val myTextDocument = XmlDocument(myDocument)
|
|
||||||
println("${myDocument.getType()} ${myTextDocument.getType()}")
|
|
||||||
}
|
|
||||||
|
|||||||
@ -0,0 +1,18 @@
|
|||||||
|
package com.baeldung.range
|
||||||
|
|
||||||
|
import org.junit.Test
|
||||||
|
import kotlin.test.assertEquals
|
||||||
|
|
||||||
|
class DocumentTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDefaultMethod() {
|
||||||
|
|
||||||
|
val myDocument = TextDocument()
|
||||||
|
val myTextDocument = XmlDocument(myDocument)
|
||||||
|
|
||||||
|
assertEquals("text", myDocument.getType())
|
||||||
|
assertEquals("text", myTextDocument.getType())
|
||||||
|
assertEquals("document", myTextDocument.getTypeDefault())
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -10,7 +10,7 @@ import org.junit.Test;
|
|||||||
/**
|
/**
|
||||||
* BAEL-2832: Different ways to check if a Substring could be found in a String.
|
* BAEL-2832: Different ways to check if a Substring could be found in a String.
|
||||||
*/
|
*/
|
||||||
public class SubstringSearch {
|
public class SubstringSearchUnitTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void searchSubstringWithIndexOf() {
|
public void searchSubstringWithIndexOf() {
|
||||||
@ -1,21 +1,100 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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/maven-v4_0_0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.car.app</groupId>
|
|
||||||
<artifactId>car-app</artifactId>
|
|
||||||
<name>car-app</name>
|
|
||||||
<packaging>war</packaging>
|
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>jhipster-microservice</artifactId>
|
<artifactId>jhipster-microservice</artifactId>
|
||||||
<groupId>com.baeldung.jhipster</groupId>
|
<groupId>com.baeldung.jhipster</groupId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
<groupId>com.car.app</groupId>
|
||||||
|
<artifactId>car-app</artifactId>
|
||||||
|
<packaging>war</packaging>
|
||||||
|
<name>car-app</name>
|
||||||
|
|
||||||
<prerequisites>
|
<prerequisites>
|
||||||
<maven>${maven.version}</maven>
|
<maven>${maven.version}</maven>
|
||||||
</prerequisites>
|
</prerequisites>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
|
||||||
|
<assertj.version>3.6.2</assertj.version>
|
||||||
|
<awaitility.version>2.0.0</awaitility.version>
|
||||||
|
<commons-io.version>2.5</commons-io.version>
|
||||||
|
<commons-lang.version>3.5</commons-lang.version>
|
||||||
|
<docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
|
||||||
|
<hazelcast-hibernate52.version>1.2</hazelcast-hibernate52.version>
|
||||||
|
<hibernate.version>5.2.8.Final</hibernate.version>
|
||||||
|
<hikaricp.version>2.6.0</hikaricp.version>
|
||||||
|
<jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
|
||||||
|
<java.version>1.8</java.version>
|
||||||
|
<javassist.version>3.21.0-GA</javassist.version>
|
||||||
|
<jcache.version>1.0.0</jcache.version>
|
||||||
|
<jhipster.server.version>1.1.0</jhipster.server.version>
|
||||||
|
<jjwt.version>0.7.0</jjwt.version>
|
||||||
|
<liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
|
||||||
|
<liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
|
||||||
|
<liquibase.version>3.6.2</liquibase.version>
|
||||||
|
<logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
|
||||||
|
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
|
||||||
|
<mapstruct.version>1.1.0.Final</mapstruct.version>
|
||||||
|
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
|
||||||
|
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
|
||||||
|
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
|
||||||
|
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
|
||||||
|
<maven.version>3.0.0</maven.version>
|
||||||
|
<metrics-spring.version>3.1.3</metrics-spring.version>
|
||||||
|
<node.version>v6.10.0</node.version>
|
||||||
|
<!-- These remain empty unless the corresponding profile is active -->
|
||||||
|
<profile.no-liquibase />
|
||||||
|
<profile.swagger />
|
||||||
|
<!-- Sonar properties -->
|
||||||
|
<project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
|
||||||
|
<prometheus-simpleclient.version>0.0.20</prometheus-simpleclient.version>
|
||||||
|
<run.addResources>false</run.addResources>
|
||||||
|
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
|
||||||
|
<scala.version>2.12.1</scala.version>
|
||||||
|
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
|
||||||
|
|
||||||
|
<sonar.exclusions>src/main/webapp/content/**/*.*, src/main/webapp/bower_components/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*</sonar.exclusions>
|
||||||
|
|
||||||
|
<sonar.issue.ignore.multicriteria>S3437,UndocumentedApi,BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria>
|
||||||
|
|
||||||
|
<!-- Rule https://sonarqube.com/coding_rules#rule_key=Web%3ABoldAndItalicTagsCheck is ignored. Even if we agree that using the "i" tag is an awful practice, this is what is
|
||||||
|
recommended by http://fontawesome.io/examples/ -->
|
||||||
|
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>src/main/webapp/app/**/*.*</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>
|
||||||
|
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>Web:BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>
|
||||||
|
<!-- Rule https://sonarqube.com/coding_rules#rule_key=squid%3AS3437 is ignored, as a JPA-managed field cannot be transient -->
|
||||||
|
<sonar.issue.ignore.multicriteria.S3437.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.S3437.resourceKey>
|
||||||
|
<sonar.issue.ignore.multicriteria.S3437.ruleKey>squid:S3437</sonar.issue.ignore.multicriteria.S3437.ruleKey>
|
||||||
|
<!-- Rule http://sonarqube.com/coding_rules#rule_key=squid%3AUndocumentedApi is ignored, as we want to follow "clean code" guidelines and classes, methods and arguments names
|
||||||
|
should be self-explanatory -->
|
||||||
|
<sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>
|
||||||
|
<sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>squid:UndocumentedApi</sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>
|
||||||
|
|
||||||
|
<sonar.jacoco.itReportPath>${project.testresult.directory}/coverage/jacoco/jacoco-it.exec</sonar.jacoco.itReportPath>
|
||||||
|
<sonar.jacoco.reportPath>${project.testresult.directory}/coverage/jacoco/jacoco.exec</sonar.jacoco.reportPath>
|
||||||
|
<sonar.java.codeCoveragePlugin>jacoco</sonar.java.codeCoveragePlugin>
|
||||||
|
|
||||||
|
<sonar.javascript.jstestdriver.reportsPath>${project.testresult.directory}/karma</sonar.javascript.jstestdriver.reportsPath>
|
||||||
|
<!-- For Sonar < 6.2 -->
|
||||||
|
<sonar.javascript.lcov.reportPath>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPath>
|
||||||
|
<!-- For Sonar >= 6.2 -->
|
||||||
|
<sonar.javascript.lcov.reportPaths>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPaths>
|
||||||
|
|
||||||
|
<sonar.sources>${project.basedir}/src/main/</sonar.sources>
|
||||||
|
<sonar.surefire.reportsPath>${project.testresult.directory}/surefire-reports</sonar.surefire.reportsPath>
|
||||||
|
<sonar.tests>${project.basedir}/src/test/</sonar.tests>
|
||||||
|
|
||||||
|
<sortpom-maven-plugin.version>2.5.0</sortpom-maven-plugin.version>
|
||||||
|
<!-- Spring properties -->
|
||||||
|
<spring-cloud.version>Camden.SR5</spring-cloud.version>
|
||||||
|
<springfox.version>2.6.1</springfox.version>
|
||||||
|
<undertow.version>1.4.10.Final</undertow.version>
|
||||||
|
<validation-api.version>1.1.0.Final</validation-api.version>
|
||||||
|
<yarn.version>v0.21.3</yarn.version>
|
||||||
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -819,83 +898,4 @@
|
|||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
<properties>
|
|
||||||
<argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
|
|
||||||
<assertj.version>3.6.2</assertj.version>
|
|
||||||
<awaitility.version>2.0.0</awaitility.version>
|
|
||||||
<commons-io.version>2.5</commons-io.version>
|
|
||||||
<commons-lang.version>3.5</commons-lang.version>
|
|
||||||
<docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
|
|
||||||
<hazelcast-hibernate52.version>1.2</hazelcast-hibernate52.version>
|
|
||||||
<hibernate.version>5.2.8.Final</hibernate.version>
|
|
||||||
<hikaricp.version>2.6.0</hikaricp.version>
|
|
||||||
<jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
|
|
||||||
<java.version>1.8</java.version>
|
|
||||||
<javassist.version>3.21.0-GA</javassist.version>
|
|
||||||
<jcache.version>1.0.0</jcache.version>
|
|
||||||
<jhipster.server.version>1.1.0</jhipster.server.version>
|
|
||||||
<jjwt.version>0.7.0</jjwt.version>
|
|
||||||
<liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
|
|
||||||
<liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
|
|
||||||
<liquibase.version>3.6.2</liquibase.version>
|
|
||||||
<logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
|
|
||||||
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
|
|
||||||
<mapstruct.version>1.1.0.Final</mapstruct.version>
|
|
||||||
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
|
|
||||||
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
|
|
||||||
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
|
|
||||||
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
|
|
||||||
<maven.version>3.0.0</maven.version>
|
|
||||||
<metrics-spring.version>3.1.3</metrics-spring.version>
|
|
||||||
<node.version>v6.10.0</node.version>
|
|
||||||
<!-- These remain empty unless the corresponding profile is active -->
|
|
||||||
<profile.no-liquibase />
|
|
||||||
<profile.swagger />
|
|
||||||
<!-- Sonar properties -->
|
|
||||||
<project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
|
|
||||||
<prometheus-simpleclient.version>0.0.20</prometheus-simpleclient.version>
|
|
||||||
<run.addResources>false</run.addResources>
|
|
||||||
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
|
|
||||||
<scala.version>2.12.1</scala.version>
|
|
||||||
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
|
|
||||||
|
|
||||||
<sonar.exclusions>src/main/webapp/content/**/*.*, src/main/webapp/bower_components/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*</sonar.exclusions>
|
|
||||||
|
|
||||||
<sonar.issue.ignore.multicriteria>S3437,UndocumentedApi,BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria>
|
|
||||||
|
|
||||||
<!-- Rule https://sonarqube.com/coding_rules#rule_key=Web%3ABoldAndItalicTagsCheck is ignored. Even if we agree that using the "i" tag is an awful practice, this is what is
|
|
||||||
recommended by http://fontawesome.io/examples/ -->
|
|
||||||
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>src/main/webapp/app/**/*.*</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>
|
|
||||||
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>Web:BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>
|
|
||||||
<!-- Rule https://sonarqube.com/coding_rules#rule_key=squid%3AS3437 is ignored, as a JPA-managed field cannot be transient -->
|
|
||||||
<sonar.issue.ignore.multicriteria.S3437.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.S3437.resourceKey>
|
|
||||||
<sonar.issue.ignore.multicriteria.S3437.ruleKey>squid:S3437</sonar.issue.ignore.multicriteria.S3437.ruleKey>
|
|
||||||
<!-- Rule http://sonarqube.com/coding_rules#rule_key=squid%3AUndocumentedApi is ignored, as we want to follow "clean code" guidelines and classes, methods and arguments names
|
|
||||||
should be self-explanatory -->
|
|
||||||
<sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>
|
|
||||||
<sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>squid:UndocumentedApi</sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>
|
|
||||||
|
|
||||||
<sonar.jacoco.itReportPath>${project.testresult.directory}/coverage/jacoco/jacoco-it.exec</sonar.jacoco.itReportPath>
|
|
||||||
<sonar.jacoco.reportPath>${project.testresult.directory}/coverage/jacoco/jacoco.exec</sonar.jacoco.reportPath>
|
|
||||||
<sonar.java.codeCoveragePlugin>jacoco</sonar.java.codeCoveragePlugin>
|
|
||||||
|
|
||||||
<sonar.javascript.jstestdriver.reportsPath>${project.testresult.directory}/karma</sonar.javascript.jstestdriver.reportsPath>
|
|
||||||
<!-- For Sonar < 6.2 -->
|
|
||||||
<sonar.javascript.lcov.reportPath>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPath>
|
|
||||||
<!-- For Sonar >= 6.2 -->
|
|
||||||
<sonar.javascript.lcov.reportPaths>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPaths>
|
|
||||||
|
|
||||||
<sonar.sources>${project.basedir}/src/main/</sonar.sources>
|
|
||||||
<sonar.surefire.reportsPath>${project.testresult.directory}/surefire-reports</sonar.surefire.reportsPath>
|
|
||||||
<sonar.tests>${project.basedir}/src/test/</sonar.tests>
|
|
||||||
|
|
||||||
<sortpom-maven-plugin.version>2.5.0</sortpom-maven-plugin.version>
|
|
||||||
<!-- Spring properties -->
|
|
||||||
<spring-cloud.version>Camden.SR5</spring-cloud.version>
|
|
||||||
<springfox.version>2.6.1</springfox.version>
|
|
||||||
<undertow.version>1.4.10.Final</undertow.version>
|
|
||||||
<validation-api.version>1.1.0.Final</validation-api.version>
|
|
||||||
<yarn.version>v0.21.3</yarn.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,21 +1,99 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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/maven-v4_0_0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.dealer.app</groupId>
|
|
||||||
<artifactId>dealer-app</artifactId>
|
|
||||||
<name>dealer-app</name>
|
|
||||||
<packaging>war</packaging>
|
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>jhipster-microservice</artifactId>
|
<artifactId>jhipster-microservice</artifactId>
|
||||||
<groupId>com.baeldung.jhipster</groupId>
|
<groupId>com.baeldung.jhipster</groupId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
<groupId>com.dealer.app</groupId>
|
||||||
|
<artifactId>dealer-app</artifactId>
|
||||||
|
<packaging>war</packaging>
|
||||||
|
<name>dealer-app</name>
|
||||||
|
|
||||||
<prerequisites>
|
<prerequisites>
|
||||||
<maven>${maven.version}</maven>
|
<maven>${maven.version}</maven>
|
||||||
</prerequisites>
|
</prerequisites>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
|
||||||
|
<assertj.version>3.6.2</assertj.version>
|
||||||
|
<awaitility.version>2.0.0</awaitility.version>
|
||||||
|
<commons-io.version>2.5</commons-io.version>
|
||||||
|
<commons-lang.version>3.5</commons-lang.version>
|
||||||
|
<docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
|
||||||
|
<hazelcast-hibernate52.version>1.2</hazelcast-hibernate52.version>
|
||||||
|
<hibernate.version>5.2.8.Final</hibernate.version>
|
||||||
|
<hikaricp.version>2.6.0</hikaricp.version>
|
||||||
|
<jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
|
||||||
|
<javassist.version>3.21.0-GA</javassist.version>
|
||||||
|
<jcache.version>1.0.0</jcache.version>
|
||||||
|
<jhipster.server.version>1.1.0</jhipster.server.version>
|
||||||
|
<jjwt.version>0.7.0</jjwt.version>
|
||||||
|
<liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
|
||||||
|
<liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
|
||||||
|
<liquibase.version>3.6.2</liquibase.version>
|
||||||
|
<logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
|
||||||
|
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
|
||||||
|
<mapstruct.version>1.1.0.Final</mapstruct.version>
|
||||||
|
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
|
||||||
|
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
|
||||||
|
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
|
||||||
|
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
|
||||||
|
<maven.version>3.0.0</maven.version>
|
||||||
|
<metrics-spring.version>3.1.3</metrics-spring.version>
|
||||||
|
<node.version>v6.10.0</node.version>
|
||||||
|
<!-- These remain empty unless the corresponding profile is active -->
|
||||||
|
<profile.no-liquibase />
|
||||||
|
<profile.swagger />
|
||||||
|
<!-- Sonar properties -->
|
||||||
|
<project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
|
||||||
|
<prometheus-simpleclient.version>0.0.20</prometheus-simpleclient.version>
|
||||||
|
<run.addResources>false</run.addResources>
|
||||||
|
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
|
||||||
|
<scala.version>2.12.1</scala.version>
|
||||||
|
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
|
||||||
|
|
||||||
|
<sonar.exclusions>src/main/webapp/content/**/*.*, src/main/webapp/bower_components/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*</sonar.exclusions>
|
||||||
|
|
||||||
|
<sonar.issue.ignore.multicriteria>S3437,UndocumentedApi,BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria>
|
||||||
|
|
||||||
|
<!-- Rule https://sonarqube.com/coding_rules#rule_key=Web%3ABoldAndItalicTagsCheck is ignored. Even if we agree that using the "i" tag is an awful practice, this is what is
|
||||||
|
recommended by http://fontawesome.io/examples/ -->
|
||||||
|
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>src/main/webapp/app/**/*.*</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>
|
||||||
|
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>Web:BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>
|
||||||
|
<!-- Rule https://sonarqube.com/coding_rules#rule_key=squid%3AS3437 is ignored, as a JPA-managed field cannot be transient -->
|
||||||
|
<sonar.issue.ignore.multicriteria.S3437.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.S3437.resourceKey>
|
||||||
|
<sonar.issue.ignore.multicriteria.S3437.ruleKey>squid:S3437</sonar.issue.ignore.multicriteria.S3437.ruleKey>
|
||||||
|
<!-- Rule http://sonarqube.com/coding_rules#rule_key=squid%3AUndocumentedApi is ignored, as we want to follow "clean code" guidelines and classes, methods and arguments names
|
||||||
|
should be self-explanatory -->
|
||||||
|
<sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>
|
||||||
|
<sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>squid:UndocumentedApi</sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>
|
||||||
|
|
||||||
|
<sonar.jacoco.itReportPath>${project.testresult.directory}/coverage/jacoco/jacoco-it.exec</sonar.jacoco.itReportPath>
|
||||||
|
<sonar.jacoco.reportPath>${project.testresult.directory}/coverage/jacoco/jacoco.exec</sonar.jacoco.reportPath>
|
||||||
|
<sonar.java.codeCoveragePlugin>jacoco</sonar.java.codeCoveragePlugin>
|
||||||
|
|
||||||
|
<sonar.javascript.jstestdriver.reportsPath>${project.testresult.directory}/karma</sonar.javascript.jstestdriver.reportsPath>
|
||||||
|
<!-- For Sonar < 6.2 -->
|
||||||
|
<sonar.javascript.lcov.reportPath>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPath>
|
||||||
|
<!-- For Sonar >= 6.2 -->
|
||||||
|
<sonar.javascript.lcov.reportPaths>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPaths>
|
||||||
|
|
||||||
|
<sonar.sources>${project.basedir}/src/main/</sonar.sources>
|
||||||
|
<sonar.surefire.reportsPath>${project.testresult.directory}/surefire-reports</sonar.surefire.reportsPath>
|
||||||
|
<sonar.tests>${project.basedir}/src/test/</sonar.tests>
|
||||||
|
|
||||||
|
<sortpom-maven-plugin.version>2.5.0</sortpom-maven-plugin.version>
|
||||||
|
<!-- Spring properties -->
|
||||||
|
<spring-cloud.version>Camden.SR5</spring-cloud.version>
|
||||||
|
<springfox.version>2.6.1</springfox.version>
|
||||||
|
<undertow.version>1.4.10.Final</undertow.version>
|
||||||
|
<validation-api.version>1.1.0.Final</validation-api.version>
|
||||||
|
<yarn.version>v0.21.3</yarn.version>
|
||||||
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -814,82 +892,4 @@
|
|||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
<properties>
|
|
||||||
<argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
|
|
||||||
<assertj.version>3.6.2</assertj.version>
|
|
||||||
<awaitility.version>2.0.0</awaitility.version>
|
|
||||||
<commons-io.version>2.5</commons-io.version>
|
|
||||||
<commons-lang.version>3.5</commons-lang.version>
|
|
||||||
<docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
|
|
||||||
<hazelcast-hibernate52.version>1.2</hazelcast-hibernate52.version>
|
|
||||||
<hibernate.version>5.2.8.Final</hibernate.version>
|
|
||||||
<hikaricp.version>2.6.0</hikaricp.version>
|
|
||||||
<jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
|
|
||||||
<javassist.version>3.21.0-GA</javassist.version>
|
|
||||||
<jcache.version>1.0.0</jcache.version>
|
|
||||||
<jhipster.server.version>1.1.0</jhipster.server.version>
|
|
||||||
<jjwt.version>0.7.0</jjwt.version>
|
|
||||||
<liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
|
|
||||||
<liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
|
|
||||||
<liquibase.version>3.6.2</liquibase.version>
|
|
||||||
<logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
|
|
||||||
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
|
|
||||||
<mapstruct.version>1.1.0.Final</mapstruct.version>
|
|
||||||
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
|
|
||||||
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
|
|
||||||
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
|
|
||||||
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
|
|
||||||
<maven.version>3.0.0</maven.version>
|
|
||||||
<metrics-spring.version>3.1.3</metrics-spring.version>
|
|
||||||
<node.version>v6.10.0</node.version>
|
|
||||||
<!-- These remain empty unless the corresponding profile is active -->
|
|
||||||
<profile.no-liquibase />
|
|
||||||
<profile.swagger />
|
|
||||||
<!-- Sonar properties -->
|
|
||||||
<project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
|
|
||||||
<prometheus-simpleclient.version>0.0.20</prometheus-simpleclient.version>
|
|
||||||
<run.addResources>false</run.addResources>
|
|
||||||
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
|
|
||||||
<scala.version>2.12.1</scala.version>
|
|
||||||
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
|
|
||||||
|
|
||||||
<sonar.exclusions>src/main/webapp/content/**/*.*, src/main/webapp/bower_components/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*</sonar.exclusions>
|
|
||||||
|
|
||||||
<sonar.issue.ignore.multicriteria>S3437,UndocumentedApi,BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria>
|
|
||||||
|
|
||||||
<!-- Rule https://sonarqube.com/coding_rules#rule_key=Web%3ABoldAndItalicTagsCheck is ignored. Even if we agree that using the "i" tag is an awful practice, this is what is
|
|
||||||
recommended by http://fontawesome.io/examples/ -->
|
|
||||||
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>src/main/webapp/app/**/*.*</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>
|
|
||||||
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>Web:BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>
|
|
||||||
<!-- Rule https://sonarqube.com/coding_rules#rule_key=squid%3AS3437 is ignored, as a JPA-managed field cannot be transient -->
|
|
||||||
<sonar.issue.ignore.multicriteria.S3437.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.S3437.resourceKey>
|
|
||||||
<sonar.issue.ignore.multicriteria.S3437.ruleKey>squid:S3437</sonar.issue.ignore.multicriteria.S3437.ruleKey>
|
|
||||||
<!-- Rule http://sonarqube.com/coding_rules#rule_key=squid%3AUndocumentedApi is ignored, as we want to follow "clean code" guidelines and classes, methods and arguments names
|
|
||||||
should be self-explanatory -->
|
|
||||||
<sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>
|
|
||||||
<sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>squid:UndocumentedApi</sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>
|
|
||||||
|
|
||||||
<sonar.jacoco.itReportPath>${project.testresult.directory}/coverage/jacoco/jacoco-it.exec</sonar.jacoco.itReportPath>
|
|
||||||
<sonar.jacoco.reportPath>${project.testresult.directory}/coverage/jacoco/jacoco.exec</sonar.jacoco.reportPath>
|
|
||||||
<sonar.java.codeCoveragePlugin>jacoco</sonar.java.codeCoveragePlugin>
|
|
||||||
|
|
||||||
<sonar.javascript.jstestdriver.reportsPath>${project.testresult.directory}/karma</sonar.javascript.jstestdriver.reportsPath>
|
|
||||||
<!-- For Sonar < 6.2 -->
|
|
||||||
<sonar.javascript.lcov.reportPath>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPath>
|
|
||||||
<!-- For Sonar >= 6.2 -->
|
|
||||||
<sonar.javascript.lcov.reportPaths>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPaths>
|
|
||||||
|
|
||||||
<sonar.sources>${project.basedir}/src/main/</sonar.sources>
|
|
||||||
<sonar.surefire.reportsPath>${project.testresult.directory}/surefire-reports</sonar.surefire.reportsPath>
|
|
||||||
<sonar.tests>${project.basedir}/src/test/</sonar.tests>
|
|
||||||
|
|
||||||
<sortpom-maven-plugin.version>2.5.0</sortpom-maven-plugin.version>
|
|
||||||
<!-- Spring properties -->
|
|
||||||
<spring-cloud.version>Camden.SR5</spring-cloud.version>
|
|
||||||
<springfox.version>2.6.1</springfox.version>
|
|
||||||
<undertow.version>1.4.10.Final</undertow.version>
|
|
||||||
<validation-api.version>1.1.0.Final</validation-api.version>
|
|
||||||
<yarn.version>v0.21.3</yarn.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,21 +1,103 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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/maven-v4_0_0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.gateway</groupId>
|
|
||||||
<artifactId>gateway-app</artifactId>
|
|
||||||
<name>gateway-app</name>
|
|
||||||
<packaging>war</packaging>
|
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>jhipster-microservice</artifactId>
|
<artifactId>jhipster-microservice</artifactId>
|
||||||
<groupId>com.baeldung.jhipster</groupId>
|
<groupId>com.baeldung.jhipster</groupId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
<groupId>com.gateway</groupId>
|
||||||
|
<artifactId>gateway-app</artifactId>
|
||||||
|
<packaging>war</packaging>
|
||||||
|
<name>gateway-app</name>
|
||||||
|
|
||||||
<prerequisites>
|
<prerequisites>
|
||||||
<maven>${maven.version}</maven>
|
<maven>${maven.version}</maven>
|
||||||
</prerequisites>
|
</prerequisites>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
|
||||||
|
<assertj.version>3.6.2</assertj.version>
|
||||||
|
<awaitility.version>2.0.0</awaitility.version>
|
||||||
|
<cassandra-driver.version>3.6.0</cassandra-driver.version>
|
||||||
|
<commons-codec.version>1.10</commons-codec.version>
|
||||||
|
<commons-io.version>2.5</commons-io.version>
|
||||||
|
<commons-lang.version>3.5</commons-lang.version>
|
||||||
|
<docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
|
||||||
|
<frontend-maven-plugin.version>1.3</frontend-maven-plugin.version>
|
||||||
|
<hazelcast-hibernate52.version>1.2</hazelcast-hibernate52.version>
|
||||||
|
<hibernate.version>5.2.8.Final</hibernate.version>
|
||||||
|
<hikaricp.version>2.6.0</hikaricp.version>
|
||||||
|
<jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
|
||||||
|
<javassist.version>3.21.0-GA</javassist.version>
|
||||||
|
<jcache.version>1.0.0</jcache.version>
|
||||||
|
<jhipster.server.version>1.1.0</jhipster.server.version>
|
||||||
|
<jjwt.version>0.7.0</jjwt.version>
|
||||||
|
<liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
|
||||||
|
<liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
|
||||||
|
<liquibase.version>3.6.2</liquibase.version>
|
||||||
|
<logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
|
||||||
|
<lz4.version>1.3.0</lz4.version>
|
||||||
|
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
|
||||||
|
<mapstruct.version>1.1.0.Final</mapstruct.version>
|
||||||
|
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
|
||||||
|
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
|
||||||
|
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
|
||||||
|
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
|
||||||
|
<maven.version>3.0.0</maven.version>
|
||||||
|
<metrics-spring.version>3.1.3</metrics-spring.version>
|
||||||
|
<node.version>v6.10.0</node.version>
|
||||||
|
<!-- These remain empty unless the corresponding profile is active -->
|
||||||
|
<profile.no-liquibase />
|
||||||
|
<profile.swagger />
|
||||||
|
<!-- Sonar properties -->
|
||||||
|
<project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
|
||||||
|
<prometheus-simpleclient.version>0.0.20</prometheus-simpleclient.version>
|
||||||
|
<run.addResources>false</run.addResources>
|
||||||
|
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
|
||||||
|
<scala.version>2.12.1</scala.version>
|
||||||
|
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
|
||||||
|
|
||||||
|
<sonar.exclusions>src/main/webapp/content/**/*.*, src/main/webapp/bower_components/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*</sonar.exclusions>
|
||||||
|
|
||||||
|
<sonar.issue.ignore.multicriteria>S3437,UndocumentedApi,BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria>
|
||||||
|
|
||||||
|
<!-- Rule https://sonarqube.com/coding_rules#rule_key=Web%3ABoldAndItalicTagsCheck is ignored. Even if we agree that using the "i" tag is an awful practice, this is what is
|
||||||
|
recommended by http://fontawesome.io/examples/ -->
|
||||||
|
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>src/main/webapp/app/**/*.*</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>
|
||||||
|
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>Web:BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>
|
||||||
|
<!-- Rule https://sonarqube.com/coding_rules#rule_key=squid%3AS3437 is ignored, as a JPA-managed field cannot be transient -->
|
||||||
|
<sonar.issue.ignore.multicriteria.S3437.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.S3437.resourceKey>
|
||||||
|
<sonar.issue.ignore.multicriteria.S3437.ruleKey>squid:S3437</sonar.issue.ignore.multicriteria.S3437.ruleKey>
|
||||||
|
<!-- Rule http://sonarqube.com/coding_rules#rule_key=squid%3AUndocumentedApi is ignored, as we want to follow "clean code" guidelines and classes, methods and arguments names
|
||||||
|
should be self-explanatory -->
|
||||||
|
<sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>
|
||||||
|
<sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>squid:UndocumentedApi</sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>
|
||||||
|
|
||||||
|
<sonar.jacoco.itReportPath>${project.testresult.directory}/coverage/jacoco/jacoco-it.exec</sonar.jacoco.itReportPath>
|
||||||
|
<sonar.jacoco.reportPath>${project.testresult.directory}/coverage/jacoco/jacoco.exec</sonar.jacoco.reportPath>
|
||||||
|
<sonar.java.codeCoveragePlugin>jacoco</sonar.java.codeCoveragePlugin>
|
||||||
|
|
||||||
|
<sonar.javascript.jstestdriver.reportsPath>${project.testresult.directory}/karma</sonar.javascript.jstestdriver.reportsPath>
|
||||||
|
<!-- For Sonar < 6.2 -->
|
||||||
|
<sonar.javascript.lcov.reportPath>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPath>
|
||||||
|
<!-- For Sonar >= 6.2 -->
|
||||||
|
<sonar.javascript.lcov.reportPaths>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPaths>
|
||||||
|
|
||||||
|
<sonar.sources>${project.basedir}/src/main/</sonar.sources>
|
||||||
|
<sonar.surefire.reportsPath>${project.testresult.directory}/surefire-reports</sonar.surefire.reportsPath>
|
||||||
|
<sonar.tests>${project.basedir}/src/test/</sonar.tests>
|
||||||
|
|
||||||
|
<sortpom-maven-plugin.version>2.5.0</sortpom-maven-plugin.version>
|
||||||
|
<!-- Spring properties -->
|
||||||
|
<spring-cloud.version>Camden.SR5</spring-cloud.version>
|
||||||
|
<springfox.version>2.6.1</springfox.version>
|
||||||
|
<undertow.version>1.4.10.Final</undertow.version>
|
||||||
|
<validation-api.version>1.1.0.Final</validation-api.version>
|
||||||
|
<yarn.version>v0.21.3</yarn.version>
|
||||||
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -926,86 +1008,4 @@
|
|||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
<properties>
|
|
||||||
<argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
|
|
||||||
<assertj.version>3.6.2</assertj.version>
|
|
||||||
<awaitility.version>2.0.0</awaitility.version>
|
|
||||||
<cassandra-driver.version>3.6.0</cassandra-driver.version>
|
|
||||||
<commons-codec.version>1.10</commons-codec.version>
|
|
||||||
<commons-io.version>2.5</commons-io.version>
|
|
||||||
<commons-lang.version>3.5</commons-lang.version>
|
|
||||||
<docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
|
|
||||||
<frontend-maven-plugin.version>1.3</frontend-maven-plugin.version>
|
|
||||||
<hazelcast-hibernate52.version>1.2</hazelcast-hibernate52.version>
|
|
||||||
<hibernate.version>5.2.8.Final</hibernate.version>
|
|
||||||
<hikaricp.version>2.6.0</hikaricp.version>
|
|
||||||
<jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
|
|
||||||
<javassist.version>3.21.0-GA</javassist.version>
|
|
||||||
<jcache.version>1.0.0</jcache.version>
|
|
||||||
<jhipster.server.version>1.1.0</jhipster.server.version>
|
|
||||||
<jjwt.version>0.7.0</jjwt.version>
|
|
||||||
<liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
|
|
||||||
<liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
|
|
||||||
<liquibase.version>3.6.2</liquibase.version>
|
|
||||||
<logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
|
|
||||||
<lz4.version>1.3.0</lz4.version>
|
|
||||||
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
|
|
||||||
<mapstruct.version>1.1.0.Final</mapstruct.version>
|
|
||||||
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
|
|
||||||
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
|
|
||||||
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
|
|
||||||
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
|
|
||||||
<maven.version>3.0.0</maven.version>
|
|
||||||
<metrics-spring.version>3.1.3</metrics-spring.version>
|
|
||||||
<node.version>v6.10.0</node.version>
|
|
||||||
<!-- These remain empty unless the corresponding profile is active -->
|
|
||||||
<profile.no-liquibase />
|
|
||||||
<profile.swagger />
|
|
||||||
<!-- Sonar properties -->
|
|
||||||
<project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
|
|
||||||
<prometheus-simpleclient.version>0.0.20</prometheus-simpleclient.version>
|
|
||||||
<run.addResources>false</run.addResources>
|
|
||||||
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
|
|
||||||
<scala.version>2.12.1</scala.version>
|
|
||||||
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
|
|
||||||
|
|
||||||
<sonar.exclusions>src/main/webapp/content/**/*.*, src/main/webapp/bower_components/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*</sonar.exclusions>
|
|
||||||
|
|
||||||
<sonar.issue.ignore.multicriteria>S3437,UndocumentedApi,BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria>
|
|
||||||
|
|
||||||
<!-- Rule https://sonarqube.com/coding_rules#rule_key=Web%3ABoldAndItalicTagsCheck is ignored. Even if we agree that using the "i" tag is an awful practice, this is what is
|
|
||||||
recommended by http://fontawesome.io/examples/ -->
|
|
||||||
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>src/main/webapp/app/**/*.*</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.resourceKey>
|
|
||||||
<sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>Web:BoldAndItalicTagsCheck</sonar.issue.ignore.multicriteria.BoldAndItalicTagsCheck.ruleKey>
|
|
||||||
<!-- Rule https://sonarqube.com/coding_rules#rule_key=squid%3AS3437 is ignored, as a JPA-managed field cannot be transient -->
|
|
||||||
<sonar.issue.ignore.multicriteria.S3437.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.S3437.resourceKey>
|
|
||||||
<sonar.issue.ignore.multicriteria.S3437.ruleKey>squid:S3437</sonar.issue.ignore.multicriteria.S3437.ruleKey>
|
|
||||||
<!-- Rule http://sonarqube.com/coding_rules#rule_key=squid%3AUndocumentedApi is ignored, as we want to follow "clean code" guidelines and classes, methods and arguments names
|
|
||||||
should be self-explanatory -->
|
|
||||||
<sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>src/main/java/**/*</sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey>
|
|
||||||
<sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>squid:UndocumentedApi</sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey>
|
|
||||||
|
|
||||||
<sonar.jacoco.itReportPath>${project.testresult.directory}/coverage/jacoco/jacoco-it.exec</sonar.jacoco.itReportPath>
|
|
||||||
<sonar.jacoco.reportPath>${project.testresult.directory}/coverage/jacoco/jacoco.exec</sonar.jacoco.reportPath>
|
|
||||||
<sonar.java.codeCoveragePlugin>jacoco</sonar.java.codeCoveragePlugin>
|
|
||||||
|
|
||||||
<sonar.javascript.jstestdriver.reportsPath>${project.testresult.directory}/karma</sonar.javascript.jstestdriver.reportsPath>
|
|
||||||
<!-- For Sonar < 6.2 -->
|
|
||||||
<sonar.javascript.lcov.reportPath>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPath>
|
|
||||||
<!-- For Sonar >= 6.2 -->
|
|
||||||
<sonar.javascript.lcov.reportPaths>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPaths>
|
|
||||||
|
|
||||||
<sonar.sources>${project.basedir}/src/main/</sonar.sources>
|
|
||||||
<sonar.surefire.reportsPath>${project.testresult.directory}/surefire-reports</sonar.surefire.reportsPath>
|
|
||||||
<sonar.tests>${project.basedir}/src/test/</sonar.tests>
|
|
||||||
|
|
||||||
<sortpom-maven-plugin.version>2.5.0</sortpom-maven-plugin.version>
|
|
||||||
<!-- Spring properties -->
|
|
||||||
<spring-cloud.version>Camden.SR5</spring-cloud.version>
|
|
||||||
<springfox.version>2.6.1</springfox.version>
|
|
||||||
<undertow.version>1.4.10.Final</undertow.version>
|
|
||||||
<validation-api.version>1.1.0.Final</validation-api.version>
|
|
||||||
<yarn.version>v0.21.3</yarn.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,6 +0,0 @@
|
|||||||
### Relevant Articles:
|
|
||||||
- [A Guide to the Front Controller Pattern in Java](http://www.baeldung.com/java-front-controller-pattern)
|
|
||||||
- [Introduction to Intercepting Filter Pattern in Java](http://www.baeldung.com/intercepting-filter-pattern-in-java)
|
|
||||||
- [Introduction to the Null Object Pattern](https://www.baeldung.com/java-null-object-pattern)
|
|
||||||
- [The Dependency Inversion Principle in Java](https://www.baeldung.com/java-dependency-inversion-principle)
|
|
||||||
- [Avoid Check for Null Statement in Java](https://www.baeldung.com/java-avoid-null-check)
|
|
||||||
@ -1,3 +1,5 @@
|
|||||||
### Relevant Articles
|
### Relevant Articles
|
||||||
|
|
||||||
- [The Mediator Pattern in Java](https://www.baeldung.com/java-mediator-pattern)
|
- [The Mediator Pattern in Java](https://www.baeldung.com/java-mediator-pattern)
|
||||||
|
- [Introduction to the Null Object Pattern](https://www.baeldung.com/java-null-object-pattern)
|
||||||
|
- [Avoid Check for Null Statement in Java](https://www.baeldung.com/java-avoid-null-check)
|
||||||
|
|||||||
3
patterns/dip/README.md
Normal file
3
patterns/dip/README.md
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
### Relevant Articles:
|
||||||
|
|
||||||
|
- [The Dependency Inversion Principle in Java](https://www.baeldung.com/java-dependency-inversion-principle)
|
||||||
2
patterns/front-controller/README.md
Normal file
2
patterns/front-controller/README.md
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
### Relevant Articles:
|
||||||
|
- [A Guide to the Front Controller Pattern in Java](http://www.baeldung.com/java-front-controller-pattern)
|
||||||
2
patterns/intercepting-filter/README.md
Normal file
2
patterns/intercepting-filter/README.md
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
### Relevant Articles:
|
||||||
|
- [Introduction to Intercepting Filter Pattern in Java](http://www.baeldung.com/intercepting-filter-pattern-in-java)
|
||||||
@ -1,17 +0,0 @@
|
|||||||
|
|
||||||
## Persistence Modules
|
|
||||||
|
|
||||||
|
|
||||||
### Relevant Articles:
|
|
||||||
|
|
||||||
- [Introduction to Hibernate Search](http://www.baeldung.com/hibernate-search)
|
|
||||||
- [Introduction to Lettuce – the Java Redis Client](http://www.baeldung.com/java-redis-lettuce)
|
|
||||||
- [A Guide to Jdbi](http://www.baeldung.com/jdbi)
|
|
||||||
- [Pessimistic Locking in JPA](http://www.baeldung.com/jpa-pessimistic-locking)
|
|
||||||
- [Get All Data from a Table with Hibernate](https://www.baeldung.com/hibernate-select-all)
|
|
||||||
- [Spring Data with Reactive Cassandra](https://www.baeldung.com/spring-data-cassandra-reactive)
|
|
||||||
- [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
|
|
||||||
- [Difference Between save() and saveAndFlush() in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-save-saveandflush)
|
|
||||||
- [Spring Boot with Hibernate](https://www.baeldung.com/spring-boot-hibernate)
|
|
||||||
- [Persisting Maps with Hibernate](https://www.baeldung.com/hibernate-persisting-maps)
|
|
||||||
- [Difference Between @Size, @Length, and @Column(length=value)](https://www.baeldung.com/jpa-size-length-column-differences)
|
|
||||||
@ -2,3 +2,4 @@
|
|||||||
### Relevant Articles:
|
### Relevant Articles:
|
||||||
|
|
||||||
- [Persisting Maps with Hibernate](https://www.baeldung.com/hibernate-persisting-maps)
|
- [Persisting Maps with Hibernate](https://www.baeldung.com/hibernate-persisting-maps)
|
||||||
|
- [Difference Between @Size, @Length, and @Column(length=value)](https://www.baeldung.com/jpa-size-length-column-differences)
|
||||||
|
|||||||
@ -1 +1,3 @@
|
|||||||
### Relevant Articles:
|
### Relevant Articles:
|
||||||
|
|
||||||
|
- [A Guide to Jdbi](http://www.baeldung.com/jdbi)
|
||||||
|
|||||||
@ -15,3 +15,4 @@
|
|||||||
- [Spring Data JPA and Named Entity Graphs](https://www.baeldung.com/spring-data-jpa-named-entity-graphs)
|
- [Spring Data JPA and Named Entity Graphs](https://www.baeldung.com/spring-data-jpa-named-entity-graphs)
|
||||||
- [Tagging and Filtering JUnit Tests](https://www.baeldung.com/junits-filtering-tests)
|
- [Tagging and Filtering JUnit Tests](https://www.baeldung.com/junits-filtering-tests)
|
||||||
- [Batch Insert/Update with Hibernate/JPA](https://www.baeldung.com/jpa-hibernate-batch-insert-update)
|
- [Batch Insert/Update with Hibernate/JPA](https://www.baeldung.com/jpa-hibernate-batch-insert-update)
|
||||||
|
- [Difference Between save() and saveAndFlush() in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-save-saveandflush)
|
||||||
|
|||||||
@ -43,22 +43,22 @@ public class DeleteFromRepositoryUnitTest {
|
|||||||
public void whenDeleteByIdFromRepository_thenDeletingShouldBeSuccessful() {
|
public void whenDeleteByIdFromRepository_thenDeletingShouldBeSuccessful() {
|
||||||
repository.deleteById(book1.getId());
|
repository.deleteById(book1.getId());
|
||||||
|
|
||||||
assertThat(repository.count() == 1).isTrue();
|
assertThat(repository.count()).isEqualTo(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenDeleteAllFromRepository_thenRepositoryShouldBeEmpty() {
|
public void whenDeleteAllFromRepository_thenRepositoryShouldBeEmpty() {
|
||||||
repository.deleteAll();
|
repository.deleteAll();
|
||||||
|
|
||||||
assertThat(repository.count() == 0).isTrue();
|
assertThat(repository.count()).isEqualTo(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Transactional
|
@Transactional
|
||||||
public void whenDeleteFromDerivedQuery_thenDeletingShouldBeSuccessful() {
|
public void whenDeleteFromDerivedQuery_thenDeletingShouldBeSuccessful() {
|
||||||
repository.deleteByTitle("The Hobbit");
|
long deletedRecords = repository.deleteByTitle("The Hobbit");
|
||||||
|
|
||||||
assertThat(repository.count() == 1).isTrue();
|
assertThat(deletedRecords).isEqualTo(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -66,7 +66,7 @@ public class DeleteFromRepositoryUnitTest {
|
|||||||
public void whenDeleteFromCustomQuery_thenDeletingShouldBeSuccessful() {
|
public void whenDeleteFromCustomQuery_thenDeletingShouldBeSuccessful() {
|
||||||
repository.deleteBooks("The Hobbit");
|
repository.deleteBooks("The Hobbit");
|
||||||
|
|
||||||
assertThat(repository.count() == 1).isTrue();
|
assertThat(repository.count()).isEqualTo(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -46,15 +46,15 @@ public class DeleteInRelationshipsUnitTest {
|
|||||||
public void whenDeletingCategories_thenBooksShouldAlsoBeDeleted() {
|
public void whenDeletingCategories_thenBooksShouldAlsoBeDeleted() {
|
||||||
categoryRepository.deleteAll();
|
categoryRepository.deleteAll();
|
||||||
|
|
||||||
assertThat(bookRepository.count() == 0).isTrue();
|
assertThat(bookRepository.count()).isEqualTo(0);
|
||||||
assertThat(categoryRepository.count() == 0).isTrue();
|
assertThat(categoryRepository.count()).isEqualTo(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenDeletingBooks_thenCategoriesShouldAlsoBeDeleted() {
|
public void whenDeletingBooks_thenCategoriesShouldAlsoBeDeleted() {
|
||||||
bookRepository.deleteAll();
|
bookRepository.deleteAll();
|
||||||
|
|
||||||
assertThat(bookRepository.count() == 0).isTrue();
|
assertThat(bookRepository.count()).isEqualTo(0);
|
||||||
assertThat(categoryRepository.count() == 2).isTrue();
|
assertThat(categoryRepository.count()).isEqualTo(2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3,3 +3,4 @@
|
|||||||
- [Hibernate Many to Many Annotation Tutorial](http://www.baeldung.com/hibernate-many-to-many)
|
- [Hibernate Many to Many Annotation Tutorial](http://www.baeldung.com/hibernate-many-to-many)
|
||||||
- [Programmatic Transactions in the Spring TestContext Framework](http://www.baeldung.com/spring-test-programmatic-transactions)
|
- [Programmatic Transactions in the Spring TestContext Framework](http://www.baeldung.com/spring-test-programmatic-transactions)
|
||||||
- [JPA Criteria Queries](http://www.baeldung.com/hibernate-criteria-queries)
|
- [JPA Criteria Queries](http://www.baeldung.com/hibernate-criteria-queries)
|
||||||
|
- [Introduction to Hibernate Search](http://www.baeldung.com/hibernate-search)
|
||||||
|
|||||||
5
pom.xml
5
pom.xml
@ -1527,7 +1527,8 @@
|
|||||||
<logback.version>1.1.7</logback.version>
|
<logback.version>1.1.7</logback.version>
|
||||||
|
|
||||||
<!-- plugins -->
|
<!-- plugins -->
|
||||||
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
|
<!-- can't upgrade the plugin yet; as there is an issue with 2.22 no longer running all the tests-->
|
||||||
|
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
|
||||||
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
|
||||||
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
|
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
@ -1538,7 +1539,7 @@
|
|||||||
<jmh-generator.version>1.19</jmh-generator.version>
|
<jmh-generator.version>1.19</jmh-generator.version>
|
||||||
<hamcrest-all.version>1.3</hamcrest-all.version>
|
<hamcrest-all.version>1.3</hamcrest-all.version>
|
||||||
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
|
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
|
||||||
<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
|
<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
|
||||||
<commons-io.version>2.5</commons-io.version>
|
<commons-io.version>2.5</commons-io.version>
|
||||||
<commons-cli.version>1.4</commons-cli.version>
|
<commons-cli.version>1.4</commons-cli.version>
|
||||||
<maven-war-plugin.version>3.0.0</maven-war-plugin.version>
|
<maven-war-plugin.version>3.0.0</maven-war-plugin.version>
|
||||||
|
|||||||
@ -3,6 +3,7 @@ package org.baeldung.batch;
|
|||||||
import org.springframework.batch.core.Job;
|
import org.springframework.batch.core.Job;
|
||||||
import org.springframework.batch.core.JobExecution;
|
import org.springframework.batch.core.JobExecution;
|
||||||
import org.springframework.batch.core.JobParameters;
|
import org.springframework.batch.core.JobParameters;
|
||||||
|
import org.springframework.batch.core.JobParametersBuilder;
|
||||||
import org.springframework.batch.core.launch.JobLauncher;
|
import org.springframework.batch.core.launch.JobLauncher;
|
||||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
||||||
|
|
||||||
@ -21,7 +22,11 @@ public class App {
|
|||||||
final Job job = (Job) context.getBean("firstBatchJob");
|
final Job job = (Job) context.getBean("firstBatchJob");
|
||||||
System.out.println("Starting the batch job");
|
System.out.println("Starting the batch job");
|
||||||
try {
|
try {
|
||||||
final JobExecution execution = jobLauncher.run(job, new JobParameters());
|
// To enable multiple execution of a job with the same parameters
|
||||||
|
JobParameters jobParameters = new JobParametersBuilder()
|
||||||
|
.addString("jobID", String.valueOf(System.currentTimeMillis()))
|
||||||
|
.toJobParameters();
|
||||||
|
final JobExecution execution = jobLauncher.run(job, jobParameters);
|
||||||
System.out.println("Job Status : " + execution.getStatus());
|
System.out.println("Job Status : " + execution.getStatus());
|
||||||
System.out.println("Job succeeded");
|
System.out.println("Job succeeded");
|
||||||
} catch (final Exception e) {
|
} catch (final Exception e) {
|
||||||
|
|||||||
@ -1,21 +0,0 @@
|
|||||||
## The Module Holds Sources for the Following Articles
|
|
||||||
|
|
||||||
- [Quick Intro to Spring Cloud Configuration](http://www.baeldung.com/spring-cloud-configuration)
|
|
||||||
|
|
||||||
Spring Cloud Config is Spring’s client/server approach for storing and serving distributed configurations across multiple applications and environments.
|
|
||||||
|
|
||||||
In this write-up, we’ll focus on an example of how to setup a Git-backed config server, use it in a simple REST application server and setup a secure environment including encrypted property values.
|
|
||||||
|
|
||||||
- [Introduction to Spring Cloud Netflix – Eureka](http://www.baeldung.com/spring-cloud-netflix-eureka)
|
|
||||||
|
|
||||||
In this article, we’ll introduce client-side service discovery via “Spring Cloud Netflix Eureka“.
|
|
||||||
|
|
||||||
Client-side service discovery allows services to find and communicate with each other without hardcoding hostname and port. The only ‘fixed point’ in such an architecture consists of a service registry with which each service has to register.
|
|
||||||
|
|
||||||
### Relevant Articles:
|
|
||||||
- [Intro to Spring Cloud Netflix - Hystrix](http://www.baeldung.com/spring-cloud-netflix-hystrix)
|
|
||||||
- [Dockerizing a Spring Boot Application](http://www.baeldung.com/dockerizing-spring-boot-application)
|
|
||||||
- [Instance Profile Credentials using Spring Cloud](http://www.baeldung.com/spring-cloud-instance-profiles)
|
|
||||||
- [Running Spring Boot Applications With Minikube](http://www.baeldung.com/spring-boot-minikube)
|
|
||||||
- [Introduction to Spring Cloud OpenFeign](https://www.baeldung.com/spring-cloud-openfeign)
|
|
||||||
|
|
||||||
@ -5,6 +5,7 @@
|
|||||||
- [Spring Cloud AWS – EC2](https://www.baeldung.com/spring-cloud-aws-ec2)
|
- [Spring Cloud AWS – EC2](https://www.baeldung.com/spring-cloud-aws-ec2)
|
||||||
- [Spring Cloud AWS – RDS](https://www.baeldung.com/spring-cloud-aws-rds)
|
- [Spring Cloud AWS – RDS](https://www.baeldung.com/spring-cloud-aws-rds)
|
||||||
- [Spring Cloud AWS – Messaging Support](https://www.baeldung.com/spring-cloud-aws-messaging)
|
- [Spring Cloud AWS – Messaging Support](https://www.baeldung.com/spring-cloud-aws-messaging)
|
||||||
|
- [Instance Profile Credentials using Spring Cloud](http://www.baeldung.com/spring-cloud-instance-profiles)
|
||||||
|
|
||||||
#### Running the Integration Tests
|
#### Running the Integration Tests
|
||||||
|
|
||||||
|
|||||||
@ -1,2 +1,3 @@
|
|||||||
### Relevant Articles:
|
### Relevant Articles:
|
||||||
|
- [Quick Intro to Spring Cloud Configuration](http://www.baeldung.com/spring-cloud-configuration)
|
||||||
- [Dockerizing a Spring Boot Application](http://www.baeldung.com/dockerizing-spring-boot-application)
|
- [Dockerizing a Spring Boot Application](http://www.baeldung.com/dockerizing-spring-boot-application)
|
||||||
|
|||||||
4
spring-cloud/spring-cloud-openfeign/README.md
Normal file
4
spring-cloud/spring-cloud-openfeign/README.md
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
### Relevant Articles:
|
||||||
|
|
||||||
|
- [Introduction to Spring Cloud OpenFeign](https://www.baeldung.com/spring-cloud-openfeign)
|
||||||
|
|
||||||
@ -32,10 +32,10 @@ public final class RestPreconditions {
|
|||||||
/**
|
/**
|
||||||
* Check if some value was found, otherwise throw exception.
|
* Check if some value was found, otherwise throw exception.
|
||||||
*
|
*
|
||||||
* @param expression
|
* @param resource
|
||||||
* has value true if found, otherwise false
|
* has value not null to be returned, otherwise throw exception
|
||||||
* @throws MyResourceNotFoundException
|
* @throws MyResourceNotFoundException
|
||||||
* if expression is false, means value not found.
|
* if resource is null, means value not found.
|
||||||
*/
|
*/
|
||||||
public static <T> T checkFound(final T resource) {
|
public static <T> T checkFound(final T resource) {
|
||||||
if (resource == null) {
|
if (resource == null) {
|
||||||
|
|||||||
@ -21,3 +21,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
|
|||||||
- [Get and Post Lists of Objects with RestTemplate](http://www.baeldung.com/spring-rest-template-list)
|
- [Get and Post Lists of Objects with RestTemplate](http://www.baeldung.com/spring-rest-template-list)
|
||||||
- [How to Set a Header on a Response with Spring 5](http://www.baeldung.com/spring-response-header)
|
- [How to Set a Header on a Response with Spring 5](http://www.baeldung.com/spring-response-header)
|
||||||
- [Uploading MultipartFile with Spring RestTemplate](http://www.baeldung.com/spring-rest-template-multipart-upload)
|
- [Uploading MultipartFile with Spring RestTemplate](http://www.baeldung.com/spring-rest-template-multipart-upload)
|
||||||
|
- [Download an Image or a File with Spring MVC](http://www.baeldung.com/spring-controller-return-image-file)
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
### Relevant articles
|
|
||||||
|
|
||||||
- [Download an Image or a File with Spring MVC](http://www.baeldung.com/spring-controller-return-image-file)
|
|
||||||
@ -26,6 +26,14 @@
|
|||||||
<groupId>org.springframework.security</groupId>
|
<groupId>org.springframework.security</groupId>
|
||||||
<artifactId>spring-security-config</artifactId>
|
<artifactId>spring-security-config</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.thymeleaf.extras</groupId>
|
||||||
|
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.thymeleaf</groupId>
|
||||||
|
<artifactId>thymeleaf-spring5</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
|
|
||||||
|
|||||||
@ -2,22 +2,35 @@ package org.baeldung.config.child;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.ApplicationContext;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.ComponentScan;
|
import org.springframework.context.annotation.ComponentScan;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
|
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
|
||||||
import org.springframework.http.converter.HttpMessageConverter;
|
import org.springframework.http.converter.HttpMessageConverter;
|
||||||
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
|
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
|
||||||
|
import org.springframework.web.servlet.ViewResolver;
|
||||||
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
|
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
|
||||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||||
|
import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
|
||||||
|
import org.thymeleaf.spring5.ISpringTemplateEngine;
|
||||||
|
import org.thymeleaf.spring5.SpringTemplateEngine;
|
||||||
|
import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
|
||||||
|
import org.thymeleaf.spring5.view.ThymeleafViewResolver;
|
||||||
|
import org.thymeleaf.templatemode.TemplateMode;
|
||||||
|
import org.thymeleaf.templateresolver.ITemplateResolver;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableWebMvc
|
@EnableWebMvc
|
||||||
@ComponentScan("org.baeldung.web")
|
@ComponentScan("org.baeldung.web")
|
||||||
// @ImportResource({ "classpath:prop.xml" })
|
//@ImportResource({ "classpath:prop.xml" })
|
||||||
// @PropertySource("classpath:foo.properties")
|
//@PropertySource("classpath:foo.properties")
|
||||||
public class WebConfig implements WebMvcConfigurer {
|
public class WebConfig implements WebMvcConfigurer {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ApplicationContext applicationContext;
|
||||||
|
|
||||||
public WebConfig() {
|
public WebConfig() {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
@ -38,4 +51,30 @@ public class WebConfig implements WebMvcConfigurer {
|
|||||||
return ppc;
|
return ppc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public ViewResolver viewResolver() {
|
||||||
|
ThymeleafViewResolver resolver = new ThymeleafViewResolver();
|
||||||
|
resolver.setTemplateEngine(templateEngine());
|
||||||
|
resolver.setCharacterEncoding("UTF-8");
|
||||||
|
return resolver;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public ISpringTemplateEngine templateEngine() {
|
||||||
|
SpringTemplateEngine engine = new SpringTemplateEngine();
|
||||||
|
engine.setEnableSpringELCompiler(true);
|
||||||
|
engine.setTemplateResolver(templateResolver());
|
||||||
|
engine.addDialect(new SpringSecurityDialect());
|
||||||
|
return engine;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ITemplateResolver templateResolver() {
|
||||||
|
SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
|
||||||
|
resolver.setApplicationContext(applicationContext);
|
||||||
|
resolver.setPrefix("/WEB-INF/templates/");
|
||||||
|
resolver.setSuffix(".html");
|
||||||
|
resolver.setTemplateMode(TemplateMode.HTML);
|
||||||
|
return resolver;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -10,7 +10,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
|
|||||||
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
|
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
// @ImportResource({ "classpath:webSecurityConfig.xml" })
|
//@ImportResource({ "classpath:webSecurityConfig.xml" })
|
||||||
@EnableWebSecurity
|
@EnableWebSecurity
|
||||||
@ComponentScan("org.baeldung.security")
|
@ComponentScan("org.baeldung.security")
|
||||||
public class SecurityConfig extends WebSecurityConfigurerAdapter {
|
public class SecurityConfig extends WebSecurityConfigurerAdapter {
|
||||||
|
|||||||
@ -0,0 +1,13 @@
|
|||||||
|
package org.baeldung.web.controller;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
public class ViewController {
|
||||||
|
|
||||||
|
@RequestMapping({ "/index", "/" })
|
||||||
|
public String index() {
|
||||||
|
return "index";
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -4,9 +4,9 @@
|
|||||||
xmlns:context="http://www.springframework.org/schema/context"
|
xmlns:context="http://www.springframework.org/schema/context"
|
||||||
xsi:schemaLocation="
|
xsi:schemaLocation="
|
||||||
http://www.springframework.org/schema/beans
|
http://www.springframework.org/schema/beans
|
||||||
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
|
http://www.springframework.org/schema/beans/spring-beans.xsd
|
||||||
http://www.springframework.org/schema/context
|
http://www.springframework.org/schema/context
|
||||||
http://www.springframework.org/schema/context/spring-context-4.2.xsd">
|
http://www.springframework.org/schema/context/spring-context.xsd">
|
||||||
|
|
||||||
<context:property-placeholder location="classpath:foo.properties" />
|
<context:property-placeholder location="classpath:foo.properties" />
|
||||||
|
|
||||||
|
|||||||
@ -2,9 +2,9 @@
|
|||||||
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
|
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
|
||||||
xsi:schemaLocation="
|
xsi:schemaLocation="
|
||||||
http://www.springframework.org/schema/security
|
http://www.springframework.org/schema/security
|
||||||
http://www.springframework.org/schema/security/spring-security-4.2.xsd
|
http://www.springframework.org/schema/security/spring-security.xsd
|
||||||
http://www.springframework.org/schema/beans
|
http://www.springframework.org/schema/beans
|
||||||
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"
|
http://www.springframework.org/schema/beans/spring-beans.xsd"
|
||||||
>
|
>
|
||||||
|
|
||||||
<http use-expressions="true">
|
<http use-expressions="true">
|
||||||
|
|||||||
@ -0,0 +1,7 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns:th="https://www.thymeleaf.org"
|
||||||
|
xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
|
||||||
|
<body>
|
||||||
|
<div sec:authorize="isAuthenticated()">Authenticated as <span sec:authentication="name"></span></div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@ -1,3 +1,4 @@
|
|||||||
### Relevant Articles:
|
### Relevant Articles:
|
||||||
|
|
||||||
- [Get the Path of the /src/test/resources Directory in JUnit](https://www.baeldung.com/junit-src-test-resources-directory-path)
|
- [Get the Path of the /src/test/resources Directory in JUnit](https://www.baeldung.com/junit-src-test-resources-directory-path)
|
||||||
|
- [Tagging and Filtering JUnit Tests](https://www.baeldung.com/junit-filtering-tests)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user