Story/q20 19

quadriga/pom.xml

@@ -44,7 +44,10 @@
         <citesphere.base.url></citesphere.base.url>
         <citesphere.client.id></citesphere.client.id>
         <citesphere.client.secret></citesphere.client.secret>
-
+
+        <conceptpower.base.url></conceptpower.base.url>
+        <conceptpower.id.endpoint></conceptpower.id.endpoint>
+
         <log.level>info</log.level>
 
         <tomcat.deploy.path></tomcat.deploy.path>
@@ -315,13 +318,15 @@
             <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
+
         <!-- https://mvnrepository.com/artifact/commons-validator/commons-validator -->
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
             <version>1.7</version>
+        </dependency>
+
         <!-- https://mvnrepository.com/artifact/org.ehcache/ehcache -->
-         </dependency>
         <dependency>
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>

quadriga/src/main/java/edu/asu/diging/quadriga/api/v1/model/Metadata.java

@@ -1,5 +1,6 @@
 package edu.asu.diging.quadriga.api.v1.model;
 
+import edu.asu.diging.quadriga.core.model.Context;
 import edu.asu.diging.quadriga.core.model.DefaultMapping;
 
 public class Metadata {

quadriga/src/main/java/edu/asu/diging/quadriga/api/v1/model/NodeData.java

@@ -1,5 +1,7 @@
 package edu.asu.diging.quadriga.api.v1.model;
 
+import edu.asu.diging.quadriga.core.model.Context;
+
 public class NodeData {
 
 	private String label;

quadriga/src/main/java/edu/asu/diging/quadriga/config/PersistenceConfig.java

@@ -24,7 +24,11 @@
 @Configuration
 @PropertySource("classpath:config.properties")
 @EnableTransactionManagement
-@EnableJpaRepositories(basePackages = { "edu.asu.diging.quadriga.core.data", "edu.asu.diging.simpleusers.core.data" })
+@EnableJpaRepositories(basePackages = {
+    "edu.asu.diging.quadriga.core.data",
+    "edu.asu.diging.quadriga.core.conceptpower.data",
+    "edu.asu.diging.simpleusers.core.data"
+})
 public class PersistenceConfig {
 
     @Autowired
@@ -45,7 +49,10 @@ public DataSource dataSource() {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "edu.asu.diging.quadriga.core.model", "edu.asu.diging.simpleusers.core.model" });
+        em.setPackagesToScan(new String[] { "edu.asu.diging.quadriga.core.model",
+            "edu.asu.diging.quadriga.core.conceptpower.model",
+            "edu.asu.diging.simpleusers.core.model"
+        });
 
         JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);

quadriga/src/main/java/edu/asu/diging/quadriga/core/conceptpower/data/ConceptCacheRepository.java

@@ -0,0 +1,25 @@
+package edu.asu.diging.quadriga.core.conceptpower.data;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import edu.asu.diging.quadriga.core.conceptpower.model.ConceptCache;
+
+/**
+ * 
+ * An interface used to retrieve data from conceptpower_concept_entry table that
+ * stores data extracted from ConceptPower
+ * 
+ * @author poojakulkarni
+ *
+ */
+@Repository
+public interface ConceptCacheRepository extends PagingAndSortingRepository<ConceptCache, String> {
+
+    @Query("SELECT c from ConceptCache c WHERE ?1 in elements(c.alternativeUris)")
+    public List<ConceptCache> findConceptByAlternativeURI(String uri);
+
+}

quadriga/src/main/java/edu/asu/diging/quadriga/core/conceptpower/data/ConceptTypeRepository.java

@@ -0,0 +1,18 @@
+package edu.asu.diging.quadriga.core.conceptpower.data;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import edu.asu.diging.quadriga.core.conceptpower.model.ConceptType;
+
+/**
+ * An interface used to retrieve data from conceptpower_concept_type table that
+ * stores information for a concept's type extracted from ConceptPower
+ * 
+ * @author poojakulkarni
+ *
+ */
+@Repository
+public interface ConceptTypeRepository extends PagingAndSortingRepository<ConceptType, String> {
+
+}

quadriga/src/main/java/edu/asu/diging/quadriga/core/conceptpower/model/ConceptCache.java

@@ -0,0 +1,223 @@
+package edu.asu.diging.quadriga.core.conceptpower.model;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import javax.persistence.CollectionTable;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.LazyCollection;
+import org.hibernate.annotations.LazyCollectionOption;
+
+/**
+ * This class represents the 'conceptpower_concept_cache' table present in the
+ * database that stores cached concept data
+ * 
+ * @author Digital Innovation Group
+ *
+ */
+@Entity
+@Table(name = "conceptpower_concept_cache")
+public class ConceptCache implements Serializable, Comparable<ConceptCache> {
+
+    private static final long serialVersionUID = 6260562492095202271L;
+
+    @Id
+    private String uri;
+    private String id;
+    private String word;
+    private String pos;
+
+    @Lob
+    private String description;
+
+    private String conceptList;
+    private String typeId;
+    private boolean deleted;
+    private LocalDateTime lastUpdated;
+
+    @ElementCollection
+    @LazyCollection(LazyCollectionOption.FALSE)
+    @CollectionTable(name = "conceptpower_alternative_uris")
+    private List<String> alternativeUris;
+
+    @ElementCollection
+    @LazyCollection(LazyCollectionOption.FALSE)
+    @CollectionTable(name = "conceptpower_equal_to")
+    private List<String> equalTo;
+
+    @ElementCollection
+    @LazyCollection(LazyCollectionOption.FALSE)
+    @CollectionTable(name = "conceptpower_wordnetids")
+    private List<String> wordNetIds;
+
+    private String creatorId;
+
+    @Transient
+    private ConceptType conceptType;
+
+    public ConceptCache() {
+        this.lastUpdated = LocalDateTime.now();
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getWord() {
+        return word;
+    }
+
+    public void setWord(String word) {
+        this.word = word;
+    }
+
+    public String getPos() {
+        return pos;
+    }
+
+    public void setPos(String pos) {
+        this.pos = pos;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getConceptList() {
+        return conceptList;
+    }
+
+    public void setConceptList(String conceptList) {
+        this.conceptList = conceptList;
+    }
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public LocalDateTime getLastUpdated() {
+        return lastUpdated;
+    }
+
+    public void setLastUpdated(LocalDateTime lastUpdated) {
+        this.lastUpdated = lastUpdated;
+    }
+
+    public List<String> getAlternativeUris() {
+        return alternativeUris;
+    }
+
+    public void setAlternativeUris(List<String> alternativeUris) {
+        this.alternativeUris = alternativeUris;
+    }
+
+    public List<String> getEqualTo() {
+        return equalTo;
+    }
+
+    public void setEqualTo(List<String> equalTo) {
+        this.equalTo = equalTo;
+    }
+
+    public List<String> getWordNetIds() {
+        return wordNetIds;
+    }
+
+    public void setWordNetIds(List<String> wordNetIds) {
+        this.wordNetIds = wordNetIds;
+    }
+
+    public String getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(String creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public ConceptType getConceptType() {
+        return conceptType;
+    }
+
+    public void setConceptType(ConceptType conceptType) {
+        this.conceptType = conceptType;
+    }
+
+    @Override
+    public int compareTo(ConceptCache conceptCache) {
+        // If both old and new cache values are null/blank/empty, nothing has changed
+        // If old value is null/blank/empty, new value is not null/blank/empty, difference present
+        // If old value is not null/blank/empty, new value is null/blank/empty, difference present
+        // If both are not null/blank/empty, we need to check difference
+
+        if(isDifferentList(conceptCache.getAlternativeUris(), this.getAlternativeUris())) return -1;
+        if(isDifferentList(conceptCache.getEqualTo(), this.getEqualTo())) return -1;
+        if(isDifferentList(conceptCache.getWordNetIds(), this.getWordNetIds())) return -1;
+        if (isDifferentString(conceptCache.getConceptList(), this.getConceptList())) return -1;
+        if (isDifferentString(conceptCache.getCreatorId(), this.getCreatorId())) return -1;
+        if (isDifferentString(conceptCache.getDescription(), this.getDescription())) return -1;
+        if (isDifferentString(conceptCache.getId(), this.getId())) return -1;
+        if (isDifferentString(conceptCache.getPos(), this.getPos())) return -1;
+        if (isDifferentString(conceptCache.getTypeId(), this.getTypeId())) return -1;
+        if (isDifferentString(conceptCache.getUri(), this.getUri())) return -1;
+        if (isDifferentString(conceptCache.getWord(), this.getWord())) return -1;
+        return 0;
+    }
+
+    private static boolean isDifferentString(String str1, String str2) {
+        if(!(StringUtils.isEmpty(str1) && StringUtils.isEmpty(str2)) 
+                && (StringUtils.isEmpty(str1) || !str1.equals(str2))) {
+            return true;
+        }
+        return false;
+    }
+
+    private static boolean isDifferentList(List<String> list1, List<String> list2) {
+        if (!(isNullOrEmpty(list1) && isNullOrEmpty(list2) 
+                && (isNullOrEmpty(list1) || !list1.equals(list2)))) {
+            return true;
+        }
+        return false;
+    }
+
+    private static boolean isNullOrEmpty(List<String> list) {
+        return list == null || list.isEmpty();
+    }
+
+}