JAVAMONEY-89: Removed timestamp methods.

Author: atsticks

src/main/java/javax/money/AbstractContext.java

@@ -11,9 +11,6 @@
 package javax.money;
 
 import java.io.Serializable;
-import java.time.Instant;
-import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalAccessor;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -34,12 +31,8 @@ public abstract class AbstractContext implements Serializable {
 	/**
 	 * Key for storing the target providers to be queried
 	 */
-	public static final String KEY_PROVIDER = "provider";
+    protected static final String KEY_PROVIDER = "provider";
 
-	/**
-	 * Key name for the timestamp attribute.
-	 */
-	public static final String KEY_TIMESTAMP = "timestamp";
 
     /**
      * The data map containing all values.
@@ -175,43 +168,6 @@ public String getProviderName() {
         return getText(KEY_PROVIDER);
     }
 
-    /**
-     * Get the current target timestamp of the query in UTC milliseconds.  If not set it tries to of an
-     * UTC timestamp from #getTimestamp(). This allows to select historical roundings that were valid in the
-     * past. Its implementation specific, to what extend historical roundings are available. By default if this
-     * property is not set always current {@link  javax.money.MonetaryRounding} instances are provided.
-     *
-     * @return the timestamp in millis, or null.
-     */
-    public Long getTimestampMillis() {
-        Long value = get(KEY_TIMESTAMP, Long.class);
-        if (Objects.isNull(value)) {
-            TemporalAccessor acc = getTimestamp();
-            if (Objects.nonNull(acc)) {
-                return (acc.getLong(ChronoField.INSTANT_SECONDS) * 1000L) + acc.getLong(ChronoField.MILLI_OF_SECOND);
-            }
-        }
-        return value;
-    }
-
-    /**
-     * Get the current target timestamp of the query. If not set it tries to of an Instant from
-     * #getTimestampMillis(). This allows to select historical roundings that were valid in the
-     * past. Its implementation specific, to what extend historical roundings are available. By default if this
-     * property is not set always current {@link  javax.money.MonetaryRounding} instances are provided.
-     *
-     * @return the current timestamp, or null.
-     */
-    public TemporalAccessor getTimestamp() {
-        TemporalAccessor acc = get(KEY_TIMESTAMP, TemporalAccessor.class);
-        if (Objects.isNull(acc)) {
-            Long value = get(KEY_TIMESTAMP, Long.class);
-            if (Objects.nonNull(value)) {
-                acc = Instant.ofEpochMilli(value);
-            }
-        }
-        return acc;
-    }
 
     /**
      * Checks if the current instance has no attributes set. This is often the cases, when used in default cases.
@@ -232,19 +188,6 @@ public int hashCode() {
         return Objects.hash(data);
     }
 
-    /**
-     * Access all the key/values present, filtered by the values that are assignable to the given type.
-     *
-     * @param type the value type, not null.
-     * @return return all key/values with values assignable to a given value type.
-     */
-    public <T> Map<String, T> getValues(Class<T> type) {
-        Map<String, T> result = new HashMap<>();
-        data.entrySet().stream().filter(en -> type.isAssignableFrom(en.getValue().getClass())).forEach(
-                en -> result.put(en.getKey(), type.cast(en.getValue())));
-        return result;
-    }
-
     /*
      * (non-Javadoc)
      *

src/main/java/javax/money/AbstractContextBuilder.java

@@ -8,8 +8,6 @@
  */
 package javax.money;
 
-import java.time.LocalDateTime;
-import java.time.temporal.TemporalAccessor;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -191,35 +189,35 @@ public B setProviderName(String provider) {
         set(AbstractContext.KEY_PROVIDER, provider);
         return (B) this;
     }
-
-    /**
-     * Set the target timestamp in UTC millis. This allows to select historical roundings that were valid in the
-     * past. Its implementation specific, to what extend historical roundings are available. By default if this
-     * property is not set always current {@link  javax.money.MonetaryRounding} instances are provided.
-     *
-     * @param timestamp the target timestamp
-     * @return this instance for chaining
-     * @see #setTimestamp(java.time.temporal.TemporalAccessor)
-     */
-    public B setTimestampMillis(long timestamp){
-        set(AbstractContext.KEY_TIMESTAMP, timestamp);
-        return (B) this;
-    }
-
-    /**
-     * Set the target timestamp as {@link java.time.temporal.TemporalAccessor}. This allows to select historical
-     * roundings that were valid in the past. Its implementation specific, to what extend historical roundings
-     * are available. By default if this property is not set always current {@link  javax.money.MonetaryRounding}
-     * instances are provided.
-     *
-     * @param timestamp the target timestamp
-     * @return this instance for chaining
-     * @see #setTimestampMillis(long)
-     */
-	public B setTimestamp(LocalDateTime timestamp) {
-        set(AbstractContext.KEY_TIMESTAMP, Objects.requireNonNull(timestamp));
-        return (B) this;
-    }
+//
+//    /**
+//     * Set the target timestamp in UTC millis. This allows to select historical roundings that were valid in the
+//     * past. Its implementation specific, to what extend historical roundings are available. By default if this
+//     * property is not set always current {@link  javax.money.MonetaryRounding} instances are provided.
+//     *
+//     * @param timestamp the target timestamp
+//     * @return this instance for chaining
+//     * @see #setTimestamp(java.time.temporal.TemporalAccessor)
+//     */
+//    public B setTimestampMillis(long timestamp){
+//        set(AbstractContext.KEY_TIMESTAMP, timestamp);
+//        return (B) this;
+//    }
+//
+//    /**
+//     * Set the target timestamp as {@link java.time.temporal.TemporalAccessor}. This allows to select historical
+//     * roundings that were valid in the past. Its implementation specific, to what extend historical roundings
+//     * are available. By default if this property is not set always current {@link  javax.money.MonetaryRounding}
+//     * instances are provided.
+//     *
+//     * @param timestamp the target timestamp
+//     * @return this instance for chaining
+//     * @see #setTimestampMillis(long)
+//     */
+//	public B setTimestamp(LocalDateTime timestamp) {
+//        set(AbstractContext.KEY_TIMESTAMP, Objects.requireNonNull(timestamp));
+//        return (B) this;
+//    }
 
     /**
      * Removes an entry of a certain keys. This can be useful, when a context is initialized with another
@@ -236,16 +234,6 @@ public B removeAttributes(String... keys) {
         return (B) this;
     }
 
-    /**
-     * Removes all entries.
-     *
-     * @return this Builder, for chaining
-     */
-    public B removeAll() {
-        this.data.clear();
-        return (B) this;
-    }
-
     /**
      * Creates a new {@link AbstractContext} with the data from this Builder
      * instance.

src/main/java/javax/money/AbstractQuery.java

@@ -10,15 +10,8 @@
  */
 package javax.money;
 
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalAccessor;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Represents a general context of data targeting an item of type {@code Q}. Contexts are used to add arbitrary
@@ -80,29 +73,4 @@ public Class<?> getTargetType() {
         return get(KEY_QUERY_TARGET_TYPE, Class.class);
     }
 
-    /**
-     * Get the current timestamp of the context in UTC milliseconds.  If not set it tries to of an
-     * UTC timestamp from #getTimestamp().
-     *
-     * @return the timestamp in millis, or null.
-     */
-    @Override
-	public Long getTimestampMillis() {
-		LocalDateTime value = getTimestamp();
-		if (Objects.nonNull(value)) {
-			return Date.from(value.atZone(ZoneId.systemDefault()).toInstant())
-					.getTime();
-        }
-        return null;
-    }
-
-    /**
-     * Get the current timestamp. If not set it tries to of an Instant from #getTimestampMillis().
-     * @return the current timestamp, or null.
-     */
-    @Override
-	public LocalDateTime getTimestamp() {
-		return get(KEY_QUERY_TIMESTAMP, LocalDateTime.class);
-    }
-
 }

