summaryrefslogtreecommitdiffstats
path: root/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src')
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionAuthenticationFilter.java11
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionAuthorizationFilter.java8
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/filters/ActionLibraryPrivilege.java22
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/DefaultOutput.java3
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/EmptyOutputOutInterceptor.java4
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/InternalEmptyObject.java3
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml24
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/web.xml102
8 files changed, 111 insertions, 66 deletions
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">
+
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
@@ -30,11 +31,27 @@
<!-- ASDC -->
<bean id="vendorLicenseManager" class="org.openecomp.sdc.vendorlicense.impl.VendorLicenseManagerImpl"/>
- <bean id="vendorSoftwareProductManager" class="org.openecomp.sdc.vendorsoftwareproduct.impl.VendorSoftwareProductManagerImpl"/>
- <bean id="UploadValidationManager" class="org.openecomp.sdc.validation.impl.UploadValidationManagerImpl"/>
+ <bean id="uploadValidationManager" class="org.openecomp.sdc.validation.impl.UploadValidationManagerImpl"/>
<bean id="actionManager" class="org.openecomp.sdc.action.impl.ActionManagerImpl"/>
<bean id="applicationConfigManager" class="org.openecomp.sdc.applicationconfig.impl.ApplicationConfigManagerImpl"/>
+ <!-- aspect beans -->
+ <bean id = "debugAspect" class="org.openecomp.sdc.logging.aspects.DebugAspect"/>
+
+ <!--aop:config>
+ < aspect pointcuts>
+ <aop:pointcut id="loggingDebugPointcut" expression="execution(* org.openecomp.sdc.*.*.*(..))"/>
+
+ <advices>
+ <aop:aspect id="logDebugAspect" ref="debugAspect">
+ <aop:before pointcut-ref="loggingDebugPointcut" method="debugEnterMethod"/>
+ <aop:after-returning pointcut-ref="loggingDebugPointcut" method="debugExitMethod"/>
+ </aop:aspect>
+ </aop:config-->
+
+
+
+
<!-- RESTful Services -->
<jaxrs:server id="restContainer" address="/">
@@ -54,6 +71,9 @@
<ref bean="actions"/>
<ref bean="applicationConfiguration"/>
<ref bean="componentUploads"/>
+ <ref bean="orchestrationTemplateCandidate"/>
+ <ref bean="componentDependencyModel"/>
+ <ref bean="activityLog"/>
</jaxrs:serviceBeans>
<jaxrs:providers>
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 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
+<web-app
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ version="3.0">
-<web-app>
+ <!-- Spring -->
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>WEB-INF/beans-services.xml</param-value>
+ </context-param>
- <!-- Spring -->
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>WEB-INF/beans-services.xml</param-value>
- </context-param>
-
- <listener>
- <listener-class>org.openecomp.server.listeners.OnboardingAppStartupListener</listener-class>
- </listener>
+ <listener>
+ <listener-class>org.openecomp.server.listeners.OnboardingAppStartupListener</listener-class>
+ </listener>
<filter>
<filter-name>cross-origin</filter-name>
@@ -55,41 +55,49 @@
</filter-mapping>
<filter>
<filter-name>LoggingServletFilter</filter-name>
- <filter-class>org.openecomp.core.logging.servlet.LoggingFilter</filter-class>
+ <filter-class>org.openecomp.sdc.logging.servlet.LoggingFilter</filter-class>
</filter>
- <filter-mapping>
- <filter-name>LoggingServletFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <!-- CXF -->
- <servlet>
- <servlet-name>CXFServlet</servlet-name>
- <display-name>CXF Servlet</display-name>
- <servlet-class>
- org.apache.cxf.transport.servlet.CXFServlet
- </servlet-class>
- <init-param>
- <param-name>redirects-list</param-name>
- <param-value>
- /docs/(\S)+\.json
- </param-value>
- </init-param>
- <init-param>
- <param-name>redirect-attributes</param-name>
- <param-value>
- javax.servlet.include.request_uri
- </param-value>
- </init-param>
- <init-param>
- <param-name>redirect-servlet-name</param-name>
- <param-value>default</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>CXFServlet</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
+ <filter-mapping>
+ <filter-name>LoggingServletFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <!-- CXF -->
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <display-name>CXF Servlet</display-name>
+ <servlet-class>
+ org.apache.cxf.transport.servlet.CXFServlet
+ </servlet-class>
+ <init-param>
+ <param-name>redirects-list</param-name>
+ <param-value>
+ /docs/(\S)+\.json
+ </param-value>
+ </init-param>
+ <init-param>
+ <param-name>redirect-attributes</param-name>
+ <param-value>
+ javax.servlet.include.request_uri
+ </param-value>
+ </init-param>
+ <init-param>
+ <param-name>redirect-servlet-name</param-name>
+ <param-value>default</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <!--servlet-name>logger-aspect</servlet-name-->
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+ <!--servlet>
+ <servlet-name>logger-aspect</servlet-name>
+ <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+ <load-on-startup>2</load-on-startup>
+ </servlet-->
+
+
</web-app>