2 files changed, 272 insertions, 0 deletions
diff --git a/misc/env/src/test/java/org/onap/aaf/misc/env/jaxb/JAXBObjectifier.java b/misc/env/src/test/java/org/onap/aaf/misc/env/jaxb/JAXBObjectifier.java
new file mode 100644
index 00000000..ac0e859c
--- /dev/null
+++ b/misc/env/src/test/java/org/onap/aaf/misc/env/jaxb/JAXBObjectifier.java
@@ -0,0 +1,135 @@
+/**
+ * ============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.misc.env.jaxb;
+
+import java.io.InputStream;
+import java.io.Reader;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.validation.Schema;
+
+import org.onap.aaf.misc.env.APIException;
+import org.onap.aaf.misc.env.Env;
+import org.onap.aaf.misc.env.TimeTaken;
+import org.onap.aaf.misc.env.old.IOObjectifier;
+
+/**
+ * Allow Extended IO interface usage without muddying up the Stringifier Interface
+ */
+public class JAXBObjectifier<T> implements IOObjectifier<T> {
+    private JAXBumar jumar;
+
+    public JAXBObjectifier(Schema schema, Class<?>... classes) throws APIException {
+        try {
+            jumar = new JAXBumar(schema, classes);
+        } catch (JAXBException e) {
+            throw new APIException(e);
+        }
+    }
+
+    public JAXBObjectifier(Class<?>... classes) throws APIException {
+        try {
+            jumar = new JAXBumar(classes);
+        } catch (JAXBException e) {
+            throw new APIException(e);
+        }
+    }
+    
+    // package on purpose
+    JAXBObjectifier(JAXBumar jumar) {
+        this.jumar = jumar;
+    }
+
+    @SuppressWarnings("unchecked")
+    // @Override
+    public T objectify(Env env, String input) throws APIException {
+        TimeTaken tt = env.start("JAXB Unmarshal", Env.XML);
+        try {
+            tt.size(input.length());
+            return (T)jumar.unmarshal(env.debug(), input);
+        } catch (JAXBException e) {
+            throw new APIException(e);
+        } finally {
+            tt.done();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    // @Override
+    public T objectify(Env env, Reader rdr) throws APIException {
+        //TODO create a Reader that Counts?
+        TimeTaken tt = env.start("JAXB Unmarshal", Env.XML);
+        try {
+            return (T)jumar.unmarshal(env.debug(), rdr);
+        } catch (JAXBException e) {
+            throw new APIException(e);
+        } finally {
+            tt.done();
+        }
+    }
+
+
+    @SuppressWarnings("unchecked")
+    // @Override
+    public T objectify(Env env, InputStream is) throws APIException {
+        //TODO create a Reader that Counts?
+        TimeTaken tt = env.start("JAXB Unmarshal", Env.XML);
+        try {
+            return (T)jumar.unmarshal(env.debug(), is);
+        } catch (JAXBException e) {
+            throw new APIException(e);
+        } finally {
+            tt.done();
+        }
+    }
+
+
+    public void servicePrestart(Env env) throws APIException {
+    }
+
+    public void threadPrestart(Env env) throws APIException {
+    }
+
+    // // @Override
+    public void refresh(Env env) throws APIException {
+    }
+
+    // // @Override
+    public void threadDestroy(Env env) throws APIException {
+    }
+
+    // // @Override
+    public void serviceDestroy(Env env) throws APIException {
+    }
+
+
+    @SuppressWarnings("unchecked")
+    public T newInstance() throws APIException {
+        try {
+            return (T)jumar.newInstance();
+        } catch (Exception e) {
+            throw new APIException(e);
+        }
+    }
+
+}
+
diff --git a/misc/env/src/test/java/org/onap/aaf/misc/env/jaxb/JAXBStringifier.java b/misc/env/src/test/java/org/onap/aaf/misc/env/jaxb/JAXBStringifier.java
new file mode 100644
index 00000000..9b8a2c97
--- /dev/null
+++ b/misc/env/src/test/java/org/onap/aaf/misc/env/jaxb/JAXBStringifier.java
@@ -0,0 +1,137 @@
+/**
+ * ============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.misc.env.jaxb;
+
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.namespace.QName;
+
+import org.onap.aaf.misc.env.APIException;
+import org.onap.aaf.misc.env.Env;
+import org.onap.aaf.misc.env.TimeTaken;
+import org.onap.aaf.misc.env.old.IOStringifier;
+
+public class JAXBStringifier<T> implements IOStringifier<T> {
+    private JAXBmar jmar;
+
+    public JAXBStringifier(Class<?>... classes) throws APIException {
+        try {
+            jmar = new JAXBmar(classes);
+        } catch (JAXBException e) {
+            throw new APIException(e);
+        }
+    }
+
+    public JAXBStringifier(QName qname, Class<?>... classes)
+            throws APIException {
+        try {
+            jmar = new JAXBmar(qname, classes);
+        } catch (JAXBException e) {
+            throw new APIException(e);
+        }
+    }
+    
+    // package on purpose
+    JAXBStringifier(JAXBmar jmar) {
+        this.jmar = jmar;
+    }
+
+    // // @Override
+    public void stringify(Env env, T input, Writer writer, boolean ... options)
+            throws APIException {
+        TimeTaken tt = env.start("JAXB Marshal", Env.XML);
+        try {
+            jmar.marshal(env.debug(), input, writer, options);
+        } catch (JAXBException e) {
+            throw new APIException(e);
+        } finally {
+            tt.done();
+        }
+    }
+
+    // @Override
+    public void stringify(Env env, T input, OutputStream os, boolean ... options)
+            throws APIException {
+        // TODO create an OutputStream that Counts?
+        TimeTaken tt = env.start("JAXB Marshal", Env.XML);
+        try {
+            jmar.marshal(env.debug(), input, os, options);
+        } catch (JAXBException e) {
+            throw new APIException(e);
+        } finally {
+            tt.done();
+        }
+    }
+
+    // @Override
+    public String stringify(Env env, T input, boolean ... options) throws APIException {
+        TimeTaken tt = env.start("JAXB Marshal", Env.XML);
+        StringWriter sw = new StringWriter();
+        try {
+            jmar.marshal(env.debug(), input, sw, options);
+            String rv = sw.toString();
+            tt.size(rv.length());
+            return rv;
+        } catch (JAXBException e) {
+            tt.size(0);
+            throw new APIException(e);
+        } finally {
+            tt.done();
+        }
+    }
+
+    // // @Override
+    public void servicePrestart(Env env) throws APIException {
+    }
+
+    // // @Override
+    public void threadPrestart(Env env) throws APIException {
+    }
+
+    // // @Override
+    public void refresh(Env env) throws APIException {
+    }
+
+    // // @Override
+    public void threadDestroy(Env env) throws APIException {
+    }
+
+    // // @Override
+    public void serviceDestroy(Env env) throws APIException {
+    }
+
+    // @Override
+    public JAXBStringifier<T> pretty(boolean pretty) {
+        jmar.pretty(pretty);
+        return this;
+    }
+
+    // @Override
+    public JAXBStringifier<T> asFragment(boolean fragment) {
+        jmar.asFragment(fragment);
+        return this;
+    }
+
+}