The commits that didn't make it. #9356

IQSS · Mar 21, 2024 · a70d601 · a70d601
1 parent a9b2514
commit a70d601
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -24,7 +24,7 @@
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.impl.CheckRateLimitForDatasetPage;
+import edu.harvard.iq.dataverse.engine.command.impl.CheckRateLimitForDatasetPageCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreatePrivateUrlCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CuratePublishedDatasetVersionCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.DeaccessionDatasetVersionCommand;
@@ -252,6 +252,8 @@ public enum DisplayMode {
     DatasetVersionUI datasetVersionUI;
     @Inject
     PermissionsWrapper permissionsWrapper;
+    @Inject 
+    NavigationWrapper navigationWrapper;
     @Inject
     FileDownloadHelper fileDownloadHelper;
     @Inject
@@ -1935,8 +1937,8 @@ private void setIdByPersistentId() {
 
     private String init(boolean initFull) {
         // Check for rate limit exceeded. Must be done before anything else to prevent unnecessary processing.
-        if (!cacheFactory.checkRate(session.getUser(), new CheckRateLimitForDatasetPage(null,null))) {
-            return BundleUtil.getStringFromBundle("command.exception.user.ratelimited", Arrays.asList(CheckRateLimitForDatasetPage.class.getSimpleName()));
+        if (!cacheFactory.checkRate(session.getUser(), new CheckRateLimitForDatasetPageCommand(null,null))) {
+            return navigationWrapper.tooManyRequests();
         }
         //System.out.println("_YE_OLDE_QUERY_COUNTER_");  // for debug purposes
         setDataverseSiteUrl(systemConfig.getDataverseSiteUrl());

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -9,7 +9,7 @@
 import edu.harvard.iq.dataverse.dataverse.DataverseUtil;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.impl.CheckRateLimitForCollectionPage;
+import edu.harvard.iq.dataverse.engine.command.impl.CheckRateLimitForCollectionPageCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateSavedSearchCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.DeleteDataverseCommand;
@@ -118,6 +118,8 @@ public enum LinkMode {
     @EJB
     DataverseLinkingServiceBean linkingService;
     @Inject PermissionsWrapper permissionsWrapper;
+    @Inject 
+    NavigationWrapper navigationWrapper;
     @Inject DataverseHeaderFragment dataverseHeaderFragment;
     @EJB
     PidProviderFactoryBean pidProviderFactoryBean;
@@ -324,8 +326,8 @@ public void updateOwnerDataverse() {
     public String init() {
         //System.out.println("_YE_OLDE_QUERY_COUNTER_");  // for debug purposes
         // Check for rate limit exceeded. Must be done before anything else to prevent unnecessary processing.
-        if (!cacheFactory.checkRate(session.getUser(), new CheckRateLimitForCollectionPage(null,null))) {
-            return BundleUtil.getStringFromBundle("command.exception.user.ratelimited", Arrays.asList(CheckRateLimitForCollectionPage.class.getSimpleName()));
+        if (!cacheFactory.checkRate(session.getUser(), new CheckRateLimitForCollectionPageCommand(null,null))) {
+            return navigationWrapper.tooManyRequests();
         }
         if (this.getAlias() != null || this.getId() != null || this.getOwnerId() == null) {// view mode for a dataverse
             if (this.getAlias() != null) {

diff --git a/src/main/java/edu/harvard/iq/dataverse/NavigationWrapper.java b/src/main/java/edu/harvard/iq/dataverse/NavigationWrapper.java
@@ -16,6 +16,7 @@
 import java.util.logging.Logger;
 import jakarta.faces.context.FacesContext;
 import jakarta.faces.view.ViewScoped;
+import jakarta.ws.rs.core.Response.Status;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.servlet.http.HttpServletRequest;
@@ -87,6 +88,10 @@ public String notAuthorized(){
         }        
     }
 
+    public String tooManyRequests() {
+        return sendError(Status.TOO_MANY_REQUESTS.getStatusCode());
+    }
+
     public String notFound() {
         return sendError(HttpServletResponse.SC_NOT_FOUND);
     }

diff --git a/...impl/CheckRateLimitForCollectionPage.java → ...eckRateLimitForCollectionPageCommand.java b/...impl/CheckRateLimitForCollectionPage.java → ...eckRateLimitForCollectionPageCommand.java
@@ -6,8 +6,8 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 
-public class CheckRateLimitForCollectionPage extends AbstractVoidCommand {
-    public CheckRateLimitForCollectionPage(DataverseRequest aRequest, DvObject dvObject) {
+public class CheckRateLimitForCollectionPageCommand extends AbstractVoidCommand {
+    public CheckRateLimitForCollectionPageCommand(DataverseRequest aRequest, DvObject dvObject) {
         super(aRequest, dvObject);
     }
 

diff --git a/...nd/impl/CheckRateLimitForDatasetPage.java → .../CheckRateLimitForDatasetPageCommand.java b/...nd/impl/CheckRateLimitForDatasetPage.java → .../CheckRateLimitForDatasetPageCommand.java
@@ -6,9 +6,9 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 
-public class CheckRateLimitForDatasetPage  extends AbstractVoidCommand {
+public class CheckRateLimitForDatasetPageCommand  extends AbstractVoidCommand {
 
-    public CheckRateLimitForDatasetPage(DataverseRequest aRequest, DvObject dvObject) {
+    public CheckRateLimitForDatasetPageCommand(DataverseRequest aRequest, DvObject dvObject) {
         super(aRequest, dvObject);
     }