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

     package eu.dnetlib.parthenos.catalogue;
     import java.io.IOException;
     import eu.dnetlib.parthenos.jrr.JRRClient;
     import eu.dnetlib.parthenos.publisher.ParthenosPublisherException;
     import eu.dnetlib.parthenos.publisher.SaxonHelper;
     /**
      * Created by Alessia Bardi on 21/11/2017.
+     *
      * @author Alessia Bardi
      */
     @Deprecated
     public class CatalogueClient extends JRRClient{
     	private CatalogueRegistrator catalogueRegistrator;
     	@Override
     	protected void doRegister(final String recordRDF, final String objIdentifier) throws IOException, ParthenosPublisherException {
     		//this.catalogueRegistrator.register(recordRDF, objIdentifier);
+    	}
     	public CatalogueClient(final SaxonHelper saxonHelper, final CatalogueRegistrator catalogueRegistrator ) throws ParthenosPublisherException {
     		super(saxonHelper);
     		this.catalogueRegistrator = catalogueRegistrator;
+    	}
+    }

     package eu.dnetlib.parthenos.catalogue;
     import eu.dnetlib.parthenos.publisher.ParthenosPublisherException;
     import eu.dnetlib.parthenos.publisher.SaxonHelper;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.beans.factory.annotation.Value;
     import org.springframework.stereotype.Component;
     /**
      * Created by Alessia Bardi on 26/09/2017.
+     *
      * @author Alessia Bardi
      */
     @Component
     @Deprecated
     public class CatalogueClientFactory {
     	private static final Log log = LogFactory.getLog(CatalogueClientFactory.class);
     	@Value("${gcube.catalogue.baseurl}")
     	private String baseURL;
     	@Value("${gcube.registry.application.token}")
     	private String gcubeToken;
     	@Autowired
     	private SaxonHelper saxonHelper;
     	@Autowired
     	private CatalogueRegistrator catalogueRegistrator;
     	public CatalogueClient getCatalogueClient() throws ParthenosPublisherException {
     		log.debug("Creating CatalogueClient");
     		return new CatalogueClient(saxonHelper, catalogueRegistrator);
+    	}
     	public String getBaseURL() {
     		return baseURL;
+    	}
     	public void setBaseURL(final String baseURL) {
     		this.baseURL = baseURL;
+    	}
     	public String getGcubeToken() {
     		return gcubeToken;
+    	}
     	public void setGcubeToken(final String gcubeToken) {
     		this.gcubeToken = gcubeToken;
+    	}
     	public SaxonHelper getSaxonHelper() {
     		return saxonHelper;
+    	}
     	public void setSaxonHelper(final SaxonHelper saxonHelper) {
     		this.saxonHelper = saxonHelper;
+    	}
+    }

     	private RestTemplate jrrRestTemplate;
     	public ParthenosRegistryResource getRegistered(final String resCatName) throws ParthenosPublisherException {
     		log.debug(String.format("Catalogue --> Checking if %s exists", resCatName));
     		log.debug(String.format("Catalogue --> Checking if item %s exists", resCatName));
     		HttpEntity<String> entity = new HttpEntity<String>(getHeaders());
     		try {
     			URI uri = new URIBuilder(getBaseURL()+showItemPath).addParameter("gcube-token", getApplicationToken()).addParameter("id", resCatName).build();
-...
     	 * @throws ParthenosPublisherException
     	 */
     	public String doRegister(final String json, final String resCatName) throws URISyntaxException, IOException {
     		log.debug(String.format("Catalogue --> Registering %s : %s", resCatName, json));
     		log.debug(String.format("Catalogue --> Registering item %s : %s", resCatName, json));
     		HttpEntity<String> entity = new HttpEntity<String>(json, getHeaders());
     		URI uri = new URIBuilder(getBaseURL() + createItemPath).addParameter("gcube-token", getApplicationToken()).build();
     		ResponseEntity<String> res = jrrRestTemplate.exchange(uri, HttpMethod.POST, entity, String.class);
-...
+    	}
     	public boolean groupExist(final String groupName) throws ParthenosPublisherException {
     		log.debug(String.format("Catalogue --> Checking if %s exists", groupName));
     		HttpEntity<String> entity = new HttpEntity<String>(getHeaders());
     		log.debug(String.format("Catalogue --> Checking if group %s exists", groupName));
     		HttpEntity<String> entity = new HttpEntity<>(getHeaders());
     		try {
     			URI uri = new URIBuilder(getBaseURL()+showGroupPath).addParameter("gcube-token", getApplicationToken()).addParameter("id", groupName).build();
     			ResponseEntity<String> res = jrrRestTemplate.<String>exchange(uri, HttpMethod.GET, entity, String.class);

     package eu.dnetlib.parthenos.registry;
     import eu.dnetlib.parthenos.publisher.ParthenosPublisherException;
     import eu.dnetlib.parthenos.publisher.SaxonHelper;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.beans.factory.annotation.Value;
     import org.springframework.stereotype.Component;
     /**
      * Created by Alessia Bardi on 26/09/2017.
+     *
      * @author Alessia Bardi
      */
     @Component
     @Deprecated
     public class RegistryClientFactory {
     	private static final Log log = LogFactory.getLog(RegistryClientFactory.class);
     	@Value("${gcube.registry.uri.base.default}")
     	private String defaultBaseURI;
     	@Autowired
     	private SaxonHelper saxonHelper;
     	@Autowired
     	private GCubeResourceRegistrator gCubeResourceRegistrator;
     	public RegistryClient getRegistryClient() throws ParthenosPublisherException {
     		log.debug("Creating RegistryClient");
     		return new RegistryClient(getSaxonHelper(), defaultBaseURI, getgCubeResourceRegistrator());
+    	}
     	public SaxonHelper getSaxonHelper() {
     		return saxonHelper;
+    	}
     	public void setSaxonHelper(final SaxonHelper saxonHelper) {
     		this.saxonHelper = saxonHelper;
+    	}
     	public String getDefaultBaseURI() {
     		return defaultBaseURI;
+    	}
     	public void setDefaultBaseURI(final String defaultBaseURI) {
     		this.defaultBaseURI = defaultBaseURI;
+    	}
     	public GCubeResourceRegistrator getgCubeResourceRegistrator() {
     		return gCubeResourceRegistrator;
+    	}
     	public void setgCubeResourceRegistrator(final GCubeResourceRegistrator gCubeResourceRegistrator) {
     		this.gCubeResourceRegistrator = gCubeResourceRegistrator;
+    	}
+    }

     package eu.dnetlib.parthenos.registry;
     import java.io.IOException;
     import eu.dnetlib.parthenos.jrr.JRRClient;
     import eu.dnetlib.parthenos.publisher.ParthenosPublisherException;
     import eu.dnetlib.parthenos.publisher.SaxonHelper;
     import net.sf.saxon.s9api.SaxonApiException;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClient;
     import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory;
     import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher;
     import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisherFactory;
     /**
      * Created by Alessia Bardi on 26/09/2017.
+     *
      * @author Alessia Bardi
      */
     @Deprecated
     public class RegistryClient extends JRRClient{
     	private static final Log log = LogFactory.getLog(RegistryClient.class);
     	private GCubeResourceRegistrator gCubeResourceRegistrator;
     	private ResourceRegistryPublisher resourceRegistryPublisher;
     	private ResourceRegistryClient resourceRegistryClient;
     	private String defaultBaseURI;
     	protected RegistryClient(final SaxonHelper saxonHelper,
     			final String defaultBaseURI,
     			final GCubeResourceRegistrator gCubeResourceRegistrator)
     			throws ParthenosPublisherException {
     		super(saxonHelper);
     		this.defaultBaseURI = defaultBaseURI;
     		this.resourceRegistryPublisher = ResourceRegistryPublisherFactory.create();
     		this.resourceRegistryClient = ResourceRegistryClientFactory.create();
     		this.gCubeResourceRegistrator = gCubeResourceRegistrator;
     		try {
     			prepareXpathSelectors();
     		} catch (SaxonApiException e) {
     			throw new ParthenosPublisherException(e);
+    		}
+    	}
     	public int unregister(final String datasourceInterface) {
     		return gCubeResourceRegistrator.unregister(datasourceInterface);
+    	}
     	public void doRegister(final String recordRDF, final String objIdentifier) throws ParthenosPublisherException, IOException {
     		//gCubeResourceRegistrator.register(recordRDF, objIdentifier);
+    	}
     	public void dropRegistry() throws ParthenosPublisherException {
     		//TODO ask Luca to implement a method or instruction to do so
     		log.fatal("dropRegistry not yet implemented");
+    	}
     	public void setDefaultBaseURI(final String defaultBaseURI) {
     		this.defaultBaseURI = defaultBaseURI;
+    	}
     	public String getDefaultBaseURI() {
     		return defaultBaseURI;
+    	}
     	public GCubeResourceRegistrator getgCubeResourceRegistrator() {
     		return gCubeResourceRegistrator;
+    	}
     	public void setgCubeResourceRegistrator(final GCubeResourceRegistrator gCubeResourceRegistrator) {
     		this.gCubeResourceRegistrator = gCubeResourceRegistrator;
+    	}
     	public ResourceRegistryPublisher getResourceRegistryPublisher() {
     		return resourceRegistryPublisher;
+    	}
     	public void setResourceRegistryPublisher(final ResourceRegistryPublisher resourceRegistryPublisher) {
     		this.resourceRegistryPublisher = resourceRegistryPublisher;
+    	}
     	public ResourceRegistryClient getResourceRegistryClient() {
     		return resourceRegistryClient;
+    	}
     	public void setResourceRegistryClient(final ResourceRegistryClient resourceRegistryClient) {
     		this.resourceRegistryClient = resourceRegistryClient;
+    	}
+    }

     package eu.dnetlib.parthenos.jrr;
     import java.io.IOException;
     import java.util.Map;
     import com.google.common.collect.Maps;
     import eu.dnetlib.parthenos.publisher.ParthenosPublisherException;
     import eu.dnetlib.parthenos.publisher.SaxonHelper;
     import eu.dnetlib.parthenos.registry.RegistryClient;
     import net.sf.saxon.s9api.SaxonApiException;
     import net.sf.saxon.s9api.Serializer;
     import net.sf.saxon.s9api.XPathSelector;
     import org.apache.commons.lang3.StringUtils;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     /**
      * Created by Alessia Bardi on 21/11/2017.
+     *
      * @author Alessia Bardi
      */
     @Deprecated
     public abstract class JRRClient {
     	private static final Log log = LogFactory.getLog(RegistryClient.class);
     	public static final String OAI_NAMESPACE_URI = "http://www.openarchives.org/OAI/2.0/";
     	public static final String DRI_NAMESPACE_URI = "http://www.driver-repository.eu/namespace/dri";
     	public static final String RDF_NAMESPACE_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
     	private SaxonHelper saxonHelper;
     	private XPathSelector xpathSelectorObjIdentifier;
     	private XPathSelector xpathSelectorRDF;
     	protected JRRClient(final SaxonHelper saxonHelper) throws ParthenosPublisherException {
     		this.saxonHelper = saxonHelper;
     		try {
     			prepareXpathSelectors();
     		} catch (SaxonApiException e) {
     			throw new ParthenosPublisherException(e);
+    		}
+    	}
     	public void register(final String record) throws ParthenosPublisherException {
     		try {
     			if (StringUtils.isBlank(record)) {
     				log.warn("Got empty record -- skipping");
     				return;
+    			}
     			String objIdentifier = getObjIdentifier(record);
     			if (StringUtils.isBlank(objIdentifier)) {
     				log.warn("Got record with no objIdentifier -- skipping");
     				return;
+    			}
     			String recordRDF = getRDFBlock(record);
     			doRegister(recordRDF, objIdentifier);
     		} catch (Throwable e) {
     			log.error(e.getMessage());
     			throw new ParthenosPublisherException(e);
+    		}
+    	}
     	protected abstract void doRegister(final String recordRDF, final String objIdentifier) throws IOException, ParthenosPublisherException;
     	protected void prepareXpathSelectors() throws SaxonApiException {
     		Map<String, String> namespaces = Maps.newHashMap();
     		namespaces.put("oai", OAI_NAMESPACE_URI);
     		namespaces.put("dri", DRI_NAMESPACE_URI);
     		namespaces.put("rdf", RDF_NAMESPACE_URI);
     		xpathSelectorObjIdentifier = this.saxonHelper.help().prepareXPathSelector("//oai:header/dri:objIdentifier/text()", namespaces);
     		xpathSelectorRDF = this.saxonHelper.help().prepareXPathSelector("//oai:metadata/rdf:RDF", namespaces);
+    	}
     	protected String extractFromRecord(final String record, final XPathSelector xPathSelector) {
     		try {
     			return this.saxonHelper.help().setSerializerProperty(Serializer.Property.OMIT_XML_DECLARATION, "yes").setSerializerProperty(Serializer.Property.ENCODING, "UTF-8").evaluateSingleAsString(record, xPathSelector);
     		} catch (SaxonApiException e) {
     			throw new RuntimeException("Cannot extract content ", e);
+    		}
+    	}
     	protected String getObjIdentifier(final String record){
     		return extractFromRecord(record, xpathSelectorObjIdentifier);
+    	}
     	protected String getRDFBlock(final String record){
     		return extractFromRecord(record, xpathSelectorRDF);
+    	}
     	public void setSaxonHelper(final SaxonHelper saxonHelper) {
     		this.saxonHelper = saxonHelper;
+    	}
     	public SaxonHelper getSaxonHelper() {
     		return saxonHelper;
+    	}
+    }

     import java.io.IOException;
     import java.net.URISyntaxException;
     import eu.dnetlib.parthenos.catalogue.CatalogueClientFactory;
     import eu.dnetlib.parthenos.jrr.JRRPublisher;
     import eu.dnetlib.parthenos.registry.RegistryClient;
     import eu.dnetlib.parthenos.registry.RegistryClientFactory;
     import eu.dnetlib.parthenos.virtuoso.VirtuosoClient;
     import eu.dnetlib.parthenos.virtuoso.VirtuosoClientFactory;
     import org.apache.commons.logging.Log;
-...
     import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.stereotype.Component;
     import sun.reflect.generics.reflectiveObjects.NotImplementedException;
     /**
      * Created by Alessia Bardi on 11/08/2017.
-...
     	@Autowired
     	private VirtuosoClientFactory virtuosoClientFactory;
     	@Autowired
     	private RegistryClientFactory registryClientFactory;
     	@Autowired
     	private CatalogueClientFactory catalogueClientFactory;
     	@Autowired
     	private JRRPublisher jrrPublisher;
     	public void publish(final String record, final ParthenosTargets target) throws ParthenosPublisherException {
-...
     		//Note that this method might not be a good idea if we want to keep the uuid and only update the facets/rels
     		//maybe it is worth to implement the incremental in the ResourceRegistrator. We slow down things, but it may be worthy...
     		log.debug("Unpublishing from registry "+datasourceInterface);
     		RegistryClient registryClient = this.registryClientFactory.getRegistryClient();
     		return registryClient.unregister(datasourceInterface);
     		//TODO: implement me
     		throw new NotImplementedException();
+    	}
     	private long unpublishVirtuoso(final String datasourceInterface) throws ParthenosPublisherException {
-...
     	public void dropRegistry() throws ParthenosPublisherException {
     		log.debug("Dropping JRR");
     		RegistryClient registryClient = this.registryClientFactory.getRegistryClient();
     		registryClient.dropRegistry();
     		//TODO: implement me
     		throw new NotImplementedException();
+    	}

Project

General

Profile

D-Net

Revision 51479

Added by Alessia Bardi over 6 years ago