From 908b4693e5a0a4c2f323dbf518b35e4620f183a1 Mon Sep 17 00:00:00 2001 From: "Bansal, Nitin (nb121v)" Date: Mon, 20 Nov 2017 16:02:06 -0500 Subject: Refactor to move from openecomp to onap Refactor to move from openecomp to onap IssueID: AAI-486 Change-Id: I1d5634739514acf11d5fbdf5e2c7865aaccd864e Signed-off-by: Bansal, Nitin (nb121v) --- .../crud/util/CrudJaxbTransformation.java | 92 ---------------------- .../org/openecomp/crud/util/CrudProperties.java | 77 ------------------ .../openecomp/crud/util/CrudServiceConstants.java | 54 ------------- .../org/openecomp/crud/util/CrudServiceUtil.java | 63 --------------- .../java/org/openecomp/crud/util/FileWatcher.java | 48 ----------- 5 files changed, 334 deletions(-) delete mode 100644 src/main/java/org/openecomp/crud/util/CrudJaxbTransformation.java delete mode 100644 src/main/java/org/openecomp/crud/util/CrudProperties.java delete mode 100644 src/main/java/org/openecomp/crud/util/CrudServiceConstants.java delete mode 100644 src/main/java/org/openecomp/crud/util/CrudServiceUtil.java delete mode 100644 src/main/java/org/openecomp/crud/util/FileWatcher.java (limited to 'src/main/java/org/openecomp/crud/util') diff --git a/src/main/java/org/openecomp/crud/util/CrudJaxbTransformation.java b/src/main/java/org/openecomp/crud/util/CrudJaxbTransformation.java deleted file mode 100644 index c1a1e18..0000000 --- a/src/main/java/org/openecomp/crud/util/CrudJaxbTransformation.java +++ /dev/null @@ -1,92 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * Gizmo - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * 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========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ -package org.openecomp.crud.util; - -import org.eclipse.persistence.dynamic.DynamicEntity; -import org.eclipse.persistence.jaxb.JAXBMarshaller; -import org.eclipse.persistence.jaxb.MarshallerProperties; -import org.eclipse.persistence.jaxb.UnmarshallerProperties; -import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; - -import java.io.StringReader; -import java.io.StringWriter; -import javax.ws.rs.core.MediaType; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.transform.stream.StreamSource; - -public class CrudJaxbTransformation { - /** - * Marshal a dynamic entity into a string. - * - * @param entity the dynamic entity - * @param jaxbContext the dynamic jaxb context - * @return the marshaled entity - * @throws RouterException on error - */ - public static String marshal(MediaType mediaType, final DynamicEntity entity, - final DynamicJAXBContext jaxbContext) throws JAXBException { - - final JAXBMarshaller marshaller = jaxbContext.createMarshaller(); - marshaller.setProperty(JAXBMarshaller.JAXB_FORMATTED_OUTPUT, false); - - if (MediaType.APPLICATION_JSON_TYPE.isCompatible(mediaType)) { - marshaller.setProperty("eclipselink.media-type", "application/json"); - marshaller.setProperty("eclipselink.json.include-root", false); - marshaller.setProperty(MarshallerProperties.JSON_MARSHAL_EMPTY_COLLECTIONS, Boolean.FALSE); - } - - final StringWriter writer = new StringWriter(); - marshaller.marshal(entity, writer); - return writer.toString(); - - } - - /** - * @param type - * @param json - * @param mediaType - * @return - * @throws JAXBException - * @throws Exception - */ - public static Object unmarshal(String javaClass, String content, MediaType mediaType, - final DynamicJAXBContext jaxbContext) throws JAXBException { - Object clazz = null; - Unmarshaller unmarshaller = null; - - clazz = jaxbContext.newDynamicEntity(javaClass); - - unmarshaller = jaxbContext.createUnmarshaller(); - if (mediaType.equals(MediaType.APPLICATION_JSON_TYPE)) { - unmarshaller.setProperty(UnmarshallerProperties.MEDIA_TYPE, "application/json"); - unmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false); - unmarshaller.setProperty(UnmarshallerProperties.JSON_WRAPPER_AS_ARRAY_NAME, true); - } - - return unmarshaller.unmarshal(new StreamSource(new StringReader(content)), - clazz.getClass()).getValue(); - } - -} diff --git a/src/main/java/org/openecomp/crud/util/CrudProperties.java b/src/main/java/org/openecomp/crud/util/CrudProperties.java deleted file mode 100644 index 69b2e16..0000000 --- a/src/main/java/org/openecomp/crud/util/CrudProperties.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * Gizmo - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * 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========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ -package org.openecomp.crud.util; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Properties; - -public class CrudProperties { - - private static Properties properties; - - static { - properties = new Properties(); - File file = new File(CrudServiceConstants.CRD_CONFIG_FILE); - try { - properties.load(new FileInputStream(file)); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public static String get(String key) { - return properties.getProperty(key); - } - - public static String get(String key, String defaultValue) { - return properties.getProperty(key, defaultValue); - } - - public static void put(String key, String value) { - properties.setProperty(key, value); - FileOutputStream fileOut = null; - try { - fileOut = new FileOutputStream(new File(CrudServiceConstants.CRD_CONFIG_FILE)); - properties.store(fileOut, "Added property: " + key); - } catch (Exception e) { - e.printStackTrace(); - } finally { - - try { - fileOut.close(); - } catch (IOException ex) { - ex.printStackTrace(); - } - } - - } - - -} diff --git a/src/main/java/org/openecomp/crud/util/CrudServiceConstants.java b/src/main/java/org/openecomp/crud/util/CrudServiceConstants.java deleted file mode 100644 index 1a4858f..0000000 --- a/src/main/java/org/openecomp/crud/util/CrudServiceConstants.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * Gizmo - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * 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========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ -package org.openecomp.crud.util; - -public class CrudServiceConstants { - public static final String CRD_SERVICE_NAME = "Crud-Service"; - - public static final String CRD_FILESEP = (System.getProperty("file.separator") == null) ? "/" - : System.getProperty("file.separator"); - - public static final String CRD_SPECIFIC_CONFIG = System.getProperty("CONFIG_HOME") + CRD_FILESEP; - - public static final String CRD_HOME_MODEL = CRD_SPECIFIC_CONFIG + "model" + CRD_FILESEP; - public static final String CRD_HOME_AUTH = CRD_SPECIFIC_CONFIG + "auth" + CRD_FILESEP; - - public static final String CRD_GRAPH_HOST = "crud.graph.host"; - public static final String CRD_GRAPH_PORT = "crud.graph.port"; - public static final String CRD_GRAPH_NAME = "crud.graph.name"; - public static final String CRD_STORAGE_BACKEND_DB = "crud.storage.backend.db"; - public static final String CRD_HBASE_ZNODE_PARENT - = "crud.storage.hbase.ext.zookeeper.znode.parent"; - - public static final String CRD_CONFIG_FILE = CRD_SPECIFIC_CONFIG + "crud-api.properties"; - public static final String CRD_AUTH_FILE = CRD_HOME_AUTH + "crud_policy.json"; - public static final String CRD_CHAMPION_AUTH_FILE = CRD_HOME_AUTH + "champion-cert.p12"; - - public static final String CRD_AUTH_POLICY_NAME = "crud"; - - public static final String CRD_EVENT_STREAM_HOSTS = "event.stream.hosts"; - - - -} diff --git a/src/main/java/org/openecomp/crud/util/CrudServiceUtil.java b/src/main/java/org/openecomp/crud/util/CrudServiceUtil.java deleted file mode 100644 index b88f20b..0000000 --- a/src/main/java/org/openecomp/crud/util/CrudServiceUtil.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * Gizmo - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * 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========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ -package org.openecomp.crud.util; - -import org.openecomp.crud.exception.CrudException; - -import javax.ws.rs.core.Response.Status; - -public class CrudServiceUtil { - - - public static Object validateFieldType(String value, Class clazz) throws CrudException { - try { - if (clazz.isAssignableFrom(Integer.class)) { - return Integer.parseInt(value); - } else if (clazz.isAssignableFrom(Long.class)) { - return Long.parseLong(value); - } else if (clazz.isAssignableFrom(Float.class)) { - return Float.parseFloat(value); - } else if (clazz.isAssignableFrom(Double.class)) { - return Double.parseDouble(value); - } else if (clazz.isAssignableFrom(Boolean.class)) { - - // If the value is an IN/OUT direction, this gets seen as a boolean, so - // check for that first. - if (value.equals("OUT") || value.equals("IN")) { - return value; - } - - if (!value.equals("true") && !value.equals("false")) { - throw new CrudException("Invalid propertry value: " + value, Status.BAD_REQUEST); - } - return Boolean.parseBoolean(value); - } else { - return value; - } - } catch (Exception e) { - throw new CrudException("Invalid property value: " + value, Status.BAD_REQUEST); - } - } - -} diff --git a/src/main/java/org/openecomp/crud/util/FileWatcher.java b/src/main/java/org/openecomp/crud/util/FileWatcher.java deleted file mode 100644 index 8c7cbc1..0000000 --- a/src/main/java/org/openecomp/crud/util/FileWatcher.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * Gizmo - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * 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========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ -package org.openecomp.crud.util; - -import java.io.File; -import java.util.TimerTask; - -public abstract class FileWatcher extends TimerTask { - private long timeStamp; - private File file; - - public FileWatcher(File file) { - this.file = file; - this.timeStamp = file.lastModified(); - } - - public final void run() { - long timeStamp = file.lastModified(); - - if ((timeStamp - this.timeStamp) > 500) { - this.timeStamp = timeStamp; - onChange(file); - } - } - - protected abstract void onChange(File file); -} \ No newline at end of file -- cgit 1.2.3-korg