JPA annotations

Author: gdesiato

logicaldoc-core/src/main/java/com/logicaldoc/core/document/Document.java

@@ -237,16 +237,6 @@ public String getTagsString() {
 		return sb.toString();
 	}
 
-	@Override
-	public Set<DocumentAccessControlEntry> getAccessControlList() {
-		return accessControlList;
-	}
-
-	@Override
-	public void setAccessControlList(Set<DocumentAccessControlEntry> accessControlList) {
-		this.accessControlList = accessControlList;
-	}
-
 	public void addTag(String word) {
 		Tag tg = new Tag();
 		tg.setTenantId(getTenantId());
@@ -340,6 +330,16 @@ public void setTemplate(Template template) {
 		this.template = template;
 	}
 
+	@Override
+	public Set<DocumentAccessControlEntry> getAccessControlList() {
+		return accessControlList;
+	}
+
+	@Override
+	public void setAccessControlList(Set<DocumentAccessControlEntry> accessControlList) {
+		this.accessControlList = accessControlList;
+	}
+	
 	@Override
 	public AccessControlEntry getAccessControlEntry(long groupId) {
 		return getAccessControlList().stream().filter(ace -> ace.getGroupId() == groupId).findFirst().orElse(null);

logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/Extensible.java

@@ -3,8 +3,20 @@
 import java.util.List;
 import java.util.Map;
 
+import com.logicaldoc.core.PersistentObject;
+
+/**
+ * Interface to be implemented by those {@link PersistentObject}s that have extensible attribtues
+ * 
+ * @author Giuseppe Desiato - LogicalDOC
+ * @since 9.2
+ */
 public interface Extensible {
 
+	public Map<String, Attribute> getAttributes();
+
+	public void setAttributes(Map<String, Attribute> attributes);
+	
 	public Long getTemplateId();
 
 	public void setTemplateId(Long templateId);
@@ -17,10 +29,6 @@ public interface Extensible {
 
 	public void setTemplate(Template template);
 
-	public Map<String, Attribute> getAttributes();
-
-	public void setAttributes(Map<String, Attribute> attributes);
-
 	public List<Attribute> getValueAttributes(String name);
 
 	public List<Object> getValues(String name);

logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/ExtensibleObject.java

@@ -25,23 +25,6 @@ public abstract class ExtensibleObject extends PersistentObject implements Exten
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * Retrieves the ordered set of the names of the attributes representing the
-	 * different values
-	 * 
-	 * @param name name of the attribute to get values from
-	 * 
-	 * @return the set of names
-	 */
-	private Set<String> getValueAttributesName(String name) {
-		TreeSet<String> attNames = new TreeSet<>();
-		for (String n : getAttributes().keySet()) {
-			if (n.equals(name) || name.equals(getAttribute(n).getParent()))
-				attNames.add(n);
-		}
-		return attNames;
-	}
-
 	@Override
 	public List<Attribute> getValueAttributes(String name) {
 		Set<String> valueNames = getValueAttributesName(name);
@@ -204,4 +187,22 @@ private int getLastPosition() {
 
 		return position;
 	}
+	
+	/**
+	 * Retrieves the ordered set of the names of the attributes representing the
+	 * different values
+	 * 
+	 * @param name name of the attribute to get values from
+	 * 
+	 * @return the set of names
+	 */
+	private Set<String> getValueAttributesName(String name) {
+		TreeSet<String> attNames = new TreeSet<>();
+		for (String n : getAttributes().keySet()) {
+			if (n.equals(name) || name.equals(getAttribute(n).getParent()))
+				attNames.add(n);
+		}
+		return attNames;
+	}
+
 }

logicaldoc-core/src/test/java/com/logicaldoc/core/searchengine/StandardSearchEngineTest.java

@@ -33,7 +33,7 @@ public void setUp() throws IOException, SQLException, PluginException {
 
 	@After
 	@Override
-	public void tearDown() throws SQLException {
+	public void tearDown() throws SQLException, IOException {
 		testSubject.unlock();
 		testSubject.close();
 		super.tearDown();