summaryrefslogtreecommitdiffstats
path: root/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2021-03-22 15:33:06 +0000
committerChristophe Closset <christophe.closset@intl.att.com>2021-03-24 06:59:47 +0000
commitd378c37fbd1ecec7b43394926f1ca32a695e07de (patch)
tree5c8a085f8732f980d871d966ac49361644efa698 /openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services
parenta6ae7294ecd336d7e88f915710b08e2658eaee00 (diff)
Reformat openecomp-be
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3449 Change-Id: I13e02322f8e00820cc5a1d85752caaeda9bf10d1
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services')
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsStatusToDto.java30
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsToDto.java28
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/services/Notifications.java80
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/services/impl/NotificationsImpl.java65
4 files changed, 84 insertions, 119 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsStatusToDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsStatusToDto.java
index 41376b040f..be98d809de 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsStatusToDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsStatusToDto.java
@@ -17,10 +17,13 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-
package org.openecomp.sdcrests.notifications.rest.mapping;
import com.datastax.driver.core.utils.UUIDs;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import org.openecomp.core.utilities.json.JsonUtil;
import org.openecomp.sdc.notification.dao.types.NotificationEntity;
import org.openecomp.sdc.notification.dtos.NotificationsStatus;
@@ -28,37 +31,24 @@ import org.openecomp.sdcrests.mapping.MappingBase;
import org.openecomp.sdcrests.notifications.types.NotificationEntityDto;
import org.openecomp.sdcrests.notifications.types.NotificationsStatusDto;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+public class MapNotificationsStatusToDto extends MappingBase<NotificationsStatus, NotificationsStatusDto> {
-public class MapNotificationsStatusToDto
- extends MappingBase<NotificationsStatus, NotificationsStatusDto> {
-
- private static final DateFormat formatter =
- DateFormat.getDateTimeInstance(DateFormat.LONG,
- DateFormat.SHORT);
+ private static final DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT);
@Override
public void doMapping(NotificationsStatus source, NotificationsStatusDto target) {
-
target.setLastScanned(source.getLastScanned());
target.setNewEntries(source.getNewEntries());
target.setEndOfPage(source.getEndOfPage());
target.setNumOfNotSeenNotifications(source.getNumOfNotSeenNotifications());
List<NotificationEntityDto> entityDtos = new ArrayList<>();
- source.getNotifications()
- .forEach(notification -> entityDtos.add(new NotificationEntityDto(notification.isRead(),
- notification.getEventId(), notification.getEventType(),
- JsonUtil.json2Object(notification.getEventAttributes(), Map.class),
- extractDate(notification))));
+ source.getNotifications().forEach(notification -> entityDtos.add(
+ new NotificationEntityDto(notification.isRead(), notification.getEventId(), notification.getEventType(),
+ JsonUtil.json2Object(notification.getEventAttributes(), Map.class), extractDate(notification))));
target.setNotifications(entityDtos);
}
private String extractDate(NotificationEntity notification) {
- return formatter.format(UUIDs.unixTimestamp
- (notification
- .getEventId()));
+ return formatter.format(UUIDs.unixTimestamp(notification.getEventId()));
}
}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsToDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsToDto.java
index 558453b7b6..a42f5f98da 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsToDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsToDto.java
@@ -17,10 +17,13 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-
package org.openecomp.sdcrests.notifications.rest.mapping;
import com.datastax.driver.core.utils.UUIDs;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import org.apache.commons.collections4.CollectionUtils;
import org.openecomp.core.utilities.json.JsonUtil;
import org.openecomp.sdc.notification.dao.types.NotificationEntity;
@@ -28,30 +31,23 @@ import org.openecomp.sdcrests.mapping.MappingBase;
import org.openecomp.sdcrests.notifications.types.NotificationEntityDto;
import org.openecomp.sdcrests.notifications.types.NotificationsStatusDto;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
public class MapNotificationsToDto extends MappingBase<List<NotificationEntity>, NotificationsStatusDto> {
- private static final DateFormat formatter =
- DateFormat.getDateTimeInstance(DateFormat.LONG,
- DateFormat.SHORT);
+
+ private static final DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT);
+
@Override
public void doMapping(List<NotificationEntity> source, NotificationsStatusDto target) {
List<NotificationEntityDto> entityDtos = new ArrayList<>();
- if(CollectionUtils.isNotEmpty(source)) {
- source.forEach(notification -> entityDtos.add(new NotificationEntityDto(notification.isRead(),
- notification.getEventId(), notification.getEventType(), JsonUtil.json2Object(notification.getEventAttributes(), Map.class),
- extractDate(notification))));
+ if (CollectionUtils.isNotEmpty(source)) {
+ source.forEach(notification -> entityDtos.add(
+ new NotificationEntityDto(notification.isRead(), notification.getEventId(), notification.getEventType(),
+ JsonUtil.json2Object(notification.getEventAttributes(), Map.class), extractDate(notification))));
target.setNotifications(entityDtos);
target.setLastScanned(source.get(0).getEventId());
}
}
private String extractDate(NotificationEntity notification) {
- return formatter.format(UUIDs.unixTimestamp
- (notification
- .getEventId()));
+ return formatter.format(UUIDs.unixTimestamp(notification.getEventId()));
}
}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/services/Notifications.java b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/services/Notifications.java
index b2e262e9ba..9a8d00c521 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/services/Notifications.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/services/Notifications.java
@@ -17,30 +17,36 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-
package org.openecomp.sdcrests.notifications.rest.services;
+import static org.openecomp.sdcrests.common.RestConstants.LAST_DELIVERED_QUERY_PARAM;
+import static org.openecomp.sdcrests.common.RestConstants.USER_ID_HEADER_PARAM;
+import static org.openecomp.sdcrests.common.RestConstants.USER_MISSING_ERROR_MSG;
+
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.tags.Tags;
-import org.openecomp.sdcrests.notifications.types.NotificationsStatusDto;
-import org.openecomp.sdcrests.notifications.types.UpdateNotificationResponseStatus;
-import org.springframework.validation.annotation.Validated;
-
+import java.lang.reflect.InvocationTargetException;
+import java.util.UUID;
import javax.validation.constraints.NotNull;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import java.lang.reflect.InvocationTargetException;
-import java.util.UUID;
-
-import static org.openecomp.sdcrests.common.RestConstants.*;
+import org.openecomp.sdcrests.notifications.types.NotificationsStatusDto;
+import org.openecomp.sdcrests.notifications.types.UpdateNotificationResponseStatus;
+import org.springframework.validation.annotation.Validated;
@Path("/v1.0/notifications")
@Produces(MediaType.APPLICATION_JSON)
@@ -48,38 +54,32 @@ import static org.openecomp.sdcrests.common.RestConstants.*;
@Tags({@Tag(name = "SDCE-1 APIs"), @Tag(name = "Notifications")})
@Validated
public interface Notifications {
- String LIMIT_QUERY_PARAM = "NOTIFICATION_ROWS_LIMIT";
- String END_OF_PAGE_QUERY_PARAM = "END_OF_PAGE_EVENT_ID";
- @GET
- @Operation(description = "Retrieve all user notifications", responses = @ApiResponse(content = @Content(array = @ArraySchema( schema = @Schema(implementation = NotificationsStatusDto.class)))))
- Response getNotifications(
- @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user,
- @QueryParam(LAST_DELIVERED_QUERY_PARAM) UUID lastDelvered,
- @QueryParam(END_OF_PAGE_QUERY_PARAM) UUID endOfPage);
+ String LIMIT_QUERY_PARAM = "NOTIFICATION_ROWS_LIMIT";
+ String END_OF_PAGE_QUERY_PARAM = "END_OF_PAGE_EVENT_ID";
- @PUT
- @Path("/{notificationId}")
- @Operation(description = "Mark notification as read", responses = @ApiResponse(content = @Content(schema = @Schema(implementation = UpdateNotificationResponseStatus.class))))
- Response markAsRead(
- @Parameter(description = "Notification Id") @PathParam("notificationId") String notificationId,
- @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user)
- throws InvocationTargetException, IllegalAccessException;
+ @GET
+ @Operation(description = "Retrieve all user notifications", responses = @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = NotificationsStatusDto.class)))))
+ Response getNotifications(@NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user,
+ @QueryParam(LAST_DELIVERED_QUERY_PARAM) UUID lastDelvered, @QueryParam(END_OF_PAGE_QUERY_PARAM) UUID endOfPage);
- @PUT
- @Path("/last-seen/{notificationId}")
- @Operation(description = "Update Last Seen Notification", responses = @ApiResponse(content = @Content(schema = @Schema(implementation = UpdateNotificationResponseStatus.class))))
- Response updateLastSeenNotification(
- @Parameter(description = "Notification Id") @PathParam("notificationId") String notificationId,
- @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user)
- throws InvocationTargetException, IllegalAccessException;
+ @PUT
+ @Path("/{notificationId}")
+ @Operation(description = "Mark notification as read", responses = @ApiResponse(content = @Content(schema = @Schema(implementation = UpdateNotificationResponseStatus.class))))
+ Response markAsRead(@Parameter(description = "Notification Id") @PathParam("notificationId") String notificationId,
+ @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user)
+ throws InvocationTargetException, IllegalAccessException;
- @GET
- @Path("/worker")
- @Operation(description = "Retrive user not delivered notifications",responses = @ApiResponse(content = @Content(array = @ArraySchema( schema = @Schema(implementation = NotificationsStatusDto.class)))))
- Response getNewNotificationsByOwnerId(
- @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user,
- @QueryParam(LAST_DELIVERED_QUERY_PARAM) String eventId,
- @QueryParam(LIMIT_QUERY_PARAM) String limit);
+ @PUT
+ @Path("/last-seen/{notificationId}")
+ @Operation(description = "Update Last Seen Notification", responses = @ApiResponse(content = @Content(schema = @Schema(implementation = UpdateNotificationResponseStatus.class))))
+ Response updateLastSeenNotification(@Parameter(description = "Notification Id") @PathParam("notificationId") String notificationId,
+ @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user)
+ throws InvocationTargetException, IllegalAccessException;
+ @GET
+ @Path("/worker")
+ @Operation(description = "Retrive user not delivered notifications", responses = @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = NotificationsStatusDto.class)))))
+ Response getNewNotificationsByOwnerId(@NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user,
+ @QueryParam(LAST_DELIVERED_QUERY_PARAM) String eventId, @QueryParam(LIMIT_QUERY_PARAM) String limit);
}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/services/impl/NotificationsImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/services/impl/NotificationsImpl.java
index bc33784bc8..4463717910 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/services/impl/NotificationsImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/main/java/org/openecomp/sdcrests/notifications/rest/services/impl/NotificationsImpl.java
@@ -7,9 +7,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,14 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-
package org.openecomp.sdcrests.notifications.rest.services.impl;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+import javax.inject.Named;
+import javax.ws.rs.core.Response;
import org.openecomp.sdc.common.errors.Messages;
import org.openecomp.sdc.datatypes.error.ErrorLevel;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
@@ -38,13 +43,6 @@ import org.openecomp.sdcrests.notifications.types.UpdateNotificationResponseStat
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
-
/**
* @author Avrahamg
* @since June 22, 2017
@@ -54,54 +52,41 @@ import java.util.UUID;
@Scope(value = "prototype")
public class NotificationsImpl implements Notifications {
- private static int selectionLimit = 10;
-
- private static final Logger LOGGER = LoggerFactory.getLogger(NotificationsImpl.class);
- private NotificationsService notificationsService = NotificationsServiceFactory.getInstance().createInterface();
+ private static final Logger LOGGER = LoggerFactory.getLogger(NotificationsImpl.class);
+ private static int selectionLimit = 10;
+ private NotificationsService notificationsService = NotificationsServiceFactory.getInstance().createInterface();
@Override
public Response getNotifications(String user, UUID lastDelivered, UUID endOfPage) {
- NotificationsStatus notificationsStatus = notificationsService
- .getNotificationsStatus(user, lastDelivered, selectionLimit, endOfPage);
+ NotificationsStatus notificationsStatus = notificationsService.getNotificationsStatus(user, lastDelivered, selectionLimit, endOfPage);
MapNotificationsStatusToDto converter = new MapNotificationsStatusToDto();
NotificationsStatusDto notificationsStatusDto = new NotificationsStatusDto();
converter.doMapping(notificationsStatus, notificationsStatusDto);
-
return Response.ok(notificationsStatusDto).build();
}
@Override
- public Response updateLastSeenNotification(String notificationId, String user)
- throws InvocationTargetException, IllegalAccessException {
- UpdateNotificationResponseStatus
- updateNotificationResponseStatus = new UpdateNotificationResponseStatus();
+ public Response updateLastSeenNotification(String notificationId, String user) throws InvocationTargetException, IllegalAccessException {
+ UpdateNotificationResponseStatus updateNotificationResponseStatus = new UpdateNotificationResponseStatus();
try {
notificationsService.updateLastSeenNotification(user, UUID.fromString(notificationId));
} catch (Exception ex) {
- LOGGER.error(
- String.format(Messages.FAILED_TO_UPDATE_LAST_SEEN_NOTIFICATION.getErrorMessage(),
- user), ex);
+ LOGGER.error(String.format(Messages.FAILED_TO_UPDATE_LAST_SEEN_NOTIFICATION.getErrorMessage(), user), ex);
updateNotificationResponseStatus.addStructureError(notificationId,
- new ErrorMessage(ErrorLevel.ERROR,
- Messages.FAILED_TO_UPDATE_LAST_SEEN_NOTIFICATION.getErrorMessage()));
+ new ErrorMessage(ErrorLevel.ERROR, Messages.FAILED_TO_UPDATE_LAST_SEEN_NOTIFICATION.getErrorMessage()));
}
return Response.ok(updateNotificationResponseStatus).build();
}
@Override
- public Response markAsRead(String notificationId, String user)
- throws InvocationTargetException, IllegalAccessException {
-
- UpdateNotificationResponseStatus
- updateNotificationResponseStatus = new UpdateNotificationResponseStatus();
+ public Response markAsRead(String notificationId, String user) throws InvocationTargetException, IllegalAccessException {
+ UpdateNotificationResponseStatus updateNotificationResponseStatus = new UpdateNotificationResponseStatus();
try {
notificationsService.markAsRead(user, notificationId);
} catch (NotificationNotExistException ex) {
LOGGER.error(Messages.FAILED_TO_MARK_NOTIFICATION_AS_READ.getErrorMessage(), ex);
- updateNotificationResponseStatus.addStructureError(
- notificationId, new ErrorMessage(ErrorLevel.ERROR, Messages
- .FAILED_TO_MARK_NOTIFICATION_AS_READ
- .getErrorMessage()));
+ updateNotificationResponseStatus.addStructureError(notificationId,
+ new ErrorMessage(ErrorLevel.ERROR, Messages.FAILED_TO_MARK_NOTIFICATION_AS_READ.getErrorMessage()));
}
return Response.ok(updateNotificationResponseStatus).build();
}
@@ -109,24 +94,18 @@ public class NotificationsImpl implements Notifications {
@Override
public Response getNewNotificationsByOwnerId(String user, String eventId, String limitStr) {
int limit = selectionLimit;
-
if (Objects.nonNull(limitStr)) {
try {
limit = Integer.parseInt(limitStr);
- }
- catch (NumberFormatException f) {
+ } catch (NumberFormatException f) {
LOGGER.error("Non numeric selection list size value specified: " + limitStr);
}
}
-
- List<NotificationEntity> notifications = Objects.isNull(eventId)
- ? notificationsService.getNotificationsByOwnerId(user, limit)
+ List<NotificationEntity> notifications = Objects.isNull(eventId) ? notificationsService.getNotificationsByOwnerId(user, limit)
: notificationsService.getNewNotificationsByOwnerId(user, UUID.fromString(eventId), limit);
-
MapNotificationsToDto converter = new MapNotificationsToDto();
NotificationsStatusDto notificationsStatusDto = new NotificationsStatusDto();
converter.doMapping(notifications, notificationsStatusDto);
-
return Response.ok(notificationsStatusDto).build();
}
}