sonar cloud fixes

europeana · Sep 11, 2024 · 47a6454 · 47a6454
1 parent c5084b5
commit 47a6454
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/...definitions/src/main/java/eu/europeana/set/definitions/model/vocabulary/UserSetTypes.java b/...definitions/src/main/java/eu/europeana/set/definitions/model/vocabulary/UserSetTypes.java
@@ -10,7 +10,8 @@
  */
 public enum UserSetTypes implements JsonKeyword {
 
-    COLLECTION("Collection"), DYNAMICCOLLECTION("DynamicCollection"), BOOKMARKSFOLDER("BookmarkFolder"), ENTITYBESTITEMSSET("EntityBestItemsSet"), GALLERY("Gallery");
+    COLLECTION("Collection"), DYNAMICCOLLECTION("DynamicCollection"), BOOKMARKSFOLDER("BookmarkFolder"), ENTITYBESTITEMSSET("EntityBestItemsSet"), 
+    GALLERY("Gallery");
 
     private String jsonValue;
 

diff --git a/...ns/src/main/java/eu/europeana/set/definitions/model/vocabulary/WebUserSetModelFields.java b/...ns/src/main/java/eu/europeana/set/definitions/model/vocabulary/WebUserSetModelFields.java
@@ -5,10 +5,6 @@
  */
 public class WebUserSetModelFields {
 
-	WebUserSetModelFields() {
-
-	}
-
 	//common fields constants
 	public static final String ID               = "id";
 	public static final String TYPE             = "type";
@@ -47,4 +43,8 @@ public class WebUserSetModelFields {
 
 
 	public static final String VALUE_CONTEXT_EUROPEANA_COLLECTION = "http://www.europeana.eu/schemas/context/collection.jsonld";
+
+    WebUserSetModelFields() {
+    }
+
 }
diff --git a/set-mongo/src/main/java/eu/europeana/set/web/model/WebUserSetImpl.java b/set-mongo/src/main/java/eu/europeana/set/web/model/WebUserSetImpl.java
@@ -22,8 +22,9 @@
 
 @JsonPropertyOrder({ WebUserSetModelFields.ID, WebUserSetModelFields.TYPE, WebUserSetModelFields.COLLECTION_TYPE, WebUserSetModelFields.TITLE, 
         WebUserSetModelFields.SUBJECT, WebUserSetFields.DESCRIPTION, WebUserSetModelFields.VISIBILITY, WebUserSetModelFields.IS_DEFINED_BY, 
-        WebUserSetModelFields.PINNED, WebUserSetModelFields.ITEMS, WebUserSetModelFields.CREATOR, WebUserSetModelFields.CONTRIBUTOR, WebUserSetModelFields.PROVIDER, 
-        WebUserSetModelFields.CREATED, WebUserSetModelFields.MODIFIED, WebUserSetModelFields.TOTAL, WebUserSetFields.NEXT, WebUserSetFields.PREV })
+        WebUserSetModelFields.PINNED, WebUserSetModelFields.ITEMS, WebUserSetModelFields.CREATOR, WebUserSetModelFields.CONTRIBUTOR, 
+        WebUserSetModelFields.PROVIDER, WebUserSetModelFields.CREATED, WebUserSetModelFields.MODIFIED, WebUserSetModelFields.TOTAL, 
+        WebUserSetFields.NEXT, WebUserSetFields.PREV })
 @JsonInclude(value = JsonInclude.Include.NON_DEFAULT)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class WebUserSetImpl extends PersistentUserSetImpl {
@@ -63,12 +64,14 @@ public String getIdentifier() {
 	return super.getIdentifier();
     }
 
-    @JsonProperty(WebUserSetFields.TYPE)
+    @Override
+    @JsonProperty(WebUserSetModelFields.TYPE)
     public void setType(String type) {
 	super.setType(type);
     }
 
-    @JsonProperty(WebUserSetFields.COLLECTION_TYPE)
+    @Override
+    @JsonProperty(WebUserSetModelFields.COLLECTION_TYPE)
     public void setCollectionType(String collType) {
     super.setCollectionType(collType);
     }