diff options
Diffstat (limited to 'cadi/core')
5 files changed, 106 insertions, 14 deletions
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java index 7ad1921c..62b458ab 100644 --- a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java +++ b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java @@ -29,14 +29,13 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import javax.xml.ws.Holder; - import org.onap.aaf.cadi.Access; import org.onap.aaf.cadi.Access.Level; import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.Symm; import org.onap.aaf.cadi.util.CSV; import org.onap.aaf.cadi.util.CSV.Visitor; +import org.onap.aaf.cadi.util.Holder; /** * This Filter is designed to help MIGRATE users from systems that don't match the FQI style. @@ -119,7 +118,7 @@ public class MapBathConverter { throw new CadiException("Invalid Authentication Credential for " + cred); } if(hpass!=null) { - hpass.value = cred.substring(colon+1); + hpass.set(cred.substring(colon+1)); } return cred.substring(0, colon); } else { @@ -144,7 +143,7 @@ public class MapBathConverter { Holder<String> hpass=null; try { if(bath.startsWith(BASIC)) { - cred = idFromBasic(bath,(hpass=new Holder<String>())); + cred = idFromBasic(bath,(hpass=new Holder<String>(null))); if(rv==null) { rv = map.get(cred); } @@ -161,7 +160,7 @@ public class MapBathConverter { } else { if(hpass!=null) { tcred = rv; - rv = BASIC + Symm.base64noSplit.encode(rv+':'+hpass.value); + rv = BASIC + Symm.base64noSplit.encode(rv+':'+hpass.get()); } } if(tcred != null) { diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/SideChain.java b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/SideChain.java index 0f69b5b0..439bca87 100644 --- a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/SideChain.java +++ b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/SideChain.java @@ -29,7 +29,8 @@ import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.xml.ws.Holder; + +import org.onap.aaf.cadi.util.Holder; /** * Add various Filters by CADI Property not in the official Chain @@ -53,20 +54,20 @@ public class SideChain { FilterChain truth = new FilterChain() { @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { - hbool.value=Boolean.TRUE; + hbool.set(Boolean.TRUE); } public String toString() { - return hbool.value.toString(); + return hbool.get().toString(); } }; for(Filter f : sideChain) { - hbool.value=Boolean.FALSE; + hbool.set(Boolean.FALSE); f.doFilter(request, response, truth); - if(!hbool.value) { + if(!hbool.get()) { return; } } - if(hbool.value) { + if(hbool.get()) { chain.doFilter(request, response); } } diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/util/Holder.java b/cadi/core/src/main/java/org/onap/aaf/cadi/util/Holder.java new file mode 100644 index 00000000..3280e471 --- /dev/null +++ b/cadi/core/src/main/java/org/onap/aaf/cadi/util/Holder.java @@ -0,0 +1,46 @@ +/** + * ============LICENSE_START==================================================== + * org.onap.aaf + * =========================================================================== + * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + * =========================================================================== + * 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. + * ============LICENSE_END==================================================== + * + */ + +package org.onap.aaf.cadi.util; + +/** + * Use to set Variables outside of Anonymous classes. + * @author Jonathan + * + * @param <T> + */ +public class Holder<T> { + private T value; + public Holder(T t) { + value = t; + } + public T set(T t) { + value = t; + return t; + } + + public T get() { + return value; + } + public String toString() { + return value.toString(); + } +} diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java index 1681f435..fa62fe4e 100644 --- a/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java +++ b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java @@ -27,8 +27,6 @@ import java.io.PrintStream; import java.util.ArrayList; import java.util.List; -import javax.xml.ws.Holder; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -40,6 +38,7 @@ import org.onap.aaf.cadi.PropAccess; import org.onap.aaf.cadi.util.CSV; import org.onap.aaf.cadi.util.CSV.Visitor; import org.onap.aaf.cadi.util.CSV.Writer; +import org.onap.aaf.cadi.util.Holder; public class JU_CSV { @@ -110,7 +109,8 @@ public class JU_CSV { public void visit(List<String> row) { for(String s: row) { // System.out.println(hi.value + ") " + s); - Assert.assertEquals(expected.get(hi.value++),s); + Assert.assertEquals(expected.get(hi.get()),s); + hi.set(hi.get()+1); // increment } } }); diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_Holder.java b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_Holder.java new file mode 100644 index 00000000..d1fa94b8 --- /dev/null +++ b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_Holder.java @@ -0,0 +1,46 @@ +/******************************************************************************* + * ============LICENSE_START==================================================== + * * org.onap.aaf + * * =========================================================================== + * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * * =========================================================================== + * * 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. + * * ============LICENSE_END==================================================== + * * + * * + ******************************************************************************/ + +package org.onap.aaf.cadi.util.test; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + +import org.junit.Test; +import org.onap.aaf.cadi.util.Holder; + +public class JU_Holder { + + @Test + public void test() { + String str1 = "a string"; + String str2 = "another string"; + Holder<String> holder = new Holder<String>(str1); + assertThat(holder.get(), is(str1)); + assertThat(holder.toString(), is(str1)); + + holder.set(str2); + assertThat(holder.get(), is(str2)); + assertThat(holder.toString(), is(str2)); + } + +} |