Merge branch 'main' into dev

ILLGrenoble · Nov 27, 2024 · e8f70b4 · e8f70b4
2 parents 5058a8a + 97ecfa6
commit e8f70b4
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 34 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+3.0.3 27/11/2024
+================
+ * FIX #6: Add responses for POST Requests in JupyterController
+ * FIX #5: Avoid json serialization of instrument scientists  
+
 3.0.2 25/11/2024
 ================
  * Fix bug of synchronising all activity updates on user interaction with remote desktop.  

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>eu.ill.visa</groupId>
     <artifactId>api</artifactId>
-    <version>3.0.2</version>
+    <version>3.0.3</version>
 
     <modules>
         <module>visa-core</module>

diff --git a/visa-app/pom.xml b/visa-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-web-rest</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-web-graphql</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-web-gateway</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-remote-desktop</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-scheduler</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
     </dependencies>
 

diff --git a/visa-business/pom.xml b/visa-business/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,17 +22,17 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-persistence</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-cloud</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-message-broker</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
 
         <dependency>

diff --git a/visa-cloud/pom.xml b/visa-cloud/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/visa-core/pom.xml b/visa-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/visa-core/src/main/java/eu/ill/visa/core/entity/Instrument.java b/visa-core/src/main/java/eu/ill/visa/core/entity/Instrument.java
@@ -1,5 +1,6 @@
 package eu.ill.visa.core.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -64,6 +65,7 @@ public class Instrument {
     @Column(name = "name", length = 250, nullable = false)
     private String name;
 
+    @JsonIgnore
     @ManyToMany()
     @JoinTable(
         name = "instrument_scientist",

diff --git a/visa-message-broker/pom.xml b/visa-message-broker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-core</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
 
         <dependency>

diff --git a/visa-persistence/pom.xml b/visa-persistence/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-core</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>eu.ill</groupId>

diff --git a/visa-remote-desktop/pom.xml b/visa-remote-desktop/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
 
         <dependency>

diff --git a/visa-scheduler/pom.xml b/visa-scheduler/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/visa-security/pom.xml b/visa-security/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>visa-security</artifactId>
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
 
         <dependency>

diff --git a/visa-web-gateway/pom.xml b/visa-web-gateway/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-message-broker</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
     </dependencies>
 

diff --git a/visa-web-graphql/pom.xml b/visa-web-graphql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-security</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
 
         <dependency>

diff --git a/visa-web-rest/pom.xml b/visa-web-rest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-security</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
 
         <dependency>

diff --git a/visa-web-rest/src/main/java/eu/ill/visa/web/rest/controllers/JupyterController.java b/visa-web-rest/src/main/java/eu/ill/visa/web/rest/controllers/JupyterController.java
@@ -67,21 +67,23 @@ public MetaResponse<InstanceDto> get(@Context final SecurityContext securityCont
     @POST
     @Path("/{instance}/notebook/open")
     @Authenticated
-    public void jupyterSessionOpen(@Context final SecurityContext securityContext, @PathParam("instance") Instance instance, @NotNull @Valid final JupyterNotebookSessionInput input) {
+    public MetaResponse<String> jupyterSessionOpen(@Context final SecurityContext securityContext, @PathParam("instance") Instance instance, @NotNull @Valid final JupyterNotebookSessionInput input) {
         final User user = this.getUserPrincipal(securityContext);
 
         if (this.instanceService.isAuthorisedForInstance(user, instance)) {
             this.instanceJupyterSessionService.create(instance, user, input.getKernelId(), input.getSessionId());
+            return createResponse();
         }
 
         throw new NotFoundException();
     }
 
     @POST
     @Path("/{instance}/notebook/close")
-    public void jupyterSessionClose(@PathParam("instance") Instance instance, @NotNull @Valid final JupyterNotebookSessionInput input) {
+    public MetaResponse<String> jupyterSessionClose(@PathParam("instance") Instance instance, @NotNull @Valid final JupyterNotebookSessionInput input) {
         // Allow any access this endpoint: allows the visa-jupyter-proxy to remove zombie sessions without authentication (needs to know both kernelId and sessionId so security risk is low)
         this.instanceJupyterSessionService.destroy(instance, input.getKernelId(), input.getSessionId());
+        return createResponse();
     }
 
     private boolean isAuthorisedForJupyter(User user, Instance instance) {