diff options
Diffstat (limited to 'champ-lib/champ-core')
2 files changed, 39 insertions, 39 deletions
diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java index 5db9cba..f78abea 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java @@ -20,8 +20,7 @@ */ package org.onap.aai.champcore.graph.impl; -import java.util.UUID; - +import java.security.SecureRandom; import org.apache.tinkerpop.gremlin.structure.Graph; import org.onap.aai.champcore.ChampTransaction; import org.onap.aai.champcore.exceptions.ChampTransactionException; @@ -31,68 +30,68 @@ import org.slf4j.LoggerFactory; public class TinkerpopTransaction extends ChampTransaction { private static final int COMMIT_RETRY_COUNT = 3; - + /** Threaded Tinkerpop transaction. */ protected Graph threadedTransaction; - + private static final Logger LOGGER = LoggerFactory.getLogger(TinkerpopTransaction.class); protected TinkerpopTransaction() { } - - + + /** * Creates a new transaction instance. - * + * * @param aGraphInstance - Instance of the graph to request the transaction from. */ public TinkerpopTransaction(Graph aGraphInstance) { super(); - + if(!aGraphInstance.features().graph().supportsTransactions()) { throw new UnsupportedOperationException(); } - + // Request a threaded transaction object from the graph. this.threadedTransaction = aGraphInstance.tx().createThreadedTx(); - + LOGGER.info("Open transaction - id: " + id); } - + @Override public String id() { return id.toString(); } - + public Graph getGraphInstance() { return threadedTransaction; } @Override public void commit() throws ChampTransactionException { - - LOGGER.debug("Commiting transaction - " + id); - - final long initialBackoff = (int) (Math.random() * 50); + + LOGGER.debug("Commiting transaction - " + id); + + final long initialBackoff = (int)(new SecureRandom().nextDouble() * 50); // If something goes wrong, we will retry a couple of times before // giving up. for (int i = 0; i < COMMIT_RETRY_COUNT; i++) { - + try { - + // Do the commit. threadedTransaction.tx().commit(); LOGGER.info("Committed transaction - id: " + id); return; - + } catch (Throwable e) { - + LOGGER.debug("Transaction " + id + " failed to commit due to: " + e.getMessage()); - + // Have we used up all of our retries? if (i == COMMIT_RETRY_COUNT - 1) { - + LOGGER.error("Maxed out commit attempt retries, client must handle exception and retry", e); threadedTransaction.tx().rollback(); throw new ChampTransactionException(e); @@ -101,13 +100,13 @@ public class TinkerpopTransaction extends ChampTransaction { // Calculate how long we will wait before retrying... final long backoff = (long) Math.pow(2, i) * initialBackoff; LOGGER.warn("Caught exception while retrying transaction commit, retrying in " + backoff + " ms"); - + // ...and sleep before trying the commit again. try { Thread.sleep(backoff); - + } catch (InterruptedException ie) { - + LOGGER.info("Interrupted while backing off on transaction commit"); Thread.interrupted(); return; @@ -118,41 +117,41 @@ public class TinkerpopTransaction extends ChampTransaction { @Override public void rollback() throws ChampTransactionException { - - long initialBackoff = (int) (Math.random() * 50); - + long initialBackoff = (int)(new SecureRandom().nextDouble() * 50); + + // If something goes wrong, we will retry a couple of times before // giving up. for (int i = 0; i < COMMIT_RETRY_COUNT; i++) { - + try { - - threadedTransaction.tx().rollback(); + + threadedTransaction.tx().rollback(); LOGGER.info("Rolled back transaction - id: " + id); return; - + } catch (Throwable e) { - + LOGGER.debug("Transaction " + id + " failed to roll back due to: " + e.getMessage()); - + // Have we used up all of our retries? if (i == COMMIT_RETRY_COUNT - 1) { - + LOGGER.error("Maxed out rollback attempt retries, client must handle exception and retry", e); throw new ChampTransactionException(e); } - + // Calculate how long we will wait before retrying... final long backoff = (long) Math.pow(2, i) * initialBackoff; LOGGER.warn("Caught exception while retrying transaction roll back, retrying in " + backoff + " ms"); - + // ...and sleep before trying the commit again. try { Thread.sleep(backoff); - + } catch (InterruptedException ie) { - + LOGGER.info("Interrupted while backing off on transaction rollback"); Thread.interrupted(); return; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/GraphMLImporterExporter.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/GraphMLImporterExporter.java index a41f159..9f2f719 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/GraphMLImporterExporter.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/GraphMLImporterExporter.java @@ -97,6 +97,7 @@ public class GraphMLImporterExporter implements Importer, Exporter { try { final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); final DocumentBuilder builder = factory.newDocumentBuilder(); final InputSource inputSource = new InputSource(is); final Document doc = builder.parse(inputSource); |