From 280f8015d06af1f41a3ef12e8300801c7a5e0d54 Mon Sep 17 00:00:00 2001 From: AviZi Date: Fri, 9 Jun 2017 02:39:56 +0300 Subject: [SDC-29] Amdocs OnBoard 1707 initial commit. Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi --- .../server/filters/ActionAuthenticationFilter.java | 11 +-- .../server/filters/ActionAuthorizationFilter.java | 8 +- .../server/filters/ActionLibraryPrivilege.java | 22 ++++- .../server/interceptors/DefaultOutput.java | 3 + .../interceptors/EmptyOutputOutInterceptor.java | 4 + .../server/interceptors/InternalEmptyObject.java | 3 +- .../src/main/webapp/WEB-INF/beans-services.xml | 24 ++++- .../src/main/webapp/WEB-INF/web.xml | 102 +++++++++++---------- 8 files changed, 111 insertions(+), 66 deletions(-) (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main') diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionAuthenticationFilter.java b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionAuthenticationFilter.java index 6e9b4dbe25..e59d3fb3b8 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionAuthenticationFilter.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionAuthenticationFilter.java @@ -23,7 +23,6 @@ package org.openecomp.server.filters; import java.io.IOException; import java.security.Principal; import java.util.Base64; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -40,6 +39,7 @@ public class ActionAuthenticationFilter implements Filter { @Override public void destroy() { + // TODO Auto-generated method stub } @@ -57,7 +57,7 @@ public class ActionAuthenticationFilter implements Filter { httpRequest.getHeader("Authorization").replace("Basic", "").trim(); String decodedCredentials = new String(Base64.getDecoder().decode(base64Credentials)); username = decodedCredentials.substring(0, decodedCredentials.indexOf(":")); - } catch (Exception e0) { + } catch (Exception exception) { setResponseStatus((HttpServletResponse) arg1, HttpServletResponse.SC_FORBIDDEN); return; } @@ -81,7 +81,7 @@ public class ActionAuthenticationFilter implements Filter { ActionLibraryPrivilege userPrivilege = ActionLibraryPrivilege .valueOf(username.substring(username.indexOf("-") + 1).toUpperCase()); return userPrivilege.ordinal() >= requiredPrivilege.ordinal(); - } catch (Exception e0) { + } catch (Exception exception) { return false; } } @@ -106,10 +106,7 @@ public class ActionAuthenticationFilter implements Filter { @Override public void init(FilterConfig arg0) throws ServletException { - /*runningOnLocal = System.getProperty("file.separator").equals("\\"); - if (!runningOnLocal){ - // call to super init of cadi filter as we are not running on windows - }*/ + } } diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionAuthorizationFilter.java b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionAuthorizationFilter.java index ba9c7537f4..82e4fa80d9 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionAuthorizationFilter.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionAuthorizationFilter.java @@ -21,7 +21,6 @@ package org.openecomp.server.filters; import java.io.IOException; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -37,6 +36,8 @@ public class ActionAuthorizationFilter implements Filter { @Override public void destroy() { + // TODO Auto-generated method stub + } @Override @@ -62,10 +63,7 @@ public class ActionAuthorizationFilter implements Filter { @Override public void init(FilterConfig arg0) throws ServletException { - /*runningOnLocal = System.getProperty("file.separator").equals("\\"); - if (!runningOnLocal){ - // call to super init of cadi filter as we are not running on windows - }*/ + } } diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionLibraryPrivilege.java b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionLibraryPrivilege.java index c34af00830..6c8b1e8ca5 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionLibraryPrivilege.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionLibraryPrivilege.java @@ -20,14 +20,30 @@ package org.openecomp.server.filters; +/** + * The enum Action library privilege. + */ public enum ActionLibraryPrivilege { - RETRIEVE, CREATE, UPDATE, DELETE; + /** + * Retrieve action library privilege. + */ + RETRIEVE, /** + * Create action library privilege. + */ + CREATE, /** + * Update action library privilege. + */ + UPDATE, /** + * Delete action library privilege. + */ + DELETE; /** + * Gets privilege. * - * @param operation . - * @return actionLibraryPrivilege + * @param operation the operation + * @return the privilege */ public static ActionLibraryPrivilege getPrivilege(String operation) { diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/DefaultOutput.java b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/DefaultOutput.java index b2e1119a78..991a286a48 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/DefaultOutput.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/DefaultOutput.java @@ -20,6 +20,7 @@ package org.openecomp.server.interceptors; + import java.io.Serializable; import java.lang.annotation.Annotation; import java.net.URI; @@ -48,6 +49,7 @@ public class DefaultOutput extends Response implements Serializable { this.status = s0; this.entity = e0; } + public Object getEntity() { return entity; } @@ -141,6 +143,7 @@ public class DefaultOutput extends Response implements Serializable { return false; } + @Override public Link getLink(String s0) { return null; diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/EmptyOutputOutInterceptor.java b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/EmptyOutputOutInterceptor.java index 4e2f56834f..9c02d5a558 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/EmptyOutputOutInterceptor.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/EmptyOutputOutInterceptor.java @@ -29,6 +29,10 @@ import org.apache.cxf.phase.Phase; import javax.inject.Named; import javax.ws.rs.core.Response; + +/** + * The type Empty output out interceptor. + */ @Named public class EmptyOutputOutInterceptor extends AbstractOutDatabindingInterceptor { diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/InternalEmptyObject.java b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/InternalEmptyObject.java index d2b24bde77..903907fa78 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/InternalEmptyObject.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/InternalEmptyObject.java @@ -25,8 +25,7 @@ import org.codehaus.jackson.annotate.JsonAutoDetect; import java.io.Serializable; /** - * This class is for Internal use only. - * Please don't use this class. + * This class is for Internal use only. Please don't use this class. */ @JsonAutoDetect public class InternalEmptyObject implements Serializable { diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml index 5eb2b98cd5..609d69f9f8 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml @@ -7,6 +7,7 @@ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + @@ -30,11 +31,27 @@ - - + + + + + + + + + @@ -54,6 +71,9 @@ + + + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/web.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/web.xml index 68b7758609..08e8dd8ec8 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/web.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/web.xml @@ -1,20 +1,20 @@ - + - + + + contextConfigLocation + WEB-INF/beans-services.xml + - - - contextConfigLocation - WEB-INF/beans-services.xml - - - - org.openecomp.server.listeners.OnboardingAppStartupListener - + + org.openecomp.server.listeners.OnboardingAppStartupListener + cross-origin @@ -55,41 +55,49 @@ LoggingServletFilter - org.openecomp.core.logging.servlet.LoggingFilter + org.openecomp.sdc.logging.servlet.LoggingFilter - - LoggingServletFilter - /* - - - - CXFServlet - CXF Servlet - - org.apache.cxf.transport.servlet.CXFServlet - - - redirects-list - - /docs/(\S)+\.json - - - - redirect-attributes - - javax.servlet.include.request_uri - - - - redirect-servlet-name - default - - 1 - - - CXFServlet - /* - + + LoggingServletFilter + /* + + + + CXFServlet + CXF Servlet + + org.apache.cxf.transport.servlet.CXFServlet + + + redirects-list + + /docs/(\S)+\.json + + + + redirect-attributes + + javax.servlet.include.request_uri + + + + redirect-servlet-name + default + + 1 + + + + CXFServlet + /* + + + + -- cgit 1.2.3-korg