17437818570

Committed 03 Sep 2025 03:09PM UTC coverage: 12.108% (-0.03%) from 12.137%

Build # 17437818570

Build Type

push

github

Committed by

tkuhn

Commit Message

Improve async loading of projects; provide new MethodResultComponent

Run Details

337 of 3874 branches covered (8.7%)

Branch coverage included in aggregate %.

972 of 6937 relevant lines covered (14.01%)

0.62 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

5.81

src/main/java/com/knowledgepixels/nanodash/Project.java

package com.knowledgepixels.nanodash;

import static com.knowledgepixels.nanodash.Utils.vf;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Literal;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.model.vocabulary.DCTERMS;
import org.nanopub.Nanopub;
import org.nanopub.extra.services.ApiResponse;
import org.nanopub.extra.services.ApiResponseEntry;
import org.nanopub.vocabulary.NTEMPLATE;

import com.knowledgepixels.nanodash.template.Template;
import com.knowledgepixels.nanodash.template.TemplateData;

/**
 * Class representing a Nanodash project.
 */
public class Project implements Serializable {

    /**
     * The predicate for the owner of the project.
     */
    public static final IRI HAS_OWNER = vf.createIRI("https://w3id.org/kpxl/gen/terms/hasOwner");

    /**
     * The predicate for pinned templates in the project.
     */
    public static final IRI HAS_PINNED_TEMPLATE = vf.createIRI("https://w3id.org/kpxl/gen/terms/hasPinnedTemplate");

    /**
     * The predicate for pinned queries in the project.
     */
    public static final IRI HAS_PINNED_QUERY = vf.createIRI("https://w3id.org/kpxl/gen/terms/hasPinnedQuery");

    private static List<Project> projectList = new ArrayList<>();
    private static ConcurrentMap<String,Project> projectsByCoreInfo = new ConcurrentHashMap<>();
    private static ConcurrentMap<String,Project> projectsById = new ConcurrentHashMap<>();

    public static synchronized void refresh(ApiResponse resp) {
        projectList.clear();
        ConcurrentMap<String,Project> prevProjectsByCoreInfoPrev = projectsByCoreInfo;
        projectsByCoreInfo = new ConcurrentHashMap<>();
        projectsById.clear();
        for (ApiResponseEntry entry : resp.getData()) {
            Project project = new Project(entry.get("project"), entry.get("label"), entry.get("np"));
            Project prevProject = prevProjectsByCoreInfoPrev.get(project.getCoreInfoString());
            if (prevProject != null) project = prevProject;
            projectList.add(project);
            projectsByCoreInfo.put(project.getCoreInfoString(), project);
            projectsById.put(project.getId(), project);
        }
    }

    public static List<Project> getProjectList() {
        return projectList;
    }

    public static Project get(String id) {
        return projectsById.get(id);
    }

    public static void refresh() {
        for (Project project : projectList) {
            project.dataNeedsUpdate = true;
        }
    }

    private String id, label, rootNanopubId;
    private Nanopub rootNanopub = null;

    private String description = null;
    private List<IRI> owners = new ArrayList<>();
    private List<IRI> members = new ArrayList<>();
    private ConcurrentMap<String,IRI> ownerPubkeyMap = new ConcurrentHashMap<>();
    private List<Template> templates = new ArrayList<>();
    private Set<String> templateTags = new HashSet<>();
    private ConcurrentMap<String, List<Template>> templatesPerTag = new ConcurrentHashMap<>();
    private List<IRI> queryIds = new ArrayList<>();
    private IRI defaultProvenance = null;

    private boolean dataInitialized = false;
    private boolean dataNeedsUpdate = true;

