From 7e966914050e66219689001ff4ab601a49eef0ac Mon Sep 17 00:00:00 2001 From: Instrumental Date: Fri, 7 Sep 2018 13:43:23 -0500 Subject: Mass whitespace changes (Style Warnings) Issue-ID: AAF-473 Change-Id: Ia1b3825a527bd56299949b5962bb9354dffbeef8 Signed-off-by: Instrumental --- .../src/main/java/org/onap/aaf/auth/cui/CUI.java | 2 +- .../main/java/org/onap/aaf/auth/gui/AAF_GUI.java | 4 +- .../java/org/onap/aaf/auth/gui/BreadCrumbs.java | 10 ++--- .../main/java/org/onap/aaf/auth/gui/Display.java | 24 +++++------ .../src/main/java/org/onap/aaf/auth/gui/Form.java | 2 +- .../main/java/org/onap/aaf/auth/gui/NamedCode.java | 2 +- .../org/onap/aaf/auth/gui/OrgLookupFilter.java | 6 +-- .../src/main/java/org/onap/aaf/auth/gui/Page.java | 38 ++++++++--------- .../main/java/org/onap/aaf/auth/gui/SlotCode.java | 4 +- .../src/main/java/org/onap/aaf/auth/gui/Table.java | 26 ++++++------ .../java/org/onap/aaf/auth/gui/XFrameFilter.java | 2 +- .../java/org/onap/aaf/auth/gui/pages/ApiDocs.java | 44 ++++++++++---------- .../org/onap/aaf/auth/gui/pages/ApiExample.java | 10 ++--- .../onap/aaf/auth/gui/pages/ApprovalAction.java | 12 +++--- .../org/onap/aaf/auth/gui/pages/ApprovalForm.java | 20 ++++----- .../aaf/auth/gui/pages/CMArtiChangeAction.java | 44 ++++++++++---------- .../onap/aaf/auth/gui/pages/CMArtiChangeForm.java | 24 +++++------ .../onap/aaf/auth/gui/pages/CMArtifactShow.java | 22 +++++----- .../org/onap/aaf/auth/gui/pages/CredDetail.java | 48 +++++++++++----------- .../org/onap/aaf/auth/gui/pages/LoginLanding.java | 6 +-- .../java/org/onap/aaf/auth/gui/pages/NsDetail.java | 14 +++---- .../org/onap/aaf/auth/gui/pages/NsHistory.java | 2 +- .../org/onap/aaf/auth/gui/pages/NsInfoAction.java | 14 +++---- .../org/onap/aaf/auth/gui/pages/NsInfoForm.java | 18 ++++---- .../java/org/onap/aaf/auth/gui/pages/NssShow.java | 12 +++--- .../onap/aaf/auth/gui/pages/PassChangeAction.java | 34 +++++++-------- .../onap/aaf/auth/gui/pages/PassChangeForm.java | 30 +++++++------- .../onap/aaf/auth/gui/pages/PassDeleteAction.java | 4 +- .../aaf/auth/gui/pages/PendingRequestsShow.java | 6 +-- .../org/onap/aaf/auth/gui/pages/PermDetail.java | 10 ++--- .../onap/aaf/auth/gui/pages/PermGrantAction.java | 2 +- .../org/onap/aaf/auth/gui/pages/PermGrantForm.java | 4 +- .../org/onap/aaf/auth/gui/pages/PermHistory.java | 2 +- .../org/onap/aaf/auth/gui/pages/PermsShow.java | 6 +-- .../org/onap/aaf/auth/gui/pages/RequestDetail.java | 4 +- .../org/onap/aaf/auth/gui/pages/RoleDetail.java | 30 +++++++------- .../onap/aaf/auth/gui/pages/RoleDetailAction.java | 18 ++++---- .../org/onap/aaf/auth/gui/pages/RoleHistory.java | 2 +- .../org/onap/aaf/auth/gui/pages/RolesShow.java | 2 +- .../onap/aaf/auth/gui/pages/UserRoleExtend.java | 2 +- .../onap/aaf/auth/gui/pages/UserRoleRemove.java | 2 +- .../java/org/onap/aaf/auth/gui/table/RefCell.java | 2 +- 42 files changed, 285 insertions(+), 285 deletions(-) (limited to 'auth/auth-gui/src/main') diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/cui/CUI.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/cui/CUI.java index ecbd0a25..e533abbe 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/cui/CUI.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/cui/CUI.java @@ -51,7 +51,7 @@ public class CUI extends HttpCode { int c; StringBuilder cmd = new StringBuilder(); - while((c=isr.read())>=0) { + while ((c=isr.read())>=0) { cmd.append((char)c); } diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java index 84ad1b1f..48164227 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java @@ -124,7 +124,7 @@ public class AAF_GUI extends AbsService implements State1) { + if (component.length>1) { deployedVersion =component[1]; } else { deployedVersion = "2.x"; @@ -217,7 +217,7 @@ public class AAF_GUI extends AbsService implements State fp, HTMLGen hgen, int indent) { - if(hgen!=null) { + if (hgen!=null) { String msg = aafCon.readableErrMsg(fp); hgen.incr(HTMLGen.P,"style=text-indent:"+indent*10+"px") .text("Error: ") diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/BreadCrumbs.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/BreadCrumbs.java index c5c14d3f..4f1a7e82 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/BreadCrumbs.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/BreadCrumbs.java @@ -55,18 +55,18 @@ public class BreadCrumbs extends NamedCode { HttpServletRequest req = trans.get(gui.slot_httpServletRequest, null); StringBuilder key = new StringBuilder(); String value, hidden; - for(Page p : breadcrumbs) { + for (Page p : breadcrumbs) { hidden=""; // Add keys for page from commandline, where possible. - if(p.fields().length>0) { + if (p.fields().length>0) { boolean first = true; key.setLength(0); - for(String field : p.fields()) { - if((value=req.getParameter(field))==null) { + for (String field : p.fields()) { + if ((value=req.getParameter(field))==null) { hidden="style=display:none;"; break; } - if(first) { + if (first) { first = false; key.append('?'); } else { diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Display.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Display.java index d1817531..c25d6641 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Display.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Display.java @@ -38,7 +38,7 @@ public class Display { final String[] fields = page.fields(); final Slot slots[] = new Slot[fields.length]; String prefix = page.name() + '.'; - for(int i=0;i(gui,page.name()) { @Override public void handle(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) throws Exception { trans.put(gui.slot_httpServletRequest, req); - for(int i=0; i" corresponding to an array of types String field=fields[i].substring(0, idx)+'.'; String[] array = new String[16]; - for(Enumeration names = req.getParameterNames(); names.hasMoreElements();) { + for (Enumeration names = req.getParameterNames(); names.hasMoreElements();) { String key = names.nextElement(); - if(key.startsWith(field)) { + if (key.startsWith(field)) { try { int x = Integer.parseInt(key.substring(field.length())); - if(x>=array.length) { + if (x>=array.length) { String[] temp = new String[x+10]; System.arraycopy(temp, 0, temp, 0, array.length); array = temp; @@ -95,20 +95,20 @@ public class Display { @Override public void handle(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) throws Exception { trans.put(gui.slot_httpServletRequest, req); - for(int i=0; i mm = req.getParameterNames();mm.hasMoreElements();) { + for (Enumeration mm = req.getParameterNames();mm.hasMoreElements();) { String key = mm.nextElement(); - if(key.startsWith(field)) { + if (key.startsWith(field)) { try { int x = Integer.parseInt(key.substring(field.length())); - if(x>=array.length) { + if (x>=array.length) { String[] temp = new String[x+10]; System.arraycopy(temp, 0, temp, 0, array.length); array = temp; diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Form.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Form.java index cc51983b..40aef8fb 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Form.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Form.java @@ -45,7 +45,7 @@ public class Form extends NamedCode { @Override public void code(final Cache cache, final HTMLGen hgen) throws APIException, IOException { - if(preamble!=null) { + if (preamble!=null) { hgen.incr("p","class=preamble").text(preamble).end(); } hgen.incr("form","method=post"); diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/NamedCode.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/NamedCode.java index 37576008..435197c8 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/NamedCode.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/NamedCode.java @@ -51,7 +51,7 @@ public abstract class NamedCode implements ContentCode { public void addAttr(boolean first, String attr) { String[] temp = new String[idattrs.length+1]; - if(first) { + if (first) { temp[0] = attr; System.arraycopy(idattrs, 0, temp, 1, idattrs.length); } else { diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/OrgLookupFilter.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/OrgLookupFilter.java index 6010dd8b..deed77c0 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/OrgLookupFilter.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/OrgLookupFilter.java @@ -48,16 +48,16 @@ public class OrgLookupFilter implements Filter { @Override public void doFilter(ServletRequest req, ServletResponse resp, FilterChain fc) throws IOException, ServletException { final AuthzTrans trans = (AuthzTrans) req.getAttribute(TransFilter.TRANS_TAG); - if(req instanceof HttpServletRequest) { + if (req instanceof HttpServletRequest) { Principal p = ((HttpServletRequest)req).getUserPrincipal(); - if(p instanceof TaggedPrincipal) { + if (p instanceof TaggedPrincipal) { ((TaggedPrincipal)p).setTagLookup(new TaggedPrincipal.TagLookup() { @Override public String lookup() throws CadiException { Identity id; try { id = trans.org().getIdentity(trans, p.getName()); - if(id!=null && id.isFound()) { + if (id!=null && id.isFound()) { return id.firstName(); } } catch (OrganizationException e) { diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java index a44a4846..1e067c44 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java @@ -102,7 +102,7 @@ public class Page extends HTMLCacheGen { super(CacheGen.PRETTY, new PageCode(env, 1, content)); fields = new String[en.length]; int i=-1; - for(Enum p : en) { + for (Enum p : en) { fields[++i]=p.name(); } @@ -110,8 +110,8 @@ public class Page extends HTMLCacheGen { bcUrl = url; // Mark which fields must be "no_cache" boolean no_cacheTemp=false; - for(NamedCode nc : content) { - if(nc.no_cache()) { + for (NamedCode nc : content) { + if (nc.no_cache()) { no_cacheTemp=true; break; } @@ -124,7 +124,7 @@ public class Page extends HTMLCacheGen { public Page(AuthzEnv env, String name, String url, int backdots, String [] fields, final NamedCode ... content) throws APIException,IOException { super(CacheGen.PRETTY, new PageCode(env, backdots, content)); - if(fields==null) { + if (fields==null) { this.fields = new String[0]; } else { this.fields = fields; @@ -133,8 +133,8 @@ public class Page extends HTMLCacheGen { bcUrl = url; // Mark which fields must be "no_cache" boolean no_cacheTemp=false; - for(NamedCode nc : content) { - if(nc.no_cache()) { + for (NamedCode nc : content) { + if (nc.no_cache()) { no_cacheTemp=true; break; } @@ -220,7 +220,7 @@ public class Page extends HTMLCacheGen { // Obtain User Info, and print TaggedPrincipal p = trans.getUserPrincipal(); String user,secured; - if(p==null) { + if (p==null) { user = "please choose a Login Authority"; secured = "NOT Secure!"; } else { @@ -251,7 +251,7 @@ public class Page extends HTMLCacheGen { int cIdx; ContentCode nc; // If BreadCrumbs, put here - if(content.length>0 && content[0] instanceof BreadCrumbs) { + if (content.length>0 && content[0] instanceof BreadCrumbs) { nc = content[0]; Mark ctnt = hgen.divID(nc.idattrs()); nc.code(cache, hgen); @@ -265,7 +265,7 @@ public class Page extends HTMLCacheGen { Mark inner = hgen.divID("inner"); // Content - for(int i=cIdx;i=0) { msie+=5; @@ -379,14 +379,14 @@ public class Page extends HTMLCacheGen { protected static synchronized Permission getPerm(String instance, String action) { Map msp = perms.get(instance); Permission p; - if(msp==null) { + if (msp==null) { msp = new HashMap<>(); perms.put(instance, msp); p=null; } else { p = msp.get(instance); } - if(p==null) { + if (p==null) { p=new AAFPermission(PERM_NS, PERM_CA_TYPE,instance,action); msp.put(action, p); } diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/SlotCode.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/SlotCode.java index 844270ed..7462de80 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/SlotCode.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/SlotCode.java @@ -31,7 +31,7 @@ public abstract class SlotCode extends NamedCode { public SlotCode(boolean no_cache,EnvStore env, String root, Enum ... params) { super(no_cache,root); slots = new Slot[params.length]; - for(int i=0;i extends NamedCode { } public T get(TRANS trans,int idx, T dflt) { - if(idx>slots.length) { + if (idx>slots.length) { return dflt; } return trans.get(slots[idx],dflt); diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Table.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Table.java index 079593c9..6451c4e7 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Table.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Table.java @@ -57,15 +57,15 @@ public class Table, TRANS extends TransStore> extends Named public Table(String title, TRANS trans, Data data, String name, String ... attrs) { super(true,name); // prefix=postfix=null; - for(String a : attrs) { + for (String a : attrs) { addAttr(false, a); } ROW_MSG_SLOT=trans.slot("TABLE_ROW_MSG"); EMPTY_TABLE_SLOT=trans.slot("TABLE_EMPTY"); this.columns = data.headers(); boolean alt = false; - for(String s : attrs) { - if("class=std".equals(s) || "class=stdform".equals(s)) { + for (String s : attrs) { + if ("class=std".equals(s) || "class=stdform".equals(s)) { alt=true; } } @@ -89,7 +89,7 @@ public class Table, TRANS extends TransStore> extends Named Mark tr = new Mark(); hgen.incr(table,TABLE); - if(title==null) { + if (title==null) { cache.dynamic(hgen, new DynamicCode() { @Override public void code(S state, TRANS trans, final Cache cache, final HTMLGen hgen) throws APIException, IOException { @@ -100,7 +100,7 @@ public class Table, TRANS extends TransStore> extends Named hgen.leaf("caption", "class=title").text(title).end(); } hgen.incr(tr,TR); - for(String column : columns) { + for (String column : columns) { hgen.leaf("th").text(column).end(); } hgen.end(tr); @@ -110,7 +110,7 @@ public class Table, TRANS extends TransStore> extends Named // End Table hgen.end(table); - if(other!=null) { + if (other!=null) { other.code(cache,hgen); } @@ -119,10 +119,10 @@ public class Table, TRANS extends TransStore> extends Named @Override public void code(S state, TRANS trans, final Cache cache, final HTMLGen hgen) throws APIException, IOException { String msg; - if((msg = trans.get(EMPTY_TABLE_SLOT, null))!=null) { + if ((msg = trans.get(EMPTY_TABLE_SLOT, null))!=null) { hgen.incr("style").text("#inner tr,caption,input,p.preamble {display: none;}#inner p.notfound {margin: 0px 0px 0px 20px}").end(); hgen.incr(HTMLGen.P,"class=notfound").text(msg).end().br(); - } else if((msg=trans.get(ROW_MSG_SLOT,null))!=null) { + } else if ((msg=trans.get(ROW_MSG_SLOT,null))!=null) { hgen.p(msg).br(); } } @@ -181,9 +181,9 @@ public class Table, TRANS extends TransStore> extends Named int alt = this.alt; Cells cells = data.get(trans,state); - if(cells.cells.length>0) { - for(AbsCell[] row : cells.cells) { - if(row.length==0) { + if (cells.cells.length>0) { + for (AbsCell[] row : cells.cells) { + if (row.length==0) { hgen.text("") .hr() .text(""); @@ -198,7 +198,7 @@ public class Table, TRANS extends TransStore> extends Named alt=1; hgen.incr(tr,TR,"class=alt"); } - for(AbsCell cell :row) { + for (AbsCell cell :row) { hgen.leaf(td, TD,cell.attrs()); cell.write(hgen); hgen.end(td); @@ -207,7 +207,7 @@ public class Table, TRANS extends TransStore> extends Named } } // Pass Msg back to Table code, in order to place after Table Complete - if(cells.msg!=null) { + if (cells.msg!=null) { trans.put(ROW_MSG_SLOT,cells.msg); } } else { diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/XFrameFilter.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/XFrameFilter.java index f362418e..cf3a6715 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/XFrameFilter.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/XFrameFilter.java @@ -52,7 +52,7 @@ public class XFrameFilter implements Filter { @Override public void doFilter(ServletRequest req, ServletResponse resp, FilterChain fc) throws IOException, ServletException { - if(resp instanceof HttpServletResponse) { + if (resp instanceof HttpServletResponse) { @SuppressWarnings("unused") HttpServletResponse hresp = (HttpServletResponse)resp; ((HttpServletResponse)resp).addHeader("X-Frame-Options", xframe); diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiDocs.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiDocs.java index 235683d5..7d57b3d8 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiDocs.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiDocs.java @@ -176,11 +176,11 @@ public class ApiDocs extends Page { @Override public Void code(Rcli client) throws CadiException, ConnectException, APIException { Future fa = client.read("/api",gui.getDF(Api.class)); - if(fa.get(5000)) { + if (fa.get(5000)) { tt.done(); TimeTaken tt2 = trans.start("Load Data", Env.SUB); try { - if(fa.value!=null)for(Route r : fa.value.getRoute()) { + if (fa.value!=null)for (Route r : fa.value.getRoute()) { String path = r.getPath(); // Build info StringBuilder desc = new StringBuilder(); @@ -188,39 +188,39 @@ public class ApiDocs extends Page { desc.append("

"); desc.append(r.getDesc()); - if(r.getComments().size()>0) { - for(String ct : r.getComments()) { + if (r.getComments().size()>0) { + for (String ct : r.getComments()) { desc.append("

"); desc.append(ct); } } - if(r.getParam().size()>0) { + if (r.getParam().size()>0) { desc.append("

Parameters

"); - for(String params : r.getParam()) { + for (String params : r.getParam()) { String param[] = params.split("\\s*\\|\\s*"); desc.append("

"); desc.append(param[0]); desc.append(" : "); desc.append(param[1]); - if("true".equalsIgnoreCase(param[2])) { + if ("true".equalsIgnoreCase(param[2])) { desc.append(" (Required)"); } } } - if(r.getExpected()!=0) { + if (r.getExpected()!=0) { desc.append("

Expected HTTP Code

"); desc.append(r.getExpected()); } - if(r.getExplicitErr().size()!=0) { + if (r.getExplicitErr().size()!=0) { desc.append("

Explicit HTTP Error Codes

"); boolean first = true; - for(int ee : r.getExplicitErr()) { - if(first) { + for (int ee : r.getExplicitErr()) { + if (first) { first = false; } else { desc.append(", "); @@ -232,11 +232,11 @@ public class ApiDocs extends Page { desc.append("

"); desc.append("GET".equals(r.getMeth())?"Accept:":"ContentType:"); Collections.sort(r.getContentType()); - if(r.getPath().startsWith("/authn/basicAuth")) { + if (r.getPath().startsWith("/authn/basicAuth")) { desc.append("

text/plain"); } - for(String ct : r.getContentType()) { - if(ct.contains("version=2")) { + for (String ct : r.getContentType()) { + if (ct.contains("version=2")) { desc.append("

rv, ArrayList ... all) { AbsCell lead; AbsCell[] row; - for(ArrayList al : all) { - if(al.size()>1) { + for (ArrayList al : all) { + if (al.size()>1) { row = al.get(0); lead = row[0]; row[0]=BLANK; @@ -312,7 +312,7 @@ public class ApiDocs extends Page { public int compare(AbsCell[] ca1, AbsCell[] ca2) { int meth = ((TextCell)ca1[2]).name.compareTo( ((TextCell)ca2[2]).name); - if(meth == 0) { + if (meth == 0) { return (HttpMethods.valueOf(((TextCell)ca1[1]).name).compareTo( HttpMethods.valueOf(((TextCell)ca2[1]).name))); } else { diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiExample.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiExample.java index 3beed563..7da77607 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiExample.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApiExample.java @@ -79,7 +79,7 @@ public class ApiExample extends Page { "application/Void+json" ); Future fs2; - if(typecode.contains("Request+")) { + if (typecode.contains("Request+")) { fs2 = gui.client().read("/api/example/" + encoded+"?optional=true", "application/Void+json" ); @@ -88,19 +88,19 @@ public class ApiExample extends Page { } - if(fp.get(5000)) { + if (fp.get(5000)) { xgen.incr(HTMLGen.H1).text("Sample Code").end() .incr(HTMLGen.H5).text(typecode).end(); xgen.incr("pre"); - if(typecode.contains("+xml")) { + if (typecode.contains("+xml")) { xgen.xml(fp.body()); - if(fs2!=null && fs2.get(5000)) { + if (fs2!=null && fs2.get(5000)) { xgen.text(WITH_OPTIONAL_PARAMETERS); xgen.xml(fs2.body()); } } else { xgen.text(fp.body()); - if(fs2!=null && fs2.get(5000)) { + if (fs2!=null && fs2.get(5000)) { xgen.text(WITH_OPTIONAL_PARAMETERS); xgen.text(fs2.body()); } diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalAction.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalAction.java index 507cb21a..8c90b491 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalAction.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalAction.java @@ -63,16 +63,16 @@ public class ApprovalAction extends Page { lastPage += "?user="+user; } - if(appr==null) { + if (appr==null) { hgen.p("No Approvals have been selected."); } else { Approval app; final Approvals apps = new Approvals(); int count = 0; - for(String a : appr) { - if(a!=null) { + for (String a : appr) { + if (a!=null) { int idx = a.indexOf('|'); - if(idx>=0) { + if (idx>=0) { app = new Approval(); app.setStatus(a.substring(0,idx)); app.setTicket(a.substring(++idx)); @@ -82,7 +82,7 @@ public class ApprovalAction extends Page { } } } - if(apps.getApprovals().isEmpty()) { + if (apps.getApprovals().isEmpty()) { hgen.p("No Approvals have been sent."); } else { TimeTaken tt = trans.start("AAF Update Approvals",Env.REMOTE); @@ -93,7 +93,7 @@ public class ApprovalAction extends Page { public Boolean code(Rcli client) throws APIException, CadiException { boolean fail2 = true; Future fa = client.update("/authz/approval",gui.getDF(Approvals.class),apps); - if(fa.get(AAF_GUI.TIMEOUT)) { + if (fa.get(AAF_GUI.TIMEOUT)) { // Do Remote Call fail2 = false; hgen.p(total + (total==1?" Approval has":" Approvals have") + " been Saved"); diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalForm.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalForm.java index 14d434cb..27fd5274 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalForm.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalForm.java @@ -146,9 +146,9 @@ public class ApprovalForm extends Page { public Integer code(Rcli client) throws CadiException, ConnectException, APIException { Future fa = client.read("/authz/approval/approver/"+trans.user(),gui.getDF(Approvals.class)); int numLeft = 0; - if(fa.get(AAF_GUI.TIMEOUT)) { + if (fa.get(AAF_GUI.TIMEOUT)) { - if(fa.value!=null) { + if (fa.value!=null) { for (Approval appr : fa.value.getApprovals()) { if ("pending".equals(appr.getStatus())) { if (userParam!=null && !appr.getUser().equalsIgnoreCase(userParam)) { @@ -227,23 +227,23 @@ public class ApprovalForm extends Page { boolean userOK=true; for (Approval appr : currApproverList) { - if(++line0) { + if (numLeft>0) { msg = "After these, there will be " + numLeft + " approvals left to process"; } - if(rv.isEmpty()) { + if (rv.isEmpty()) { if (numLeft>0) { msg = "No Approvals to process at this time for user " + userParam +". You have " + numLeft + " other approvals to process."; diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeAction.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeAction.java index 8088a700..d32c7dc3 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeAction.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeAction.java @@ -77,34 +77,34 @@ trans.info().log("Step 1"); final String machine = trans.get(sMachine,null); final String ca = trans.get(sCA, null); final String sans = ((String)trans.get(sSans,null)); - if(sans!=null) { - for(String s: Split.splitTrim(',', sans)) { + if (sans!=null) { + for (String s: Split.splitTrim(',', sans)) { arti.getSans().add(s); } } // Disallow IP entries, except by special Permission - if(!trans.fish(getPerm(ca,"ip"))) { + if (!trans.fish(getPerm(ca,"ip"))) { boolean ok=true; - if(IPValidator.ip(machine)) { + if (IPValidator.ip(machine)) { ok=false; } - if(ok) { - for(String s: arti.getSans()) { - if(IPValidator.ip(s)) { + if (ok) { + for (String s: arti.getSans()) { + if (IPValidator.ip(s)) { ok=false; break; } } } - if(!ok) { + if (!ok) { hgen.p("Policy Failure: IPs in certificates are only allowed by Exception."); return; } } // Disallow Domain based Definitions without exception - if(machine.startsWith("*")) { // Domain set - if(!trans.fish(getPerm(ca, "domain"))) { + if (machine.startsWith("*")) { // Domain set + if (!trans.fish(getPerm(ca, "domain"))) { hgen.p("Policy Failure: Domain Artifact Declarations are only allowed by Exception."); return; } @@ -119,8 +119,8 @@ trans.info().log("Step 1"); arti.setRenewDays(Integer.parseInt((String)trans.get(sRenewal, null))); arti.setNotification((String)trans.get(sNotify, null)); String[] checkbox = trans.get(sType,null); - for(int i=0;i fc; rv = fc = client.create("/cert/artifacts", gui.artifactsDF, artifacts); - if(fc.get(AAFcli.timeout())) { + if (fc.get(AAFcli.timeout())) { hgen.p("Created Artifact " + arti.getMechid() + " on " + arti.getMachine()); ok.set(true); } break; case CMArtiChangeForm.UPDATE: Future fu = client.update("/cert/artifacts", gui.artifactsDF, artifacts); - if((rv=fu).get(AAFcli.timeout())) { + if ((rv=fu).get(AAFcli.timeout())) { hgen.p("Artifact " + arti.getMechid() + " on " + arti.getMachine() + " is updated"); ok.set(true); } @@ -159,12 +159,12 @@ trans.info().log("Step 1"); case CMArtiChangeForm.COPY: Future future = client.read("/cert/artifacts/"+arti.getMechid()+'/'+arti.getMachine(), gui.artifactsDF); rv = future; - if(future.get(AAFcli.timeout())) { - for(Artifact a : future.value.getArtifact()) { // only one, because these two are key - for(String newMachine :Split.split(',', trans.get(sOther, ""))) { + if (future.get(AAFcli.timeout())) { + for (Artifact a : future.value.getArtifact()) { // only one, because these two are key + for (String newMachine :Split.split(',', trans.get(sOther, ""))) { a.setMachine(newMachine); Future fup = client.update("/cert/artifacts", gui.artifactsDF, future.value); - if(fup.get(AAFcli.timeout())) { + if (fup.get(AAFcli.timeout())) { hgen.p("Copied to " + newMachine); ok.set(true); } @@ -175,7 +175,7 @@ trans.info().log("Step 1"); case CMArtiChangeForm.DELETE: Future fv; rv = fv = client.delete("/cert/artifacts/"+arti.getMechid()+"/"+arti.getMachine(),"application/json"); - if(fv.get(AAFcli.timeout())) { + if (fv.get(AAFcli.timeout())) { hgen.p("Deleted " + arti.getMechid() + " on " + arti.getMachine()); ok.set(true); deleted.set(true); @@ -185,11 +185,11 @@ trans.info().log("Step 1"); return rv; } }); - if(!ok.get()) { - if(f==null) { + if (!ok.get()) { + if (f==null) { hgen.p("Unknown Command"); } else { - if(f.body().contains("%")) { + if (f.body().contains("%")) { Error err = gui.getDF(Error.class).newData().in(TYPE.JSON).load(f.body()).asObject(); hgen.p(Vars.convert(err.getText(),err.getVariables())); } else { diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java index 0268f498..ee55fdbc 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java @@ -138,25 +138,25 @@ public class CMArtiChangeForm extends Page { @Override public Artifact code(Rcli client) throws CadiException, ConnectException, APIException { Future fa = client.read("/cert/artifacts/"+incomingID+'/'+incomingMach, gui.artifactsDF); - if(fa.get(AAFcli.timeout())) { - for(Artifact arti : fa.value.getArtifact()) { + if (fa.get(AAFcli.timeout())) { + for (Artifact arti : fa.value.getArtifact()) { return arti; // just need the first one } } return null; } }); - if(arti==null) { + if (arti==null) { Organization org = OrganizationFactory.get(trans); Identity user = org.getIdentity(trans, incomingID); - if(user==null) { + if (user==null) { hgen.p("The mechID you typed, \"" + incomingID + "\", is not a valid " + org.getName() + " ID"); return; } arti = new Artifact(); arti.setMechid(incomingID); Identity managedBy = user.responsibleTo(); - if(managedBy == null) { + if (managedBy == null) { arti.setSponsor("Unknown Sponsor"); } else { arti.setSponsor(managedBy.fullID()); @@ -173,7 +173,7 @@ public class CMArtiChangeForm extends Page { submitText = CREATE; delete = false; } else { - if(arti.getNotification()==null) { + if (arti.getNotification()==null) { Organization org = OrganizationFactory.get(trans); Identity user = org.getIdentity(trans, incomingID); arti.setNotification("mailto:"+user.email()); @@ -184,15 +184,15 @@ public class CMArtiChangeForm extends Page { .input(fields[0],"AppID*",true,"value="+arti.getMechid()) .input("sponsor", "Sponsor",false,"value="+arti.getSponsor(),"readonly","style=border:none;background-color:white;") .input(fields[1],"FQDN*",true,"value="+arti.getMachine(),"style=width:130%;"); -// if(maySans) { +// if (maySans) { hgen.incr(HTMLGen.TR).incr(HTMLGen.TD).end() .incr(HTMLGen.TD,"class=subtext").text("Use Fully Qualified Domain Names (that will be in DNS), "); - if(!trans.fish(getPerm(arti.getCa(),"ip"))) { + if (!trans.fish(getPerm(arti.getCa(),"ip"))) { hgen.text("NO "); } StringBuilder sb = null; - for(String s: arti.getSans()) { - if(sb==null) { + for (String s: arti.getSans()) { + if (sb==null) { sb = new StringBuilder(); } else { sb.append(", "); @@ -212,7 +212,7 @@ public class CMArtiChangeForm extends Page { .incr(HTMLGen.TR) .incr(HTMLGen.TD).leaf("label","for=types","required").text("Artifact Types").end(2) .incr(HTMLGen.TD); - for(int i=0;i