From 20d009fe6194e261df02b61825b0bd801e3b3e3b Mon Sep 17 00:00:00 2001
From: ErmiasG <ermiasg@kth.se>
Date: Wed, 31 Jan 2024 14:55:08 +0100
Subject: [PATCH] [HWORKS-958] add null check for FeaturestoreService

---
 .../hopsworks/api/featurestore/FeaturestoreService.java  | 9 +++++----
 .../io/hops/hopsworks/api/project/ProjectService.java    | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/FeaturestoreService.java b/hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/FeaturestoreService.java
index 4896a95c72..fcb6f3e68c 100644
--- a/hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/FeaturestoreService.java
+++ b/hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/FeaturestoreService.java
@@ -30,14 +30,15 @@
 import io.hops.hopsworks.api.kafka.KafkaResource;
 import io.hops.hopsworks.api.auth.key.ApiKeyRequired;
 import io.hops.hopsworks.common.api.ResourceRequest;
-import io.hops.hopsworks.common.dao.project.ProjectFacade;
 import io.hops.hopsworks.common.featurestore.FeaturestoreController;
 import io.hops.hopsworks.common.featurestore.FeaturestoreDTO;
 import io.hops.hopsworks.common.featurestore.keyword.KeywordDTO;
 import io.hops.hopsworks.common.featurestore.metadata.FeatureStoreKeywordControllerIface;
 import io.hops.hopsworks.common.featurestore.settings.FeaturestoreClientSettingsDTO;
+import io.hops.hopsworks.common.project.ProjectController;
 import io.hops.hopsworks.common.util.Settings;
 import io.hops.hopsworks.exceptions.FeaturestoreException;
+import io.hops.hopsworks.exceptions.ProjectException;
 import io.hops.hopsworks.jwt.annotation.JWTRequired;
 import io.hops.hopsworks.persistence.entity.featurestore.Featurestore;
 import io.hops.hopsworks.persistence.entity.project.Project;
@@ -81,7 +82,7 @@ public class FeaturestoreService {
   @EJB
   private FeaturestoreController featurestoreController;
   @EJB
-  private ProjectFacade projectFacade;
+  private ProjectController projectController;
   @EJB
   private Settings settings;
   @Inject
@@ -112,8 +113,8 @@ public class FeaturestoreService {
    *
    * @param projectId the id of the project
    */
-  public void setProjectId(Integer projectId) {
-    this.project = projectFacade.find(projectId);
+  public void setProjectId(Integer projectId) throws ProjectException {
+    this.project = projectController.findProjectById(projectId);
   }
 
   /**
diff --git a/hopsworks-api/src/main/java/io/hops/hopsworks/api/project/ProjectService.java b/hopsworks-api/src/main/java/io/hops/hopsworks/api/project/ProjectService.java
index 63311e45fb..56d2da340a 100644
--- a/hopsworks-api/src/main/java/io/hops/hopsworks/api/project/ProjectService.java
+++ b/hopsworks-api/src/main/java/io/hops/hopsworks/api/project/ProjectService.java
@@ -725,9 +725,9 @@ public InferenceResource infer(@PathParam("projectId") Integer projectId) {
     inference.setProjectId(projectId);
     return inference;
   }
-  
+
   @Path("{projectId}/featurestores")
-  public FeaturestoreService featurestoreService(@PathParam("projectId") Integer projectId) {
+  public FeaturestoreService featurestoreService(@PathParam("projectId") Integer projectId) throws ProjectException {
     featurestoreService.setProjectId(projectId);
     return featurestoreService;
   }