    private Project(String id, String label, String rootNanopubId) {
        this.id = id;
        this.label = label;
        this.rootNanopubId = rootNanopubId;
        this.rootNanopub = Utils.getAsNanopub(rootNanopubId);

        for (Statement st : rootNanopub.getAssertion()) {
            if (st.getSubject().stringValue().equals(getId())) {
                if (st.getPredicate().equals(DCTERMS.DESCRIPTION)) {
                    description = st.getObject().stringValue();
                } else if (st.getPredicate().equals(HAS_OWNER) && st.getObject() instanceof IRI obj) {
                    addOwner(obj);
                } else if (st.getPredicate().equals(HAS_PINNED_TEMPLATE) && st.getObject() instanceof IRI obj) {
                    templates.add(TemplateData.get().getTemplate(obj.stringValue()));
                } else if (st.getPredicate().equals(HAS_PINNED_QUERY) && st.getObject() instanceof IRI obj) {
                    queryIds.add(obj);
                } else if (st.getPredicate().equals(NTEMPLATE.HAS_DEFAULT_PROVENANCE) && st.getObject() instanceof IRI obj) {
                    defaultProvenance = obj;
                }
            } else if (st.getPredicate().equals(NTEMPLATE.HAS_TAG) && st.getObject() instanceof Literal l) {
                templateTags.add(l.stringValue());
                List<Template> list = templatesPerTag.get(l.stringValue());
                if (list == null) {
                    list = new ArrayList<>();
                    templatesPerTag.put(l.stringValue(), list);
                }
                list.add(TemplateData.get().getTemplate(st.getSubject().stringValue()));
            }
        }

    }

    private void addOwner(IRI owner) {
        // TODO This isn't efficient for long owner lists:
        if (owners.contains(owner)) return;
        owners.add(owner);
        UserData ud = User.getUserData();
        for (String pubkeyhash : ud.getPubkeyhashes(owner, true)) {
            ownerPubkeyMap.put(pubkeyhash, owner);
        }
    }

    public String getId() {
        return id;
    }

    public String getRootNanopubId() {
        return rootNanopubId;
    }

    public String getCoreInfoString() {
        return id + " " + rootNanopubId;
    }

    public Nanopub getRootNanopub() {
        return rootNanopub;
    }

    public String getLabel() {
        return label;
    }

    public String getDescription() {
        return description;
    }

    public boolean isDataInitialized() {
        triggerDataUpdate();
        return dataInitialized;
    }

    public List<IRI> getOwners() {
        triggerDataUpdate();
        return owners;
    }

    public List<IRI> getMembers() {
        triggerDataUpdate();
        return members;
    }

    public List<Template> getTemplates() {
        return templates;
    }

    public Set<String> getTemplateTags() {
        return templateTags;
    }

    public ConcurrentMap<String, List<Template>> getTemplatesPerTag() {
        return templatesPerTag;
    }

    public List<IRI> getQueryIds() {
        return queryIds;
    }

    public IRI getDefaultProvenance() {
        return defaultProvenance;
    }

    private synchronized void triggerDataUpdate() {
        if (dataNeedsUpdate) {
            new Thread(() -> {
                for (ApiResponseEntry r : QueryApiAccess.forcedGet("get-owners-of-project", "project", id).getData()) {
                    String pubkeyhash = r.get("pubkeyhash");
                    if (ownerPubkeyMap.containsKey(pubkeyhash)) {
                        addOwner(Utils.vf.createIRI(r.get("owner")));
                    }
                }
                members = new ArrayList<>();
                for (ApiResponseEntry r : QueryApiAccess.forcedGet("get-members-of-project", "project", id).getData()) {
                    IRI memberId = Utils.vf.createIRI(r.get("member"));
                    // TODO These checks are inefficient for long member lists:
                    if (owners.contains(memberId)) continue;
                    if (members.contains(memberId)) continue;
                    members.add(memberId);
                }
                dataInitialized = true;
            }).start();
            dataNeedsUpdate = false;
        }
    }

}

