From 00806c85382e00defabf71c0d762b16375de4499 Mon Sep 17 00:00:00 2001 From: "Kishore Reddy, Gujja (kg811t)" Date: Tue, 29 May 2018 16:27:56 -0400 Subject: Nullpointer fixes in AAF jar Issue-ID: PORTAL-281 AAF module fix Change-Id: I7b06bd8b7879df23ada141df38ec17a2a4833687 Signed-off-by: Kishore Reddy, Gujja (kg811t) --- .../portalsdk/external/authorization/service/UserApiServiceImpl.java | 2 -- .../main/java/org/onap/portalapp/music/conf/MusicSessionRepository.java | 2 +- .../org/onap/portalapp/music/filter/MusicSessionRepositoryFilter.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/UserApiServiceImpl.java b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/UserApiServiceImpl.java index 32a7421f..38abcacc 100644 --- a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/UserApiServiceImpl.java +++ b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/UserApiServiceImpl.java @@ -71,7 +71,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.ObjectMapper; @@ -104,7 +103,6 @@ public class UserApiServiceImpl implements UserApiService { private AppService appService; @Override - @Transactional public User getUser(String orgUserId, HttpServletRequest request) throws UserNotFoundException { User user = null; diff --git a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepository.java b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepository.java index 4bebfc2b..f2f8fee5 100644 --- a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepository.java +++ b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepository.java @@ -38,8 +38,8 @@ package org.onap.portalapp.music.conf; import java.time.Duration; -import java.util.Map; +import org.springframework.session.MapSession; import org.springframework.session.Session; import org.springframework.session.SessionRepository; import org.springframework.session.events.SessionDeletedEvent; diff --git a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/filter/MusicSessionRepositoryFilter.java b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/filter/MusicSessionRepositoryFilter.java index 7959405b..15ae3494 100644 --- a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/filter/MusicSessionRepositoryFilter.java +++ b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/filter/MusicSessionRepositoryFilter.java @@ -2,7 +2,7 @@ * ============LICENSE_START========================================== * ONAP Portal SDK * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed -- cgit 1.2.3-korg