Skip to content

S175 : remove joda #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eschultink wants to merge 1 commit into
base: main
Choose a base branch
from
Open

S175 : remove joda #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,6 @@
<artifactId>guava</artifactId>
<version>[32.1,32.99]</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>[2.3,2.10.99)</version>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
Expand Down
12 changes: 2 additions & 10 deletions java/src/main/java/com/google/appengine/tools/mapreduce/impl/InProcessMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@
import com.google.common.collect.ImmutableList;

import lombok.SneakyThrows;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.io.IOException;
import java.io.Serializable;
import java.time.Instant;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
Expand Down Expand Up @@ -96,20 +93,15 @@ public void completed(Iterator<WorkerShardTask<I, O, MapOnlyMapperContext<O>>> t
return new MapReduceResultImpl<>(output.finish(writers), counters);
}


@SneakyThrows
@SuppressWarnings("unchecked")
private MapOnlyMapper<I, O> getCopyOfMapper() {
byte[] bytes = SerializationUtil.serializeToByteArray(mapper);
return SerializationUtil.deserialize(bytes);
}

private static final DateTimeFormatter DATE_FORMAT =
DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss");

private static String getMapReduceId() {
DateTime dt = new DateTime();
return "in-process-map-" + DATE_FORMAT.print(dt) + "-" + new Random().nextInt(1000000);
return "in-process-map-" + Instant.now().toString() + "-" + new Random().nextInt(1000000);
}

public static <I, O, R> MapReduceResult<R> runMap(MapSpecification<I, O, R> mrSpec)
Expand Down
10 changes: 2 additions & 8 deletions java/src/main/java/com/google/appengine/tools/mapreduce/impl/InProcessMapReduce.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@
import com.google.common.collect.ImmutableList;

import lombok.SneakyThrows;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.io.IOException;
import java.time.Instant;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
Expand Down Expand Up @@ -221,12 +219,8 @@ public void completed(
return new MapReduceResultImpl<>(output.finish(outputs), counters);
}

private static final DateTimeFormatter DATE_FORMAT =
DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss");

private static String getMapReduceId() {
DateTime dt = new DateTime();
return "in-process-mr-" + DATE_FORMAT.print(dt) + "-" + new Random().nextInt(1000000);
return "in-process-mr-" + Instant.now().toString() + "-" + new Random().nextInt(1000000);
}

public static <I, K, V, O, R> MapReduceResult<R> runMapReduce(
Expand Down