src/main/java/javax/money/AbstractQueryBuilder.java

@@ -8,12 +8,7 @@
  */
 package javax.money;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -59,30 +54,6 @@ public B setProviderNames(List<String> providers) {
         return set(AbstractQuery.KEY_QUERY_PROVIDERS, providers);
     }
 
-    /**
-     * Set the target timestamp as {@link java.time.temporal.TemporalAccessor}. This allows to select historical
-     * roundings that were valid in the past. Its implementation specific, to what extend historical roundings
-     * are available. By default if this property is not set always current {@link  javax.money.MonetaryRounding}
-     * instances are provided.
-     *
-     * @param timestamp the target timestamp
-     * @return this instance for chaining
-     * @see #setTimestampMillis(long)
-     */
-	@Override
-	public B setTimestamp(LocalDateTime timestamp) {
-		set(AbstractQuery.KEY_QUERY_TIMESTAMP,
-				Objects.requireNonNull(timestamp));
-		return (B) this;
-	}
-
-	public B setTimestamp(LocalDate timestamp) {
-		return setTimestamp(timestamp.atTime(LocalTime.now()));
-	}
-
-	public B setTimestamp(LocalTime timestamp) {
-		return setTimestamp(LocalDate.now().atTime(timestamp));
-	}
     /**
      * Set the providers to be considered. If not set explicitly the <i>default</i> providers and the corresponding
      * default ordering are used.
@@ -105,19 +76,6 @@ public B setProviderName(String provider) {
         return setProviderNames(provider);
     }
 
-    /**
-     * Sets the target timestamp as UTC millisesonds.
-     *
-     * @param timestamp the target timestamp
-     * @return the query builder for chaining.
-     */
-    @Override
-	public B setTimestampMillis(long timestamp) {
-		Date date = new Date(timestamp);
-		LocalDateTime localDateTime = LocalDateTime.ofInstant(date.toInstant(),
-				ZoneId.systemDefault());
-		return set(AbstractQuery.KEY_QUERY_TIMESTAMP, localDateTime);
-    }
 
     /**
      * Sets the target implementation type required. This can be used to explicitly acquire a specific
@@ -140,6 +98,6 @@ public B setTargetType(Class<?> type) {
      * @return a new {@link AbstractQuery}. never {@code null}.
      */
     @Override
