/ - Diff - D-Net - D-Net project tracking tool

     			hib.getProtocols().add(new HibServiceProtocol(new HibServiceProtocolId(hib, e.getKey()), e.getValue()));
+    		}
     		for (Entry<String, String> e : service.getProperties().entrySet()) {
     			hib.getProperties().add(new HibDnetResourceProperty(hib, e.getKey(), e.getValue()));
     			if (e.getValue() != null) {
     				hib.getProperties().add(new HibDnetResourceProperty(hib, e.getKey(), e.getValue()));
+    			}
+    		}
     		for (BlackboardMessageContainer b : service.getBlackboard()) {
     			hib.getBlackboard().add(new HibBlackboardMessage(hib, b));
-...
     		hib.setValid(ds.isValid());
     		for (Entry<String, String> e : ds.getProperties().entrySet()) {
     			System.out.println(" **************** K = " + e.getKey());
     			hib.getProperties().add(new HibDnetResourceProperty(hib, e.getKey(), e.getValue()));
     			if (e.getValue() != null) {
     				System.out.println(" **************** K = " + e.getKey());
     				hib.getProperties().add(new HibDnetResourceProperty(hib, e.getKey(), e.getValue()));
+    			}
+    		}
     		if (StringUtils.isNotBlank(ds.getServiceId())) {

     	@Column(name = "date", nullable = false, insertable = false, updatable = false)
     	private Date date;
     	@OneToMany(mappedBy = "resource", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     	@OneToMany(mappedBy = "id.resource", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     	private Set<HibDnetResourceProperty> properties = Sets.newLinkedHashSet();
     	public HibDnetResource() {}

     package eu.dnetlib.enabling.is.hib.objects;
     import java.io.Serializable;
     import javax.persistence.Column;
     import javax.persistence.Embeddable;
     import javax.persistence.JoinColumn;
     import javax.persistence.ManyToOne;
     import javax.persistence.Transient;
     import org.apache.commons.lang.builder.HashCodeBuilder;
     @Embeddable
     public class HibDnetResourcePropertyId implements Serializable {
     	@Transient
     	private static final long serialVersionUID = 612491084747663805L;
     	@ManyToOne
     	@JoinColumn(name = "resource", nullable = false)
     	private HibDnetResource resource;
     	@Column(name = "name", nullable = false)
     	private String name;
     	@Column(name = "value")
     	private String value;
     	public HibDnetResourcePropertyId() {}
     	public HibDnetResourcePropertyId(final HibDnetResource resource, final String name, final String value) {
     		this.resource = resource;
     		this.name = name;
     		this.value = value;
+    	}
     	public HibDnetResource getResource() {
     		return resource;
+    	}
     	public void setResource(final HibDnetResource resource) {
     		this.resource = resource;
+    	}
     	public String getName() {
     		return name;
+    	}
     	public void setName(final String name) {
     		this.name = name;
+    	}
     	public String getValue() {
     		return value;
+    	}
     	public void setValue(final String value) {
     		this.value = value;
+    	}
     	@Override
     	public int hashCode() {
     		return new HashCodeBuilder().append(resource.getId()).append(name).append(value).toHashCode();
+    	}
+    }

     import java.io.Serializable;
     import javax.persistence.Column;
     import javax.persistence.EmbeddedId;
     import javax.persistence.Entity;
     import javax.persistence.Id;
     import javax.persistence.JoinColumn;
     import javax.persistence.ManyToOne;
     import javax.persistence.Table;
     import javax.persistence.Transient;
-...
     public class HibDnetResourceProperty extends HibDnetObject implements Serializable {
     	@Transient
     	private static final long serialVersionUID = 612491084747663805L;
     	private static final long serialVersionUID = -2095052466902711468L;
     	@Id
     	@Column(name = "id", insertable = false)
     	private int id;
     	@EmbeddedId
     	private HibDnetResourcePropertyId id;
     	@ManyToOne
     	@JoinColumn(name = "resource", nullable = false)
     	private HibDnetResource resource;
     	@Column(name = "name", nullable = false)
     	private String name;
     	@Column(name = "value")
     	private String value;
     	public HibDnetResourceProperty() {}
     	public HibDnetResourceProperty(final int id, final HibDnetResource resource, final String name, final String value) {
     	public HibDnetResourceProperty(final HibDnetResourcePropertyId id) {
     		this.id = id;
     		this.resource = resource;
     		this.name = name;
     		this.value = value;
+    	}
     	public HibDnetResourceProperty(final HibDnetResource resource, final String name, final String value) {
     		this(-1, resource, name, value);
     		this.id = new HibDnetResourcePropertyId(resource, name, value);
+    	}
     	public int getId() {
     	public final HibDnetResourcePropertyId getId() {
     		return id;
+    	}
     	public void setId(final int id) {
     	public final void setId(final HibDnetResourcePropertyId id) {
     		this.id = id;
+    	}
     	public HibDnetResource getResource() {
     		return resource;
+    	}
     	public void setResource(final HibDnetResource resource) {
     		this.resource = resource;
+    	}
     	public String getName() {
     		return name;
     		return id.getName();
+    	}
     	public void setName(final String name) {
     		this.name = name;
+    	}
     	public String getValue() {
     		return value;
     		return id.getValue();
+    	}
     	public void setValue(final String value) {
     		this.value = value;
+    	}
     	@Override
     	public int hashCode() {
     		return id;
     		return id.hashCode();
+    	}
+    }

     );
     CREATE TABLE IF NOT EXISTS resource_properties (
     	id       serial       NOT NULL PRIMARY KEY,
     	resource varchar(255) NOT NULL REFERENCES resources(id) ON DELETE CASCADE,
     	name     varchar(255) NOT NULL,
     	value    varchar(255)
     	value    varchar(255) NOT NULL,
     	PRIMARY KEY (resource, name, value)
     );
     CREATE TABLE IF NOT EXISTS service_protocols (

     import com.google.gson.Gson;
     import eu.dnetlib.enabling.annotations.DnetResource;
     import eu.dnetlib.enabling.utils.DnetAnnotationUtils;
     import eu.dnetlib.rmi.objects.is.DnetDataStructure;
     import eu.dnetlib.rmi.soap.exceptions.InformationServiceException;
-...
     			ds.setName(name);
     			ds.setDescription(description);
     			ds.setContent(new Gson().toJson(this));
     			ds.setProperties(DnetAnnotationUtils.getIndexedFields(this));
     			return ds;
     		} else {
     			throw new InformationServiceException("Missing DnetResource annotation in class " + getClass());

Project

General

Profile

D-Net

Revision 37126

Added by Michele Artini about 9 years ago