From 8bffd0e947bdf8288eec321a7187b8e0d2422809 Mon Sep 17 00:00:00 2001
From: Massimiliano Cristarella <m.cristarella@outlook.com>
Date: Tue, 6 Sep 2022 00:31:43 +0200
Subject: [PATCH] Downgrade Hibernate to finally fix dependency
 incompatibilities! Add some named queries to entities and fix access by
 primary key

---
 .idea/artifacts/TripRecorder_war_exploded.xml | 61 +++++++++----------
 .idea/dataSources.xml                         | 11 ++++
 .idea/inspectionProfiles/Project_Default.xml  |  3 +
 pom.xml                                       | 40 +++++++-----
 .../com/mcris/triprecorder/HelloServlet.java  |  9 ++-
 .../models/entities/Geopoint.java             |  8 ++-
 .../triprecorder/models/entities/Session.java | 18 ++++--
 .../triprecorder/models/entities/Trip.java    | 17 ++++--
 .../triprecorder/models/entities/User.java    |  8 ++-
 9 files changed, 109 insertions(+), 66 deletions(-)

diff --git a/.idea/artifacts/TripRecorder_war_exploded.xml b/.idea/artifacts/TripRecorder_war_exploded.xml
index 8245672..19be8c5 100644
--- a/.idea/artifacts/TripRecorder_war_exploded.xml
+++ b/.idea/artifacts/TripRecorder_war_exploded.xml
@@ -14,46 +14,44 @@
           <element id="module-output" name="TripRecorder" />
         </element>
         <element id="directory" name="lib">
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet:2.36" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet-core:2.36" />
+          <element id="library" level="project" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet:2.34" />
+          <element id="library" level="project" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet-core:2.34" />
           <element id="library" level="project" name="Maven: org.glassfish.hk2.external:jakarta.inject:2.6.1" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.core:jersey-common:2.36" />
+          <element id="library" level="project" name="Maven: org.glassfish.jersey.core:jersey-common:2.34" />
           <element id="library" level="project" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" />
           <element id="library" level="project" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.3" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.core:jersey-server:2.36" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.core:jersey-client:2.36" />
+          <element id="library" level="project" name="Maven: org.glassfish.jersey.core:jersey-server:2.34" />
+          <element id="library" level="project" name="Maven: org.glassfish.jersey.core:jersey-client:2.34" />
           <element id="library" level="project" name="Maven: jakarta.ws.rs:jakarta.ws.rs-api:2.1.6" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:2.36" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.36" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.3" />
+          <element id="library" level="project" name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:2.34" />
+          <element id="library" level="project" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.34" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.2" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.2" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.2" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.2" />
+          <element id="library" level="project" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" />
           <element id="library" level="project" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.inject:jersey-cdi2-se:2.36" />
-          <element id="library" level="project" name="Maven: javax.ws.rs:javax.ws.rs-api:2.1.1" />
-          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:8.0.29" />
+          <element id="library" level="project" name="Maven: org.glassfish.jersey.inject:jersey-cdi2-se:2.34" />
+          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:8.0.30" />
           <element id="library" level="project" name="Maven: com.google.protobuf:protobuf-java:3.19.4" />
-          <element id="library" level="project" name="Maven: org.glassfish:jakarta.el:4.0.1" />
-          <element id="library" level="project" name="Maven: jakarta.el:jakarta.el-api:4.0.0" />
-          <element id="library" level="project" name="Maven: org.hibernate.orm:hibernate-core:6.1.0.Final" />
-          <element id="library" level="project" name="Maven: jakarta.persistence:jakarta.persistence-api:3.0.0" />
-          <element id="library" level="project" name="Maven: jakarta.transaction:jakarta.transaction-api:2.0.0" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-core:5.6.11.Final" />
           <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" />
