eliminated remaining explicit usages of HTTP proxy in source

java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/SwissTimingRaceConfigurationTest.java

@@ -1,9 +1,11 @@
 package com.sap.sailing.domain.swisstimingreplayadapter;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
 import java.net.URL;
 import java.net.URLConnection;
 import java.text.MessageFormat;
@@ -15,16 +17,12 @@ import java.util.Map;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
 public class SwissTimingRaceConfigurationTest {
     
     private static final String JSON_URL = "/2012_OSG.json";
     
+    @Ignore("Takes a very long time; only used to see if we can parse all configurations")
     @Test
-    @Ignore
     public void testLoadConfigurations() throws IOException, ParseException, org.json.simple.parser.ParseException {
         InputStream inputStream = getClass().getResourceAsStream(JSON_URL);
         List<SwissTimingReplayRace> races = SwissTimingReplayService.parseJSONObject(inputStream , JSON_URL);
@@ -57,14 +55,9 @@ public class SwissTimingRaceConfigurationTest {
 
     @Test
     public void testRaceConfig_6260_with_detail_config() throws Exception {
-
-        InetSocketAddress proxyAddress = new InetSocketAddress("proxy", 8080);
-        Proxy proxy = new Proxy(Proxy.Type.HTTP, proxyAddress);
-
         URL configFileURL = new URL(MessageFormat.format(SwissTimingReplayService.RACE_CONFIG_URL_TEMPLATE, "6260"));
-        URLConnection connection = configFileURL.openConnection(proxy);
+        URLConnection connection = configFileURL.openConnection();
         InputStream configDataStream = connection.getInputStream();
-
         SwissTimingRaceConfig config_446483 = SwissTimingReplayService.loadRaceConfig(configDataStream);
         assertNotNull(config_446483);
         assertEquals("GB", config_446483.country_code);

java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/SwissTimingReplayAdapterServiceTest.java

@@ -16,9 +16,7 @@ public class SwissTimingReplayAdapterServiceTest {
         InputStream inputStream = getClass().getResourceAsStream(swissTimingUrlText);
         List<SwissTimingReplayRace> races = SwissTimingReplayService.parseJSONObject(inputStream , swissTimingUrlText);
         assertEquals(201, races.size());
-        
         assertEquals("446483", races.get(0).race_id);
-        
         SwissTimingReplayRace race_42 = races.get(42);
         assertEquals("Elliott", race_42.boat_class);
         assertEquals("19", race_42.flight_number);
@@ -28,7 +26,6 @@ public class SwissTimingReplayAdapterServiceTest {
         assertEquals("6264", race_42.race_id);
         assertEquals("SAW010955", race_42.rsc);
         assertEquals("02.08.2012 15:30", SwissTimingReplayService.getStartTimeFormat().format(races.get(42).startTime));
-        
         assertEquals("live.ota.st-sportservice.com/Data/Log?_rsc=SAM009901&_date=30.07.2012", races.get(races.size() - 1).link);
     }    
     
@@ -36,7 +33,6 @@ public class SwissTimingReplayAdapterServiceTest {
     public void testRaceData_SAW005906_20120805() throws Exception {
         SwissTimingReplayTestListener replayCountListener = new SwissTimingReplayTestListener();
         SwissTimingReplayParser.readData(getClass().getResourceAsStream("/SAW005906.20120805.replay"), replayCountListener);
-        
         assertEquals(0, replayCountListener.keyFrameIndexSum);          
         assertEquals(790, replayCountListener.keyFrameIndexPositionCount);  
         assertEquals(2013, replayCountListener.eotCount);                    
@@ -58,7 +54,6 @@ public class SwissTimingReplayAdapterServiceTest {
     public void testRaceData_SAW010955_20120802() throws Exception {
         SwissTimingReplayTestListener replayCountListener = new SwissTimingReplayTestListener();
         SwissTimingReplayParser.readData(getClass().getResourceAsStream("/SAW010955.20120802.replay"), replayCountListener);
-        
         assertEquals(0, replayCountListener.keyFrameIndexSum);          
         assertEquals(402, replayCountListener.keyFrameIndexPositionCount);  
         assertEquals(404, replayCountListener.eotCount);                    

java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/SwissTimingReplayPrintListener.java

@@ -24,55 +24,62 @@ public class SwissTimingReplayPrintListener implements SwissTimingReplayParser.S
     public void referenceLocation(int latitude, int longitude) {
         this.referenceLatitude = latitude;
         this.referenceLongitude = longitude;
-        System.out.println("referenceLocation - latitude: " + (double) this.referenceLatitude / 1E7 + ", longitude: " + (double) this.referenceLongitude / 1E7); 
-        
+        System.out.println("referenceLocation - latitude: " + (double) this.referenceLatitude / 1E7 + ", longitude: "
+                + (double) this.referenceLongitude / 1E7);
     }
-    
+
     @Override
     public void keyFrameIndexPosition(int keyFrameIndexPosition) {
         System.out.println("keyFrameIndexPosition - keyFrameIndexPosition: " + keyFrameIndexPosition);
-        
     }
     
     @Override
     public void keyFrameIndex(int keyFrameIndex) {
         System.out.println("keyFrameIndex - keyFrameIndex:" + keyFrameIndex); 
-        
     }
     
     @Override
     public void competitorsCount(short competitorsCount) {
         System.out.println("competitorsCount - competitorsCount: " + competitorsCount);
-        
     }
     
     @Override
     public void competitor(int hashValue, String nation, String sailNumber, String name, CompetitorStatus competitorStatus,
-            BoatType boatType, short cRank_Bracket, short cnPoints_x10_Bracket, short ctPoints_x10_Winner) {
-        System.out.println("competitor - hashValue: " + hashValue + ", nation: " + nation + ", sailNumber: " + sailNumber + ", name: " + name + ", competitorStatus: " + competitorStatus + ", boatType: " + boatType + ", cRank_Bracket: " + cRank_Bracket + ", cnPoints_x10_Bracket: " + cnPoints_x10_Bracket + ", ctPoints_x10_Winner: " + ctPoints_x10_Winner);
-        
+            BoatType boatType, short cRank_Bracket, short cnPoints_x10_Bracket,
+            short ctPoints_x10_Winner) {
+        System.out.println("competitor - hashValue: " + hashValue + ", nation: " + nation + ", sailNumber: "
+                + sailNumber + ", name: " + name + ", competitorStatus: " + competitorStatus + ", boatType: "
+                + boatType + ", cRank_Bracket: " + cRank_Bracket + ", cnPoints_x10_Bracket: " + cnPoints_x10_Bracket
+                + ", ctPoints_x10_Winner: " + ctPoints_x10_Winner);
     }
 
     @Override
     public void mark(MarkType markType, String identifier, byte index, String id1, String id2, short windSpeed,
             short windDirection) {
-        System.out.println("mark - markType: " + markType + ", identifier: " + identifier + ", index: " + index + ", id1: " + id1 + ", id2: " + id2 + ", windSpeed: " + windSpeed + ", windDirection: " + windDirection);
-        
+        System.out
+                .println("mark - markType: " + markType + ", identifier: " + identifier + ", index: " + index
+                        + ", id1: " + id1 + ", id2: " + id2 + ", windSpeed: " + windSpeed + ", windDirection: "
+                        + windDirection);
     }
 
     @Override
     public void frameMetaData(byte cid, int raceTime, int startTime, int estimatedStartTime, RaceStatus raceStatus,
             short distanceToNextMark, Weather weather, short humidity, short temperature, String messageText,
             byte cFlag, byte rFlag, byte duration, short nm) {
-        System.out.println("frame - cid: " + cid + ", raceTime: " + raceTime + ", startTime: " + startTime + ", estimatedStartTime: " + estimatedStartTime + ", raceStatus: " + raceStatus + ", distanceToNextMark: " + distanceToNextMark + ", weather: " + weather + ", humidity: " + humidity + ", temperature: " + temperature + ", messageText: " + messageText + ", cFlag: " + cFlag + ", rFlag: " + rFlag + ", duration: " + duration + ", nm: " + nm);
-        
+        System.out.println("frame - cid: " + cid + ", raceTime: " + raceTime + ", startTime: " + startTime
+                + ", estimatedStartTime: " + estimatedStartTime + ", raceStatus: " + raceStatus
+                + ", distanceToNextMark: " + distanceToNextMark + ", weather: " + weather + ", humidity: " + humidity
+                + ", temperature: " + temperature + ", messageText: " + messageText + ", cFlag: " + cFlag + ", rFlag: "
+                + rFlag + ", duration: " + duration + ", nm: " + nm);
     }
 
     @Override
     public void ranking(int hashValue, short rank, short rankIndex, short racePoints, CompetitorStatus competitorStatus,
             short finishRank, short finishRankIndex, int gap, int raceTime) {
-        System.out.println("ranking - hashValue: " + hashValue + ", rank: " + rank + ", rankIndex: " + rankIndex + ", racePoints: " + racePoints + ", competitorStatus: " + competitorStatus + ", finishRank: " + finishRank + ", finishRankIndex: " + finishRankIndex + ", gap: " + gap + ", raceTime: " + raceTime);
-        
+        System.out.println("ranking - hashValue: " + hashValue + ", rank: " + rank + ", rankIndex: " + rankIndex
+                + ", racePoints: " + racePoints + ", competitorStatus: " + competitorStatus + ", finishRank: "
+                + finishRank + ", finishRankIndex: " + finishRankIndex + ", gap: " + gap + ", raceTime: " + raceTime);
+
     }
 
     @Override
@@ -83,8 +90,9 @@ public class SwissTimingReplayPrintListener implements SwissTimingReplayParser.S
 
     @Override
     public void rankingMark(short marksRank, short marksRankIndex, int marksGap, int marksRaceTime) {
-        System.out.println("rankingMark - marksRank: " + marksRank + ", marksRankIndex: " + marksRankIndex + ", marksGap: " + marksGap + ", marksRaceTime: " + marksRaceTime);
-        
+        System.out.println("rankingMark - marksRank: " + marksRank + ", marksRankIndex: " + marksRankIndex
+                + ", marksGap: " + marksGap + ", marksRaceTime: " + marksRaceTime);
+
     }
 
     @Override
@@ -99,13 +107,15 @@ public class SwissTimingReplayPrintListener implements SwissTimingReplayParser.S
             short pnPoints) {
         latitude = referenceLatitude - latitude;
         longitude = referenceLongitude - longitude;
-        System.out.println("trackers - hashValue: " + hashValue + ", latitude: " + (double) latitude / 1E7 + ", longitude: " + (double) longitude / 1E7 + ", cog: " + cog + ", sog: " + sog + ", average_sog: " + average_sog + ", vmg: " + vmg + ", competitorStatus: " + competitorStatus + ", rank: " + rank + ", dtl: " + dtl + ", dtnm: " + dtnm + ", nm: " + nm + ", pRank: " + pRank + ", ptPoints: " + ptPoints + ", pnPoints: " + pnPoints);
-        
+        System.out.println("trackers - hashValue: " + hashValue + ", latitude: " + (double) latitude / 1E7
+                + ", longitude: " + (double) longitude / 1E7 + ", cog: " + cog + ", sog: " + sog + ", average_sog: "
+                + average_sog + ", vmg: " + vmg + ", competitorStatus: " + competitorStatus + ", rank: " + rank
+                + ", dtl: " + dtl + ", dtnm: " + dtnm + ", nm: " + nm + ", pRank: " + pRank + ", ptPoints: " + ptPoints
+                + ", pnPoints: " + pnPoints);
     }
 
     @Override
     public void eot() {
         System.out.println("EOT");
     }
-    
 }

java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/SwissTimingReplayTestListener.java

@@ -20,7 +20,6 @@ public class SwissTimingReplayTestListener implements SwissTimingReplayParser.Sw
     int rankingMarkCount;
 
     public SwissTimingReplayTestListener() {
-
     }
 
     @Override