-	public abstract C build();
+    public abstract C build();
 
 }

src/test/java/javax/money/AbstractContextBuilderTest.java

@@ -188,19 +188,6 @@ public void testRemoveAttributes() throws Exception {
         assertEquals(ctx.getText("myKey"), null);
     }
 
-    @Test
-    public void testRemoveAll() throws Exception {
-        AbstractContextBuilder b = createBuilder();
-        Set<Number> set = new HashSet<>();
-        set.add(BigDecimal.ONE);
-        b.set("myKey", "test");
-        AbstractContext ctx = b.build();
-        assertEquals(ctx.getText("myKey"), "test");
-        b.removeAll();
-        ctx = b.build();
-        assertEquals(ctx.getText("myKey"), null);
-    }
-
     @Test
     public void testToString() throws Exception {
         AbstractContextBuilder b = createBuilder();

src/test/java/javax/money/AbstractContextTest.java

@@ -16,7 +16,6 @@
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -127,19 +126,19 @@ public void testGetType() {
         assertEquals(Integer.class, ctx.getType("a"));
         assertEquals(Integer.class, ctx.getType("b"));
     }
-
-    @Test
-    public void testGetTimestampMillis() {
-        TestContext ctx = new TestContext.Builder().setTimestampMillis(2000L).build();
-        assertEquals(Long.valueOf(2000L), ctx.getTimestampMillis());
-    }
-
-    @Test
-    public void testGetTimestamp() {
-        LocalDateTime now = LocalDateTime.now();
-        TestContext ctx = new TestContext.Builder().setTimestamp(now).build();
-        assertEquals(now, ctx.getTimestamp());
-    }
+//
+//    @Test
+//    public void testGetTimestampMillis() {
+//        TestContext ctx = new TestContext.Builder().setTimestampMillis(2000L).build();
+//        assertEquals(Long.valueOf(2000L), ctx.getTimestampMillis());
+//    }
+//
+//    @Test
+//    public void testGetTimestamp() {
+//        LocalDateTime now = LocalDateTime.now();
+//        TestContext ctx = new TestContext.Builder().setTimestamp(now).build();
+//        assertEquals(now, ctx.getTimestamp());
+//    }
 
     private static class TestContext extends AbstractContext {