Address review feedback

Signed-off-by: Ravi Nadahar <nadahar@rediffmail.com>

Author: Ravi Nadahar

bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/AbstractRemoteAddonService.java

@@ -69,8 +69,9 @@ public abstract class AbstractRemoteAddonService implements AddonService {
         if (compatible != 0) {
             return compatible;
         }
+        Version v1 = addon1.getVersion();
         Version v2 = addon2.getVersion();
-        return v2 == null ? 1 : v2.compareTo(addon1.getVersion());
+        return v1 == null && v2 == null ? 0 : v2 == null ? 1 : v2.compareTo(v1);
     };
 
     protected final Version coreVersion;

bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/Addon.java

@@ -12,7 +12,7 @@
  */
 package org.openhab.core.addon;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -362,7 +362,7 @@ private Builder(Addon addon) {
             this.connection = addon.connection;
             this.backgroundColor = addon.backgroundColor;
             this.imageLink = addon.imageLink;
-            this.properties = addon.properties;
+            this.properties = new LinkedHashMap<>(addon.properties);
             this.loggerPackages = addon.loggerPackages;
         }
 
@@ -446,7 +446,7 @@ public Builder withKeywords(String keywords) {
             return countries;
         }
 
-        public Builder withCountries(List<@NonNull String> countries) {
+        public Builder withCountries(@Nullable List<@NonNull String> countries) {
             this.countries = countries;
             return this;
         }
@@ -474,7 +474,7 @@ public Builder withImageLink(@Nullable String imageLink) {
         public Builder withProperty(@NonNull String key, @NonNull Object value) {
             Map<@NonNull String, @NonNull Object> props = this.properties;
             if (props == null) {
-                props = new HashMap<>();
+                props = new LinkedHashMap<>();
             }
             props.put(key, value);
             this.properties = props;

bundles/org.openhab.core/src/main/java/org/openhab/core/common/VersionRange.java

@@ -199,7 +199,7 @@ public int hashCode() {
         if (h != 0) {
             return h;
         }
-        return h = Objects.hash(leftInclusive, left, right, rightInclusive);
+        return hash = Objects.hash(leftInclusive, left, right, rightInclusive);
     }
 
     @Override