Fixed merge conflicts

OHDSI · Dec 27, 2024 · b5dda3e · b5dda3e
2 parents 75cdbd6 + 70dc4e2
commit b5dda3e
Show file tree

Hide file tree

Showing 69 changed files with 1,991 additions and 365 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = tab
+indent_size = 2
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -122,7 +122,7 @@
     <security.ad.system.password></security.ad.system.password>
     <security.ad.searchFilter>(&amp;(objectClass=person)(cn=%s))</security.ad.searchFilter>
     <security.ad.ignore.partial.result.exception>true</security.ad.ignore.partial.result.exception>
-    <security.ad.result.count.limit>30000</security.ad.result.count.limit> <!-- 0 means no limit -->
+    <security.ad.result.count.limit>30000</security.ad.result.count.limit>    <!-- 0 means no limit -->
     <security.ad.default.import.group>public</security.ad.default.import.group>
     <security.ad.searchString>(&amp;(objectClass=person)(userPrincipalName=%s))</security.ad.searchString>
     <security.ad.userMapping.displaynameAttr>displayname</security.ad.userMapping.displaynameAttr>
@@ -191,8 +191,8 @@
     <!-- If defaultGlobalReadPermissions is set to true (default), then all users can see every artifact.  -->
     <!-- If it is set to false, WebAPI will filter out the artifacts that a user does not explicitly have -->
     <!-- read permissions to -->
-    <security.defaultGlobalReadPermissions>true</security.defaultGlobalReadPermissions>	
-    
+    <security.defaultGlobalReadPermissions>true</security.defaultGlobalReadPermissions>
+
     <!-- EMBEDDED SERVER CONFIGURATION (ServerProperties) -->
     <server.port>8080</server.port>
     <server.ssl.key-store></server.ssl.key-store>
@@ -216,7 +216,7 @@
     <jasypt.encryptor.enabled>false</jasypt.encryptor.enabled>
     <jasypt.encryptor.password></jasypt.encryptor.password>
     <jasypt.encryptor.algorithm>PBEWithMD5AndDES</jasypt.encryptor.algorithm>
-                
+
     <!-- ORGANIZATION SETTINGS -->
     <organization.name>OHDSI</organization.name>
 
@@ -236,6 +236,10 @@
     <logging.level.org.hibernate>info</logging.level.org.hibernate>
     <logging.level.org.apache.shiro>warn</logging.level.org.apache.shiro>
 
+    <!-- Spring Cache properties -->
+    <spring.cache.type>jcache</spring.cache.type>
+
+    <!-- Spring Batch -->
     <spring.batch.taskExecutor.corePoolSize>10</spring.batch.taskExecutor.corePoolSize>
     <spring.batch.taskExecutor.maxPoolSize>20</spring.batch.taskExecutor.maxPoolSize>
     <spring.batch.taskExecutor.queueCapacity>2147483647</spring.batch.taskExecutor.queueCapacity>
@@ -272,6 +276,7 @@
     <cache.jobs.count>3</cache.jobs.count>
     <!-- Achilles cache -->
     <cache.achilles.usePersonCount>true</cache.achilles.usePersonCount>
+    <cache.webapi.enabled>true</cache.webapi.enabled>
 
     <!-- Build info -->
     <buildinfo.atlas.milestone.id>47</buildinfo.atlas.milestone.id>
@@ -301,6 +306,7 @@
     <!-- Shiny -->
     <shiny.enabled>false</shiny.enabled>
   </properties>
+
   <build>
     <finalName>WebAPI</finalName>
     <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
@@ -371,8 +377,8 @@
           <!-- only include properties to speed up plugin -->
           <!-- ref: https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/462 -->
           <includeOnlyProperties>
-              <includeOnlyProperty>git.branch</includeOnlyProperty>
-              <includeOnlyProperty>git.commit.id.abbrev</includeOnlyProperty>
+            <includeOnlyProperty>git.branch</includeOnlyProperty>
+            <includeOnlyProperty>git.commit.id.abbrev</includeOnlyProperty>
           </includeOnlyProperties>
         </configuration>
       </plugin>
@@ -578,6 +584,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -745,6 +752,10 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>javax.cache</groupId>
+      <artifactId>cache-api</artifactId>
+      <version>1.1.1</version>
+    </dependency>    <dependency>
       <groupId>org.ohdsi.sql</groupId>
       <artifactId>SqlRender</artifactId>
       <version>${SqlRender.version}</version>
