Added Descriptor.publisher

genesys-catalog-core/src/main/java/org/genesys/catalog/model/traits/Descriptor.java

@@ -139,6 +139,10 @@ public class Descriptor extends UuidModel implements Publishable, Copyable<Descr
     @Column(name = "keyDescriptor")
 	private boolean key;
 
+    /** The publisher. */
+    @Column(length = 200)
+    private String publisher;
+
 	/** Not published by default. */
 	private boolean published = false;
 
@@ -515,6 +519,24 @@ public class Descriptor extends UuidModel implements Publishable, Copyable<Descr
         this.key = key;
     }
 
+    /**
+	 * Sets the publisher.
+	 *
+	 * @param publisher the new publisher
+	 */
+    public void setPublisher(String publisher) {
+		this.publisher = publisher;
+	}
+    
+    /**
+	 * Gets the publisher.
+	 *
+	 * @return the publisher
+	 */
+    public String getPublisher() {
+		return publisher;
+	}
+    
     /**
 	 * Checks if is published.
 	 *

genesys-catalog-core/src/main/java/org/genesys/catalog/service/filters/DescriptorFilter.java

@@ -60,8 +60,11 @@ public class DescriptorFilter extends AuditedVersionedModelFilter {
 	/** The uom. */
 	public Set<String> uom;
 
-    /** The key. */
-    public Boolean key;
+	/** The key. */
+	public Boolean key;
+
+	/** The publisher. */
+	public Set<String> publisher;
 
 	/** The published. */
 	public Boolean published;
@@ -90,9 +93,12 @@ public class DescriptorFilter extends AuditedVersionedModelFilter {
 		if ((category != null) && !category.isEmpty()) {
 			and.and(descriptor.category.in(category));
 		}
-        if (key != null) {
-            and.and(descriptor.key.eq(key));
-        }
+		if (key != null) {
+			and.and(descriptor.key.eq(key));
+		}
+		if ((publisher != null) && !publisher.isEmpty()) {
+			and.and(descriptor.publisher.in(publisher));
+		}
 		if (published != null) {
 			and.and(descriptor.published.eq(published));
 		}

genesys-catalog-server/src/main/resources/liquibase/liquibase-changeLog.yml

@@ -3160,3 +3160,21 @@ databaseChangeLog:
         onUpdate:              NO ACTION
         referencedColumnNames: id
         referencedTableName:   partner
+
+- changeSet:
+    id:            1516643805000-2
+    author:        mobreza
+    comment:       Adding Descriptor.publisher
+    changes:
+    - addColumn:
+        columns:
+        - column:
+            name:  publisher
+            type:  VARCHAR(200)
+        tableName: descriptor
+    - createIndex:
+        columns:
+        - column:
+            name: publisher
+        indexName: FK_1d4veryraxx6fll3y8cnte24p
+        tableName: descriptor