Merge pull request #83 from osmlab/ljdelight/batchHttpFix

Avoid unnecessary http requests due to map getOrDefault

Author: Michael Cuthbert

src/main/java/org/maproulette/client/batch/BatchUploader.java

@@ -88,8 +88,11 @@ public Tuple<Long, Long> addTask(final Challenge challenge, final Task task)
         {
             identifier = this.getDefaultProjectIdentifier();
         }
-        final var projectBatch = this.projectBatchMap.getOrDefault(identifier,
-                new ProjectBatch(identifier, this.configuration));
+
+        final long finalIdentifier = identifier;
+        final var projectBatch = this.projectBatchMap.computeIfAbsent(identifier,
+                k -> new ProjectBatch(finalIdentifier, this.configuration));
+
         final var challengeId = projectBatch.addTask(challenge, task);
         this.projectBatchMap.put(identifier, projectBatch);
         return new Tuple<>(identifier, challengeId);
@@ -131,6 +134,16 @@ public void flushAll()
         });
     }
 
+    /**
+     * Get the project id for the configuration's default project name. If the project id is not yet
+     * known, HTTP requests will be make to (1) get the default project and (2) if the default
+     * project doesn't exist create it. <br>
+     * THIS METHOD MAY MAKE EXTERNAL HTTP REQUESTS. <br>
+     *
+     * @return project id
+     * @throws MapRouletteException
+     *             when the requests fail
+     */
     private long getDefaultProjectIdentifier() throws MapRouletteException
     {
         if (this.defaultProjectIdentifier == -1)

src/main/java/org/maproulette/client/batch/ChallengeBatch.java

@@ -15,6 +15,7 @@
 import org.maproulette.client.exception.MapRouletteRuntimeException;
 import org.maproulette.client.model.Challenge;
 import org.maproulette.client.model.Task;
+import org.maproulette.client.utilities.ObjectMapperSingleton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,7 +37,7 @@ public class ChallengeBatch
 {
     private static final int MAXIMUM_BATCH_SIZE = 5000;
     private final Logger logger = LoggerFactory.getLogger(ChallengeBatch.class);
-    private final ObjectMapper mapper = new ObjectMapper();
+    private final ObjectMapper mapper = ObjectMapperSingleton.getMapper();
     private final IMapRouletteConnection connection;
     private final long challengeId;
     private final int maxBatchSize;
@@ -116,6 +117,8 @@ public synchronized void addTask(final Task task) throws MapRouletteException
         this.batch.add(task);
         if (this.batch.size() >= this.maxBatchSize)
         {
+            this.logger.debug("FLUSHING queued tasks as batch size {} meets max {}",
+                    this.batch.size(), this.maxBatchSize);
             this.flush();
         }
     }

src/main/java/org/maproulette/client/batch/ProjectBatch.java

@@ -83,8 +83,10 @@ public synchronized long addTask(final Challenge challenge, final Task task)
         {
             challengeId = challenge.getId();
         }
-        final var challengeBatch = this.batch.getOrDefault(challengeId,
-                new ChallengeBatch(this.configuration, challenge));
+
+        final var challengeBatch = this.batch.computeIfAbsent(challengeId,
+                k -> new ChallengeBatch(this.configuration, challenge));
+
         task.setParent(challengeId);
         challengeBatch.addTask(task);
         this.batch.put(challengeId, challengeBatch);

src/main/java/org/maproulette/client/connection/MapRouletteConnection.java

@@ -57,7 +57,11 @@ public MapRouletteConnection(final MapRouletteConfiguration configuration)
     @Override
     public Optional<String> execute(final Query query) throws MapRouletteException
     {
-        log.trace("Request: {} {} data={}", query.getMethodName(), query.getUri(), query.getData());
+        log.debug("Request: {} {}", query.getMethodName(), query.getUri());
+        if (log.isTraceEnabled())
+        {
+            log.trace("data={}", query.getData());
+        }
 
         // add authentication to the query
         query.addHeader(KEY_API_KEY, this.configuration.getApiKey());