diff options
Diffstat (limited to 'cmso-ticketmgt')
6 files changed, 3 insertions, 236 deletions
diff --git a/cmso-ticketmgt/data/a.json b/cmso-ticketmgt/data/a.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/cmso-ticketmgt/data/a.json @@ -0,0 +1 @@ +{} diff --git a/cmso-ticketmgt/pom.xml b/cmso-ticketmgt/pom.xml index 2012bfb..278ee01 100644 --- a/cmso-ticketmgt/pom.xml +++ b/cmso-ticketmgt/pom.xml @@ -27,7 +27,7 @@ <packaging>jar</packaging> - <name>cmso</name> + <name>cmso-ticketmgt</name> <properties> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> @@ -155,10 +155,6 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> </dependency> <dependency> @@ -378,7 +374,7 @@ <apiVersion>1.23</apiVersion> <images> <image> - <name>onap/optf-cmso-tciketmgt</name> + <name>onap/optf-cmso-ticketmgt</name> <alias>onap-optf-cmso-tciketmgt</alias> <build> <cleanup>true</cleanup> diff --git a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/AuthProviderTest.java b/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/AuthProviderTest.java deleted file mode 100644 index ad24e4f..0000000 --- a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/AuthProviderTest.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright © 2019 IBM Intellectual Property. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.onap.optf.cmso; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; -import org.onap.optf.ticketmgt.AuthProvider; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -@RunWith(MockitoJUnitRunner.class) -public class AuthProviderTest { - - @Test - public void authenticate() { - String principal = "testName"; - String credential = "testPassword"; - Authentication authentication = mock(Authentication.class); - when(authentication.getName()).thenReturn(principal); - when(authentication.getCredentials()).thenReturn(credential); - AuthProvider authProvider = new AuthProvider(); - Authentication auth = authProvider.authenticate(authentication); - assertEquals(principal, auth.getPrincipal()); - assertEquals(credential, auth.getCredentials()); - } - - @Test - public void supports() { - AuthProvider authProvider = new AuthProvider(); - assertTrue(authProvider.supports(UsernamePasswordAuthenticationToken.class)); - assertFalse(authProvider.supports(Authentication.class)); - } -}
\ No newline at end of file diff --git a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/JtestHelper.java b/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/JtestHelper.java deleted file mode 100644 index eb013a6..0000000 --- a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/JtestHelper.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright © 2017-2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.onap.optf.cmso; - -import java.io.File; -import java.io.FileNotFoundException; -import java.util.Map; -import java.util.Scanner; -import org.apache.commons.lang3.text.StrSubstitutor; - -public class JtestHelper { - private static String templatefolder = "src/test/templates" + File.separator; - - public static String template(String filename, Map<String, String> values) { - String data = ""; - Scanner s = null; - try { - File t = new File(templatefolder + filename); - s = new Scanner(t); - s.useDelimiter("\\Z"); - data = s.next(); - StrSubstitutor ss = new StrSubstitutor(values); - data = ss.replace(data); - } catch (FileNotFoundException e) { - data = ""; - } finally { - if (s != null) - s.close(); - } - return data; - } -} diff --git a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java b/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java deleted file mode 100644 index cb5f9df..0000000 --- a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright © 2017-2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.onap.optf.cmso.service.rs; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; - -public class MockHttpServletRequest { - public StringBuffer url = new StringBuffer("http://localhost:8089/cmso/v1/ChangeManagement/schedules/"); - public HttpServletRequest request = mock(HttpServletRequest.class); - - MockHttpServletRequest() { - - when(request.getRequestURL()).thenReturn(url); - when(request.getHeader("Authorization")).thenReturn("BasicbTEzODc3OnNjaGVkdWxlci1SMTgwMiE="); - - } - -} diff --git a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java b/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java deleted file mode 100644 index e5a4ee3..0000000 --- a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright © 2017-2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.onap.optf.cmso.utilities; - -import org.onap.optf.cmso.common.PropertiesManagement; - -public class PropertiesAdmin { - public static void main(String[] args) { - PropertiesManagement pm = new PropertiesManagement(); - if (args.length < 1) { - System.out.println("Missing argument"); - return; - } - String value = ""; - if (args[0].startsWith("dec:")) { - value = PropertiesManagement.getDecryptedValue(args[0].substring(4)); - } else { - value = pm.getEncryptedValue(args[0]); - } - System.out.println(args[0] + " : " + value); - } - -} |