From 3d1706fcbe7f95830ff6fd23cf679ee55c6d0595 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Wed, 7 Aug 2019 13:40:39 -0500 Subject: Remove Tabs, per Jococo Issue-ID: AAF-932 Change-Id: I3ab0ebcc082048d2d1424a58a90ea479fb005ee6 Signed-off-by: Instrumental --- .../java/org/onap/aaf/auth/locate/AAF_Locate.java | 24 ++-- .../aaf/auth/locate/service/LocateServiceImpl.java | 22 ++-- .../onap/aaf/auth/locate/JU_BasicAuthCodeTest.java | 96 +++++++-------- .../onap/aaf/auth/locate/api/JU_API_AAFTest.java | 64 +++++----- .../aaf/auth/locate/mapper/JU_Mapper_1_0Test.java | 46 +++---- .../locate/service/JU_LocateServiceImplTest.java | 132 ++++++++++----------- 6 files changed, 192 insertions(+), 192 deletions(-) (limited to 'auth/auth-locate') diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java index ebbeae6b..b481ff9a 100644 --- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java +++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java @@ -193,13 +193,13 @@ public class AAF_Locate extends AbsService { public Locator getGUILocator() throws LocatorException { if (gui_locator==null) { - RegistrationPropHolder rph; - try { - rph = new RegistrationPropHolder(access, 0); - } catch (UnknownHostException | CadiException e) { - throw new LocatorException(e); - } - String url = rph.getPublicEntryName("gui", rph.default_container); + RegistrationPropHolder rph; + try { + rph = new RegistrationPropHolder(access, 0); + } catch (UnknownHostException | CadiException e) { + throw new LocatorException(e); + } + String url = rph.getPublicEntryName("gui", rph.default_container); gui_locator = AbsAAFLocator.create(url,Config.AAF_DEFAULT_API_VERSION); } return gui_locator; @@ -243,11 +243,11 @@ public class AAF_Locate extends AbsService { try { new JettyServiceStarter( - new AAF_Locate(new AuthzEnv(propAccess)),true) - .start(); - } catch (Exception e) { - propAccess.log(e); - } + new AAF_Locate(new AuthzEnv(propAccess)),true) + .start(); + } catch (Exception e) { + propAccess.log(e); + } } catch (Exception e) { e.printStackTrace(); } diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java index 829335c0..e080e7ee 100644 --- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java +++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java @@ -77,10 +77,10 @@ public class LocateServiceImpl int dot = me.getName().lastIndexOf('.'); // Note: Validator checks for NS for getName() AAFPermission p = new AAFPermission(me.getName().substring(0,dot),"locator",me.getHostname(),"write"); if (!trans.fish(p)) { - if(denied==null) { - denied = new StringBuilder("May not register service(s):"); - } - + if(denied==null) { + denied = new StringBuilder("May not register service(s):"); + } + denied.append("\n\t"); denied.append(p.getKey()); denied.append(')'); @@ -95,7 +95,7 @@ public class LocateServiceImpl return Result.ok(); } else { return denied==null?Result.err(Result.ERR_NotFound, "No endpoints found") - :Result.err(Result.ERR_Security,denied.toString()); + :Result.err(Result.ERR_Security,denied.toString()); } } @@ -111,14 +111,14 @@ public class LocateServiceImpl int count = 0; StringBuilder denied = null; for (MgmtEndpoint me : meps.getMgmtEndpoint()) { - if (permToRegister) { + if (permToRegister) { int dot = me.getName().lastIndexOf('.'); // Note: Validator checks for NS for getName() AAFPermission p = new AAFPermission(me.getName().substring(0,dot),"locator",me.getHostname(),"write"); if (!trans.fish(p)) { - if(denied==null) { - denied = new StringBuilder("May not deregister service(s):"); - } - + if(denied==null) { + denied = new StringBuilder("May not deregister service(s):"); + } + denied.append("\n\t"); denied.append(p.getKey()); denied.append(')'); @@ -133,7 +133,7 @@ public class LocateServiceImpl return Result.ok(); } else { return denied==null?Result.err(Result.ERR_NotFound, "No endpoints found") - :Result.err(Result.ERR_Security,denied.toString()); + :Result.err(Result.ERR_Security,denied.toString()); } } diff --git a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/JU_BasicAuthCodeTest.java b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/JU_BasicAuthCodeTest.java index 31876fef..fa713094 100644 --- a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/JU_BasicAuthCodeTest.java +++ b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/JU_BasicAuthCodeTest.java @@ -41,74 +41,74 @@ import org.onap.aaf.cadi.principal.X509Principal; import org.onap.aaf.misc.env.LogTarget; public class JU_BasicAuthCodeTest { - @Mock - AAFAuthn authn; + @Mock + AAFAuthn authn; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - AuthzTrans trans; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + AuthzTrans trans; - @Mock - HttpServletRequest req; + @Mock + HttpServletRequest req; - @Mock - HttpServletResponse resp; + @Mock + HttpServletResponse resp; - @Mock - LogTarget error; + @Mock + LogTarget error; - @Mock - LocateFacade facade; + @Mock + LocateFacade facade; - @Mock - BasicPrincipal basicPrincipal; - @Mock - X509Principal x509Principal; + @Mock + BasicPrincipal basicPrincipal; + @Mock + X509Principal x509Principal; - @Before - public void setUp() throws Exception { - initMocks(this); - } + @Before + public void setUp() throws Exception { + initMocks(this); + } - @Test - public void testWithNullUserPrincipal() throws Exception { - BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade); - LocateCode locateCode = basicAuthCode.clone(facade, false); + @Test + public void testWithNullUserPrincipal() throws Exception { + BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade); + LocateCode locateCode = basicAuthCode.clone(facade, false); - assertEquals(locateCode.desc(), basicAuthCode.desc()); + assertEquals(locateCode.desc(), basicAuthCode.desc()); - when(trans.getUserPrincipal()).thenReturn(null); - when(trans.error()).thenReturn(error); + when(trans.getUserPrincipal()).thenReturn(null); + when(trans.error()).thenReturn(error); - basicAuthCode.handle(trans, req, resp); - } + basicAuthCode.handle(trans, req, resp); + } - @Test - public void testWithBasicUserPrincipal() throws Exception { - BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade); - LocateCode locateCode = basicAuthCode.clone(facade, false); + @Test + public void testWithBasicUserPrincipal() throws Exception { + BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade); + LocateCode locateCode = basicAuthCode.clone(facade, false); - assertEquals(locateCode.desc(), basicAuthCode.desc()); + assertEquals(locateCode.desc(), basicAuthCode.desc()); - when(trans.getUserPrincipal()).thenReturn(basicPrincipal); + when(trans.getUserPrincipal()).thenReturn(basicPrincipal); - basicAuthCode.handle(trans, req, resp); + basicAuthCode.handle(trans, req, resp); - verify(resp).setStatus(HttpStatus.OK_200); - } + verify(resp).setStatus(HttpStatus.OK_200); + } - @Test - public void testWithX509UserPrincipal() throws Exception { - BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade); - LocateCode locateCode = basicAuthCode.clone(facade, false); + @Test + public void testWithX509UserPrincipal() throws Exception { + BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade); + LocateCode locateCode = basicAuthCode.clone(facade, false); - assertEquals(locateCode.desc(), basicAuthCode.desc()); + assertEquals(locateCode.desc(), basicAuthCode.desc()); - when(trans.getUserPrincipal()).thenReturn(x509Principal); - when(req.getHeader("Authorization")).thenReturn("Basic 76//76"); + when(trans.getUserPrincipal()).thenReturn(x509Principal); + when(req.getHeader("Authorization")).thenReturn("Basic 76//76"); - basicAuthCode.handle(trans, req, resp); + basicAuthCode.handle(trans, req, resp); - verify(resp).setStatus(HttpStatus.FORBIDDEN_403); - } + verify(resp).setStatus(HttpStatus.FORBIDDEN_403); + } } diff --git a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/api/JU_API_AAFTest.java b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/api/JU_API_AAFTest.java index ef8a1dc4..dd9ac7fc 100644 --- a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/api/JU_API_AAFTest.java +++ b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/api/JU_API_AAFTest.java @@ -32,40 +32,40 @@ import org.onap.aaf.auth.locate.facade.LocateFacade; public class JU_API_AAFTest { - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private AAF_Locate gwAPI; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private LocateFacade facade; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private AAF_Locate gwAPI; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private LocateFacade facade; - @Before - public void setUp() throws Exception { - initMocks(this); - } + @Before + public void setUp() throws Exception { + initMocks(this); + } - @Test - public void testAPI_AAFAccess() throws Exception { - try { - API_AAFAccess.init(gwAPI, facade); - } catch (Exception e) { - fail("There should be no exception as Mocks are used"); - } - } + @Test + public void testAPI_AAFAccess() throws Exception { + try { + API_AAFAccess.init(gwAPI, facade); + } catch (Exception e) { + fail("There should be no exception as Mocks are used"); + } + } - @Test - public void testAPI_Find() throws Exception { - try { - API_Find.init(gwAPI, facade); - } catch (Exception e) { - fail("There should be no exception as Mocks are used"); - } - } + @Test + public void testAPI_Find() throws Exception { + try { + API_Find.init(gwAPI, facade); + } catch (Exception e) { + fail("There should be no exception as Mocks are used"); + } + } - @Test - public void testAPI_API() throws Exception { - try { - API_Api.init(gwAPI, facade); - } catch (Exception e) { - fail("There should be no exception as Mocks are used"); - } - } + @Test + public void testAPI_API() throws Exception { + try { + API_Api.init(gwAPI, facade); + } catch (Exception e) { + fail("There should be no exception as Mocks are used"); + } + } } diff --git a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/mapper/JU_Mapper_1_0Test.java b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/mapper/JU_Mapper_1_0Test.java index 26bea940..5422117c 100644 --- a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/mapper/JU_Mapper_1_0Test.java +++ b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/mapper/JU_Mapper_1_0Test.java @@ -35,31 +35,31 @@ import locate_local.v1_0.Out; public class JU_Mapper_1_0Test { - @Before - public void setUp() throws Exception { + @Before + public void setUp() throws Exception { - } + } - @Test - public void testGetClasses() { - Mapper_1_1 mapper = new Mapper_1_1(); - assertEquals(InRequest.class, mapper.getClass(API.IN_REQ)); - assertEquals(Out.class, mapper.getClass(API.OUT)); - assertEquals(Error.class, mapper.getClass(API.ERROR)); - assertEquals(Void.class, mapper.getClass(API.VOID)); - assertEquals(Endpoints.class, mapper.getClass(API.ENDPOINTS)); - assertEquals(MgmtEndpoints.class, mapper.getClass(API.MGMT_ENDPOINTS)); - } + @Test + public void testGetClasses() { + Mapper_1_1 mapper = new Mapper_1_1(); + assertEquals(InRequest.class, mapper.getClass(API.IN_REQ)); + assertEquals(Out.class, mapper.getClass(API.OUT)); + assertEquals(Error.class, mapper.getClass(API.ERROR)); + assertEquals(Void.class, mapper.getClass(API.VOID)); + assertEquals(Endpoints.class, mapper.getClass(API.ENDPOINTS)); + assertEquals(MgmtEndpoints.class, mapper.getClass(API.MGMT_ENDPOINTS)); + } - @Test - public void testNewInstance() { - Mapper_1_1 mapper = new Mapper_1_1(); - assertTrue(mapper.newInstance(API.IN_REQ) instanceof InRequest); - assertTrue(mapper.newInstance(API.OUT) instanceof Out); - assertTrue(mapper.newInstance(API.ERROR) instanceof Error); - assertTrue(mapper.newInstance(API.ENDPOINTS) instanceof Endpoints); - assertTrue(mapper.newInstance(API.MGMT_ENDPOINTS) instanceof MgmtEndpoints); - assertEquals(null, mapper.newInstance(API.VOID)); - } + @Test + public void testNewInstance() { + Mapper_1_1 mapper = new Mapper_1_1(); + assertTrue(mapper.newInstance(API.IN_REQ) instanceof InRequest); + assertTrue(mapper.newInstance(API.OUT) instanceof Out); + assertTrue(mapper.newInstance(API.ERROR) instanceof Error); + assertTrue(mapper.newInstance(API.ENDPOINTS) instanceof Endpoints); + assertTrue(mapper.newInstance(API.MGMT_ENDPOINTS) instanceof MgmtEndpoints); + assertEquals(null, mapper.newInstance(API.VOID)); + } } diff --git a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/service/JU_LocateServiceImplTest.java b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/service/JU_LocateServiceImplTest.java index c66de60b..e3a74720 100644 --- a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/service/JU_LocateServiceImplTest.java +++ b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/service/JU_LocateServiceImplTest.java @@ -44,71 +44,71 @@ import locate.v1_0.MgmtEndpoints; public class JU_LocateServiceImplTest { - // Extend, because I don't want a "setter" in the original. Compromised with a protected... - private final class LocateServiceImplExtension extends LocateServiceImpl { - private LocateServiceImplExtension(AuthzTrans trans, AAF_Locate locate, Mapper mapper) throws APIException { - super(trans, locate, mapper); - } - public void set(LocateDAO ld) { - locateDAO=ld; - } - } - - @Mock - private AuthzTrans trans; - @Mock - private AAF_Locate aaf_locate; - @Mock - private LocateDAO locateDAO; - @Mock - private Mapper mapper; - @Mock - private Result> result; - @Mock - private Result endPointResult; - @Mock - private MgmtEndpoints meps; - @Mock - private MgmtEndpoint mgmtEndPoint; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - } - - @Test - public void test() throws APIException { - LocateServiceImplExtension locateServiceImpl = new LocateServiceImplExtension(trans, aaf_locate, mapper); - locateServiceImpl.set(locateDAO); - - assertEquals(mapper, locateServiceImpl.mapper()); - - when(locateDAO.readByName(trans, "http")).thenReturn(result); - when(mapper.endpoints(result, "1.0", "other")).thenReturn(endPointResult); - - Result output = locateServiceImpl.getEndPoints(trans, "http", "1.0", "other"); - - assertEquals(endPointResult, output); - - List mgmtEndPoints = new ArrayList<>(); - mgmtEndPoints.add(mgmtEndPoint); - - when(mgmtEndPoint.getName()).thenReturn("http.Endpoint1"); - when(mgmtEndPoint.getHostname()).thenReturn("HOST1"); - when(mgmtEndPoint.getPort()).thenReturn(9090); - when(mgmtEndPoint.getProtocol()).thenReturn("HTTP"); - - when(meps.getMgmtEndpoint()).thenReturn(mgmtEndPoints); - output = locateServiceImpl.putMgmtEndPoints(trans, meps); - - assertEquals(output.toString(), Result.ok().toString()); - - when(trans.fish(any())).thenReturn(true); - Data data = new LocateDAO.Data(); - when(mapper.locateData(mgmtEndPoint)).thenReturn(data); - output = locateServiceImpl.removeMgmtEndPoints(trans, meps); - - assertEquals(output.toString(), Result.ok().toString()); - } + // Extend, because I don't want a "setter" in the original. Compromised with a protected... + private final class LocateServiceImplExtension extends LocateServiceImpl { + private LocateServiceImplExtension(AuthzTrans trans, AAF_Locate locate, Mapper mapper) throws APIException { + super(trans, locate, mapper); + } + public void set(LocateDAO ld) { + locateDAO=ld; + } + } + + @Mock + private AuthzTrans trans; + @Mock + private AAF_Locate aaf_locate; + @Mock + private LocateDAO locateDAO; + @Mock + private Mapper mapper; + @Mock + private Result> result; + @Mock + private Result endPointResult; + @Mock + private MgmtEndpoints meps; + @Mock + private MgmtEndpoint mgmtEndPoint; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + @Test + public void test() throws APIException { + LocateServiceImplExtension locateServiceImpl = new LocateServiceImplExtension(trans, aaf_locate, mapper); + locateServiceImpl.set(locateDAO); + + assertEquals(mapper, locateServiceImpl.mapper()); + + when(locateDAO.readByName(trans, "http")).thenReturn(result); + when(mapper.endpoints(result, "1.0", "other")).thenReturn(endPointResult); + + Result output = locateServiceImpl.getEndPoints(trans, "http", "1.0", "other"); + + assertEquals(endPointResult, output); + + List mgmtEndPoints = new ArrayList<>(); + mgmtEndPoints.add(mgmtEndPoint); + + when(mgmtEndPoint.getName()).thenReturn("http.Endpoint1"); + when(mgmtEndPoint.getHostname()).thenReturn("HOST1"); + when(mgmtEndPoint.getPort()).thenReturn(9090); + when(mgmtEndPoint.getProtocol()).thenReturn("HTTP"); + + when(meps.getMgmtEndpoint()).thenReturn(mgmtEndPoints); + output = locateServiceImpl.putMgmtEndPoints(trans, meps); + + assertEquals(output.toString(), Result.ok().toString()); + + when(trans.fish(any())).thenReturn(true); + Data data = new LocateDAO.Data(); + when(mapper.locateData(mgmtEndPoint)).thenReturn(data); + output = locateServiceImpl.removeMgmtEndPoints(trans, meps); + + assertEquals(output.toString(), Result.ok().toString()); + } } -- cgit 1.2.3-korg