This is an automated email from the ASF dual-hosted git repository. wlieurance pushed a commit to branch TAMAYA-394-sonar-errors in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git
commit 82f76b7c99411afef3683ea948a06bb923b51da5 Author: William Lieurance <[email protected]> AuthorDate: Thu Jun 13 22:38:08 2019 -0500 TAMAYA-394 Sonar vulns --- .../examples/distributed/ContentManagerPanel.java | 8 +- .../tamaya/examples/distributed/Display.java | 16 ++-- .../examples/distributed/DisplayContent.java | 94 +++++++++++++++++++--- .../examples/distributed/DisplayManager.java | 10 +-- .../examples/distributed/DisplayContentTest.java | 6 +- 5 files changed, 101 insertions(+), 33 deletions(-) diff --git a/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/ContentManagerPanel.java b/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/ContentManagerPanel.java index 5972396..41e4e23 100644 --- a/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/ContentManagerPanel.java +++ b/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/ContentManagerPanel.java @@ -72,10 +72,10 @@ class ContentManagerPanel extends VBox{ if(selection!=null){ String uuid = selection.split("::")[1]; DisplayContent content = new DisplayContent(); - content.content.put(Display.CONTENT_FIELD, contentField.getText()); - content.title = titleField.getText(); - content.displayId = uuid; - content.displayName = displayNameField.getText(); + content.getContent().put(Display.CONTENT_FIELD, contentField.getText()); + content.setTitle(titleField.getText()); + content.setDisplayId(uuid); + content.setDisplayName(displayNameField.getText()); vertx.eventBus().publish(Display.DISPLAY_SHOW_TOPIC, Json.encode(content)); } }); diff --git a/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/Display.java b/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/Display.java index ba0e8db..cd8e178 100644 --- a/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/Display.java +++ b/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/Display.java @@ -108,7 +108,7 @@ public class Display extends Application{ try { Thread.sleep(100L); } catch (InterruptedException e) { - e.printStackTrace(); + LOG.severe("Vertx cluster did not respond in time."); Thread.currentThread().interrupt(); } } @@ -160,16 +160,14 @@ public class Display extends Application{ vertx.eventBus().consumer(DISPLAY_SHOW_TOPIC, h -> { DisplayContent content = Json.decodeValue((String)h.body(), DisplayContent.class); logToMonitor("NEW CONTENT: " + content.toString()); - if(registration.getId().equals(content.displayId)) { + if(registration.getId().equals(content.getDisplayId())) { logToMonitor("Applying content: " + content + "..."); - titleField.setText(content.title); - contentField.setText(content.content.get(CONTENT_FIELD)); - if(content.displayName!=null) { - this.registration.setDisplayName( - content.displayName - ); + titleField.setText(content.getTitle()); + contentField.setText(content.getContent().get(CONTENT_FIELD)); + if(content.getDisplayName()!=null) { + this.registration.setDisplayName(content.getDisplayName()); Platform.runLater(() -> { - this.stage.setTitle(content.displayName); + this.stage.setTitle(content.getDisplayName()); }); } logToMonitor("SUCCESS."); diff --git a/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/DisplayContent.java b/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/DisplayContent.java index 2a48630..57e7f22 100644 --- a/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/DisplayContent.java +++ b/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/DisplayContent.java @@ -27,11 +27,11 @@ import java.util.Objects; * Created by atsticks on 13.11.16. */ public class DisplayContent { - public String displayId; - public String title = "UNKNOWN"; - public Map<String,String> content = new HashMap<>(); - public long timestamp = System.currentTimeMillis(); - public String displayName; + private String displayId; + private String title = "UNKNOWN"; + private Map<String,String> content = new HashMap<>(); + private long timestamp = System.currentTimeMillis(); + private String displayName; @Override public boolean equals(Object o) { @@ -42,22 +42,92 @@ public class DisplayContent { return false; } DisplayContent that = (DisplayContent) o; - return timestamp == that.timestamp && - Objects.equals(displayId, that.displayId) && - Objects.equals(title, that.title); + return getTimestamp() == that.getTimestamp() && + Objects.equals(getDisplayId(), that.getDisplayId()) && + Objects.equals(getTitle(), that.getTitle()); } @Override public int hashCode() { - return Objects.hash(displayId, title, timestamp); + return Objects.hash(getDisplayId(), getTitle(), getTimestamp()); } @Override public String toString() { return "DisplayContent{" + - "displayId='" + displayId + '\'' + - ", title='" + title + '\'' + - ", content=" + content + + "displayId='" + getDisplayId() + '\'' + + ", title='" + getTitle() + '\'' + + ", content=" + getContent() + '}'; } + + /** + * @return the displayId + */ + public String getDisplayId() { + return displayId; + } + + /** + * @param displayId the displayId to set + */ + public void setDisplayId(String displayId) { + this.displayId = displayId; + } + + /** + * @return the title + */ + public String getTitle() { + return title; + } + + /** + * @param title the title to set + */ + public void setTitle(String title) { + this.title = title; + } + + /** + * @return the content + */ + public Map<String,String> getContent() { + return content; + } + + /** + * @param content the content to set + */ + public void setContent(Map<String,String> content) { + this.content = content; + } + + /** + * @return the timestamp + */ + public long getTimestamp() { + return timestamp; + } + + /** + * @param timestamp the timestamp to set + */ + public void setTimestamp(long timestamp) { + this.timestamp = timestamp; + } + + /** + * @return the displayName + */ + public String getDisplayName() { + return displayName; + } + + /** + * @param displayName the displayName to set + */ + public void setDisplayName(String displayName) { + this.displayName = displayName; + } } diff --git a/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/DisplayManager.java b/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/DisplayManager.java index b5cf2a2..1eca9fb 100644 --- a/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/DisplayManager.java +++ b/examples/06-distributed/src/main/java/org/apache/tamaya/examples/distributed/DisplayManager.java @@ -95,7 +95,7 @@ public class DisplayManager extends Application{ try { Thread.sleep(100L); } catch (InterruptedException e) { - e.printStackTrace(); + LOG.severe("Vertx cluster did not respond in time."); Thread.currentThread().interrupt(); } } @@ -125,10 +125,10 @@ public class DisplayManager extends Application{ logToMonitor("NEW CONTENT: " + content.toString()); logToMonitor("Updating config for content: " + content + "..."); MutableConfiguration config = MutableConfiguration.create(); - String id = content.displayId; - config.put("displays."+id+".title", content.title); - config.put("displays."+id+".timestamp", String.valueOf(content.timestamp)); - config.put("displays."+id+".content.content", content.content.get(CONTENT_FIELD)); + String id = content.getDisplayId(); + config.put("displays."+id+".title", content.getTitle()); + config.put("displays."+id+".timestamp", String.valueOf(content.getTimestamp())); + config.put("displays."+id+".content.content", content.getContent().get(CONTENT_FIELD)); config.store(); logToMonitor("UPDATED."); }); diff --git a/examples/06-distributed/src/test/java/org/apache/tamaya/examples/distributed/DisplayContentTest.java b/examples/06-distributed/src/test/java/org/apache/tamaya/examples/distributed/DisplayContentTest.java index b052cc1..9b3bf4c 100644 --- a/examples/06-distributed/src/test/java/org/apache/tamaya/examples/distributed/DisplayContentTest.java +++ b/examples/06-distributed/src/test/java/org/apache/tamaya/examples/distributed/DisplayContentTest.java @@ -36,9 +36,9 @@ public class DisplayContentTest { @org.junit.Test public void testJson() throws Exception { DisplayContent content = new DisplayContent(); - content.displayId = "1234"; - content.title = "myTitle"; - content.content.put("content", "myContent"); + content.setDisplayId("1234"); + content.setTitle("myTitle"); + content.getContent().put("content", "myContent"); String val = Json.encode(content); DisplayContent decoded = Json.decodeValue(val, DisplayContent.class); assertThat(decoded).isNotNull();