@@ -772,11 +783,22 @@
       <artifactId>json-smart</artifactId>
       <version>2.4.9</version>
     </dependency>
+    <dependency>
+      <groupId>net.minidev</groupId>
+      <artifactId>asm</artifactId>
+      <version>1.0.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
       <version>3.12.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+      <version>1.10.0</version>
+    </dependency>
     <dependency>
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-core</artifactId>
@@ -805,12 +827,12 @@
           <artifactId>jackson-databind</artifactId>
         </exclusion>
         <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
         <exclusion>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -1156,7 +1178,7 @@
       <version>${pac4j.version}</version>
       <exclusions>
         <exclusion>
-      <groupId>com.fasterxml.jackson.core</groupId>
+          <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
         </exclusion>
       </exclusions>
@@ -1192,6 +1214,10 @@
       <version>1.1.7</version>
     </dependency>
     <dependency>
+      <groupId>org.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>3.9.11</version>
+    </dependency>    <dependency>
       <groupId>com.opentable.components</groupId>
       <artifactId>otj-pg-embedded</artifactId>
       <version>0.13.1</version>
@@ -1202,12 +1228,12 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <version>${spring.boot.version}</version>
       <scope>test</scope>
-        <exclusions>
-            <exclusion>
-                <groupId>com.vaadin.external.google</groupId>
-                <artifactId>android-json</artifactId>
-            </exclusion>
-        </exclusions>
+      <exclusions>
+        <exclusion>
+          <groupId>com.vaadin.external.google</groupId>
+          <artifactId>android-json</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.dbunit</groupId>
@@ -1228,10 +1254,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>com.github.mjeanroy</groupId>
-        <artifactId>dbunit-plus</artifactId>
-        <version>2.0.1</version>
-        <scope>test</scope>
+      <groupId>com.github.mjeanroy</groupId>
+      <artifactId>dbunit-plus</artifactId>
+      <version>2.0.1</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
@@ -1243,6 +1269,7 @@
       <artifactId>jackson-datatype-jsr310</artifactId>
     </dependency>
   </dependencies>
+
   <profiles>
     <profile>
       <id>webapi-oracle</id>
@@ -1335,17 +1362,17 @@
           lower(email) = lower(?)</security.db.datasource.authenticationQuery>
       </properties>
       <repositories>
-	<repository>
+        <repository>
           <id>ohdsi.snapshots</id>
           <name>repo.ohdsi.org-snapshots</name>
           <url>https://repo.ohdsi.org/nexus/content/repositories/snapshots</url>
           <releases>
             <enabled>false</enabled>
           </releases>
-      	  <snapshots>
+          <snapshots>
             <enabled>true</enabled>
-      	  </snapshots>
-    	</repository>
+          </snapshots>
+        </repository>
       </repositories>
     </profile>
     <profile>
@@ -1418,7 +1445,7 @@
         <impala.enabled>true</impala.enabled>
         <impala.driver.version>2.6.15</impala.driver.version>
         <!-- Impala JDBC driver path -->
-		<impala.classpath>...path/to/impala/jdbc/drivers...</impala.classpath>
+        <impala.classpath>...path/to/impala/jdbc/drivers...</impala.classpath>
       </properties>
       <dependencies>
         <dependency>
@@ -1523,9 +1550,9 @@
           <version>v2-rev20220326-1.32.1</version>
         </dependency>
         <dependency>
-            <groupId>com.google.cloud</groupId>
-            <artifactId>google-cloud-bigquery</artifactId>
-            <version>1.2.15</version>
+          <groupId>com.google.cloud</groupId>
+          <artifactId>google-cloud-bigquery</artifactId>
+          <version>1.2.15</version>
         </dependency>
         <dependency>
           <groupId>com.google.http-client</groupId>
@@ -1834,7 +1861,7 @@
       <id>webapi-snowflake</id>
       <properties>
         <snowflake.enabled>true</snowflake.enabled>
-        <snowflake.driver.version>3.13.22</snowflake.driver.version>
+        <snowflake.driver.version>3.20.0</snowflake.driver.version>
       </properties>
       <dependencies>
         <dependency>

diff --git a/sample_settings.xml b/sample_settings.xml
@@ -61,12 +61,12 @@
       <security.maxLoginAttempts>3</security.maxLoginAttempts>
       <security.duration.initial>10</security.duration.initial>
       <security.duration.increment>10</security.duration.increment>