1	package com.knowledgepixels.nanodash;
2
3	import static com.knowledgepixels.nanodash.Utils.vf;
4
5	import java.io.Serializable;
6	import java.util.ArrayList;
7	import java.util.HashSet;
8	import java.util.List;
9	import java.util.Set;
10	import java.util.concurrent.ConcurrentHashMap;
11	import java.util.concurrent.ConcurrentMap;
12
13	import org.eclipse.rdf4j.model.IRI;
14	import org.eclipse.rdf4j.model.Literal;
15	import org.eclipse.rdf4j.model.Statement;
16	import org.eclipse.rdf4j.model.vocabulary.DCTERMS;
17	import org.nanopub.Nanopub;
18	import org.nanopub.extra.services.ApiResponse;
19	import org.nanopub.extra.services.ApiResponseEntry;
20	import org.nanopub.vocabulary.NTEMPLATE;
21
22	import com.knowledgepixels.nanodash.template.Template;
23	import com.knowledgepixels.nanodash.template.TemplateData;
24
25	/**
26	* Class representing a Nanodash project.
27	*/
28	public class Project implements Serializable {
29
30	/**
31	* The predicate for the owner of the project.
32	*/
33	public static final IRI HAS_OWNER = vf.createIRI("https://w3id.org/kpxl/gen/terms/hasOwner");	4✔
34
35	/**
36	* The predicate for pinned templates in the project.
37	*/
38	public static final IRI HAS_PINNED_TEMPLATE = vf.createIRI("https://w3id.org/kpxl/gen/terms/hasPinnedTemplate");	4✔
39
40	/**
41	* The predicate for pinned queries in the project.
42	*/
43	public static final IRI HAS_PINNED_QUERY = vf.createIRI("https://w3id.org/kpxl/gen/terms/hasPinnedQuery");	4✔
44
45	private static List<Project> projectList = new ArrayList<>();	4✔
46	private static ConcurrentMap<String,Project> projectsByCoreInfo = new ConcurrentHashMap<>();	4✔
47	private static ConcurrentMap<String,Project> projectsById = new ConcurrentHashMap<>();	5✔
48
49	public static synchronized void refresh(ApiResponse resp) {
50	projectList.clear();	×
51	ConcurrentMap<String,Project> prevProjectsByCoreInfoPrev = projectsByCoreInfo;	×
52	projectsByCoreInfo = new ConcurrentHashMap<>();	×
53	projectsById.clear();	×
54	for (ApiResponseEntry entry : resp.getData()) {	×
55	Project project = new Project(entry.get("project"), entry.get("label"), entry.get("np"));	×
56	Project prevProject = prevProjectsByCoreInfoPrev.get(project.getCoreInfoString());	×
57	if (prevProject != null) project = prevProject;	×
58	projectList.add(project);	×
59	projectsByCoreInfo.put(project.getCoreInfoString(), project);	×
60	projectsById.put(project.getId(), project);	×
61	}	×
62	}	×
63
64	public static List<Project> getProjectList() {
65	return projectList;	×
66	}
67
68	public static Project get(String id) {
69	return projectsById.get(id);	×
70	}
71
72	public static void refresh() {
73	for (Project project : projectList) {	6!
74	project.dataNeedsUpdate = true;	×
75	}	×
76	}	1✔
77
78	private String id, label, rootNanopubId;
79	private Nanopub rootNanopub = null;	×
80
81	private String description = null;	×
82	private List<IRI> owners = new ArrayList<>();	×
83	private List<IRI> members = new ArrayList<>();	×
84	private ConcurrentMap<String,IRI> ownerPubkeyMap = new ConcurrentHashMap<>();	×
85	private List<Template> templates = new ArrayList<>();	×
86	private Set<String> templateTags = new HashSet<>();	×
87	private ConcurrentMap<String, List<Template>> templatesPerTag = new ConcurrentHashMap<>();	×
88	private List<IRI> queryIds = new ArrayList<>();	×
89	private IRI defaultProvenance = null;	×
90
91	private boolean dataInitialized = false;	×
92	private boolean dataNeedsUpdate = true;	×
93
94	private Project(String id, String label, String rootNanopubId) {	×
95	this.id = id;	×
96	this.label = label;	×
97	this.rootNanopubId = rootNanopubId;	×
98	this.rootNanopub = Utils.getAsNanopub(rootNanopubId);	×
99
100	for (Statement st : rootNanopub.getAssertion()) {	×
101	if (st.getSubject().stringValue().equals(getId())) {	×
102	if (st.getPredicate().equals(DCTERMS.DESCRIPTION)) {	×
103	description = st.getObject().stringValue();	×
104	} else if (st.getPredicate().equals(HAS_OWNER) && st.getObject() instanceof IRI obj) {	×
105	addOwner(obj);	×
106	} else if (st.getPredicate().equals(HAS_PINNED_TEMPLATE) && st.getObject() instanceof IRI obj) {	×
107	templates.add(TemplateData.get().getTemplate(obj.stringValue()));	×
108	} else if (st.getPredicate().equals(HAS_PINNED_QUERY) && st.getObject() instanceof IRI obj) {	×
109	queryIds.add(obj);	×
110	} else if (st.getPredicate().equals(NTEMPLATE.HAS_DEFAULT_PROVENANCE) && st.getObject() instanceof IRI obj) {	×
111	defaultProvenance = obj;	×
112	}
113	} else if (st.getPredicate().equals(NTEMPLATE.HAS_TAG) && st.getObject() instanceof Literal l) {	×
114	templateTags.add(l.stringValue());	×
115	List<Template> list = templatesPerTag.get(l.stringValue());	×
116	if (list == null) {	×
117	list = new ArrayList<>();	×
118	templatesPerTag.put(l.stringValue(), list);	×
119	}
120	list.add(TemplateData.get().getTemplate(st.getSubject().stringValue()));	×
121	}
122	}	×
123
124	}	×
125
126	private void addOwner(IRI owner) {
127	// TODO This isn't efficient for long owner lists:
128	if (owners.contains(owner)) return;	×
129	owners.add(owner);	×
130	UserData ud = User.getUserData();	×
131	for (String pubkeyhash : ud.getPubkeyhashes(owner, true)) {	×
132	ownerPubkeyMap.put(pubkeyhash, owner);	×
133	}	×
134	}	×
135
136	public String getId() {
137	return id;	×
138	}
139
140	public String getRootNanopubId() {
141	return rootNanopubId;	×
142	}
143
144	public String getCoreInfoString() {
145	return id + " " + rootNanopubId;	×
146	}
147
148	public Nanopub getRootNanopub() {
149	return rootNanopub;	×
150	}
151
152	public String getLabel() {
153	return label;	×
154	}
155
156	public String getDescription() {
157	return description;	×
158	}
159
160	public boolean isDataInitialized() {
161	triggerDataUpdate();	×
162	return dataInitialized;	×
163	}
164
165	public List<IRI> getOwners() {
166	triggerDataUpdate();	×
167	return owners;	×
168	}
169
170	public List<IRI> getMembers() {
171	triggerDataUpdate();	×
172	return members;	×
173	}
174
175	public List<Template> getTemplates() {
176	return templates;	×
177	}
178
179	public Set<String> getTemplateTags() {
180	return templateTags;	×
181	}
182
183	public ConcurrentMap<String, List<Template>> getTemplatesPerTag() {
184	return templatesPerTag;	×
185	}
186
187	public List<IRI> getQueryIds() {
188	return queryIds;	×
189	}
190
191	public IRI getDefaultProvenance() {
192	return defaultProvenance;	×
193	}
194
195	private synchronized void triggerDataUpdate() {
196	if (dataNeedsUpdate) {	×
197	new Thread(() -> {	×
198	for (ApiResponseEntry r : QueryApiAccess.forcedGet("get-owners-of-project", "project", id).getData()) {	×
199	String pubkeyhash = r.get("pubkeyhash");	×
200	if (ownerPubkeyMap.containsKey(pubkeyhash)) {	×
201	addOwner(Utils.vf.createIRI(r.get("owner")));	×
202	}
203	}	×
204	members = new ArrayList<>();	×
205	for (ApiResponseEntry r : QueryApiAccess.forcedGet("get-members-of-project", "project", id).getData()) {	×
206	IRI memberId = Utils.vf.createIRI(r.get("member"));	×
207	// TODO These checks are inefficient for long member lists:
208	if (owners.contains(memberId)) continue;	×
209	if (members.contains(memberId)) continue;	×
210	members.add(memberId);	×
211	}	×
212	dataInitialized = true;	×
213	}).start();	×
214	dataNeedsUpdate = false;	×
215	}
216	}	×
217
218	}

knowledgepixels / nanodash / 17437818570

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous