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

     package eu.dnetlib.functionality.modular.ui;
     import java.io.StringReader;
     import javax.servlet.http.HttpServletResponse;
     import com.google.gson.Gson;
     import eu.dnetlib.enabling.locators.UniqueServiceLocator;
     import eu.dnetlib.rmi.enabling.ISLookUpService;
     import eu.dnetlib.rmi.enabling.ISRegistryService;
     import org.apache.commons.io.IOUtils;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.stereotype.Controller;
     import org.springframework.web.bind.annotation.RequestMapping;
     import org.springframework.web.bind.annotation.RequestParam;
     @Controller
     public class CommonController {
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	@RequestMapping(value = "/ui/**/getProfile")
     	public void getProfile(final HttpServletResponse res,
     			@RequestParam(value = "id", required = true) final String id) throws Exception {
     		res.setContentType("text/xml");
     		final String profile = this.serviceLocator.getService(ISLookUpService.class).getResourceProfile(id);
     		IOUtils.copy(new StringReader(profile), res.getOutputStream());
+    	}
     	@RequestMapping(value = "/ui/**/getSchema")
     	public void getSchema(final HttpServletResponse res,
     			@RequestParam(value = "name", required = true) final String name) throws Exception {
     		res.setContentType("text/xml");
     		final String schema = this.serviceLocator.getService(ISLookUpService.class).getResourceTypeSchema(name);
     		IOUtils.copy(new StringReader(schema), res.getOutputStream());
+    	}
     	@RequestMapping(value = "/ui/**/validateProfile")
     	public void validate(final HttpServletResponse res,
     			@RequestParam(value = "id", required = true) final String id) throws Exception {
     		final String newId = this.serviceLocator.getService(ISRegistryService.class).validateProfile(id);
     		IOUtils.copy(new StringReader(new Gson().toJson(newId)), res.getOutputStream());
+    	}
     	@RequestMapping(value = "/ui/**/deleteProfile")
     	public void deleteProfile(final HttpServletResponse res,
     			@RequestParam(value = "id", required = true) final String id) throws Exception {
     		final boolean b = this.serviceLocator.getService(ISRegistryService.class).deleteProfile(id);
     		IOUtils.copy(new StringReader(new Gson().toJson(b)), res.getOutputStream());
+    	}
+    }

modules/dnet-springboot-apps/trunk/pom.xml
32	32	<module>dnet-common-utils</module>
33	33	<module>dnet-is-application</module>
34	34	<module>dnet-simple-aggregation-worker</module>
	35	<module>dnet-administration-uis</module>
35	36	</modules>
36	37
37	38	<dependencies>

     					"for $x in collection('/db/DRIVER/VocabularyDSResources/VocabularyDSResourceType') order by $x//VOCABULARY_NAME "
     							+ "return concat ($x//RESOURCE_IDENTIFIER/@value,' §§§ ',$x//VOCABULARY_NAME,' §§§ ',$x//VOCABULARY_DESCRIPTION,' §§§ ',$x//VOCABULARY_NAME/@code)";
     			final List<Vocabulary> vocabularies = Lists.transform(this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(query),
     			final List<Vocabulary> vocabularies = Lists.transform(this.isClient.find(query),
     					s -> {
     						final String[] tokens = s.split("§§§");
     						return new Vocabulary(tokens[0].trim(), tokens[1].trim(), tokens[2].trim(), tokens[3].trim());
-...
     	@Override
     	public List<Term> getTerms(final String vocabularyId) throws VocabularyException {
     		try {
     			final String profile = this.serviceLocator.getService(ISLookUpService.class).getResourceProfile(vocabularyId);
     			final String profile = this.isClient.getProfile(vocabularyId);
     			final Document doc = new SAXReader().read(new StringReader(profile));
     			final Map<String, Term> terms = Maps.newHashMap();
-...
     			st.setAttribute("description", voc.getDescription());
     			st.setAttribute("code", voc.getCode());
     			st.setAttribute("date", DateUtils.now_ISO8601());
     			final String newVocabularyId = this.serviceLocator.getService(ISRegistryService.class).registerProfile(st.toString());
     			final String newVocabularyId = this.isClient.register(st.toString());
     			return newVocabularyId;
     		} catch (final IOException e) {

     public class RepoApisEntryPointController extends ModuleEntryPoint {
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Autowired
     	private RepoUIUtils repoUIUtils;

     	private static final Log log = LogFactory.getLog(RepoInternalController.class);
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Autowired
     	private WorkflowSectionGrouper workflowSectionGrouper;
     	@Autowired

     	private String protocolsVocabulary;
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Autowired
     	private RepoUIUtils repoUIUtils;

     	private String datasourceCountryVocabulary;
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Autowired
     	private RepoUIUtils repoUIUtils;

     	private final Map<String, List<ProtocolParameter>> parametersMap = new HashMap<>();
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	public List<VocabularyEntry> fetchVocabularyTerms(final String voc) throws ISLookUpException {
     		final String xquery = "for $x in collection('/db/DRIVER/VocabularyDSResources/VocabularyDSResourceType')[.//VOCABULARY_NAME/@code = '"
     				+ voc.trim() + "']//TERM return concat($x/@code, ' @@@ ', $x/@english_name)";
     		final List<VocabularyEntry> list = Lists.newArrayList();
     		for (final String s : this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(xquery)) {
     		for (final String s : this.isClient.find(xquery)) {
     			final String[] arr = s.split("@@@");
     			list.add(new VocabularyEntry(arr[0].trim(), arr[1].trim()));
+    		}

     public class ListProfilesValues extends ValidNodeValuesFetcher {
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Override
     	protected List<DnetParamValue> obtainValues(final Map<String, String> params) throws Exception {
-...
     		final String query = "for $x in /*[.//RESOURCE_TYPE/@value='" + params.get("type") + "']" + "return concat($x//RESOURCE_IDENTIFIER/@value, ' @@@ ', $x"
     				+ params.get("xpath") + ")";
     		final List<String> result = this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(query);
     		final List<String> result = this.isClient.find(query);
     		for (final String s : result) {
     			final String[] arr = s.split("@@@");
     			values.add(new DnetParamValue(arr[0].trim(), arr[1].trim()));

     import java.util.ArrayList;
     import java.util.List;
     import java.util.Map;
     import java.util.concurrent.*;
     import java.util.concurrent.ExecutorService;
     import java.util.concurrent.Executors;
     import java.util.concurrent.Future;
     import java.util.concurrent.TimeUnit;
     import com.google.common.base.Function;
     import com.google.common.collect.Lists;
     import eu.dnetlib.enabling.locators.UniqueServiceLocator;
     import eu.dnetlib.msro.workflows.util.ValidNodeValuesFetcher;
     import eu.dnetlib.rmi.data.CollectorService;
     import eu.dnetlib.rmi.data.ProtocolParameterValue;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     import org.springframework.beans.factory.annotation.Autowired;
     import com.google.common.collect.Lists;
     import eu.dnetlib.clients.is.InformationServiceClient;
     public class ListProtocolFieldValues extends ValidNodeValuesFetcher {
     	private static final Log log = LogFactory.getLog(ListProtocolFieldValues.class);
     	private final ExecutorService pool = Executors.newFixedThreadPool(10);
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Override
     	protected List<DnetParamValue> obtainValues(final Map<String, String> params) throws Exception {
-...
     		final String baseUrl = params.get("baseUrl");
     		final String field = params.get("field");
     		final Future<List<DnetParamValue>> futureList = this.pool.submit(new Callable<List<DnetParamValue>>() {
     		final Future<List<DnetParamValue>> futureList = pool.submit(() -> {
     			final List<ProtocolParameterValue> list =
     					getServiceLocator().getService(CollectorService.class).listValidValuesForParam(protocol, baseUrl, field, null);
     			@Override
     			public List<DnetParamValue> call() throws Exception {
     				final List<ProtocolParameterValue> list =
     						getServiceLocator().getService(CollectorService.class).listValidValuesForParam(protocol, baseUrl, field, null);
     				return Lists.newArrayList(Lists.transform(list, new Function<ProtocolParameterValue, ValidNodeValuesFetcher.DnetParamValue>() {
     					@Override
     					public DnetParamValue apply(final ProtocolParameterValue ppv) {
     						return new DnetParamValue(ppv.getId(), ppv.getName());
+    					}
     				}));
+    			}
     			return Lists.newArrayList(Lists.transform(list, ppv -> new DnetParamValue(ppv.getId(), ppv.getName())));
     		});
     		try {
-...
+    	}
     	public UniqueServiceLocator getServiceLocator() {
     		return this.serviceLocator;
     		return serviceLocator;
+    	}
     	public void setServiceLocator(final UniqueServiceLocator serviceLocator) {

     public class ListDedupOrchestrationValues extends ValidNodeValuesFetcher {
     	@Resource
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Override
     	protected List<DnetParamValue> obtainValues(final Map<String, String> params) throws Exception {
-...
     		final String xquery =
     				"for $x in /RESOURCE_PROFILE[.//RESOURCE_TYPE/@value='DedupOrchestrationDSResourceType'] return $x//ACTION_SET/@id/string()";
     		final List<String> result = serviceLocator.getService(ISLookUpService.class).quickSearchProfile(xquery);
     		final List<String> result = isClient.find(xquery);
     		final List<DnetParamValue> values = Lists.newArrayList();
     		for (final String s : result) {

     	/** The download plugin enumerator. */
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Override
     	protected List<DnetParamValue> obtainValues(final Map<String, String> params) throws Exception {

     public class ListActionManagerSetsValues extends ValidNodeValuesFetcher {
     	@Resource
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Override
     	protected List<DnetParamValue> obtainValues(final Map<String, String> params) throws Exception {
-...
     		final String xquery =
     				"for $x in /RESOURCE_PROFILE[.//RESOURCE_TYPE/@value='ActionManagerSetDSResourceType'] return concat($x//SET/@id, ' @@@ ', $x//SET) ";
     		final List<String> result = serviceLocator.getService(ISLookUpService.class).quickSearchProfile(xquery);
     		final List<String> result = isClient.find(xquery);
     		final List<DnetParamValue> values = Lists.newArrayList(new DnetParamValue("", "ALL SETS"));
     		for (final String s : result) {

     public class ListDedupConfigValues extends ValidNodeValuesFetcher {
     	@Resource
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Override
     	protected List<DnetParamValue> obtainValues(final Map<String, String> params) throws Exception {
-...
     		final String xquery =
     				"for $x in /RESOURCE_PROFILE[.//RESOURCE_TYPE/@value='DedupConfigurationDSResourceType'] return concat($x//CONFIGURATION/@id, ' @@@ ', $x//DESCRIPTION) ";
     		final List<String> result = serviceLocator.getService(ISLookUpService.class).quickSearchProfile(xquery);
     		final List<String> result = isClient.find(xquery);
     		final List<DnetParamValue> values = Lists.newArrayList();
     		for (final String s : result) {

     	};
     	@Resource
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Override
     	protected List<DnetParamValue> obtainValues(final Map<String, String> params) throws Exception {

     	};
     	@Resource
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Override
     	protected List<DnetParamValue> obtainValues(final Map<String, String> params) throws Exception {

     public class ListHBaseMappingTitleValues extends ValidNodeValuesFetcher {
     	@Resource
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	private String sourceFormat;
-...
     						+ ".//SOURCE_METADATA_FORMAT/@interpretation = 'cleaned'] "
     						+ "return concat($x//RESOURCE_IDENTIFIER/@value, ' @@@ ', $x//SCRIPT/TITLE/text())";
     		final List<String> result = serviceLocator.getService(ISLookUpService.class).quickSearchProfile(xquery);
     		final List<String> result = isClient.find(xquery);
     		final List<DnetParamValue> values = Lists.newArrayList();
     		for (final String s : result) {

     	private DnetLogger dnetLogger;
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Value("${repo.ui.compatibilityLevels.vocabulary}")
     	private String compatibilityLevelsVocabulary;

     import java.io.StringReader;
     import java.util.Map;
     import eu.dnetlib.enabling.locators.UniqueServiceLocator;
     import eu.dnetlib.functionality.modular.ui.workflows.objects.WorkflowNotificationInfo;
     import eu.dnetlib.functionality.modular.ui.workflows.objects.WorkflowUpdateInfo;
     import eu.dnetlib.msro.workflows.util.WorkflowsConstants.WorkflowStatus;
     import eu.dnetlib.rmi.enabling.ISRegistryException;
     import eu.dnetlib.rmi.enabling.ISRegistryService;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     import org.dom4j.Document;
-...
     import org.dom4j.io.SAXReader;
     import org.springframework.beans.factory.annotation.Autowired;
     import eu.dnetlib.clients.is.InformationServiceClient;
     import eu.dnetlib.exceptions.InformationServiceException;
     import eu.dnetlib.functionality.modular.ui.workflows.objects.WorkflowNotificationInfo;
     import eu.dnetlib.functionality.modular.ui.workflows.objects.WorkflowUpdateInfo;
     public class ISRegistryClient {
     	private static final Log log = LogFactory.getLog(ISRegistryClient.class);
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	public String registerProfile(final String profile) throws ISRegistryException {
     		return this.serviceLocator.getService(ISRegistryService.class).registerProfile(profile);
     	public String registerProfile(final String profile) throws InformationServiceException {
     		return isClient.register(profile);
+    	}
     	public void deleteProfile(final String id) throws ISRegistryException {
     		this.serviceLocator.getService(ISRegistryService.class).deleteProfile(id);
     	public void deleteProfile(final String id) throws InformationServiceException {
     		isClient.deleteProfile(id);
+    	}
     	public boolean updateWorkflowProfile(final String wfId, final String profile, final Map<String, String> map) throws Exception {
-...
     			((Element) doc.selectSingleNode("//CONFIGURATION")).addAttribute("status", WorkflowStatus.WAIT_USER_SETTINGS.name());
+    		}
     		return this.serviceLocator.getService(ISRegistryService.class).updateProfile(wfId, doc.asXML(), doc.valueOf("//RESOURCE_TYPE/@value"));
     		isClient.updateProfile(wfId, doc.asXML());
     		return true;
+    	}
     	public boolean updateWorkflowProfile(final String wfId, final String profile, final WorkflowUpdateInfo info) throws Exception {
-...
     			node.selectSingleNode("./CRON").setText(info.getCron() != null ? info.getCron() : "");
     			node.selectSingleNode("./MININTERVAL").setText(Integer.toString(info.getInterval()));
+    		}
     		return this.serviceLocator.getService(ISRegistryService.class).updateProfile(wfId, doc.asXML(), doc.valueOf("//RESOURCE_TYPE/@value"));
     		isClient.updateProfile(wfId, doc.asXML());
     		return true;
+    	}
     	public void updateWorkflowStatus(final String id, final WorkflowStatus status) throws ISRegistryException {
     		this.serviceLocator.getService(ISRegistryService.class).updateProfileNode(id, "//CONFIGURATION/@status", "'" + status.toString() + "'");
     		isClient.updateProfileNode(id, "//CONFIGURATION/@status", "'" + status.toString() + "'");
+    	}
+    }

     package eu.dnetlib.functionality.modular.ui.workflows.util;
     import java.io.StringReader;
     import java.util.*;
     import java.util.ArrayList;
     import java.util.Collections;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
     import java.util.Set;
     import java.util.stream.Collectors;
     import com.google.common.base.Function;
     import com.google.common.base.Splitter;
     import com.google.common.collect.Lists;
     import com.google.common.collect.Sets;
     import eu.dnetlib.enabling.locators.UniqueServiceLocator;
     import eu.dnetlib.functionality.modular.ui.repositories.objects.RepoHIWorkflow;
     import eu.dnetlib.functionality.modular.ui.workflows.objects.WorkflowItem;
     import eu.dnetlib.miscutils.collections.Pair;
     import eu.dnetlib.rmi.enabling.ISLookUpDocumentNotFoundException;
     import eu.dnetlib.rmi.enabling.ISLookUpException;
     import eu.dnetlib.rmi.enabling.ISLookUpService;
     import org.antlr.stringtemplate.StringTemplate;
     import org.apache.commons.io.IOUtils;
     import org.apache.commons.lang3.StringUtils;
-...
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.core.io.ClassPathResource;
     import com.google.common.base.Splitter;
     import com.google.common.collect.Lists;
     import com.google.common.collect.Sets;
     import eu.dnetlib.clients.is.InformationServiceClient;
     import eu.dnetlib.exceptions.InformationServiceException;
     import eu.dnetlib.functionality.modular.ui.repositories.objects.RepoHIWorkflow;
     import eu.dnetlib.functionality.modular.ui.workflows.objects.WorkflowItem;
     import eu.dnetlib.miscutils.collections.Pair;
     public class ISLookupClient {
     	private static final Log log = LogFactory.getLog(ISLookupClient.class);
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	public List<String> listSimpleWorflowSections() {
     		final String xquery = "distinct-values(//WORKFLOW_NAME/@menuSection/string())";
     		try {
     			return this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(xquery);
     		} catch (final ISLookUpException e) {
     			return isClient.find(xquery);
     		} catch (final InformationServiceException e) {
     			log.error("Error obtaining worflowSections", e);
     			return Lists.newArrayList();
+    		}
-...
     						+ " order by $x//WORKFLOW_NAME return concat($x//RESOURCE_IDENTIFIER/@value, ' ==@== ', $x//WORKFLOW_NAME, ' ==@== ', $x//WORKFLOW_DESCRIPTION, ' ==@== ', $x//DESTROY_WORKFLOW_TEMPLATE/@id)";
     		try {
     			return Lists.transform(this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(query), new Function<String, WorkflowItem>() {
     				@Override
     				public WorkflowItem apply(final String s) {
     					final String[] arr = s.split("==@==");
     					return new WorkflowItem(arr[0].trim(), arr[1].trim(), arr[2].trim(), arr[3].trim().length() > 0);
+    				}
     			return Lists.transform(isClient.find(query), s -> {
     				final String[] arr = s.split("==@==");
     				return new WorkflowItem(arr[0].trim(), arr[1].trim(), arr[2].trim(), arr[3].trim().length() > 0);
     			});
     		} catch (final ISLookUpException e) {
     		} catch (final InformationServiceException e) {
     			log.error("Error obtaining wfs using query: " + query, e);
     			return Lists.newArrayList();
+    		}
-...
     	public String getProfile(final String id) {
     		try {
     			return this.serviceLocator.getService(ISLookUpService.class).getResourceProfile(id);
     		} catch (final ISLookUpException e) {
     			return isClient.getProfile(id);
     		} catch (final InformationServiceException e) {
     			log.error("Error finding profile: " + id, e);
     			return null;
+    		}
+    	}
     	public String getRepoProfile(final String id) throws ISLookUpException {
     	public String getRepoProfile(final String id) throws InformationServiceException {
     		try {
     			return this.serviceLocator.getService(ISLookUpService.class).getResourceProfile(id);
     		} catch (final ISLookUpDocumentNotFoundException e) {
     			return this.serviceLocator.getService(ISLookUpService.class).getResourceProfileByQuery(
     					"collection('/db/DRIVER/RepositoryServiceResources/RepositoryServiceResourceType')/*[.//DATASOURCE_ORIGINAL_ID='" + id + "']");
     			return isClient.getProfile(id);
     		} catch (final InformationServiceException e) {
     			return isClient
     					.findOne("collection('/db/DRIVER/RepositoryServiceResources/RepositoryServiceResourceType')/*[.//DATASOURCE_ORIGINAL_ID='" + id + "']");
+    		}
+    	}
-...
     				+ "where count($x//PARAM[@required='true' and string-length(normalize-space(.)) = 0]) > 0 " + "return $x/@name/string()";
     		try {
     			final List<String> list = this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(query);
     			final List<String> list = isClient.find(query);
     			return Sets.newHashSet(list);
     		} catch (final Exception e) {
     			log.error("Error executing xquery: " + query, e);
-...
     				final SAXReader reader = new SAXReader();
     				for (final String s : this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(query)) {
     				for (final String s : isClient.find(query)) {
     					final Document doc = reader.read(new StringReader(s));
     					final Set<String> ifcTypes = Sets.newHashSet(Splitter.on(",").omitEmptyStrings().trimResults().split(doc.valueOf("//TYPES")));
     					final Set<String> compliances = Sets.newHashSet(Splitter.on(",").omitEmptyStrings().trimResults().split(doc.valueOf("//COMPLIANCES")));
-...
     		final String query = "distinct-values(for $x in collection('/db/DRIVER/WorkflowDSResources/WorkflowDSResourceType') "
     				+ "where string-length($x//DATASOURCE/@id) > 0 return $x//WORKFLOW_TYPE/@text())";
     		try {
     			return this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(query);
     		} catch (final ISLookUpException e) {
     			return isClient.find(query);
     		} catch (final InformationServiceException e) {
     			log.error("Error executing xquery: " + query, e);
     			return Lists.newArrayList();
+    		}
-...
     		final String query = "/*[.//RESOURCE_IDENTIFIER/@value='" + dsId + "']//OFFICIAL_NAME/text()";
     		try {
     			return this.serviceLocator.getService(ISLookUpService.class).getResourceProfileByQuery(query);
     		} catch (final ISLookUpException e) {
     			return isClient.findOne(query);
     		} catch (final InformationServiceException e) {
     			log.error("Error executing xquery: " + query, e);
     			return "UNKNOWN";
+    		}
-...
     			final StringTemplate st = new StringTemplate(IOUtils.toString(resource.getInputStream()));
     			st.setAttribute("wfId", wfId);
     			final List<String> list = this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(st.toString());
     			final List<String> list = isClient.find(st.toString());
     			final SAXReader reader = new SAXReader();
     			return list.stream().map(s -> {
     				try {

     	private static final Log log = LogFactory.getLog(ISLookupLightUIClient.class);
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	public List<LightUiMenuEntry> listMenuEntries() {
     		final String xQuery = "for $x in collection('/db/DRIVER/LightUiDSResources/LightUiDSResourceType') order by $x//UI_NAME "
     				+ "return concat ($x//UI_NAME/@id, '§§§', $x//UI_NAME, '§§§', $x//UI_DESCRIPTION)";
     		List<LightUiMenuEntry> result = new ArrayList<>();
     		try {
     			List<String> uiProfiles = serviceLocator.getService(ISLookUpService.class).quickSearchProfile(xQuery);
     			List<String> uiProfiles = isClient.find(xQuery);
     			int i = 1;
     			for (String profile : uiProfiles) {
     				String[] tokens = profile.split("§§§");
-...
     	public String getLightUiProfile(final String lightuiId) throws ISLookUpException {
     		String xQuery = "for $x in collection('/db/DRIVER/LightUiDSResources/LightUiDSResourceType') where $x//UI_NAME/@id = '{id}' return $x";
     		return serviceLocator.getService(ISLookUpService.class).getResourceProfileByQuery(xQuery.replace("{id}", lightuiId));
     		return isClient.getProfileByQuery(xQuery.replace("{id}", lightuiId));
+    	}
+    }

     import java.io.StringReader;
     import java.net.HttpURLConnection;
     import java.net.URL;
     import java.util.*;
     import java.util.ArrayList;
     import java.util.Collection;
     import java.util.Collections;
     import java.util.List;
     import java.util.Map;
     import javax.annotation.Resource;
     import javax.servlet.ServletOutputStream;
     import javax.servlet.ServletResponse;
     import javax.xml.transform.dom.DOMResult;
     import javax.xml.xpath.XPathFactory;
     import com.google.common.base.Splitter;
     import com.google.common.collect.Iterables;
     import com.google.common.collect.Lists;
     import com.google.common.collect.Maps;
     import eu.dnetlib.enabling.is.sn.resourcestate.ResourceStateSubscription;
     import eu.dnetlib.enabling.is.sn.resourcestate.ResourceStateSubscriptionRegistry;
     import eu.dnetlib.enabling.locators.UniqueServiceLocator;
     import eu.dnetlib.functionality.modular.ui.AbstractAjaxController;
     import eu.dnetlib.functionality.modular.ui.is.bulk.ProfileImporter;
     import eu.dnetlib.functionality.modular.ui.is.objects.*;
     import eu.dnetlib.functionality.modular.ui.is.objects.ServiceDesc.ServiceStatus;
     import eu.dnetlib.miscutils.datetime.DateUtils;
     import eu.dnetlib.rmi.enabling.ISLookUpDocumentNotFoundException;
     import eu.dnetlib.rmi.enabling.ISLookUpException;
     import eu.dnetlib.rmi.enabling.ISLookUpService;
     import eu.dnetlib.rmi.enabling.ISRegistryService;
     import org.apache.commons.io.IOUtils;
     import org.apache.commons.lang3.StringUtils;
     import org.apache.commons.lang3.math.NumberUtils;
-...
     import org.springframework.web.bind.annotation.RequestParam;
     import org.springframework.web.bind.annotation.ResponseBody;
     import com.google.common.base.Splitter;
     import com.google.common.collect.Iterables;
     import com.google.common.collect.Lists;
     import com.google.common.collect.Maps;
     import eu.dnetlib.clients.is.InformationServiceClient;
     import eu.dnetlib.functionality.modular.ui.AbstractAjaxController;
     import eu.dnetlib.functionality.modular.ui.is.bulk.ProfileImporter;
     import eu.dnetlib.functionality.modular.ui.is.objects.CollectionDesc;
     import eu.dnetlib.functionality.modular.ui.is.objects.ServiceDesc;
     import eu.dnetlib.functionality.modular.ui.is.objects.ServiceDesc.ServiceStatus;
     import eu.dnetlib.functionality.modular.ui.is.objects.ServiceGrouperDesc;
     import eu.dnetlib.functionality.modular.ui.is.objects.SubscriptionDesc;
     import eu.dnetlib.miscutils.datetime.DateUtils;
     @Controller
     public class InformationServiceInternalController extends AbstractAjaxController {
     	private static final Log log = LogFactory.getLog(InformationServiceInternalController.class);
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	private InformationServiceClient isClient;
     	@Resource(name = "modularUiProfileImporter")
     	private ProfileImporter profileImporter;
     	/**
     	 * is sn subscription registries.
     	 */
     	@Resource(name = "issResourceStateNotificationRegistries")
     	private transient List<ResourceStateSubscriptionRegistry> registries;
     	@RequestMapping("/ui/is/xquery.do")
     	public @ResponseBody List<String> query(@RequestParam(value = "query", required = true) final String query) throws Exception {
     		log.debug("Executing xquery: " + query);
     		return this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(query);
     		return isClient.find(query);
+    	}
     	@RequestMapping("/ui/is/listSchemas.do")
     	public @ResponseBody List<String> listSchemas() throws Exception {
     		final List<String> list = this.serviceLocator.getService(ISLookUpService.class).listResourceTypes();
     		final List<String> list = isClient.listSchemas();
     		Collections.sort(list);
     		return list;
+    	}
     	@RequestMapping("/ui/is/getSchema.do")
     	public @ResponseBody String getSchema(@RequestParam(value = "name", required = true) final String name) throws Exception {
     		return this.serviceLocator.getService(ISLookUpService.class).getResourceTypeSchema(name);
     		return isClient.getSchema(name);
+    	}
     	@RequestMapping("/ui/is/listCollections.do")
-...
     				"return concat ($kind, ' @@@ ', $type, ' @@@ ', count(xmldb:get-child-resources(concat('/db/DRIVER/', $kind, '/', $type))))";
     		final Map<String, CollectionDesc> map = Maps.newHashMap();
     		for (final String s : this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(xquery)) {
     		for (final String s : isClient.find(xquery)) {
     			final String[] arr = s.split("@@@");
     			final String kind = arr[0].trim();
     			final String type = arr[1].trim();
-...
     			@RequestParam(value = "type", required = true) final String type) throws Exception {
     		final String collName = "/db/DRIVER/" + kind + "/" + type;
     		final String xquery = "distinct-values(for $x in collection('" + collName + "') return $x//RESOURCE_IDENTIFIER/@value/string())";
     		final List<String> res = this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(xquery);
     		final List<String> res = isClient.find(xquery);
     		Collections.sort(res);
-...
     	@RequestMapping("/ui/is/getProfile.do")
     	public @ResponseBody String getProfiles(@RequestParam(value = "id", required = true) final String id) throws Exception {
     		return this.serviceLocator.getService(ISLookUpService.class).getResourceProfile(id);
     		return isClient.getProfile(id);
+    	}
     	@RequestMapping("/ui/is/registerProfile.do")
     	public @ResponseBody String registerProfile(@RequestParam(value = "profile", required = true) final String profile) throws Exception {
     		return this.serviceLocator.getService(ISRegistryService.class).registerProfile(profile);
     		return isClient.register(profile);
+    	}
     	@RequestMapping("/ui/is/updateProfile.do")
-...
     		final Document doc = reader.read(new StringReader(profile));
     		final String id = doc.valueOf("//RESOURCE_IDENTIFIER/@value");
     		final String type = doc.valueOf("//RESOURCE_TYPE/@value");
     		if (StringUtils.isEmpty(id)) {
     			throw new Exception("RESOURCE_IDENTIFIER is empty");
     		} else if (StringUtils.isEmpty(type)) {
     			throw new Exception("RESOURCE_TYPE is empty");
     		} else if (this.serviceLocator.getService(ISRegistryService.class).updateProfile(id, profile, type)) {
     			return id;
     		} else {
     			throw new Exception("Profile not updated");
+    		}
     		if (StringUtils.isEmpty(id)) { throw new Exception("RESOURCE_IDENTIFIER is empty"); }
     		isClient.updateProfile(id, profile);
     		return id;
+    	}
     	@RequestMapping("/ui/is/deleteProfile.do")
     	public @ResponseBody boolean deleteProfile(@RequestParam(value = "id", required = true) final String id) throws Exception {
     		return this.serviceLocator.getService(ISRegistryService.class).deleteProfile(id);
     		isClient.deleteProfile(id);
     		return true;
+    	}
     	@RequestMapping("/ui/is/import.do")
-...
     		final Map<String, Integer> res = Maps.newHashMap();
     		if (schemas) {
     			res.putAll(this.profileImporter.importSchemas(path + "/**/*.xsd"));
     			res.putAll(profileImporter.importSchemas(path + "/**/*.xsd"));
+    		}
     		if (profiles) {
     			res.putAll(this.profileImporter.importProfiles(path + "/**/*.xml"));
     			res.putAll(profileImporter.importProfiles(path + "/**/*.xml"));
+    		}
     		return res;
+    	}
     	@RequestMapping("/ui/is/listBlackboards.do")
     	public @ResponseBody List<BlackboardMessage> listBlackboards() throws Exception {
     		final List<BlackboardMessage> list = Lists.newArrayList();
     		final SAXReader reader = new SAXReader();
     		for (final String xml : this.serviceLocator
     				.getService(ISLookUpService.class)
     				.quickSearchProfile(
     						"for $x in collection('/db/DRIVER/ServiceResources')//MESSAGE return <message>{$x/../../..//RESOURCE_TYPE}{$x/../../..//RESOURCE_IDENTIFIER}{$x}</message>")) {
     			final BlackboardMessage info = new BlackboardMessage();
     			final Document doc = reader.read(new StringReader(xml));
     			info.setProfId(doc.valueOf(".//RESOURCE_IDENTIFIER/@value"));
     			info.setMessageId(doc.valueOf(".//@id"));
     			info.setResourceType(doc.valueOf(".//RESOURCE_TYPE/@value"));
     			info.setAction(doc.valueOf(".//ACTION"));
     			info.setDate(doc.valueOf(".//@date"));
     			info.setActionStatus(doc.valueOf(".//ACTION_STATUS"));
     			info.setError(doc.valueOf(".//PARAMETER[@name='error']/@value"));
     			list.add(info);
+    		}
     		return list;
+    	}
     	@RequestMapping("/ui/is/getMetaWfIdForFamily.do")
     	public @ResponseBody Map<String, String> getMetaWfId(@RequestParam(value = "family", required = true) final String family) throws ISLookUpException {
     	public @ResponseBody Map<String, String> getMetaWfId(@RequestParam(value = "family", required = true) final String family) {
     		final String xq = "for $x in collection('/db/DRIVER/MetaWorkflowDSResources/MetaWorkflowDSResourceType') " +
     				"where $x//METAWORKFLOW_NAME/@family='" + family + "' " +
     				"return concat($x//RESOURCE_IDENTIFIER/@value, ' @@@ ', $x//METAWORKFLOW_SECTION)";
     		final Map<String, String> map = Maps.newHashMap();
     		try {
     			final String[] arr = this.serviceLocator.getService(ISLookUpService.class).getResourceProfileByQuery(xq).split("@@@");
     			final String[] arr = isClient.findOne(xq).split("@@@");
     			map.put("id", arr[0].trim());
     			map.put("section", arr[1].trim());
     		} catch (final ISLookUpDocumentNotFoundException e) {
     		} catch (final Exception e) {
     			map.put("id", "");
     			map.put("section", "");
+    		}
-...
     		final List<ServiceDesc> list = Lists.newArrayList();
     		final SAXReader reader = new SAXReader();
     		for (final String s : this.serviceLocator.getService(ISLookUpService.class).quickSearchProfile(xq)) {
     		for (final String s : isClient.find(xq)) {
     			final Document doc = reader.read(new StringReader(s));
     			final String id = doc.valueOf("/service/id").trim();
     			final String name = doc.valueOf("/service/name").trim();
-...
+    		}
     		final XPathFactory xpathFactory = XPathFactory.newInstance();
     		for (final ResourceStateSubscriptionRegistry registry : this.registries) {
     		for (final ResourceStateSubscriptionRegistry registry : registries) {
     			for (final ResourceStateSubscription sub : registry.getSubscriptionDao().listSubscriptions()) {
     				boolean notFound = true;
     				final DOMResult result = new DOMResult(); // NOPMD

     import com.google.common.collect.Maps;
     import eu.dnetlib.enabling.is.store.ISStore;
     import eu.dnetlib.enabling.locators.UniqueServiceLocator;
     import eu.dnetlib.enabling.tools.StreamOpaqueResource;
     import eu.dnetlib.rmi.enabling.ISRegistryService;
     import eu.dnetlib.clients.is.InformationServiceClient;
     public class ProfileImporter implements ResourceLoaderAware {
-...
     	private static final Log log = LogFactory.getLog(ProfileImporter.class);
     	@Autowired
     	private ISStore isStore;
     	private InformationServiceClient isClient;
     	@Autowired
     	private UniqueServiceLocator serviceLocator;
     	public Map<String, Integer> importSchemas(final String path) throws IOException {
     		int done = 0;
-...
     		log.info("registering schema: " + resourceType);
     		this.serviceLocator.getService(ISRegistryService.class).addResourceType(resourceType, IOUtils.toString(url.openStream()));
     		isClient.registerSchema(resourceType, IOUtils.toString(url.openStream()));
+    	}
     	private void registerProfile(final URL url) throws Exception {
-...
     		log.info("saving profile: " + name + " in coll " + coll);
     		this.isStore.insertXML(name, coll, resource.asString());
     		isStore.insertXML(name, coll, resource.asString());
+    	}
     	public ResourceLoader getResourceLoader() {
     		return this.resourceLoader;
     		return resourceLoader;
+    	}
     	@Override

     <?xml version="1.0" encoding="UTF-8"?>
     <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
     	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     	<modelVersion>4.0.0</modelVersion>
     	<artifactId>dnet-administration-uis</artifactId>
     	<version>0.0.1-SNAPSHOT</version>
     	<packaging>jar</packaging>
     	<name>dnet-administration-uis</name>
     	<description>DNet administration UIs</description>
     	<parent>
     		<groupId>eu.dnetlib</groupId>
     		<artifactId>dnet-parent</artifactId>
     		<version>2.0.0-SNAPSHOT</version>
     		<relativePath></relativePath>
     		<artifactId>dnet-springboot-apps</artifactId>
     		<version>0.0.1-SNAPSHOT</version>
     		<relativePath>../pom.xml</relativePath>
     	</parent>
     	<modelVersion>4.0.0</modelVersion>
     	<groupId>eu.dnetlib</groupId>
     	<artifactId>dnet-modular-uis</artifactId>
     	<packaging>jar</packaging>
     	<version>1.0.0-SNAPSHOT</version>
     	<scm>
     		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet50/modules/dnet-modular-uis/trunk</developerConnection>
     	</scm>
     	<dependencies>
     		<dependency>
     			<groupId>eu.dnetlib</groupId>
     			<artifactId>dnet-msro-service</artifactId>
     			<version>5.0.0-SNAPSHOT</version>
     		</dependency>
     		<dependency>
     			<groupId>eu.dnetlib</groupId>
     			<artifactId>dnet-information-service</artifactId>
     			<version>1.0.0-SNAPSHOT</version>
     		</dependency>
     		<dependency>
     			<groupId>eu.dnetlib</groupId>
     			<artifactId>dnet-core-components</artifactId>
     			<version>1.0.0-SNAPSHOT</version>
     		</dependency>
     		<dependency>
     			<groupId>org.springframework</groupId>
     			<artifactId>spring-web</artifactId>
     			<version>${spring.version}</version>
     		</dependency>
     		<dependency>
     			<groupId>org.springframework</groupId>
     			<artifactId>spring-webmvc</artifactId>
     			<version>${spring.version}</version>
     		</dependency>
     		<dependency>
     			<groupId>org.mongodb</groupId>
     			<artifactId>mongo-java-driver</artifactId>
     			<version>${mongodb.driver.version}</version>
     		</dependency>
     		<dependency>
     			<groupId>org.codehaus.jackson</groupId>
     			<artifactId>jackson-mapper-asl</artifactId>
     			<version>1.9.13</version>
     		</dependency>
     		<dependency>
     			<groupId>javax.servlet</groupId>
     			<artifactId>javax.servlet-api</artifactId>
     			<version>${javax.servlet.version}</version>
     			<scope>provided</scope>
     		</dependency>
     		<dependency>
     			<groupId>org.apache.maven</groupId>
     			<artifactId>maven-model</artifactId>
     			<version>3.2.3</version>
     		</dependency>
     		<dependency>
     			<groupId>junit</groupId>
     			<artifactId>junit</artifactId>
     			<version>${junit.version}</version>
     			<scope>test</scope>
     		</dependency>
     		<dependency>
     			<groupId>eu.dnetlib</groupId>
     			<artifactId>dnet-data-provision-services</artifactId>
     			<version>1.0.0-SNAPSHOT</version>
     		</dependency>
     	</dependencies>
     	<properties>
     		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     		<main.basedir>${basedir}/../..</main.basedir>
     	</properties>
     </project>

Project

General

Profile

D-Net

Revision 45617

Added by Michele Artini over 7 years ago