Repair centralized-role feature.

Also show ONAP logo in EPSDK-app header top left.

Issue: PORTAL-21, PORTAL-81
Change-Id: I46953123219d4f7a239ca6c5a05890a3769ed2ea
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 117 insertions, 102 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/AccessConfiguration.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/AccessConfiguration.java
index 6b00d3fb..04163d06 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/AccessConfiguration.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/AccessConfiguration.java
@@ -6,106 +6,121 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class AccessConfiguration {
-	   
-	
-	
-		/**
-		 * 
-		 * @return RoleServiceImpl bean if  LocalAccessCondition is true
-		 */
-	   @Bean
-	   @Conditional(LocalAccessCondition.class)
-	   public RoleService roleServiceImpl() {
-	      return  new RoleServiceImpl();
-	   }
-	   
-	   
-	   /**
-		 * 
-		 * @return RoleServiceCentralizedAccess bean if  CentralAccessCondition is true
-		 */
-	   @Bean
-	   @Conditional(CentralAccessCondition.class)
-	   public RoleService roleServiceCentralizedAccess() {
-	      return  new RoleServiceCentralizedAccess();
-	   }
-	   
-	   
-	   /**
-		 * 
-		 * @return LoginServiceImpl bean if  LocalAccessCondition is true
-		 */
-	   @Bean
-	   @Conditional(LocalAccessCondition.class)
-	   public LoginService loginServiceImpl() {
-	      return  new LoginServiceImpl();
-	   }
-	   
-	   
-	   /**
-		 * 
-		 * @return LoginServiceCentralizedImpl bean if  CentralAccessCondition is true
-		 */
-	   @Bean
-	   @Conditional(CentralAccessCondition.class)
-	   public LoginService loginServiceCEntralizedImpl() {
-	      return  new LoginServiceCentralizedImpl();
-	   }
-	   
-	   /**
-		 * 
-		 * @return UserProfileServiceImpl bean if  LocalAccessCondition is true
-	     */
-	   @Bean
-	   @Conditional(LocalAccessCondition.class)
-	   public UserService userServiceImpl() {
-	      return  new UserServiceImpl();
-	   }
-	   
-	   
-	   /**
-		 * 
-		 * @return returns UserProfileServiceCentalizedImpl bean if  CentralAccessCondition is true
-	     */
-	   @Bean
-	   @Conditional(CentralAccessCondition.class)
-	   public UserService userServiceCentalizedImpl() {
-	      return  new UserServiceCentalizedImpl();
-	   }
-	   
-	   
-
-	   /**
-		 * 
-		 * @return returns ProfileServiceImpl bean if  LocalAccessCondition is true
-	     */
-	   @Bean
-	   @Conditional(LocalAccessCondition.class)
-	   public ProfileService profileServiceImpl() {
-	      return  new ProfileServiceImpl();
-	   }
-	   
-	   
-	   /**
-		 * 
-		 * @return returns ProfileServiceCentralizedImpl bean if  CentralAccessCondition is true
-	     */
-	   
-	   @Bean
-	   @Conditional(CentralAccessCondition.class)
-	   public ProfileService profileServiceCentralizedImpl() {
-	      return  new ProfileServiceCentralizedImpl();
-	   }
-	   
-	   
-	   /**
-		 * 
-		 * @return returns RestApiRequestBuilder bean if  CentralAccessCondition is true
-	     */
-	   @Bean
-	   @Conditional(CentralAccessCondition.class)
-	   public RestApiRequestBuilder restApiRequestBuilder() {
-	      return  new RestApiRequestBuilder();
-	   }
-	  
+
+	/**
+	 * 
+	 * @return RoleServiceImpl bean if LocalAccessCondition is true
+	 */
+	@Bean
+	@Conditional(LocalAccessCondition.class)
+	public RoleService roleServiceImpl() {
+		return new RoleServiceImpl();
+	}
+
+	/**
+	 * 
+	 * @return RoleServiceCentralizedAccess bean if CentralAccessCondition is true
+	 */
+	@Bean
+	@Conditional(CentralAccessCondition.class)
+	public RoleService roleServiceCentralizedAccess() {
+		return new RoleServiceCentralizedAccess();
+	}
+
+	/**
+	 * 
+	 * @return LoginServiceImpl bean if LocalAccessCondition is true
+	 */
+	@Bean
+	@Conditional(LocalAccessCondition.class)
+	public LoginService loginServiceImpl() {
+		return new LoginServiceImpl();
+	}
+
+	/**
+	 * 
+	 * @return LoginServiceCentralizedImpl bean if CentralAccessCondition is true
+	 */
+	@Bean
+	@Conditional(CentralAccessCondition.class)
+	public LoginService loginServiceCEntralizedImpl() {
+		return new LoginServiceCentralizedImpl();
+	}
+
+	/**
+	 * 
+	 * @return UserProfileServiceImpl bean if LocalAccessCondition is true
+	 */
+	@Bean
+	@Conditional(LocalAccessCondition.class)
+	public UserService userServiceImpl() {
+		return new UserServiceImpl();
+	}
+
+	/**
+	 * 
+	 * @return returns UserProfileServiceCentalizedImpl bean if
+	 *         CentralAccessCondition is true
+	 */
+	@Bean
+	@Conditional(CentralAccessCondition.class)
+	public UserService userServiceCentalizedImpl() {
+		return new UserServiceCentalizedImpl();
+	}
+
+	/**
+	 * 
+	 * @return returns ProfileServiceImpl bean if LocalAccessCondition is true
+	 */
+	@Bean
+	@Conditional(LocalAccessCondition.class)
+	public ProfileService profileServiceImpl() {
+		return new ProfileServiceImpl();
+	}
+
+	/**
+	 * 
+	 * @return returns ProfileServiceCentralizedImpl bean if CentralAccessCondition
+	 *         is true
+	 */
+
+	@Bean
+	@Conditional(CentralAccessCondition.class)
+	public ProfileService profileServiceCentralizedImpl() {
+		return new ProfileServiceCentralizedImpl();
+	}
+
+	/**
+	 * 
+	 * @return returns RestApiRequestBuilder bean if CentralAccessCondition is true
+	 */
+	@Bean
+	@Conditional(CentralAccessCondition.class)
+	public RestApiRequestBuilder restApiRequestBuilder() {
+		return new RestApiRequestBuilder();
+	}
+
+	/**
+	 * 
+	 * @return returns FunctionalMenuListServiceImpl bean if LocalAccessCondition is
+	 *         true
+	 */
+	@Bean
+	@Conditional(LocalAccessCondition.class)
+	public FunctionalMenuListService functionalMenuListService() {
+		return new FunctionalMenuListServiceImpl();
+	}
+
+	/**
+	 * 
+	 * @return returns FunctionalMenuListServiceCentralizedImpl bean if
+	 *         CentralAccessCondition is true
+	 */
+
+	@Bean
+	@Conditional(CentralAccessCondition.class)
+	public FunctionalMenuListService functionalMenuListServiceCentralizedImpl() {
+		return new FunctionalMenuListServiceCentralizedImpl();
+	}
+
 }