You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/12/12 15:29:01 UTC

[isis] 02/02: ISIS-2223: fixing code quality issues

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit c87085cc50eab1cb3228d1e0bada93a8b1829b30
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 12 16:28:47 2019 +0100

    ISIS-2223: fixing code quality issues
---
 .../isis/applib/util/TitleBufferException.java     |  2 +-
 .../isis/applib/value/LocalResourcePath.java       | 23 ++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/TitleBufferException.java b/core/applib/src/main/java/org/apache/isis/applib/util/TitleBufferException.java
index 0928182..64ec136 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/util/TitleBufferException.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/TitleBufferException.java
@@ -42,7 +42,7 @@ public class TitleBufferException extends RuntimeException {
     }
 
     @Override
-    public Throwable getCause() {
+    public synchronized Throwable getCause() {
         return cause;
     }
 }
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java b/core/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
index f657475..34b45af 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
@@ -26,13 +26,15 @@ import javax.annotation.Nonnull;
 
 import org.apache.isis.applib.annotation.Value;
 
+import lombok.NonNull;
+
 /**
  * Represents a local resource path, typically a relative path originating at this web-app's root or context-root.
  */
 @Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.localrespath.LocalResourcePathValueSemanticsProvider")
 public final class LocalResourcePath implements Serializable {
     private static final long serialVersionUID = 1L;
-    private final String path;
+    @NonNull private final String path;
 
     public LocalResourcePath(final String path) throws IllegalArgumentException {
 
@@ -41,7 +43,7 @@ public final class LocalResourcePath implements Serializable {
         this.path = (path != null) ? path : "";
     }
 
-    @Nonnull
+    @NonNull
     public Object getValue() {
         return path;
     }
@@ -58,25 +60,30 @@ public final class LocalResourcePath implements Serializable {
 
     @Override
     public boolean equals(Object obj) {
-        if(obj==null)
+        if(obj==null) {
             return false;
-
+        }
         return (obj instanceof LocalResourcePath) ?	isEqualTo((LocalResourcePath)obj) : false;
     }
+    
+    @Override
+    public int hashCode() {
+        return path.hashCode();
+    }
 
     public boolean isEqualTo(LocalResourcePath other) {
-        if(other==null)
+        if(other==null) {
             return false;
-
+        }
         return this.getPath().equals(other.getPath());
     }
 
     // -- HELPER
 
     private void validate(String path) throws IllegalArgumentException {
-        if(path==null)
+        if(path==null) {
             return;
-
+        }
         try {
             // used for syntax testing
             new java.net.URI("http://localhost/"+path);