diff options
| author |   Jonathan Gathman <jonathan.gathman@att.com> | 2019-11-21 14:41:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-11-21 14:41:02 +0000 |
| commit | 5b54d6757019e5dc6ff7b8a42078aa7d5ba0fd6d (patch) | |
| tree | 2a7b0ce734ca31c26ba04efd4a2032970f121cff | |
| parent | 333d0ca107cf66e0c227c9fe56765935413330dd (diff) | |
| parent | c4679e1c9264eb4f105bf458ee16a0353b87b7e0 (diff) | |
Merge "moving string literals on left side"
| -rw-r--r-- | auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Acceptor.java | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Acceptor.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Acceptor.java index bd718e46..bf9f57e3 100644 --- a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Acceptor.java +++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Acceptor.java @@ -45,8 +45,7 @@ class Acceptor<TRANS extends Trans> { } private boolean eval(HttpCode<TRANS,?> code, String str, List<String> props) { -// int plus = str.indexOf('+'); -// if (plus<0) { + boolean ok = false; boolean any = false; for (Pair<String, Pair<HttpCode<TRANS,?>, List<Pair<String, Object>>>> type : types) { @@ -61,23 +60,7 @@ class Acceptor<TRANS extends Trans> { } } } -// } else { // Handle Accepts with "+" as in application/xaml+xml -// int prev = str.indexOf('/')+1; -// String first = str.substring(0,prev); -// String nstr; -// while (prev!=0) { -// nstr = first + (plus<0?str.substring(prev):str.substring(prev,plus)); -// -// for (Pair<String, Pair<HttpCode<TRANS,?>, List<Pair<String, Object>>>> type : types) { -// if (type.x.equals(nstr)) { -// acceptable.add(type); -// return type; -// } -// } -// prev = plus+1; -// plus=str.indexOf('+', prev); -// }; -// } + return any; } @@ -93,9 +76,9 @@ class Acceptor<TRANS extends Trans> { if (type.y!=null) { for (Pair<String,Object> prop : type.y.y){ if (tag.equals(prop.x)) { - if (tag.equals("charset")) { + if ( "charset".equals(tag)) { return prop.x==null?false:prop.y.equals(value.toLowerCase()); // return True if Matched - } else if (tag.equals("version")) { + } else if ("version".equals(tag)) { return prop.y.equals(new Version(value)); // Note: Version Class knows Minor Version encoding } else if (tag.equals(Content.Q)) { // replace Q value try { |