-          <element id="library" level="project" name="Maven: org.hibernate.common:hibernate-commons-annotations:6.0.2.Final" />
+          <element id="library" level="project" name="Maven: javax.persistence:javax.persistence-api:2.2" />
+          <element id="library" level="project" name="Maven: net.bytebuddy:byte-buddy:1.12.9" />
+          <element id="library" level="project" name="Maven: antlr:antlr:2.7.7" />
+          <element id="library" level="project" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final" />
           <element id="library" level="project" name="Maven: org.jboss:jandex:2.4.2.Final" />
           <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.5.1" />
-          <element id="library" level="project" name="Maven: net.bytebuddy:byte-buddy:1.12.9" />
-          <element id="library" level="project" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:3.0.1" />
-          <element id="library" level="project" name="Maven: com.sun.activation:jakarta.activation:2.0.1" />
-          <element id="library" level="project" name="Maven: org.glassfish.jaxb:jaxb-runtime:3.0.2" />
-          <element id="library" level="project" name="Maven: org.glassfish.jaxb:jaxb-core:3.0.2" />
-          <element id="library" level="project" name="Maven: org.glassfish.jaxb:txw2:3.0.2" />
-          <element id="library" level="project" name="Maven: com.sun.istack:istack-commons-runtime:4.0.1" />
-          <element id="library" level="project" name="Maven: jakarta.inject:jakarta.inject-api:2.0.0" />
-          <element id="library" level="project" name="Maven: org.antlr:antlr4-runtime:4.10" />
-          <element id="library" level="project" name="Maven: org.hibernate.validator:hibernate-validator:7.0.4.Final" />
-          <element id="library" level="project" name="Maven: jakarta.validation:jakarta.validation-api:3.0.0" />
+          <element id="library" level="project" name="Maven: javax.activation:javax.activation-api:1.2.0" />
+          <element id="library" level="project" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" />
+          <element id="library" level="project" name="Maven: javax.xml.bind:jaxb-api:2.3.1" />
+          <element id="library" level="project" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.1" />
+          <element id="library" level="project" name="Maven: org.glassfish.jaxb:txw2:2.3.1" />
+          <element id="library" level="project" name="Maven: com.sun.istack:istack-commons-runtime:3.0.7" />
+          <element id="library" level="project" name="Maven: org.jvnet.staxex:stax-ex:1.8" />
+          <element id="library" level="project" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.15" />
+          <element id="library" level="project" name="Maven: org.hibernate.validator:hibernate-validator:6.2.0.Final" />
+          <element id="library" level="project" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" />
           <element id="library" level="project" name="Maven: org.jboss.weld.se:weld-se-core:3.1.8.Final" />
           <element id="library" level="project" name="Maven: org.jboss.weld.environment:weld-environment-common:3.1.8.Final" />
           <element id="library" level="project" name="Maven: org.jboss.weld:weld-core-impl:3.1.8.Final" />
@@ -64,6 +62,7 @@
           <element id="library" level="project" name="Maven: org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec:2.0.0.Final" />
           <element id="library" level="project" name="Maven: org.jboss.weld.probe:weld-probe-core:3.1.8.Final" />
           <element id="library" level="project" name="Maven: jakarta.enterprise:jakarta.enterprise.cdi-api:2.0.2" />
+          <element id="library" level="project" name="Maven: jakarta.inject:jakarta.inject-api:1.0" />
           <element id="library" level="project" name="Maven: org.jboss.classfilewriter:jboss-classfilewriter:1.2.5.Final" />
         </element>
       </element>
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index a674c43..0096713 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -8,5 +8,16 @@
       <jdbc-url>jdbc:mysql://localhost:3306/trip_recorder</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
+    <data-source source="LOCAL" name="default/Hibernate" uuid="af3bf834-c358-4717-a2cf-c6981bb64ff4">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <imported>true</imported>
+      <remarks>Hibernate
+
+C:/Users/mcris/Source/Repos/ProgrWeb2021/src/main/resources/META-INF/persistence.xml</remarks>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306/trip_recorder</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 146ab09..6cba5a4 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,9 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,javax.ws.rs.core.Response.ResponseBuilder,build" />
+    </inspection_tool>
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
       <option name="processLiterals" value="true" />
