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

« Previous | Next »

Revision 32557

Added by Andrea Mannocci over 9 years ago

removed lombok

     package eu.dnetlib.functionality.modular.ui.contexts.model;
     import lombok.AllArgsConstructor;
     import lombok.Data;
     import lombok.NoArgsConstructor;
     public class Context implements Comparable<Context> {
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
     public class Context implements Comparable<Context> {
     	private String profileId;
     	private String id;
     	private String label;
     	private String type;
     	@Override
     	public int compareTo(Context o) {
     	public int compareTo(final Context o) {
     		return label.compareTo(o.getLabel());
+    	}
     	public Context() {}
     	public Context(final String profileId, final String id, final String label, final String type) {
     		super();
     		this.profileId = profileId;
     		this.id = id;
     		this.label = label;
     		this.type = type;
+    	}
     	public String getProfileId() {
     		return profileId;
+    	}
     	public void setProfileId(final String profileId) {
     		this.profileId = profileId;
+    	}
     	public String getId() {
     		return id;
+    	}
     	public void setId(final String id) {
     		this.id = id;
+    	}
     	public String getLabel() {
     		return label;
+    	}
     	public void setLabel(final String label) {
     		this.label = label;
+    	}
     	public String getType() {
     		return type;
+    	}
     	public void setType(final String type) {
     		this.type = type;
+    	}
+    }

     import java.util.List;
     import java.util.Map;
     import lombok.AllArgsConstructor;
     import lombok.Data;
     import lombok.NoArgsConstructor;
     public class Concept implements Comparable<Concept> {
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
     public class Concept implements Comparable<Concept> {
     	private String id;
     	private String label;
     	private String claim;
     	private Map<String,String> params;
     	private Map<String, String> params;
     	private List<Concept> concepts = new ArrayList<Concept>();
     	public Concept() {}
     	public Concept(final String id, final String label, final String claim, final Map<String, String> params, final List<Concept> concepts) {
     		super();
     		this.id = id;
     		this.label = label;
     		this.claim = claim;
     		this.params = params;
     		this.concepts = concepts;
+    	}
     	@Override
     	public int compareTo(Concept o) {
     	public int compareTo(final Concept o) {
     		return label.compareTo(o.getLabel());
+    	}
     	public String getId() {
     		return id;
+    	}
     	public void setId(final String id) {
     		this.id = id;
+    	}
     	public String getLabel() {
     		return label;
+    	}
     	public void setLabel(final String label) {
     		this.label = label;
+    	}
     	public String getClaim() {
     		return claim;
+    	}
     	public void setClaim(final String claim) {
     		this.claim = claim;
+    	}
     	public Map<String, String> getParams() {
     		return params;
+    	}
     	public void setParams(final Map<String, String> params) {
     		this.params = params;
+    	}
     	public List<Concept> getConcepts() {
     		return concepts;
+    	}
     	public void setConcepts(final List<Concept> concepts) {
     		this.concepts = concepts;
+    	}
+    }

     import java.util.ArrayList;
     import java.util.List;
     import lombok.AllArgsConstructor;
     import lombok.Data;
     import lombok.NoArgsConstructor;
     public class Category implements Comparable<Category> {
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
     public class Category implements Comparable<Category> {
     	private String id;
     	private String label;
     	private String claim;
     	private List<Concept> concepts = new ArrayList<Concept>();
     	public Category() {}
     	public Category(final String id, final String label, final String claim, final List<Concept> concepts) {
     		super();
     		this.id = id;
     		this.label = label;
     		this.claim = claim;
     		this.concepts = concepts;
+    	}
     	@Override
     	public int compareTo(Category o) {
     	public int compareTo(final Category o) {
     		return label.compareTo(o.getLabel());
+    	}
     	public String getId() {
     		return id;
+    	}
     	public void setId(final String id) {
     		this.id = id;
+    	}
     	public String getLabel() {
     		return label;
+    	}
     	public void setLabel(final String label) {
     		this.label = label;
+    	}
     	public String getClaim() {
     		return claim;
+    	}
     	public void setClaim(final String claim) {
     		this.claim = claim;
+    	}
     	public List<Concept> getConcepts() {
     		return concepts;
+    	}
     	public void setConcepts(final List<Concept> concepts) {
     		this.concepts = concepts;
+    	}
+    }

     import javax.annotation.Resource;
     import lombok.extern.apachecommons.CommonsLog;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     import org.dom4j.Document;
     import org.dom4j.DocumentException;
     import org.dom4j.Element;
-...
     /**
      * Web controller for the UI
+     *
+     *
      * @author Andrea Mannocci
      */
     @CommonsLog
     @Controller
     public class ContextsController {
     	private static final Log log = LogFactory.getLog(ContextsController.class);
     	@Resource(name = "lookupLocator")
     	private ServiceLocator<ISLookUpService> lookupLocator;
-...
     	/**
     	 * Returns all contexts serialized in json. Invoked by angularJS
+    	 *
+    	 *
     	 * @param response
     	 * @return
     	 * @return
     	 * @throws ISLookUpException
     	 * @throws IOException
     	 */
     	@RequestMapping("/ui/contexts.json")
     	public @ResponseBody List<Context> getContexts() throws ISLookUpException, IOException {
     		log.info("contexts.json");
     		final String query = "for $x in collection('/db/DRIVER/ContextDSResources/ContextDSResourceType') order by $x//label "
     				+ "return concat ($x//RESOURCE_IDENTIFIER/@value,' §§§ ',$x//context/@id,' §§§ ',$x//context/@label,' §§§ ',$x//context/@type)";
     		final List<Context> contexts = Lists.transform(lookupLocator.getService().quickSearchProfile(query), new Function<String, Context>() {
     			@Override
     			public Context apply(final String s) {
     				String[] tokens = s.split("§§§");
     				return new Context(tokens[0].trim(), tokens[1].trim(), tokens[2].trim(), tokens[3].trim());
+    			}
     		});
     		return contexts;
+    	}
     	/**
     	 * Returns all categories and their concepts belonging to a context. Invoked by AngularJS
+    	 *
+    	 *
     	 * @param response
     	 * @param contextId
     	 * @throws ISLookUpException
     	 * @throws IOException
     	 * @throws DocumentException
     	 * @throws DocumentException
     	 */
     	@RequestMapping("/ui/categories.json")
     	public @ResponseBody  List<Category> getCategories(@RequestParam(value = "contextId", required = true) final String contextId)
     	public @ResponseBody List<Category> getCategories(@RequestParam(value = "contextId", required = true) final String contextId)
     			throws ISLookUpException, IOException, DocumentException {
     		log.info("categories.json?contextId=" + contextId);
     		final String profile = lookupLocator.getService().getResourceProfile(contextId);
     		final Document doc = (new SAXReader()).read(new StringReader(profile));
     		final Document doc = new SAXReader().read(new StringReader(profile));
     		final Map<String, Category> categories = Maps.newHashMap();
     		for (Object cat : doc.selectNodes("//category")) {
     			final Element categoryNode = (Element) cat;
     			final String id = categoryNode.valueOf("@id");
     			if (!categories.containsKey(id)) {
     				final Category category = new Category();
     				category.setId(categoryNode.valueOf("@id"));
-...
     				categories.put(id, category);
+    			}
     			final Category category = categories.get(id);
     			category.setConcepts(new ArrayList<Concept>());
     			for (Object con : categoryNode.selectNodes("./concept")) {
     				category.getConcepts().add(createConcept((Element) con));
+    			}
     			Collections.sort(category.getConcepts());
+    		}
     		final List<Category> list = Lists.newArrayList(categories.values());
     		Collections.sort(list);
     		return list;
+    	}
     	private Concept createConcept(Element conceptNode) {
     	private Concept createConcept(final Element conceptNode) {
     		final Concept outerConcept = new Concept();
     		outerConcept.setId(conceptNode.valueOf("@id"));
     		outerConcept.setLabel(conceptNode.valueOf("@label"));
     		outerConcept.setClaim(conceptNode.valueOf("@claim"));
     		Map<String, String> paramsMap = new HashMap<String, String>();
     		for (Object param: conceptNode.selectNodes("./param")) {
     		for (Object param : conceptNode.selectNodes("./param")) {
     			final Element paramNode = (Element) param;
     			paramsMap.put(paramNode.valueOf("@name"), paramNode.valueOf("."));
+    		}
     		outerConcept.setParams(paramsMap);
     		outerConcept.setConcepts(new ArrayList<Concept>());
     		for (Object nestedConcept : conceptNode.selectNodes("./concept")) {
     			outerConcept.getConcepts().add(createConcept((Element) nestedConcept));
+    		}
     		return outerConcept;
+    	}
     //	@RequestMapping(value = "/ui/commitContext", method = RequestMethod.POST)
     //	public @ResponseBody String commitTerms(@RequestBody(required=true) final List<Term> terms,
     //			@RequestParam(value = "contextId", required = true) final String contextId) throws IOException, ISRegistryException, JAXBException {
     //		log.info("committing context id = " + contextId);
     //
     //		// prepare terms for XML
     //		for (Term t : terms) {
     //			t.setCode(StringEscapeUtils.escapeXml(t.getCode()));
     //			t.setEncoding(StringEscapeUtils.escapeXml(t.getEncoding()));
     //			t.setEnglishName(StringEscapeUtils.escapeXml(t.getEnglishName()));
     //			t.setNativeName(StringEscapeUtils.escapeXml(t.getNativeName()));
     //			for (Synonym s : t.getSynonyms()) {
     //				s.setEncoding(StringEscapeUtils.escapeXml(s.getEncoding()));
     //				s.setTerm(StringEscapeUtils.escapeXml(s.getTerm()));
     //			}
     //			for (Relation r : t.getRelations()) {
     //				r.setType(StringEscapeUtils.escapeXml(r.getType()));
     //				r.setValue(StringEscapeUtils.escapeXml(r.getValue()));
     //			}
     //		}
     //
     //		StringTemplate st = new StringTemplate(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/functionality/modular/templates/terms.xml.st")));
     //		st.setAttribute("terms", terms);
     //		registryLocator.getService().updateProfileNode(contextId, "//TERMS", st.toString());
     //
     //		return "Context saved correctly!";
     //	}
     //
     //	@RequestMapping(value = "/ui/commitContextInfo", method = RequestMethod.POST)
     //	public @ResponseBody String commitContextInfo(@RequestBody(required=true) final Context voc,
     //			@RequestParam(value = "contextId", required = true) final String contextId) throws IOException, ISRegistryException, JAXBException {
     //		log.info("committing context info id = " + contextId);
     //
     //		// String xml = "<VOCABULARY_NAME code='{code}'>{name}</VOCABULARY_NAME>";
     //		// xml = xml.replace("{code}", StringEscapeUtils.escapeXml(voc.getCode())).replace("{name}",
     //		// StringEscapeUtils.escapeXml(voc.getName()));
     //		// registryLocator.getService().updateProfileNode(contextId, "//VOCABULARY_NAME", xml);
     //
     //		String xml = "<VOCABULARY_DESCRIPTION>{desc}</VOCABULARY_DESCRIPTION>";
     //		xml = xml.replace("{desc}", StringEscapeUtils.escapeXml(voc.getDescription()));
     //		registryLocator.getService().updateProfileNode(contextId, "//VOCABULARY_DESCRIPTION", xml);
     //
     //		return "Context info saved correctly!";
     //	}
     //
     //	@RequestMapping(value = "/ui/createContext", method = RequestMethod.POST)
     //	public @ResponseBody String createContext(@RequestBody(required=true) final Context voc) throws IOException, ISRegistryException, JAXBException {
     //		log.info("create context");
     //
     //		StringTemplate st = new StringTemplate(
     //				IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/functionality/modular/templates/context.xml.st")));
     //		st.setAttribute("name", voc.getName());
     //		st.setAttribute("description", voc.getDescription());
     //		st.setAttribute("code", voc.getCode());
     //		st.setAttribute("date", DateUtils.now_ISO8601());
     //		String newContextId = registryLocator.getService().registerProfile(st.toString());
     //
     //		return newContextId;
     //	}
     //
     //	@RequestMapping(value = "/ui/dropContext", method = RequestMethod.GET)
     //	public @ResponseBody boolean dropContext(@RequestParam(value = "contextId", required = true) final String contextId) throws IOException, ISRegistryException, JAXBException {
     //		log.info("delete context id=" + contextId);
     //
     //		return registryLocator.getService().deleteProfile(contextId);
     //	}
     	// @RequestMapping(value = "/ui/commitContext", method = RequestMethod.POST)
     	// public @ResponseBody String commitTerms(@RequestBody(required=true) final List<Term> terms,
     	// @RequestParam(value = "contextId", required = true) final String contextId) throws IOException, ISRegistryException, JAXBException {
     	// log.info("committing context id = " + contextId);
     	//
     	// // prepare terms for XML
     	// for (Term t : terms) {
     	// t.setCode(StringEscapeUtils.escapeXml(t.getCode()));
     	// t.setEncoding(StringEscapeUtils.escapeXml(t.getEncoding()));
     	// t.setEnglishName(StringEscapeUtils.escapeXml(t.getEnglishName()));
     	// t.setNativeName(StringEscapeUtils.escapeXml(t.getNativeName()));
     	// for (Synonym s : t.getSynonyms()) {
     	// s.setEncoding(StringEscapeUtils.escapeXml(s.getEncoding()));
     	// s.setTerm(StringEscapeUtils.escapeXml(s.getTerm()));
     	// }
     	// for (Relation r : t.getRelations()) {
     	// r.setType(StringEscapeUtils.escapeXml(r.getType()));
     	// r.setValue(StringEscapeUtils.escapeXml(r.getValue()));
     	// }
     	// }
     	//
     	// StringTemplate st = new
     	// StringTemplate(IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/functionality/modular/templates/terms.xml.st")));
     	// st.setAttribute("terms", terms);
     	// registryLocator.getService().updateProfileNode(contextId, "//TERMS", st.toString());
     	//
     	// return "Context saved correctly!";
     	// }
     	//
     	// @RequestMapping(value = "/ui/commitContextInfo", method = RequestMethod.POST)
     	// public @ResponseBody String commitContextInfo(@RequestBody(required=true) final Context voc,
     	// @RequestParam(value = "contextId", required = true) final String contextId) throws IOException, ISRegistryException, JAXBException {
     	// log.info("committing context info id = " + contextId);
     	//
     	// // String xml = "<VOCABULARY_NAME code='{code}'>{name}</VOCABULARY_NAME>";
     	// // xml = xml.replace("{code}", StringEscapeUtils.escapeXml(voc.getCode())).replace("{name}",
     	// // StringEscapeUtils.escapeXml(voc.getName()));
     	// // registryLocator.getService().updateProfileNode(contextId, "//VOCABULARY_NAME", xml);
     	//
     	// String xml = "<VOCABULARY_DESCRIPTION>{desc}</VOCABULARY_DESCRIPTION>";
     	// xml = xml.replace("{desc}", StringEscapeUtils.escapeXml(voc.getDescription()));
     	// registryLocator.getService().updateProfileNode(contextId, "//VOCABULARY_DESCRIPTION", xml);
     	//
     	// return "Context info saved correctly!";
     	// }
     	//
     	// @RequestMapping(value = "/ui/createContext", method = RequestMethod.POST)
     	// public @ResponseBody String createContext(@RequestBody(required=true) final Context voc) throws IOException, ISRegistryException,
     	// JAXBException {
     	// log.info("create context");
     	//
     	// StringTemplate st = new StringTemplate(
     	// IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/functionality/modular/templates/context.xml.st")));
     	// st.setAttribute("name", voc.getName());
     	// st.setAttribute("description", voc.getDescription());
     	// st.setAttribute("code", voc.getCode());
     	// st.setAttribute("date", DateUtils.now_ISO8601());
     	// String newContextId = registryLocator.getService().registerProfile(st.toString());
     	//
     	// return newContextId;
     	// }
     	//
     	// @RequestMapping(value = "/ui/dropContext", method = RequestMethod.GET)
     	// public @ResponseBody boolean dropContext(@RequestParam(value = "contextId", required = true) final String contextId) throws
     	// IOException, ISRegistryException, JAXBException {
     	// log.info("delete context id=" + contextId);
     	//
     	// return registryLocator.getService().deleteProfile(contextId);
     	// }
+    }

     	<parent>
     		<groupId>eu.dnetlib</groupId>
     		<artifactId>dnet-parent</artifactId>
     		<version>1.0.0-SNAPSHOT</version>
     		<version>1.0.0</version>
     	</parent>
     	<modelVersion>4.0.0</modelVersion>
     	<groupId>eu.dnetlib</groupId>
-...
     		<dependency>
     			<groupId>eu.dnetlib</groupId>
     			<artifactId>dnet-modular-ui</artifactId>
     			<version>2.0.0-SNAPSHOT</version>
     			<version>2.0.0</version>
     		</dependency>
     		<dependency>
-...
     			<scope>provided</scope>
     		</dependency>
     		<dependency>
     			<groupId>org.projectlombok</groupId>
     			<artifactId>lombok</artifactId>
     			<version>1.12.6</version>
     			<scope>provided</scope>
     		</dependency>
     	</dependencies>
     	<properties>

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 32557

Added by Andrea Mannocci over 9 years ago