From c895f1925031cf8bdbe380378365b01ba08d4735 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 15 Jan 2020 17:38:45 -0500 Subject: [PATCH] Polishing --- .../internet2/tap/beacon/DefaultBeaconPublisher.java | 10 ++++------ .../tap/beacon/DefaultBeaconPublisherTests.java | 8 ++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/beacon/core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java b/beacon/core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java index 74e49d930..e8061268c 100644 --- a/beacon/core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java +++ b/beacon/core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java @@ -24,7 +24,7 @@ */ public class DefaultBeaconPublisher implements BeaconPublisher { - private URL enpointUrl; + private URL endpointUrl; private String jsonPayload; @@ -42,7 +42,7 @@ public DefaultBeaconPublisher(Map beaconDetails) { throw new IllegalArgumentException("Not all the necessary beacon data is available to be able to publish to beacon"); } try { - this.enpointUrl = new URL(String.format("http://%s:%s", beaconDetails.get(LOG_HOST), beaconDetails.get(LOG_PORT))); + this.endpointUrl = new URL(String.format("http://%s:%s", beaconDetails.get(LOG_HOST), beaconDetails.get(LOG_PORT))); } catch (MalformedURLException ex) { throw new IllegalArgumentException(ex.getMessage()); } @@ -65,7 +65,7 @@ public DefaultBeaconPublisher(Map beaconDetails) { @Override public void run() { try { - HttpURLConnection con = (HttpURLConnection) this.enpointUrl.openConnection(); + HttpURLConnection con = (HttpURLConnection) this.endpointUrl.openConnection(); con.setRequestMethod("POST"); con.setRequestProperty("Content-Type", "application/json; utf-8"); con.setRequestProperty("Accept", "application/json"); @@ -77,13 +77,11 @@ public void run() { } catch (IOException e) { e.printStackTrace(); } - - } //getters used in unit tests and calling components for debugging purposes public String getEndpointUri() { - return enpointUrl.toString(); + return endpointUrl.toString(); } public String getJsonPayload() { diff --git a/beacon/core/src/test/java/edu/internet2/tap/beacon/DefaultBeaconPublisherTests.java b/beacon/core/src/test/java/edu/internet2/tap/beacon/DefaultBeaconPublisherTests.java index fcc405cb7..86c8b2edd 100644 --- a/beacon/core/src/test/java/edu/internet2/tap/beacon/DefaultBeaconPublisherTests.java +++ b/beacon/core/src/test/java/edu/internet2/tap/beacon/DefaultBeaconPublisherTests.java @@ -12,16 +12,12 @@ public class DefaultBeaconPublisherTests { @Test public void checkCorrectInvariantsWithBeaconDataNull() { - assertThrows(IllegalArgumentException.class, () -> { - new DefaultBeaconPublisher(null); - }); + assertThrows(IllegalArgumentException.class, () -> new DefaultBeaconPublisher(null)); } @Test public void checkCorrectInvariantsWithBeaconDataEmpty() { - assertThrows(IllegalArgumentException.class, () -> { - new DefaultBeaconPublisher(new HashMap<>()); - }); + assertThrows(IllegalArgumentException.class, () -> new DefaultBeaconPublisher(new HashMap<>())); } @Test