Stuff for #10

src/main/java/se/kumliens/concept2runkeeper/domain/concept2/Concept2CsvActivity.java

@@ -1,5 +1,6 @@
 package se.kumliens.concept2runkeeper.domain.concept2;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.EqualsAndHashCode;
@@ -11,11 +12,15 @@
 import se.kumliens.concept2runkeeper.domain.ExternalActivity;
 
 import org.springframework.data.annotation.PersistenceConstructor;
+import se.kumliens.concept2runkeeper.domain.runkeeper.RunKeeperDistance;
+import se.kumliens.concept2runkeeper.domain.runkeeper.RunKeeperHeartRate;
+
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Created by svante2 on 2016-12-09.
@@ -55,7 +60,7 @@ public class Concept2CsvActivity implements ExternalActivity {
     private String restTimeSeconds;
 
     @JsonProperty("Work Distance")
-    private String workDistance;
+    private Double workDistance;
 
     @JsonProperty("Rest Distance")
     private String restDistance;
@@ -90,12 +95,15 @@ public class Concept2CsvActivity implements ExternalActivity {
     @JsonProperty("Comments")
     private String comments;
 
+    @JsonIgnore
+    private List<Concept2CsvStrokeData> strokeData;
+
     public Concept2CsvActivity() {
 
     }
 
     @PersistenceConstructor
-    public Concept2CsvActivity(String date, String description, String formattedWorkTime, Double workTimeInSeconds, String formattedRestTime, String restTimeSeconds, String workDistance, String restDistance, String strokeRate, String avgWatts,
+    public Concept2CsvActivity(String date, String description, String formattedWorkTime, Double workTimeInSeconds, String formattedRestTime, String restTimeSeconds, Double workDistance, String restDistance, String strokeRate, String avgWatts,
                                String avgHeartRate, String type, String pace, Double calPerHour, String age, String weight, String ranked, String comments) {
         this.date = date;
         this.description = description;

src/main/java/se/kumliens/concept2runkeeper/runkeeper/RecordActivityRequest.java

@@ -37,7 +37,7 @@ public class RecordActivityRequest {
 
     //The total distance traveled, in meters
     @JsonProperty("total_distance")
-    private String distance;
+    private Double distance;
 
     @JsonProperty("total_calories")
     private Double totalCalories;
@@ -68,7 +68,7 @@ public static RecordActivityRequest from(RunkeeperActivity runkeeperActivity, bo
                 .type(runkeeperActivity.getType())
                 //.startTime(runkeeperActivity.getStartTime()) Not needed right now.
                 .totalCalories(runkeeperActivity.getTotalCalories())
-                .distance(runkeeperActivity.getDistance().toString())
+                .distance(runkeeperActivity.getDistance())
                 .distances(runkeeperActivity.getDistances())
                 .duration(runkeeperActivity.getDuration())
                 .equipment(runkeeperActivity.getEquipment())

src/main/java/se/kumliens/concept2runkeeper/runkeeper/UpdateActivityRequest.java

@@ -47,7 +47,7 @@ public class UpdateActivityRequest {
     @JsonProperty("notes")
     private String notes;
 
-    @JsonProperty("heart_rate")
+    @JsonProperty("heartRate")
     private List<RunKeeperHeartRate> heartRates;
 
     public String getStartTime() {

src/main/java/se/kumliens/concept2runkeeper/services/RunkeeperService.java

@@ -6,7 +6,9 @@
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.springframework.http.client.BufferingClientHttpRequestFactory;
 import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.web.client.DefaultResponseErrorHandler;
 import org.springframework.web.client.ResponseErrorHandler;
 import se.kumliens.concept2runkeeper.domain.runkeeper.ExternalRunkeeperData;
@@ -25,6 +27,7 @@
 
 import javax.annotation.PostConstruct;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.text.ParseException;
 
@@ -50,6 +53,13 @@ public class RunkeeperService {
     public void setup() {
         log.debug("Got some props: {}", props);
         restTemplate = new RestTemplate();
+
+        // set up a buffering request factory, so response body is always buffered
+        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+        BufferingClientHttpRequestFactory bufferingClientHttpRequestFactory = new BufferingClientHttpRequestFactory(requestFactory);
+        requestFactory.setOutputStreaming(false);
+        restTemplate.setRequestFactory(bufferingClientHttpRequestFactory);
+
         restTemplate.setErrorHandler(new DefaultResponseErrorHandler() {
             @Override
             public boolean hasError(ClientHttpResponse clientHttpResponse) throws IOException {
@@ -58,6 +68,10 @@ public boolean hasError(ClientHttpResponse clientHttpResponse) throws IOExceptio
 
             @Override
             public void handleError(ClientHttpResponse clientHttpResponse) throws IOException {
+                InputStream is = clientHttpResponse.getBody();
+                java.util.Scanner s = new java.util.Scanner(is).useDelimiter("\\A");
+                String body = s.hasNext() ? s.next() : "";
+                log.info("{}", body);
                 int statusCode = clientHttpResponse.getStatusCode().value();
                 if(statusCode == 404) {
                     throw new NoSuchActivityException();
@@ -154,6 +168,7 @@ public RunkeeperActivity updateActivity(RunkeeperActivity runkeeperActivity, Str
             throw new RuntimeException(e);
         }
         RequestEntity requestEntity = new RequestEntity(request, headers, PUT, URI.create(props.getBaseUrl().toString().concat(runkeeperActivity.getUri())));
+
         ResponseEntity<RunkeeperActivity> response = restTemplate.exchange(requestEntity, RunkeeperActivity.class);
         log.info("got an updated activity: {}", response.getBody());
         return response.getBody();

src/main/java/se/kumliens/concept2runkeeper/vaadin/MainUI.java

@@ -255,7 +255,7 @@ public static final String getNavigatorViewNameBasedOnView(Class<? extends View>
     }
 
     public User getUser() {
-        return (User) getSession().getAttribute(SESSION_ATTR_USER);
+        return getSession() != null ? (User) getSession().getAttribute(SESSION_ATTR_USER) : null;
     }
 
 

src/main/java/se/kumliens/concept2runkeeper/vaadin/converters/Concept2DistanceConverter.java

@@ -12,28 +12,29 @@
  * Created by svante2 on 2016-12-25.
  */
 @Slf4j
-public class Concept2DistanceConverter implements Converter<String, String> {
+public class Concept2DistanceConverter implements Converter<String, Double> {
 
     @Override
-    public String convertToModel(String value, Class<? extends String> targetType, Locale locale) throws ConversionException {
-        return value.replace("m","").replace(" ","").trim();
+    public String convertToPresentation(Double value, Class<? extends String> targetType, Locale locale) throws ConversionException {
+        return value.toString();
     }
 
     @Override
-    public String convertToPresentation(String value, Class<? extends String> targetType, Locale locale) throws ConversionException {
-        try {
+    public Double convertToModel(String value, Class<? extends Double> targetType, Locale locale) throws ConversionException {
+        /*try {
             value = MoreObjects.firstNonNull(value, "0");
             DecimalFormat decimalFormat = new DecimalFormat(Constants.DISTANCE_PATTERN);
             return decimalFormat.format(Double.valueOf(value.replace(" ","").trim())) + " m";
         } catch (Exception e) {
             log.warn("Unable to parse {} to a number", value, e);
             return "n/a";
-        }
+        }*/
+        return Double.valueOf(value);
     }
 
     @Override
-    public Class<String> getModelType() {
-        return String.class;
+    public Class<Double> getModelType() {
+        return Double.class;
     }
 
     @Override