-      <security.db.datasource.schema>${datasource.ohdsi.schema}</security.db.datasource.schema>
+      <security.db.datasource.schema>atlas_security</security.db.datasource.schema>
       <security.db.datasource.url>${datasource.url}</security.db.datasource.url>
       <security.db.datasource.driverClassName>${datasource.driverClassName}</security.db.datasource.driverClassName>
       <security.db.datasource.username>${datasource.username}</security.db.datasource.username>
       <security.db.datasource.password>${datasource.password}</security.db.datasource.password>
-      <security.db.datasource.authenticationQuery>select password from ${security.db.datasource.schema}.users where lower(email) = lower(?)</security.db.datasource.authenticationQuery>
+      <security.db.datasource.authenticationQuery>select password,firstName,middleName,lastName from ${security.db.datasource.schema}.users where username = ?</security.db.datasource.authenticationQuery>
     </properties> 
   </profile>     
   </profiles>

diff --git a/src/main/java/org/ohdsi/webapi/CacheConfig.java b/src/main/java/org/ohdsi/webapi/CacheConfig.java
@@ -0,0 +1,10 @@
+package org.ohdsi.webapi;
+
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableCaching
+public class CacheConfig {
+
+}
diff --git a/src/main/java/org/ohdsi/webapi/JerseyConfig.java b/src/main/java/org/ohdsi/webapi/JerseyConfig.java
@@ -26,7 +26,6 @@
 import org.ohdsi.webapi.service.IRAnalysisResource;
 import org.ohdsi.webapi.service.JobService;
 import org.ohdsi.webapi.service.PersonService;
-import org.ohdsi.webapi.service.ShinyService;
 import org.ohdsi.webapi.service.SqlRenderService;
 import org.ohdsi.webapi.service.TherapyPathResultsService;
 import org.ohdsi.webapi.service.UserService;
@@ -39,7 +38,7 @@
 
 import javax.inject.Singleton;
 import javax.ws.rs.ext.RuntimeDelegate;
-import java.util.List;
+import org.ohdsi.webapi.cache.CacheService;
 
 /**
  *
@@ -64,31 +63,32 @@ public JerseyConfig() {
     public void afterPropertiesSet() throws Exception {
         packages(this.rootPackage);
         register(ActivityService.class);
+        register(CacheService.class);
+        register(CcController.class);
         register(CDMResultsService.class);
         register(CohortAnalysisService.class);
         register(CohortDefinitionService.class);
         register(CohortResultsService.class);
         register(CohortService.class);
         register(ConceptSetService.class);
+        register(DDLService.class);
         register(EvidenceService.class);
         register(FeasibilityService.class);
+        register(FeatureExtractionService.class);
         register(InfoService.class);
         register(IRAnalysisResource.class);
         register(JobService.class);
+        register(MultiPartFeature.class);
+        register(PermissionController.class);
         register(PersonService.class);
+        register(ScriptExecutionController.class);
+        register(ScriptExecutionCallbackController.class);
         register(SourceController.class);
         register(SqlRenderService.class);
-        register(DDLService.class);
+        register(SSOController.class);
         register(TherapyPathResultsService.class);
         register(UserService.class);
         register(VocabularyService.class);
-        register(ScriptExecutionController.class);
-        register(ScriptExecutionCallbackController.class);
-        register(MultiPartFeature.class);
-        register(FeatureExtractionService.class);
-        register(CcController.class);
-        register(SSOController.class);
-        register(PermissionController.class);
         register(new AbstractBinder() {
             @Override
             protected void configure() {

diff --git a/src/main/java/org/ohdsi/webapi/achilles/repository/AchillesCacheRepository.java b/src/main/java/org/ohdsi/webapi/achilles/repository/AchillesCacheRepository.java
@@ -2,7 +2,7 @@
 
 import org.ohdsi.webapi.achilles.domain.AchillesCacheEntity;
 import org.ohdsi.webapi.source.Source;
-import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
@@ -16,4 +16,8 @@ public interface AchillesCacheRepository extends CrudRepository<AchillesCacheEnt
 
     @Query("select ac from AchillesCacheEntity ac where source = :source and cacheName in :names")
     List<AchillesCacheEntity> findBySourceAndNames(@Param("source") Source source, @Param("names") List<String> names);
+
+    @Modifying
+    @Query("delete from AchillesCacheEntity where source = :source")
+    void deleteBySource(@Param("source") Source source);
 }