diff --git a/pom.xml b/pom.xml
index bc523c5..0c4d98a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,42 +27,42 @@
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>
-            <version>2.36</version>
+            <version>2.34</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
-            <version>2.36</version>
+            <version>2.34</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.inject</groupId>
             <artifactId>jersey-cdi2-se</artifactId>
-            <version>2.36</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.1.1</version>
+            <version>2.34</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>javax.ws.rs</groupId>-->
+<!--            <artifactId>javax.ws.rs-api</artifactId>-->
+<!--            <version>2.1.1</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.29</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>jakarta.el</artifactId>
-            <version>4.0.1</version>
+            <version>8.0.30</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.glassfish</groupId>-->
+<!--            <artifactId>jakarta.el</artifactId>-->
+<!--            <version>4.0.1</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>6.1.0.Final</version>
+            <version>5.6.11.Final</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>7.0.4.Final</version>
+            <version>6.2.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
@@ -90,6 +90,14 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <version>3.3.2</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/mcris/triprecorder/HelloServlet.java b/src/main/java/com/mcris/triprecorder/HelloServlet.java
index b98bbe8..5d81955 100644
--- a/src/main/java/com/mcris/triprecorder/HelloServlet.java
+++ b/src/main/java/com/mcris/triprecorder/HelloServlet.java
@@ -1,8 +1,11 @@
 package com.mcris.triprecorder;
 
