diff options
18 files changed, 1123 insertions, 979 deletions
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 60a10084cd..664f22ce34 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -234,7 +234,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> <scope>provided</scope> </dependency> diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java index 94e040e2a3..f01ff0db4c 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java @@ -1,20 +1,25 @@ package org.openecomp.sdc.be.ecomp; import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.security.Principal; +import java.util.Collection; import java.util.Enumeration; import java.util.List; import java.util.Locale; import java.util.Map; - +import javax.servlet.AsyncContext; +import javax.servlet.DispatcherType; import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; import javax.servlet.ServletInputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; - +import javax.servlet.http.HttpUpgradeHandler; +import javax.servlet.http.Part; import org.junit.Test; import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException; import org.openecomp.portalsdk.core.restful.domain.EcompRole; @@ -22,431 +27,518 @@ import org.openecomp.portalsdk.core.restful.domain.EcompUser; public class EcompIntImplTest { - private EcompIntImpl createTestSubject() { - return new EcompIntImpl(); - } - - @Test(expected=PortalAPIException.class) - public void testPushUser() throws Exception { - EcompIntImpl testSubject; - EcompUser user = null; - - // default test - testSubject = createTestSubject(); - testSubject.pushUser(user); - } - - @Test(expected=PortalAPIException.class) - public void testEditUser() throws Exception { - EcompIntImpl testSubject; - String loginId = ""; - EcompUser user = null; - - // default test - testSubject = createTestSubject(); - testSubject.editUser(loginId, user); - } - - @Test(expected=PortalAPIException.class) - public void testGetUser() throws Exception { - EcompIntImpl testSubject; - String loginId = ""; - EcompUser result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getUser(loginId); - } - - @Test(expected=PortalAPIException.class) - public void testGetUsers() throws Exception { - EcompIntImpl testSubject; - List<EcompUser> result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getUsers(); - } - - @Test - public void testGetAvailableRoles() throws Exception { - EcompIntImpl testSubject; - List<EcompRole> result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getAvailableRoles(); - } - - /*@Test - public void testPushUserRole() throws Exception { - EcompIntImpl testSubject; - String loginId = ""; - List<EcompRole> roles = null; - - // test 1 - testSubject = createTestSubject(); - roles = null; - testSubject.pushUserRole(loginId, roles); - }*/ - - @Test(expected=PortalAPIException.class) - public void testGetUserRoles() throws Exception { - EcompIntImpl testSubject; - String loginId = ""; - List<EcompRole> result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getUserRoles(loginId); - } - - @Test - public void testIsAppAuthenticated() throws Exception { - EcompIntImpl testSubject; - boolean result; - HttpServletRequestImpl httpServletRequestImpl = new HttpServletRequestImpl(); - // default test - testSubject = createTestSubject(); - result = testSubject.isAppAuthenticated(httpServletRequestImpl); - } - - @Test - public void testGetUserId() throws Exception { - EcompIntImpl testSubject; - HttpServletRequestImpl httpServletRequestImpl = new HttpServletRequestImpl(); - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getUserId(httpServletRequestImpl); - } - - private class HttpServletRequestImpl implements HttpServletRequest { - - @Override - public Object getAttribute(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getAttributeNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getCharacterEncoding() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setCharacterEncoding(String env) throws UnsupportedEncodingException { - // TODO Auto-generated method stub - - } - - @Override - public int getContentLength() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getContentType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ServletInputStream getInputStream() throws IOException { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getParameter(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getParameterNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String[] getParameterValues(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Map getParameterMap() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getProtocol() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getScheme() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getServerName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getServerPort() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public BufferedReader getReader() throws IOException { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRemoteAddr() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRemoteHost() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setAttribute(String name, Object o) { - // TODO Auto-generated method stub - - } - - @Override - public void removeAttribute(String name) { - // TODO Auto-generated method stub - - } - - @Override - public Locale getLocale() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getLocales() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isSecure() { - // TODO Auto-generated method stub - return false; - } - - @Override - public RequestDispatcher getRequestDispatcher(String path) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRealPath(String path) { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getRemotePort() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getLocalName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getLocalAddr() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getLocalPort() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getAuthType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Cookie[] getCookies() { - // TODO Auto-generated method stub - return null; - } - - @Override - public long getDateHeader(String name) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getHeader(String name) { - // TODO Auto-generated method stub - return "mock"; - } - - @Override - public Enumeration getHeaders(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getHeaderNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getIntHeader(String name) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getMethod() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getPathInfo() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getPathTranslated() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getContextPath() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getQueryString() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRemoteUser() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isUserInRole(String role) { - // TODO Auto-generated method stub - return false; - } - - @Override - public Principal getUserPrincipal() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRequestedSessionId() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRequestURI() { - // TODO Auto-generated method stub - return null; - } - - @Override - public StringBuffer getRequestURL() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getServletPath() { - // TODO Auto-generated method stub - return null; - } - - @Override - public HttpSession getSession(boolean create) { - // TODO Auto-generated method stub - return null; - } - - @Override - public HttpSession getSession() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isRequestedSessionIdValid() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isRequestedSessionIdFromCookie() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isRequestedSessionIdFromURL() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isRequestedSessionIdFromUrl() { - // TODO Auto-generated method stub - return false; - } - - } + private EcompIntImpl createTestSubject() { + return new EcompIntImpl(); + } + + @Test(expected=PortalAPIException.class) + public void testPushUser() throws Exception { + EcompIntImpl testSubject; + EcompUser user = null; + + // default test + testSubject = createTestSubject(); + testSubject.pushUser(user); + } + + @Test(expected=PortalAPIException.class) + public void testEditUser() throws Exception { + EcompIntImpl testSubject; + String loginId = ""; + EcompUser user = null; + + // default test + testSubject = createTestSubject(); + testSubject.editUser(loginId, user); + } + + @Test(expected=PortalAPIException.class) + public void testGetUser() throws Exception { + EcompIntImpl testSubject; + String loginId = ""; + EcompUser result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUser(loginId); + } + + @Test(expected=PortalAPIException.class) + public void testGetUsers() throws Exception { + EcompIntImpl testSubject; + List<EcompUser> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUsers(); + } + + @Test + public void testGetAvailableRoles() throws Exception { + EcompIntImpl testSubject; + List<EcompRole> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getAvailableRoles(); + } + + /*@Test + public void testPushUserRole() throws Exception { + EcompIntImpl testSubject; + String loginId = ""; + List<EcompRole> roles = null; + + // test 1 + testSubject = createTestSubject(); + roles = null; + testSubject.pushUserRole(loginId, roles); + }*/ + + @Test(expected=PortalAPIException.class) + public void testGetUserRoles() throws Exception { + EcompIntImpl testSubject; + String loginId = ""; + List<EcompRole> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUserRoles(loginId); + } + + @Test + public void testIsAppAuthenticated() throws Exception { + EcompIntImpl testSubject; + boolean result; + HttpServletRequestImpl httpServletRequestImpl = new HttpServletRequestImpl(); + // default test + testSubject = createTestSubject(); + result = testSubject.isAppAuthenticated(httpServletRequestImpl); + } + + @Test + public void testGetUserId() throws Exception { + EcompIntImpl testSubject; + HttpServletRequestImpl httpServletRequestImpl = new HttpServletRequestImpl(); + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUserId(httpServletRequestImpl); + } + + private class HttpServletRequestImpl implements HttpServletRequest { + + @Override + public Object getAttribute(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration<String> getAttributeNames() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getCharacterEncoding() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setCharacterEncoding(String env) { + // TODO Auto-generated method stub + + } + + @Override + public int getContentLength() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public long getContentLengthLong() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getContentType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ServletInputStream getInputStream() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getParameter(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration<String> getParameterNames() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String[] getParameterValues(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Map<String, String[]> getParameterMap() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getProtocol() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getScheme() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getServerName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getServerPort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public BufferedReader getReader() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRemoteAddr() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRemoteHost() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setAttribute(String name, Object o) { + // TODO Auto-generated method stub + + } + + @Override + public void removeAttribute(String name) { + // TODO Auto-generated method stub + + } + + @Override + public Locale getLocale() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration<Locale> getLocales() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isSecure() { + // TODO Auto-generated method stub + return false; + } + + @Override + public RequestDispatcher getRequestDispatcher(String path) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRealPath(String path) { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getRemotePort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getLocalName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getLocalAddr() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getLocalPort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public ServletContext getServletContext() { + // TODO Auto-generated method stub + return null; + } + + @Override + public AsyncContext startAsync() { + // TODO Auto-generated method stub + return null; + } + + @Override + public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isAsyncStarted() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isAsyncSupported() { + // TODO Auto-generated method stub + return false; + } + + @Override + public AsyncContext getAsyncContext() { + // TODO Auto-generated method stub + return null; + } + + @Override + public DispatcherType getDispatcherType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getAuthType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Cookie[] getCookies() { + // TODO Auto-generated method stub + return null; + } + + @Override + public long getDateHeader(String name) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getHeader(String name) { + // TODO Auto-generated method stub + return "mock"; + } + + @Override + public Enumeration<String> getHeaders(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration<String> getHeaderNames() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getIntHeader(String name) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getMethod() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getPathInfo() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getPathTranslated() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getContextPath() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getQueryString() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRemoteUser() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isUserInRole(String role) { + // TODO Auto-generated method stub + return false; + } + + @Override + public Principal getUserPrincipal() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRequestedSessionId() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRequestURI() { + // TODO Auto-generated method stub + return null; + } + + @Override + public StringBuffer getRequestURL() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getServletPath() { + // TODO Auto-generated method stub + return null; + } + + @Override + public HttpSession getSession(boolean create) { + // TODO Auto-generated method stub + return null; + } + + @Override + public HttpSession getSession() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String changeSessionId() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isRequestedSessionIdValid() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isRequestedSessionIdFromCookie() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isRequestedSessionIdFromURL() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isRequestedSessionIdFromUrl() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean authenticate(HttpServletResponse httpServletResponse) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void login(String s, String s1) { + // TODO Auto-generated method stub + } + + @Override + public void logout() { + // TODO Auto-generated method stub + } + + @Override + public Collection<Part> getParts() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Part getPart(String s) { + // TODO Auto-generated method stub + return null; + } + + @Override + public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) { + // TODO Auto-generated method stub + return null; + } + } }
\ No newline at end of file diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index aac08505cb..f90e5dc886 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -178,7 +178,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> <scope>provided</scope> </dependency> diff --git a/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HttpRequestInfoTest.java b/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HttpRequestInfoTest.java index dd03cf6091..c7a44c564e 100644 --- a/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HttpRequestInfoTest.java +++ b/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HttpRequestInfoTest.java @@ -5,432 +5,510 @@ import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.security.Principal; +import java.util.Collection; import java.util.Enumeration; import java.util.Locale; import java.util.Map; - +import javax.servlet.AsyncContext; +import javax.servlet.DispatcherType; import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; import javax.servlet.ServletInputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; - +import javax.servlet.http.Part; import org.junit.Test; public class HttpRequestInfoTest { - private HttpRequestInfo createTestSubject() { - return new HttpRequestInfo(new HttpServletRequestTest(), null, ""); - } - - @Test - public void testGetHeaders() throws Exception { - HttpRequestInfo testSubject; - Map<String, String> result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getHeaders(); - } - - @Test - public void testSetHeaders() throws Exception { - HttpRequestInfo testSubject; - Map<String, String> headers = null; - - // default test - testSubject = createTestSubject(); - testSubject.setHeaders(headers); - } - - @Test - public void testGetRequestURL() throws Exception { - HttpRequestInfo testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getRequestURL(); - } - - @Test - public void testSetRequestURL() throws Exception { - HttpRequestInfo testSubject; - String requestURL = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setRequestURL(requestURL); - } - - @Test - public void testGetRequestData() throws Exception { - HttpRequestInfo testSubject; - InputStream result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getRequestData(); - } - - @Test - public void testSetRequestData() throws Exception { - HttpRequestInfo testSubject; - InputStream requestData = null; - - // default test - testSubject = createTestSubject(); - testSubject.setRequestData(requestData); - } - - @Test - public void testGetOriginServletContext() throws Exception { - HttpRequestInfo testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getOriginServletContext(); - } - - @Test - public void testSetOriginServletContext() throws Exception { - HttpRequestInfo testSubject; - String originServletContext = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setOriginServletContext(originServletContext); - } - - private class HttpServletRequestTest implements HttpServletRequest{ - - private HttpServletRequestTest() { - - } - @Override - public Object getAttribute(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getAttributeNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getCharacterEncoding() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setCharacterEncoding(String env) throws UnsupportedEncodingException { - // TODO Auto-generated method stub - - } - - @Override - public int getContentLength() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getContentType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ServletInputStream getInputStream() throws IOException { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getParameter(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getParameterNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String[] getParameterValues(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Map getParameterMap() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getProtocol() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getScheme() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getServerName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getServerPort() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public BufferedReader getReader() throws IOException { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRemoteAddr() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRemoteHost() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setAttribute(String name, Object o) { - // TODO Auto-generated method stub - - } - - @Override - public void removeAttribute(String name) { - // TODO Auto-generated method stub - - } - - @Override - public Locale getLocale() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getLocales() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isSecure() { - // TODO Auto-generated method stub - return false; - } - - @Override - public RequestDispatcher getRequestDispatcher(String path) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRealPath(String path) { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getRemotePort() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getLocalName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getLocalAddr() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getLocalPort() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getAuthType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Cookie[] getCookies() { - // TODO Auto-generated method stub - return null; - } - - @Override - public long getDateHeader(String name) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getHeader(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getHeaders(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration getHeaderNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getIntHeader(String name) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getMethod() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getPathInfo() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getPathTranslated() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getContextPath() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getQueryString() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRemoteUser() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isUserInRole(String role) { - // TODO Auto-generated method stub - return false; - } - - @Override - public Principal getUserPrincipal() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRequestedSessionId() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRequestURI() { - // TODO Auto-generated method stub - return null; - } - - @Override - public StringBuffer getRequestURL() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getServletPath() { - // TODO Auto-generated method stub - return null; - } - - @Override - public HttpSession getSession(boolean create) { - // TODO Auto-generated method stub - return null; - } - - @Override - public HttpSession getSession() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isRequestedSessionIdValid() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isRequestedSessionIdFromCookie() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isRequestedSessionIdFromURL() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isRequestedSessionIdFromUrl() { - // TODO Auto-generated method stub - return false; - } - - } + private HttpRequestInfo createTestSubject() { + return new HttpRequestInfo(new HttpServletRequestTest(), null, ""); + } + + @Test + public void testGetHeaders() { + HttpRequestInfo testSubject; + Map<String, String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getHeaders(); + } + + @Test + public void testSetHeaders() { + HttpRequestInfo testSubject; + Map<String, String> headers = null; + + // default test + testSubject = createTestSubject(); + testSubject.setHeaders(headers); + } + + @Test + public void testGetRequestURL() { + HttpRequestInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getRequestURL(); + } + + @Test + public void testSetRequestURL() { + HttpRequestInfo testSubject; + String requestURL = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setRequestURL(requestURL); + } + + @Test + public void testGetRequestData() throws IOException { + HttpRequestInfo testSubject; + + // default test + testSubject = createTestSubject(); + InputStream result = testSubject.getRequestData(); + if (result != null) { + result.close(); + } + } + + @Test + public void testSetRequestData() { + HttpRequestInfo testSubject; + InputStream requestData = null; + + // default test + testSubject = createTestSubject(); + testSubject.setRequestData(requestData); + } + + @Test + public void testGetOriginServletContext() { + HttpRequestInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getOriginServletContext(); + } + + @Test + public void testSetOriginServletContext() { + HttpRequestInfo testSubject; + String originServletContext = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setOriginServletContext(originServletContext); + } + + private class HttpServletRequestTest implements HttpServletRequest { + + private HttpServletRequestTest() { + + } + @Override + public Object getAttribute(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration getAttributeNames() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getCharacterEncoding() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setCharacterEncoding(String env) { + // TODO Auto-generated method stub + + } + + @Override + public int getContentLength() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getContentType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ServletInputStream getInputStream() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getParameter(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration getParameterNames() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String[] getParameterValues(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Map getParameterMap() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getProtocol() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getScheme() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getServerName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getServerPort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public BufferedReader getReader() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRemoteAddr() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRemoteHost() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setAttribute(String name, Object o) { + // TODO Auto-generated method stub + + } + + @Override + public void removeAttribute(String name) { + // TODO Auto-generated method stub + + } + + @Override + public Locale getLocale() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration getLocales() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isSecure() { + // TODO Auto-generated method stub + return false; + } + + @Override + public RequestDispatcher getRequestDispatcher(String path) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRealPath(String path) { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getRemotePort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getLocalName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getLocalAddr() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getLocalPort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public ServletContext getServletContext() { + // TODO Auto-generated method stub + return null; + } + + @Override + public AsyncContext startAsync() { + // TODO Auto-generated method stub + return null; + } + + @Override + public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isAsyncStarted() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isAsyncSupported() { + // TODO Auto-generated method stub + return false; + } + + @Override + public AsyncContext getAsyncContext() { + // TODO Auto-generated method stub + return null; + } + + @Override + public DispatcherType getDispatcherType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getAuthType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Cookie[] getCookies() { + // TODO Auto-generated method stub + return null; + } + + @Override + public long getDateHeader(String name) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getHeader(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration getHeaders(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration getHeaderNames() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getIntHeader(String name) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getMethod() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getPathInfo() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getPathTranslated() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getContextPath() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getQueryString() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRemoteUser() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isUserInRole(String role) { + // TODO Auto-generated method stub + return false; + } + + @Override + public Principal getUserPrincipal() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRequestedSessionId() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRequestURI() { + // TODO Auto-generated method stub + return null; + } + + @Override + public StringBuffer getRequestURL() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getServletPath() { + // TODO Auto-generated method stub + return null; + } + + @Override + public HttpSession getSession(boolean create) { + // TODO Auto-generated method stub + return null; + } + + @Override + public HttpSession getSession() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isRequestedSessionIdValid() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isRequestedSessionIdFromCookie() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isRequestedSessionIdFromURL() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isRequestedSessionIdFromUrl() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean authenticate(HttpServletResponse httpServletResponse) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void login(String s, String s1) { + // TODO Auto-generated method stub + } + + @Override + public void logout() { + // TODO Auto-generated method stub + } + + @Override + public Collection<Part> getParts() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Part getPart(String s) { + // TODO Auto-generated method stub + return null; + } + + } }
\ No newline at end of file diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 1697ada724..357c6ba786 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -28,7 +28,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> <scope>provided</scope> </dependency> diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml index 9574c822e4..c4b896f1e3 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml @@ -92,8 +92,8 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - <optional>true</optional> + <version>${servlet-api.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/common/pom.xml b/common/pom.xml index eea619f9b5..f1f1a7394c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -104,8 +104,9 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet.version}</version> + <artifactId>javax.servlet-api</artifactId> + <version>${servlet-api.version}</version> + <scope>provided</scope> </dependency> <!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils --> <dependency> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml index 45707ded40..9ce5f45d7d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml @@ -72,16 +72,6 @@ <artifactId>javax.ws.rs-api</artifactId> <version>${ws.rs.version}</version> </dependency> - - <!-- Other Stuff--> - <!--dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <version>${cglib.nodep.version}</version> - <scope>runtime</scope> - </dependency--> - - <!-- Java Stuff --> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> @@ -114,6 +104,12 @@ <version>${jersey.multipart.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${servlet-api.version}</version> + <scope>provided</scope> + </dependency> </dependencies> </project> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml index ccf95f2075..12c68237dc 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml @@ -29,6 +29,7 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>${javax.servlet.version}</version> + <scope>provided</scope> </dependency> <!-- JSON --> <dependency> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index 1c9029b19f..310b5b5fbb 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml @@ -92,8 +92,9 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${javax.servlet.version}</version> + <artifactId>javax.servlet-api</artifactId> + <version>${servlet-api.version}</version> + <scope>provided</scope> </dependency> <!-- JSON --> <dependency> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml index 2bc7d67cb8..305e307fda 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml @@ -54,6 +54,7 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>${javax.servlet.version}</version> + <scope>provided</scope> </dependency> </dependencies> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml index 50574a0900..01233644a0 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml @@ -39,16 +39,6 @@ <artifactId>zusammen-collaboration-cassandra-plugin</artifactId> <version>${zusammen-collaboration-store.version}</version> <scope>runtime</scope> -<!-- <exclusions> - <exclusion> - <groupId>com.datastax.cassandra</groupId> - <artifactId>cassandra-driver-core</artifactId> - </exclusion> - <exclusion> - <groupId>com.datastax.cassandra</groupId> - <artifactId>cassandra-driver-mapping</artifactId> - </exclusion> - </exclusions>--> </dependency> <dependency> <groupId>com.amdocs.zusammen.plugin</groupId> @@ -73,11 +63,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - </dependency> - <dependency> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-nosqldb-core</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/CassandraConnectionInitializer.java b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/CassandraConnectionInitializer.java index 8eeeb1e27b..7944999a70 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/CassandraConnectionInitializer.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/CassandraConnectionInitializer.java @@ -16,85 +16,75 @@ package org.openecomp.core.zusammen.impl; +import java.util.function.Supplier; import org.apache.commons.lang3.StringUtils; - import org.openecomp.core.nosqldb.util.CassandraUtils; -import java.util.function.Supplier; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -public class CassandraConnectionInitializer implements ServletContextListener { - - private static final String CASSANDRA_PREFIX = "cassandra."; - private static final String DATA_CENTER_PROPERTY_NAME = CASSANDRA_PREFIX + "datacenter"; - private static final String CONSISTENCY_LEVEL_PROPERTY_NAME = - CASSANDRA_PREFIX + "consistency.level"; - private static final String NODES_PROPERTY_NAME = CASSANDRA_PREFIX + "nodes"; - private static final String AUTHENTICATE_PROPERTY_NAME = CASSANDRA_PREFIX + "authenticate"; - private static final String SSL_PROPERTY_NAME = CASSANDRA_PREFIX + "ssl"; - private static final String TRUSTSTORE_PROPERTY_NAME = CASSANDRA_PREFIX + "truststore"; - private static final String TRUSTSTORE_PASSWORD_PROPERTY_NAME = - CASSANDRA_PREFIX + "truststore.password"; - private static final String USER_PROPERTY_NAME = CASSANDRA_PREFIX + "user"; - private static final String PASSWORD_PROPERTY_NAME = CASSANDRA_PREFIX + "password"; - private static final String KEYSPACE_PROPERTY_NAME = CASSANDRA_PREFIX + "keyspace"; - private static final String ZUSAMMEN = "zusammen"; - - @Override - public void contextInitialized(ServletContextEvent servletContextEvent) { - setCassandraConnectionPropertiesToSystem(); - } - - public static void setCassandraConnectionPropertiesToSystem() { - DeferredInitializer.init(); - } - - @Override - public void contextDestroyed(ServletContextEvent servletContextEvent) { - // no-op, required by the interface - } - - private static class DeferredInitializer { - - static { - setSystemProperty(NODES_PROPERTY_NAME, () -> - StringUtils.join(CassandraUtils.getAddresses(), ',')); - setBooleanSystemProperty(AUTHENTICATE_PROPERTY_NAME, CassandraUtils::isAuthenticate); - setBooleanSystemProperty(SSL_PROPERTY_NAME, CassandraUtils::isSsl); - setSystemProperty(TRUSTSTORE_PROPERTY_NAME, CassandraUtils::getTruststore); - setSystemProperty(TRUSTSTORE_PASSWORD_PROPERTY_NAME, CassandraUtils::getTruststorePassword); - setSystemProperty(USER_PROPERTY_NAME, CassandraUtils::getUser); - setSystemProperty(PASSWORD_PROPERTY_NAME, CassandraUtils::getPassword); - setSystemProperty(KEYSPACE_PROPERTY_NAME, () -> ZUSAMMEN); - setNullableSystemProperty(DATA_CENTER_PROPERTY_NAME, CassandraUtils::getLocalDataCenter); - setNullableSystemProperty(CONSISTENCY_LEVEL_PROPERTY_NAME, - CassandraUtils::getConsistencyLevel); - } - - private static void setSystemProperty(String name, Supplier<String> valueSupplier) { - - if (System.getProperty(name) == null) { - System.setProperty(name, valueSupplier.get()); - } +public class CassandraConnectionInitializer { + + private static final String CASSANDRA_PREFIX = "cassandra."; + private static final String DATA_CENTER_PROPERTY_NAME = CASSANDRA_PREFIX + "datacenter"; + private static final String CONSISTENCY_LEVEL_PROPERTY_NAME = + CASSANDRA_PREFIX + "consistency.level"; + private static final String NODES_PROPERTY_NAME = CASSANDRA_PREFIX + "nodes"; + private static final String AUTHENTICATE_PROPERTY_NAME = CASSANDRA_PREFIX + "authenticate"; + private static final String SSL_PROPERTY_NAME = CASSANDRA_PREFIX + "ssl"; + private static final String TRUSTSTORE_PROPERTY_NAME = CASSANDRA_PREFIX + "truststore"; + private static final String TRUSTSTORE_PASSWORD_PROPERTY_NAME = + CASSANDRA_PREFIX + "truststore.password"; + private static final String USER_PROPERTY_NAME = CASSANDRA_PREFIX + "user"; + private static final String PASSWORD_PROPERTY_NAME = CASSANDRA_PREFIX + "password"; + private static final String KEYSPACE_PROPERTY_NAME = CASSANDRA_PREFIX + "keyspace"; + private static final String ZUSAMMEN = "zusammen"; + + private CassandraConnectionInitializer() { + // static utility class, prevent instantiation } - private static void setBooleanSystemProperty(String name, Supplier<Boolean> valueSupplier) { - setSystemProperty(name, () -> Boolean.toString(valueSupplier.get())); + public static void setCassandraConnectionPropertiesToSystem() { + DeferredInitializer.init(); } - private static void setNullableSystemProperty(String name, Supplier<String> valueSupplier) { - - if ((System.getProperty(name) == null) && (valueSupplier.get() != null)) { - System.setProperty(name, valueSupplier.get()); - } - } - - private DeferredInitializer() { } - - public static void init() { - // just to ensure static initialization + private static class DeferredInitializer { + + static { + setSystemProperty(NODES_PROPERTY_NAME, () -> + StringUtils.join(CassandraUtils.getAddresses(), ',')); + setBooleanSystemProperty(AUTHENTICATE_PROPERTY_NAME, CassandraUtils::isAuthenticate); + setBooleanSystemProperty(SSL_PROPERTY_NAME, CassandraUtils::isSsl); + setSystemProperty(TRUSTSTORE_PROPERTY_NAME, CassandraUtils::getTruststore); + setSystemProperty(TRUSTSTORE_PASSWORD_PROPERTY_NAME, CassandraUtils::getTruststorePassword); + setSystemProperty(USER_PROPERTY_NAME, CassandraUtils::getUser); + setSystemProperty(PASSWORD_PROPERTY_NAME, CassandraUtils::getPassword); + setSystemProperty(KEYSPACE_PROPERTY_NAME, () -> ZUSAMMEN); + setNullableSystemProperty(DATA_CENTER_PROPERTY_NAME, CassandraUtils::getLocalDataCenter); + setNullableSystemProperty(CONSISTENCY_LEVEL_PROPERTY_NAME, + CassandraUtils::getConsistencyLevel); + } + + private DeferredInitializer() { } + + @SuppressWarnings("EmptyMethod") + static void init() { + // no-op, just to ensure static initialization + } + + private static void setSystemProperty(String name, Supplier<String> valueSupplier) { + + if (System.getProperty(name) == null) { + System.setProperty(name, valueSupplier.get()); + } + } + + private static void setBooleanSystemProperty(String name, Supplier<Boolean> valueSupplier) { + setSystemProperty(name, () -> Boolean.toString(valueSupplier.get())); + } + + private static void setNullableSystemProperty(String name, Supplier<String> valueSupplier) { + + if ((System.getProperty(name) == null) && (valueSupplier.get() != null)) { + System.setProperty(name, valueSupplier.get()); + } + } } - } } diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml index 3b6027e36d..751b3a9be0 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml @@ -18,7 +18,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> <scope>provided</scope> </dependency> diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml index 1a269ff6b5..29efa616ab 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml @@ -22,7 +22,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> <scope>provided</scope> </dependency> diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index 432248853f..9e11c53806 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -1,18 +1,25 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <properties> + <artifactId>openecomp-zusammen-tools</artifactId> + <groupId>org.openecomp.sdc.core.tools</groupId> + <name>openecomp-zusammen-tools</name> + <version>1.3.0-SNAPSHOT</version> + + <parent> + <groupId>org.openecomp.sdc</groupId> + <artifactId>openecomp-sdc-lib</artifactId> + <relativePath>../../lib</relativePath> + <version>1.3.0-SNAPSHOT</version> + </parent> + <properties> <groovy.version>2.4.7</groovy.version> <janino.version>2.7.7</janino.version> - </properties> - - - <name>openecomp-zusammen-tools</name> <dependencies> <dependency> <groupId>org.openecomp.sdc</groupId> @@ -47,7 +54,7 @@ <dependency> <groupId>com.amdocs.zusammen.plugin</groupId> <artifactId>zusammen-state-store-cassandra-plugin</artifactId> - <version>${zusammen-state-store.version}</version> + <version>${zusammen-state-store.version}</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -76,20 +83,6 @@ <scope>test</scope> </dependency> </dependencies> - <artifactId>openecomp-zusammen-tools</artifactId> - <groupId>org.openecomp.sdc.core.tools</groupId> - <version>1.3.0-SNAPSHOT</version> - <parent> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-lib</artifactId> - <relativePath>../../lib</relativePath> - <version>1.3.0-SNAPSHOT</version> - </parent> - <!--parent> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc</artifactId> - <version>1.0-SNAPSHOT</version> - </parent--> <build> <plugins> @@ -29,7 +29,7 @@ <spring.security.version>3.2.3.RELEASE</spring.security.version> <spring.ldap.version>2.0.1.RELEASE</spring.ldap.version> <jersey-bom.version>2.26</jersey-bom.version> - <servlet-api.version>2.5</servlet-api.version> + <servlet-api.version>3.0.1</servlet-api.version> <wire-mock.version>2.11.0</wire-mock.version> <artifact-generator-api.version>${project.version}</artifact-generator-api.version> diff --git a/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml b/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml index f31fe49974..b5d34d3c7c 100644 --- a/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml +++ b/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml @@ -84,6 +84,12 @@ <scope>runtime</scope> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${servlet-api.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <scope>test</scope> |