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

apache-olingo/README.md

@@ -0,0 +1,8 @@
+## Apache Olingo
+
+This module contains articles about Apache Olingo
+
+### Relevant articles:
+
+- [OData Protocol Guide](https://www.baeldung.com/odata)
+- [Intro to OData with Olingo](https://www.baeldung.com/olingo)

apache-olingo/Samples.md

@@ -0,0 +1,21 @@
+##  OData test URLs
+
+This following table contains test URLs that can be used with the Olingo V2 demo project.
+
+| URL                                      | Description                                     |
+|------------------------------------------|-------------------------------------------------|
+| `http://localhost:8180/odata/$metadata`  | fetch OData metadata document |
+| `http://localhost:8180/odata/CarMakers?$top=10&$skip=10` | Get 10 entities starting at offset 10 |
+| `http://localhost:8180/odata/CarMakers?$count` | Return total count of entities in this set |
+| `http://localhost:8180/odata/CarMakers?$filter=startswith(Name,'B')` | Return entities where the *Name* property starts with 'B' |
+| `http://localhost:8180/odata/CarModels?$filter=Year eq 2008 and CarMakerDetails/Name eq 'BWM'` | Return *CarModel* entities where the *Name* property of its maker  starts with 'B' |
+| `http://localhost:8180/odata/CarModels(1L)?$expand=CarMakerDetails` | Return the *CarModel* with primary key '1', along with its maker|
+| `http://localhost:8180/odata/CarModels(1L)?$select=Name,Sku` | Return the *CarModel* with primary key '1', returing only its *Name* and *Sku* properties |
+| `http://localhost:8180/odata/CarModels?$orderBy=Name asc,Sku desc` | Return *CarModel* entities, ordered by the their *Name* and *Sku* properties |
+| `http://localhost:8180/odata/CarModels?$format=json` | Return *CarModel* entities, using a JSON representation|
+
+
+
+
+
+

apache-olingo/olingo2/.gitignore

@@ -0,0 +1,29 @@
+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/

apache-olingo/olingo2/pom.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.baeldung.examples.olingo2</groupId>
+	<artifactId>olingo2</artifactId>
+	<name>olingo2</name>
+	<description>Sample Olingo 2 Project</description>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
+    </parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jersey</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Olingo 2 Dependencies -->
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>olingo-odata2-core</artifactId>
+			<version>${olingo2.version}</version>
+			<!-- Avoid jax-rs version conflict by excluding Olingo's version -->
+			<exclusions>
+				<exclusion>
+					<groupId>javax.ws.rs</groupId>
+					<artifactId>javax.ws.rs-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>olingo-odata2-jpa-processor-core</artifactId>
+			<version>${olingo2.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.olingo</groupId>
+			<artifactId>olingo-odata2-jpa-processor-ref</artifactId>
+			<version>${olingo2.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.eclipse.persistence</groupId>
+					<artifactId>eclipselink</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<properties>
+		<olingo2.version>2.0.11</olingo2.version>
+	</properties>
+
+</project>

apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java

@@ -0,0 +1,298 @@
+package org.baeldung.examples.olingo2;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.EntityGraph;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.Persistence;
+import javax.persistence.Query;
+import javax.persistence.StoredProcedureQuery;
+import javax.persistence.SynchronizationType;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaDelete;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.CriteriaUpdate;
+import javax.persistence.metamodel.Metamodel;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.olingo.odata2.api.processor.ODataContext;
+import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
+import org.apache.olingo.odata2.jpa.processor.api.ODataJPAServiceFactory;
+import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
+import org.baeldung.examples.olingo2.JerseyConfig.EntityManagerFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.orm.jpa.EntityManagerFactoryUtils;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * ODataJPAServiceFactory implementation for our sample domain 
+ * @author Philippe
+ *
+ */
+@Component
+public class CarsODataJPAServiceFactory extends ODataJPAServiceFactory {
+
+    private static final Logger log = LoggerFactory.getLogger(CarsODataJPAServiceFactory.class);
+
+    public CarsODataJPAServiceFactory() {
+        // Enable detailed error messages (useful for debugging)
+        setDetailErrors(true);
+    }
+
+    /**
+     * This method will be called by Olingo on every request to
+     * initialize the ODataJPAContext that will be used. 
+     */
+    @Override
+    public ODataJPAContext initializeODataJPAContext() throws ODataJPARuntimeException {
+
+        log.info("[I32] >>> initializeODataJPAContext()");
+        ODataJPAContext ctx = getODataJPAContext();
+        ODataContext octx = ctx.getODataContext();
+        HttpServletRequest request = (HttpServletRequest)octx.getParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT);
+        EntityManager em = (EntityManager)request.getAttribute(EntityManagerFilter.EM_REQUEST_ATTRIBUTE);
+                
+        // Here we're passing the EM that was created by the EntityManagerFilter (see JerseyConfig)
+        ctx.setEntityManager(new EntityManagerWrapper(em));
+        ctx.setPersistenceUnitName("default");
+        
+        // We're managing the EM's lifecycle, so we must inform Olingo that it should not
+        // try to manage transactions and/or persistence sessions
+        ctx.setContainerManaged(true);                
+        return ctx;
+    }
+
+    static class EntityManagerWrapper implements EntityManager {
+
+        private EntityManager delegate;
+
+        public void persist(Object entity) {
+            log.info("[I68] persist: entity.class=" + entity.getClass()
+                .getSimpleName());
+            delegate.persist(entity);
+            // delegate.flush();
+        }
+
+        public <T> T merge(T entity) {
+            log.info("[I74] merge: entity.class=" + entity.getClass()
+                .getSimpleName());
+            return delegate.merge(entity);
+        }
+
+        public void remove(Object entity) {
+            log.info("[I78] remove: entity.class=" + entity.getClass()
+                .getSimpleName());
+            delegate.remove(entity);
+        }
+
+        public <T> T find(Class<T> entityClass, Object primaryKey) {
+            return delegate.find(entityClass, primaryKey);
+        }
+
+        public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
+            return delegate.find(entityClass, primaryKey, properties);
+        }
+
+        public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode) {
+            return delegate.find(entityClass, primaryKey, lockMode);
+        }
+
+        public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties) {
+            return delegate.find(entityClass, primaryKey, lockMode, properties);
+        }
+
+        public <T> T getReference(Class<T> entityClass, Object primaryKey) {
+            return delegate.getReference(entityClass, primaryKey);
+        }
+
+        public void flush() {
+            delegate.flush();
+        }
+
+        public void setFlushMode(FlushModeType flushMode) {
+            delegate.setFlushMode(flushMode);
+        }
+
+        public FlushModeType getFlushMode() {
+            return delegate.getFlushMode();
+        }
+
+        public void lock(Object entity, LockModeType lockMode) {
+            delegate.lock(entity, lockMode);
+        }
+
+        public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties) {
+            delegate.lock(entity, lockMode, properties);
+        }
+
+        public void refresh(Object entity) {
+            delegate.refresh(entity);
+        }
+
+        public void refresh(Object entity, Map<String, Object> properties) {
+            delegate.refresh(entity, properties);
+        }
+
+        public void refresh(Object entity, LockModeType lockMode) {
+            delegate.refresh(entity, lockMode);
+        }
+
+        public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
+            delegate.refresh(entity, lockMode, properties);
+        }
+
+        public void clear() {
+            delegate.clear();
+        }
+
+        public void detach(Object entity) {
+            delegate.detach(entity);
+        }
+
+        public boolean contains(Object entity) {
+            return delegate.contains(entity);
+        }
+
+        public LockModeType getLockMode(Object entity) {
+            return delegate.getLockMode(entity);
+        }
+
+        public void setProperty(String propertyName, Object value) {
+            delegate.setProperty(propertyName, value);
+        }
+
+        public Map<String, Object> getProperties() {
+            return delegate.getProperties();
+        }
+
+        public Query createQuery(String qlString) {
+            return delegate.createQuery(qlString);
+        }
+
+        public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) {
+            return delegate.createQuery(criteriaQuery);
+        }
+
+        public Query createQuery(CriteriaUpdate updateQuery) {
+            return delegate.createQuery(updateQuery);
+        }
+
+        public Query createQuery(CriteriaDelete deleteQuery) {
+            return delegate.createQuery(deleteQuery);
+        }
+
+        public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
+            return delegate.createQuery(qlString, resultClass);
+        }
+
+        public Query createNamedQuery(String name) {
+            return delegate.createNamedQuery(name);
+        }
+
+        public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
+            return delegate.createNamedQuery(name, resultClass);
+        }
+
+        public Query createNativeQuery(String sqlString) {
+            return delegate.createNativeQuery(sqlString);
+        }
+
+        public Query createNativeQuery(String sqlString, Class resultClass) {
+            return delegate.createNativeQuery(sqlString, resultClass);
+        }
+
+        public Query createNativeQuery(String sqlString, String resultSetMapping) {
+            return delegate.createNativeQuery(sqlString, resultSetMapping);
+        }
+
+        public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
+            return delegate.createNamedStoredProcedureQuery(name);
+        }
+
+        public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
+            return delegate.createStoredProcedureQuery(procedureName);
+        }
+
+        public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
+            return delegate.createStoredProcedureQuery(procedureName, resultClasses);
+        }
+
+        public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
+            return delegate.createStoredProcedureQuery(procedureName, resultSetMappings);
+        }
+
+        public void joinTransaction() {
+            delegate.joinTransaction();
+        }
+
+        public boolean isJoinedToTransaction() {
+            return delegate.isJoinedToTransaction();
+        }
+
+        public <T> T unwrap(Class<T> cls) {
+            return delegate.unwrap(cls);
+        }
+
+        public Object getDelegate() {
+            return delegate.getDelegate();
+        }
+
+        public void close() {
+            log.info("[I229] close");
+            delegate.close();
+        }
+
+        public boolean isOpen() {
+            boolean isOpen = delegate.isOpen();
+            log.info("[I236] isOpen: " + isOpen);
+            return isOpen;
+        }
+
+        public EntityTransaction getTransaction() {
+            log.info("[I240] getTransaction()");
+            return delegate.getTransaction();
+        }
+
+        public EntityManagerFactory getEntityManagerFactory() {
+            return delegate.getEntityManagerFactory();
+        }
+
+        public CriteriaBuilder getCriteriaBuilder() {
+            return delegate.getCriteriaBuilder();
+        }
+
+        public Metamodel getMetamodel() {
+            return delegate.getMetamodel();
+        }
+
+        public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
+            return delegate.createEntityGraph(rootType);
+        }
+
+        public EntityGraph<?> createEntityGraph(String graphName) {
+            return delegate.createEntityGraph(graphName);
+        }
+
+        public EntityGraph<?> getEntityGraph(String graphName) {
+            return delegate.getEntityGraph(graphName);
+        }
+
+        public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
+            return delegate.getEntityGraphs(entityClass);
+        }
+
+        public EntityManagerWrapper(EntityManager delegate) {
+            this.delegate = delegate;
+        }
+
+    }
+
+}

apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/JerseyConfig.java

@@ -0,0 +1,125 @@
+    package org.baeldung.examples.olingo2;
+
+import java.io.IOException;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.Path;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.Provider;
+
+import org.apache.olingo.odata2.api.ODataServiceFactory;
+import org.apache.olingo.odata2.core.rest.ODataRootLocator;
+import org.apache.olingo.odata2.core.rest.app.ODataApplication;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * Jersey JAX-RS configuration
+ * @author Philippe
+ *
+ */
+@Component
+@ApplicationPath("/odata")
+public class JerseyConfig extends ResourceConfig {
+    
+    
+    public JerseyConfig(CarsODataJPAServiceFactory serviceFactory, EntityManagerFactory emf) {        
+        
+        ODataApplication app = new ODataApplication();
+        
+        app
+          .getClasses()
+          .forEach( c -> {
+              // Avoid using the default RootLocator, as we want
+              // a Spring Managed one
+              if ( !ODataRootLocator.class.isAssignableFrom(c)) {
+                  register(c);
+              }
+          });
+        
+        register(new CarsRootLocator(serviceFactory)); 
+        register( new EntityManagerFilter(emf));
+    }
+    
+    /**
+     * This filter handles the EntityManager transaction lifecycle.
+     * @author Philippe
+     *
+     */
+    @Provider
+    public static class EntityManagerFilter implements ContainerRequestFilter, ContainerResponseFilter {
+
+        private static final Logger log = LoggerFactory.getLogger(EntityManagerFilter.class);
+        public static final String EM_REQUEST_ATTRIBUTE = EntityManagerFilter.class.getName() + "_ENTITY_MANAGER";
+
+        private final EntityManagerFactory emf;
+
+        @Context
+        private HttpServletRequest httpRequest;
+
+        public EntityManagerFilter(EntityManagerFactory emf) {
+            this.emf = emf;
+        }
+
+        @Override
+        public void filter(ContainerRequestContext ctx) throws IOException {
+            log.info("[I60] >>> filter");
+            EntityManager em = this.emf.createEntityManager();
+            httpRequest.setAttribute(EM_REQUEST_ATTRIBUTE, em);
+
+            // Start a new transaction unless we have a simple GET
+            if (!"GET".equalsIgnoreCase(ctx.getMethod())) {
+                em.getTransaction()
+                    .begin();
+            }
+        }
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
+
+            log.info("[I68] <<< filter");
+            EntityManager em = (EntityManager) httpRequest.getAttribute(EM_REQUEST_ATTRIBUTE);
+
+            if (!"GET".equalsIgnoreCase(requestContext.getMethod())) {
+                EntityTransaction t = em.getTransaction();
+                if (t.isActive()) {
+                    if (!t.getRollbackOnly()) {
+                        t.commit();
+                    }
+                }
+            }
+
+            em.close();
+
+        }
+
+    }
+
+    @Path("/")
+    public static class CarsRootLocator extends ODataRootLocator {
+
+        private CarsODataJPAServiceFactory serviceFactory;
+
+        public CarsRootLocator(CarsODataJPAServiceFactory serviceFactory) {
+            this.serviceFactory = serviceFactory;
+        }
+
+        @Override
+        public ODataServiceFactory getServiceFactory() {
+            return this.serviceFactory;
+        }
+
+    }
+
+}

apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/Olingo2SampleApplication.java

@@ -0,0 +1,14 @@
+package org.baeldung.examples.olingo2;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+@SpringBootApplication
+public class Olingo2SampleApplication extends SpringBootServletInitializer {
+
+    public static void main(String[] args) {        
+        SpringApplication.run(Olingo2SampleApplication.class);
+    }
+}

apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarMaker.java

@@ -0,0 +1,115 @@
+package org.baeldung.examples.olingo2.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;
+
+@Entity
+@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;
+
+    /**
+     * @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;
+    }
+
+}

apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarModel.java

@@ -0,0 +1,159 @@
+package org.baeldung.examples.olingo2.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;
+
+@Entity
+@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.LAZY)
+    @JoinColumn(name = "maker_fk")
+    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;
+    }
+
+}

apache-olingo/olingo2/src/main/resources/application.yml

@@ -0,0 +1,12 @@
+server:
+  port: 8080
+  
+spring:
+  jersey:
+    application-path: /odata
+    
+  jpa:
+    show-sql: true
+    open-in-view: false
+    hibernate:
+      ddl-auto: update

apache-olingo/olingo2/src/main/resources/data.sql

@@ -0,0 +1,12 @@
+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;

apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java

@@ -0,0 +1,16 @@
+package org.baeldung.examples.olingo2;
+
+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 Olingo2SampleApplicationUnitTest {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}

apache-olingo/olingo2/src/test/resources/olingo2-queries.json

@@ -0,0 +1,256 @@
+{
+	"info": {
+		"_postman_id": "afa8e1e5-ab0e-4f1d-8b99-b7d1f091f975",
+		"name": "OLingo2 - Cars",
+		"schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "GET Metadata",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": "http://localhost:8080/odata/$metadata"
+			},
+			"response": []
+		},
+		{
+			"name": "GET All CarMakers",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": "http://localhost:8080/odata/CarMakers"
+			},
+			"response": []
+		},
+		{
+			"name": "GET Makers with Pagination",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": {
+					"raw": "http://localhost:8080/odata/CarMakers?$top=1&$orderby=Name&$skip=3",
+					"protocol": "http",
+					"host": [
+						"localhost"
+					],
+					"port": "8080",
+					"path": [
+						"odata",
+						"CarMakers"
+					],
+					"query": [
+						{
+							"key": "$top",
+							"value": "1"
+						},
+						{
+							"key": "$orderby",
+							"value": "Name"
+						},
+						{
+							"key": "$skip",
+							"value": "3"
+						}
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "GET Makers and Models",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": {
+					"raw": "http://localhost:8080/odata/CarMakers?$expand=CarModelDetails",
+					"protocol": "http",
+					"host": [
+						"localhost"
+					],
+					"port": "8080",
+					"path": [
+						"odata",
+						"CarMakers"
+					],
+					"query": [
+						{
+							"key": "$expand",
+							"value": "CarModelDetails"
+						}
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "GET Makers with filter",
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"key": "Accept",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": {
+					"raw": "http://localhost:8080/odata/CarMakers?$filter=Name eq 'BWM'&$expand=CarModelDetails",
+					"protocol": "http",
+					"host": [
+						"localhost"
+					],
+					"port": "8080",
+					"path": [
+						"odata",
+						"CarMakers"
+					],
+					"query": [
+						{
+							"key": "$filter",
+							"value": "Name eq 'BWM'"
+						},
+						{
+							"key": "$expand",
+							"value": "CarModelDetails"
+						}
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Create CarMaker",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"value": "application/atom+xml",
+						"type": "text"
+					},
+					{
+						"key": "Accept",
+						"value": "application/atom+xml",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "<?xml version=\"1.0\" encoding=\"utf-8\" ?> \r\n<entry xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\"\r\n    xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" \r\n    xmlns=\"http://www.w3.org/2005/Atom\">\r\n  <title type=\"text\"></title> \r\n  <updated>2019-04-02T21:36:47Z</updated>\r\n  <author> \r\n    <name /> \r\n  </author> \r\n  <category term=\"default.CarMaker\"\r\n      scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\" /> \r\n  <content type=\"application/xml\"> \r\n    <m:properties>\r\n      <d:Name>Lucien</d:Name>\r\n    </m:properties> \r\n  </content> \r\n</entry>"
+				},
+				"url": "http://localhost:8080/odata/CarMakers"
+			},
+			"response": []
+		},
+		{
+			"name": "Create CarModel",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"type": "text",
+						"value": "application/atom+xml"
+					},
+					{
+						"key": "Accept",
+						"type": "text",
+						"value": "application/atom+xml"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "<?xml version=\"1.0\" encoding=\"utf-8\" ?> \r\n<entry xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\"\r\n    xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" \r\n    xmlns=\"http://www.w3.org/2005/Atom\">\r\n  <title type=\"text\"></title> \r\n  <updated>2019-04-02T21:36:47Z</updated>\r\n  <author> \r\n    <name /> \r\n  </author> \r\n  <link href=\"CarModels(1L)/CarMakerDetails\" \r\n    rel=\"http://schemas.microsoft.com/ado/2007/08/dataservices/related/CarMakerDetails\" \r\n    title=\"CarMakerDetails\" \r\n    type=\"application/atom+xml;type=entry\"></link>  \r\n  <category term=\"default.CarModel\"\r\n      scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\" /> \r\n  <content type=\"application/xml\"> \r\n    <m:properties>\r\n\t    <d:Name>Tata</d:Name>\r\n\t    <d:Sku>TT101</d:Sku>\r\n\t    <d:Year>2018</d:Year>\r\n    </m:properties> \r\n  </content> \r\n</entry>"
+				},
+				"url": "http://localhost:8080/odata/CarModels"
+			},
+			"response": []
+		},
+		{
+			"name": "Update CarMaker",
+			"request": {
+				"method": "PUT",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"type": "text",
+						"value": "application/atom+xml"
+					},
+					{
+						"key": "Accept",
+						"type": "text",
+						"value": "application/atom+xml"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "<?xml version=\"1.0\" encoding=\"utf-8\" ?> \r\n<entry xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\"\r\n    xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" \r\n    xmlns=\"http://www.w3.org/2005/Atom\">\r\n  <title type=\"text\"></title> \r\n  <updated>2019-04-02T21:36:47Z</updated>\r\n  <author> \r\n    <name /> \r\n  </author> \r\n  <category term=\"default.CarMaker\"\r\n      scheme=\"http://schemas.microsoft.com/ado/2007/08/dataservices/scheme\" /> \r\n  <content type=\"application/xml\"> \r\n    <m:properties>\r\n      <d:Id>5</d:Id>\r\n      <d:Name>KaiserWagen</d:Name>\r\n    </m:properties> \r\n  </content> \r\n</entry>"
+				},
+				"url": "http://localhost:8080/odata/CarMakers(5L)"
+			},
+			"response": []
+		},
+		{
+			"name": "All CarModels",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": "http://localhost:8080/odata/CarModels"
+			},
+			"response": []
+		},
+		{
+			"name": "Delete CarModel",
+			"request": {
+				"method": "DELETE",
+				"header": [
+					{
+						"key": "Content-Type",
+						"name": "Content-Type",
+						"type": "text",
+						"value": "application/atom+xml"
+					},
+					{
+						"key": "Accept",
+						"type": "text",
+						"value": "application/atom+xml"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": ""
+				},
+				"url": "http://localhost:8080/odata/CarModels(100L)"
+			},
+			"response": []
+		}
+	]
+}