From f41d6230f3d73f0803c8889ef9d1ca57f989c29a Mon Sep 17 00:00:00 2001
From: AJoshi19 <ajoshi19@slb.com>
Date: Fri, 17 Jan 2025 12:57:06 -0600
Subject: [PATCH] MR suggestions
---
.../osdu/notification/auth/AuthorizationFilter.java | 3 ++-
.../org/opengroup/osdu/notification/di/GroupVmCache.java | 2 +-
.../org/opengroup/osdu/notification/utils/MathUtils.java | 8 ++++++--
.../osdu/notification/auth/AuthorizationFilterTest.java | 1 -
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/auth/AuthorizationFilter.java b/notification-core/src/main/java/org/opengroup/osdu/notification/auth/AuthorizationFilter.java
index 6ed600beb..4281902e6 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/auth/AuthorizationFilter.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/auth/AuthorizationFilter.java
@@ -94,8 +94,9 @@ public class AuthorizationFilter {
}
private boolean authorizeWithCache(String[] requiredRoles, Groups groups) {
- if(groups.any(requiredRoles))
+ if(groups.any(requiredRoles)) {
return true;
+ }
return false;
}
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/di/GroupVmCache.java b/notification-core/src/main/java/org/opengroup/osdu/notification/di/GroupVmCache.java
index ffb7b049c..451dc4732 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/di/GroupVmCache.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/di/GroupVmCache.java
@@ -1,4 +1,4 @@
-// Copyright 2017-2024, SLB
+// Copyright 2017-2025, SLB
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/utils/MathUtils.java b/notification-core/src/main/java/org/opengroup/osdu/notification/utils/MathUtils.java
index 52b8a7048..40ac37b02 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/utils/MathUtils.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/utils/MathUtils.java
@@ -1,4 +1,4 @@
-// Copyright 2017-2024, SLB
+// Copyright 2017-2025, SLB
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -22,6 +22,10 @@ public class MathUtils {
*/
public static int generateRandomNumberBetweenBounds(int lower, int upper) {
Random random = new Random();
- return random.nextInt(upper - lower) + lower;
+ if (upper > lower) {
+ return random.nextInt(upper - lower) + lower;
+ } else {
+ return random.nextInt(lower - upper) + upper;
+ }
}
}
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationFilterTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationFilterTest.java
index c042f4f36..a84b0d5ec 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationFilterTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationFilterTest.java
@@ -94,7 +94,6 @@ public class AuthorizationFilterTest {
final String USER_EMAIL = "test@test.com";
AuthorizationResponse authorizationResponse = AuthorizationResponse.builder().user(USER_EMAIL).build();
when(this.authorizationService.authorizeAny(any(), eq(ROLE1), eq(ROLE2))).thenReturn(authorizationResponse);
- //when(this.groupVmCache.get("8Z2MjQ==")).thenReturn(null);
assertTrue(this.sut.hasAnyPermission(ROLE1, ROLE2));
verify(headers).put(DpsHeaders.USER_EMAIL, "test@test.com");
--
GitLab