-import java.io.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.*;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 
 @WebServlet(name = "helloServlet", value = "/hello-servlet")
 public class HelloServlet extends HttpServlet {
diff --git a/src/main/java/com/mcris/triprecorder/models/entities/Geopoint.java b/src/main/java/com/mcris/triprecorder/models/entities/Geopoint.java
index faf88f3..003392d 100644
--- a/src/main/java/com/mcris/triprecorder/models/entities/Geopoint.java
+++ b/src/main/java/com/mcris/triprecorder/models/entities/Geopoint.java
@@ -1,19 +1,21 @@
 package com.mcris.triprecorder.models.entities;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import jakarta.persistence.*;
 
+import javax.persistence.*;
 import java.sql.Timestamp;
 
 @Entity
 @Table(name = "geopoints", schema = "trip_recorder")
+@NamedQuery(name = "Geopoint.getListByTripIdIfUser",
+        query = "select t.geopoints from Trip t where t.id = :tripId and t.userId = :userId")
 public class Geopoint {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
     @Column(name = "id")
     private int id;
     @Basic
-    @Column(name = "trip_id", insertable = false, updatable = false)
+    @Column(name = "trip_id", nullable = false)
     private int tripId;
     @Basic
     @Column(name = "latitude")
@@ -28,7 +30,7 @@ public class Geopoint {
     @Column(name = "label")
     private String label;
     @ManyToOne
-    @JoinColumn(name = "trip_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "trip_id", referencedColumnName = "id", insertable = false, updatable = false)
     @JsonIgnore
     private Trip trip;
 
diff --git a/src/main/java/com/mcris/triprecorder/models/entities/Session.java b/src/main/java/com/mcris/triprecorder/models/entities/Session.java
index acf3b06..c711395 100644
--- a/src/main/java/com/mcris/triprecorder/models/entities/Session.java
+++ b/src/main/java/com/mcris/triprecorder/models/entities/Session.java
@@ -1,31 +1,37 @@
 package com.mcris.triprecorder.models.entities;
 
-import jakarta.persistence.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.annotations.Type;
 
+import javax.persistence.*;
 import java.sql.Timestamp;
-import java.sql.Types;
 import java.util.UUID;
 
 @Entity
 @Table(name = "sessions", schema = "trip_recorder")
-@NamedQuery(name = "Session.byToken", query = "select s from Session s where s.token = :tokenString")
+@NamedQueries({
+        @NamedQuery(name = "Session.byToken",
+                query = "select s from Session s where s.token = :tokenString"),
+        @NamedQuery(name = "Session.deleteByToken",
+                query = "delete from Session s where s.token = :tokenString")
+})
 public class Session {
     // https://www.codementor.io/@petrepopescu/how-to-use-string-uuid-in-hibernate-with-mysql-1jrhjh6ef5
     @GeneratedValue(generator = "uuid2")
     @GenericGenerator(name = "uuid2", strategy = "uuid2")
     @Id
     @Column(name = "token", updatable = false, nullable = false, columnDefinition = "VARCHAR(255)")
-    @JdbcTypeCode(Types.VARCHAR)
+    @Type(type = "uuid-char")
     private UUID token;
+    @JsonIgnore
     @Basic
-    @Column(name = "user_id")
+    @Column(name = "user_id", nullable = false)
     private int userId;
     @Basic
     @Column(name = "expire_at")
     private Timestamp expireAt;
+    @JsonIgnore
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false, insertable = false, updatable = false)
     private User user;
diff --git a/src/main/java/com/mcris/triprecorder/models/entities/Trip.java b/src/main/java/com/mcris/triprecorder/models/entities/Trip.java
index ef180a5..37fd2c1 100644
--- a/src/main/java/com/mcris/triprecorder/models/entities/Trip.java
+++ b/src/main/java/com/mcris/triprecorder/models/entities/Trip.java
@@ -1,20 +1,28 @@
 package com.mcris.triprecorder.models.entities;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import jakarta.persistence.*;
 
+import javax.persistence.*;
 import java.sql.Timestamp;
 import java.util.Collection;
 
 @Entity
 @Table(name = "trips", schema = "trip_recorder")
+@NamedQueries({
+        @NamedQuery(name = "Trip.getByIdIfCorrectUser",
+                query = "select t from Trip t where t.id = :tripId and t.userId = :userId"),
+        @NamedQuery(name = "Trip.removeByIdIfCorrectUser",
+                query = "delete from Trip t where t.id = :tripId and t.userId = :userId")
+})
+
 public class Trip {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
     @Column(name = "id")
     private int id;
+    @JsonIgnore
     @Basic
-    @Column(name = "user_id", insertable = false, updatable = false)
+    @Column(name = "user_id", nullable = false)
     private int userId;
     @Basic
     @Column(name = "trip_name")
@@ -28,11 +36,12 @@ public class Trip {
     @Basic
     @Column(name = "notes")
     private String notes;
-    @OneToMany(mappedBy = "trip")
+    @JsonIgnore
+    @OneToMany(mappedBy = "trip", fetch = FetchType.LAZY)
     private Collection<Geopoint> geopoints;
     @JsonIgnore
     @ManyToOne
-    @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "user_id", referencedColumnName = "id", insertable = false, updatable = false)
     private User user;
 
     public int getId() {
diff --git a/src/main/java/com/mcris/triprecorder/models/entities/User.java b/src/main/java/com/mcris/triprecorder/models/entities/User.java
index f45005e..23bef45 100644
--- a/src/main/java/com/mcris/triprecorder/models/entities/User.java
+++ b/src/main/java/com/mcris/triprecorder/models/entities/User.java
@@ -2,8 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import jakarta.persistence.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
+import javax.persistence.*;
 import java.security.Principal;
 import java.sql.Timestamp;
 import java.util.Collection;
@@ -11,7 +12,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @Entity
 @Table(name = "users", schema = "trip_recorder")
-@NamedQuery(name = "User.byId", query = "select u from User u where u.id = :userId")
+@NamedQuery(name = "User.byUsernameAndPassword", query = "select u from User u where u.username = :username and u.password = :password")
 public class User implements Principal {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
@@ -20,7 +21,7 @@ public class User implements Principal {
     @Basic
     @Column(name = "username")
     private String username;
-    @JsonIgnore
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     @Basic
     @Column(name = "password")
     private String password;
@@ -30,6 +31,7 @@ public class User implements Principal {
     @JsonIgnore
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
     private Collection<Session> sessions;
+    @JsonIgnore
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
     private Collection<Trip> trips;
     @Basic