From d043c599100b65da97f390e9ee8df8a2af2a127b Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 18 Nov 2013 19:22:59 +0100 Subject: [PATCH] [Major] refactored the DateParameter and Order date to be Date, not long --- src/main/java/li/strolch/model/Order.java | 17 ++++++++++------- .../strolch/model/parameter/DateParameter.java | 13 +++++++------ .../java/li/strolch/test/model/ModelTest.java | 6 +++--- .../li/strolch/test/model/ModelTestHelper.java | 5 +++-- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/main/java/li/strolch/model/Order.java b/src/main/java/li/strolch/model/Order.java index dad507816..3aae680c9 100644 --- a/src/main/java/li/strolch/model/Order.java +++ b/src/main/java/li/strolch/model/Order.java @@ -21,11 +21,14 @@ */ package li.strolch.model; +import java.util.Date; + import li.strolch.model.Locator.LocatorBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; +import ch.eitchnet.utils.helper.StringHelper; import ch.eitchnet.utils.iso8601.ISO8601FormatFactory; /** @@ -43,7 +46,7 @@ public class Order extends GroupedParameterizedElement { private static final long serialVersionUID = 0L; - private long date; + private Date date; private State state; /** @@ -64,7 +67,7 @@ public class Order extends GroupedParameterizedElement { super(id, name, type); setState(State.CREATED); - setDate(System.currentTimeMillis()); + setDate(new Date()); } /** @@ -76,7 +79,7 @@ public class Order extends GroupedParameterizedElement { * @param date * @param state */ - public Order(String id, String name, String type, long date, State state) { + public Order(String id, String name, String type, Date date, State state) { super(id, name, type); setState(state); @@ -94,8 +97,8 @@ public class Order extends GroupedParameterizedElement { String date = element.getAttribute(Tags.DATE); String state = element.getAttribute(Tags.STATE); - if (date == null || date.isEmpty()) { - setDate(0); + if (StringHelper.isEmpty(date)) { + setDate(ISO8601FormatFactory.getInstance().getDateFormat().parse("-")); //$NON-NLS-1$ } else { setDate(ISO8601FormatFactory.getInstance().getDateFormat().parse(date)); } @@ -110,7 +113,7 @@ public class Order extends GroupedParameterizedElement { /** * @return the date */ - public long getDate() { + public Date getDate() { return this.date; } @@ -118,7 +121,7 @@ public class Order extends GroupedParameterizedElement { * @param date * the date to set */ - public void setDate(long date) { + public void setDate(Date date) { this.date = date; } diff --git a/src/main/java/li/strolch/model/parameter/DateParameter.java b/src/main/java/li/strolch/model/parameter/DateParameter.java index 066457d0c..8c040c7bf 100644 --- a/src/main/java/li/strolch/model/parameter/DateParameter.java +++ b/src/main/java/li/strolch/model/parameter/DateParameter.java @@ -22,6 +22,7 @@ package li.strolch.model.parameter; import java.text.MessageFormat; +import java.util.Date; import li.strolch.exception.StrolchException; import li.strolch.model.Tags; @@ -34,12 +35,12 @@ import ch.eitchnet.utils.iso8601.ISO8601FormatFactory; /** * @author Robert von Burg */ -public class DateParameter extends AbstractParameter { +public class DateParameter extends AbstractParameter { public static final String TYPE = "Date"; //$NON-NLS-1$ private static final long serialVersionUID = 0L; - private Long value; + private Date value; /** * Empty constructor @@ -55,7 +56,7 @@ public class DateParameter extends AbstractParameter { * @param name * @param value */ - public DateParameter(String id, String name, Long value) { + public DateParameter(String id, String name, Date value) { super(id, name); setValue(value); } @@ -83,12 +84,12 @@ public class DateParameter extends AbstractParameter { } @Override - public Long getValue() { + public Date getValue() { return this.value; } @Override - public void setValue(Long value) { + public void setValue(Date value) { validateValue(value); this.value = value; } @@ -99,7 +100,7 @@ public class DateParameter extends AbstractParameter { } @Override - public Parameter getClone() { + public Parameter getClone() { DateParameter clone = new DateParameter(); super.fillClone(clone); diff --git a/src/test/java/li/strolch/test/model/ModelTest.java b/src/test/java/li/strolch/test/model/ModelTest.java index 195957e40..a7197216a 100644 --- a/src/test/java/li/strolch/test/model/ModelTest.java +++ b/src/test/java/li/strolch/test/model/ModelTest.java @@ -4,6 +4,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.util.ArrayList; +import java.util.Date; import li.strolch.model.Order; import li.strolch.model.ParameterBag; @@ -33,8 +34,7 @@ public class ModelTest { @Test public void shouldCreateOrder() { - Order order = ModelTestHelper.createOrder("@ord01", "Test Order", "MyType", System.currentTimeMillis(), - State.OPEN); + Order order = ModelTestHelper.createOrder("@ord01", "Test Order", "MyType", new Date(), State.OPEN); ParameterBag bag = order.getParameterBag(ModelTestHelper.BAG_ID); validateBag(bag); } @@ -74,7 +74,7 @@ public class ModelTest { DateParameter dateParam = bag.getParameter(ModelTestHelper.PARAM_DATE_ID); assertNotNull("Date Param missing with id " + ModelTestHelper.PARAM_DATE_ID, dateParam); - assertEquals(1354295525628L, dateParam.getValue().longValue()); + assertEquals(1354295525628L, dateParam.getValue().getTime()); StringListParameter stringListP = bag.getParameter(ModelTestHelper.PARAM_LIST_STRING_ID); assertNotNull("StringList Param missing with id " + ModelTestHelper.PARAM_LIST_STRING_ID, stringListP); diff --git a/src/test/java/li/strolch/test/model/ModelTestHelper.java b/src/test/java/li/strolch/test/model/ModelTestHelper.java index 33d023e7d..7610db82a 100644 --- a/src/test/java/li/strolch/test/model/ModelTestHelper.java +++ b/src/test/java/li/strolch/test/model/ModelTestHelper.java @@ -22,6 +22,7 @@ package li.strolch.test.model; import java.util.ArrayList; +import java.util.Date; import li.strolch.model.Order; import li.strolch.model.ParameterBag; @@ -106,7 +107,7 @@ public class ModelTestHelper { * * @return the newly created {@link Order} */ - public static Order createOrder(String id, String name, String type, long date, State state) { + public static Order createOrder(String id, String name, String type, Date date, State state) { Order order = new Order(id, name, type, date, state); ParameterBag bag = createParameterBag(BAG_ID, BAG_NAME, BAG_TYPE); @@ -166,7 +167,7 @@ public class ModelTestHelper { StringParameter stringParam = new StringParameter(PARAM_STRING_ID, PARAM_STRING_NAME, "Strolch"); bag.addParameter(stringParam); - DateParameter dateParam = new DateParameter(PARAM_DATE_ID, PARAM_DATE_NAME, 1354295525628L); + DateParameter dateParam = new DateParameter(PARAM_DATE_ID, PARAM_DATE_NAME, new Date(1354295525628L)); bag.addParameter(dateParam); ArrayList stringList = new ArrayList();