From e5d1e8558f85dba7c1308a240f0aa4c8cca65235 Mon Sep 17 00:00:00 2001 From: Tamino Dauth Date: Wed, 27 Mar 2019 15:47:53 +0100 Subject: [PATCH] Refactor #19 --- .../guistatemachine/api/neo4j/ActionConverter.scala | 3 --- .../de/retest/guistatemachine/api/neo4j/StateNeo4J.scala | 8 ++++---- .../guistatemachine/api/neo4j/SutStateConverter.scala | 3 --- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/scala/de/retest/guistatemachine/api/neo4j/ActionConverter.scala b/src/main/scala/de/retest/guistatemachine/api/neo4j/ActionConverter.scala index 0677924..703ecd2 100644 --- a/src/main/scala/de/retest/guistatemachine/api/neo4j/ActionConverter.scala +++ b/src/main/scala/de/retest/guistatemachine/api/neo4j/ActionConverter.scala @@ -3,9 +3,6 @@ package de.retest.guistatemachine.api.neo4j import de.retest.surili.commons.actions.{Action, NavigateRefreshAction} import org.neo4j.ogm.typeconversion.AttributeConverter -/* - * https://github.com/neo4j/neo4j-ogm/blob/master/neo4j-ogm-docs/src/main/asciidoc/reference/conversion.adoc - */ class ActionConverter extends AttributeConverter[Action, String] { def toGraphProperty(value: Action): String = value.toString // TODO #19 convert to XML with element def toEntityAttribute(value: String): Action = new NavigateRefreshAction // TODO #19 convert from XML to an action diff --git a/src/main/scala/de/retest/guistatemachine/api/neo4j/StateNeo4J.scala b/src/main/scala/de/retest/guistatemachine/api/neo4j/StateNeo4J.scala index ce27633..339c93d 100644 --- a/src/main/scala/de/retest/guistatemachine/api/neo4j/StateNeo4J.scala +++ b/src/main/scala/de/retest/guistatemachine/api/neo4j/StateNeo4J.scala @@ -33,11 +33,11 @@ case class StateNeo4J(sutState: SutState, guiStateMachine: GuiStateMachineNeo4J) } private[api] override def addTransition(a: Action, to: State): Int = Neo4jSessionFactory.transaction { - val filter = new Filter("start", ComparisonOperator.EQUALS, sutState) - val filter2 = new Filter("action", ComparisonOperator.EQUALS, a) + val filterStart = new Filter("start", ComparisonOperator.EQUALS, sutState) + val filterAction = new Filter("action", ComparisonOperator.EQUALS, a) val targetSutState = to.asInstanceOf[StateNeo4J].sutState - val filter3 = new Filter("end", ComparisonOperator.EQUALS, targetSutState) - val transitions = session.loadAll(classOf[ActionTransitionEntity], filter.and(filter2).and(filter3)) + val filterEnd = new Filter("end", ComparisonOperator.EQUALS, targetSutState) + val transitions = session.loadAll(classOf[ActionTransitionEntity], filterStart.and(filterAction).and(filterEnd)) val first = transitions.stream().findFirst() val counter = if (first.isPresent) { first.get().counter = first.get().counter + 1 diff --git a/src/main/scala/de/retest/guistatemachine/api/neo4j/SutStateConverter.scala b/src/main/scala/de/retest/guistatemachine/api/neo4j/SutStateConverter.scala index e1d81c7..21bb175 100644 --- a/src/main/scala/de/retest/guistatemachine/api/neo4j/SutStateConverter.scala +++ b/src/main/scala/de/retest/guistatemachine/api/neo4j/SutStateConverter.scala @@ -6,9 +6,6 @@ import de.retest.recheck.XmlTransformerUtil import de.retest.recheck.ui.descriptors.SutState import org.neo4j.ogm.typeconversion.AttributeConverter -/* - * https://github.com/neo4j/neo4j-ogm/blob/master/neo4j-ogm-docs/src/main/asciidoc/reference/conversion.adoc - */ class SutStateConverter extends AttributeConverter[SutState, String] { def toGraphProperty(value: SutState): String = XmlTransformerUtil.getXmlTransformer.toXML(value) def toEntityAttribute(value: String): SutState =