Final updates to Shiro implementation

* Added hibernate dialect to POM.xml. * Added schema qualifier for FK references in migraiton scripts
OHDSI · Jan 25, 2017 · 92b8c13 · 92b8c13
1 parent c93c478
commit 92b8c13
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 68 deletions.
diff --git a/pom.xml b/pom.xml
@@ -48,10 +48,10 @@
 
     <security.enabled>false</security.enabled>
     <security.token.expiration>43200</security.token.expiration>
-    <security.origin>http://localhost:8080</security.origin>
+    <security.origin>http://localhost</security.origin>
     <security.ssl.enabled>false</security.ssl.enabled>
-    <security.oauth.callback.ui>http://localhost:8080/Atlas/#/welcome</security.oauth.callback.ui>
-    <security.oauth.callback.api>http://localhost:8084/WebAPI/user/oauth/callback</security.oauth.callback.api>
+    <security.oauth.callback.ui>http://localhost/Atlas/#/welcome</security.oauth.callback.ui>
+    <security.oauth.callback.api>http://localhost:8080/WebAPI/user/oauth/callback</security.oauth.callback.api>
     <security.oauth.google.apiKey></security.oauth.google.apiKey>
     <security.oauth.google.apiSecret></security.oauth.google.apiSecret>
     <security.oauth.facebook.apiKey></security.oauth.facebook.apiKey>
@@ -339,17 +339,15 @@
       <version>${flyway.version}</version>
     </dependency>
     <dependency>
-	<groupId>org.apache.httpcomponents</groupId>
-	<artifactId>httpclient</artifactId>
-	<version>4.3.6</version>
-</dependency>
-<dependency>
-	<groupId>commons-httpclient</groupId>
-	<artifactId>commons-httpclient</artifactId>
-	<version>3.1</version>
-</dependency>
-
-
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.3.6</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+    </dependency>
     <dependency>
       <groupId>org.springframework.batch</groupId>
       <artifactId>spring-batch-admin-manager</artifactId>
@@ -365,17 +363,16 @@
         </exclusion>
       </exclusions>
     </dependency>
-
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
       <version>9.4-1201-jdbc41</version>
       <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.microsoft.sqlserver</groupId>
-        <artifactId>mssql-jdbc</artifactId>
-        <version>6.1.0.jre8</version>
+      <groupId>com.microsoft.sqlserver</groupId>
+      <artifactId>mssql-jdbc</artifactId>
+      <version>6.1.0.jre8</version>
     </dependency>
     <dependency>
       <groupId>com.opencsv</groupId>
@@ -405,9 +402,9 @@
       <version>1.2.4</version>
     </dependency>
     <dependency>
-        <groupId>com.github.dblock.waffle</groupId>
-        <artifactId>waffle-shiro</artifactId>
-        <version>1.7.4</version>
+      <groupId>com.github.dblock.waffle</groupId>
+      <artifactId>waffle-shiro</artifactId>
+      <version>1.7.4</version>
     </dependency>
     <dependency>
       <groupId>com.github.dblock.waffle</groupId>
@@ -419,13 +416,11 @@
       <artifactId>jjwt</artifactId>
       <version>0.6.0</version>
     </dependency>
-
     <dependency>
       <groupId>io.buji</groupId>
       <artifactId>buji-pac4j</artifactId>
       <version>2.0.2</version>
     </dependency>
-
     <dependency>
       <groupId>org.pac4j</groupId>
       <artifactId>pac4j-oauth</artifactId>
@@ -448,6 +443,7 @@
         <flyway.datasource.username>user</flyway.datasource.username>
         <flyway.datasource.password>pass</flyway.datasource.password>
         <flyway.locations>classpath:db/migration/oracle</flyway.locations>
+        <hibernate.dialect>org.hibernate.dialect.Oracle10gDialect</hibernate.dialect>
       </properties>
       <dependencies>
         <dependency>
@@ -472,6 +468,7 @@
         <flyway.datasource.username>userWithWritesToOhdsiSchema</flyway.datasource.username>
         <flyway.datasource.password>PASS</flyway.datasource.password>
         <flyway.locations>classpath:db/migration/postgresql</flyway.locations>
+        <hibernate.dialect>org.hibernate.dialect.PostgreSQL9Dialect</hibernate.dialect>
       </properties>
     </profile>
     <profile>
@@ -488,39 +485,8 @@
         <flyway.datasource.username>FLYWAY_USER</flyway.datasource.username>
         <flyway.datasource.password>FLYWAY_PASS</flyway.datasource.password>
         <flyway.locations>classpath:db/migration/sqlserver</flyway.locations>
+        <hibernate.dialect>org.hibernate.dialect.SQLServer2012Dialect</hibernate.dialect>
       </properties>
-    </profile>  
-    <profile>
-      <id>webapi-local</id>
-      <properties>
-        <datasource.driverClassName>com.microsoft.sqlserver.jdbc.SQLServerDriver</datasource.driverClassName>
-        <datasource.url>jdbc:sqlserver://server</datasource.url>
-        <datasource.username>USER</datasource.username>
-        <datasource.password>PASS</datasource.password>
-        <datasource.dialect>sql server</datasource.dialect>
-        <datasource.ohdsi.schema>OHDSI_schema</datasource.ohdsi.schema>
-        <flyway.datasource.driverClassName>${datasource.driverClassName}</flyway.datasource.driverClassName>
-        <flyway.datasource.url>${datasource.url}</flyway.datasource.url>
-        <flyway.datasource.username>FLYWAY_USER</flyway.datasource.username>
-        <flyway.datasource.password>FLYWAY_PASS</flyway.datasource.password>
-        <flyway.locations>classpath:db/migration/sqlserver</flyway.locations>
-      </properties>
-    </profile>                         
-    <profile>
-      <id>webapi-alpha</id>
-      <properties>
-        <datasource.driverClassName>com.microsoft.sqlserver.jdbc.SQLServerDriver</datasource.driverClassName>
-        <datasource.url>jdbc:sqlserver://server</datasource.url>
-        <datasource.username>USER</datasource.username>
-        <datasource.password>PASS</datasource.password>
-        <datasource.dialect>sql server</datasource.dialect>
-        <datasource.ohdsi.schema>OHDSI_schema</datasource.ohdsi.schema>
-        <flyway.datasource.driverClassName>${datasource.driverClassName}</flyway.datasource.driverClassName>
-        <flyway.datasource.url>${datasource.url}</flyway.datasource.url>
-        <flyway.datasource.username>FLYWAY_USER</flyway.datasource.username>
-        <flyway.datasource.password>FLYWAY_PASS</flyway.datasource.password>
-        <flyway.locations>classpath:db/migration/sqlserver</flyway.locations>
-      </properties>
-    </profile>                         
+    </profile>                      
   </profiles>
 </project>
diff --git a/src/main/java/org/ohdsi/webapi/DataAccessConfig.java b/src/main/java/org/ohdsi/webapi/DataAccessConfig.java
@@ -35,6 +35,7 @@ public class DataAccessConfig {
   private Properties getJPAProperties() {
     Properties properties = new Properties();
     properties.setProperty("hibernate.default_schema", this.env.getProperty("spring.jpa.properties.hibernate.default_schema"));
+    properties.setProperty("hibernate.dialect", this.env.getProperty("spring.jpa.properties.hibernate.dialect"));
     return properties;
   }
 

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -50,6 +50,8 @@ spring.datasource.initialize=false
 spring.jpa.show-sql=true
 # JPA Default Schema
 spring.jpa.properties.hibernate.default_schema=${datasource.ohdsi.schema}
+#JPA Dialect
+spring.jpa.properties.hibernate.dialect=${hibernate.dialect}
 
 #JAX-RS
 jersey.resources.root.package=org.ohdsi.webapi

diff --git a/src/main/resources/db/migration/oracle/V1.0.0.9__shiro_security.sql b/src/main/resources/db/migration/oracle/V1.0.0.9__shiro_security.sql
@@ -76,10 +76,10 @@ ALTER TABLE ${ohdsiSchema}.SEC_PERMISSION ADD CONSTRAINT PK_SEC_PERMISSION PRIMA
 
 -- add SEC_USER_ROLE table constraints
 ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT PK_SEC_USER_ROLE PRIMARY KEY (ID);
-ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_USER FOREIGN KEY (USER_ID) REFERENCES SEC_USER(ID);
-ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES SEC_ROLE(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_USER FOREIGN KEY (USER_ID) REFERENCES ${ohdsiSchema}.SEC_USER(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES ${ohdsiSchema}.SEC_ROLE(ID);
 
 -- add SEC_ROLE_PERMISSION table constraints
 ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT PK_SEC_ROLE_PERMISSION PRIMARY KEY (ID);
-ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES SEC_ROLE(ID);
-ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_PERMISSION FOREIGN KEY (PERMISSION_ID) REFERENCES SEC_PERMISSION(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES ${ohdsiSchema}.SEC_ROLE(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_PERMISSION FOREIGN KEY (PERMISSION_ID) REFERENCES ${ohdsiSchema}.SEC_PERMISSION(ID);
diff --git a/src/main/resources/db/migration/postgresql/V1.0.0.9__shiro_security.sql b/src/main/resources/db/migration/postgresql/V1.0.0.9__shiro_security.sql
@@ -71,10 +71,10 @@ ALTER TABLE ${ohdsiSchema}.SEC_PERMISSION ADD CONSTRAINT PK_SEC_PERMISSION PRIMA
 
 -- add SEC_USER_ROLE table constraints
 ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT PK_SEC_USER_ROLE PRIMARY KEY (ID);
-ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_USER FOREIGN KEY (USER_ID) REFERENCES SEC_USER(ID);
-ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES SEC_ROLE(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_USER FOREIGN KEY (USER_ID) REFERENCES ${ohdsiSchema}.SEC_USER(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES ${ohdsiSchema}.SEC_ROLE(ID);
 
 -- add SEC_ROLE_PERMISSION table constraints
 ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT PK_SEC_ROLE_PERMISSION PRIMARY KEY (ID);
-ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES SEC_ROLE(ID);
-ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_PERMISSION FOREIGN KEY (PERMISSION_ID) REFERENCES SEC_PERMISSION(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES ${ohdsiSchema}.SEC_ROLE(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_PERMISSION FOREIGN KEY (PERMISSION_ID) REFERENCES ${ohdsiSchema}.SEC_PERMISSION(ID);
diff --git a/src/main/resources/db/migration/sqlserver/V1.0.0.9__shiro_security.sql b/src/main/resources/db/migration/sqlserver/V1.0.0.9__shiro_security.sql
@@ -48,10 +48,10 @@ ALTER TABLE ${ohdsiSchema}.SEC_PERMISSION ADD CONSTRAINT PK_SEC_PERMISSION PRIMA
 
 -- add SEC_USER_ROLE table constraints
 ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT PK_SEC_USER_ROLE PRIMARY KEY (ID);
-ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_USER FOREIGN KEY (USER_ID) REFERENCES SEC_USER(ID);
-ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES SEC_ROLE(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_USER FOREIGN KEY (USER_ID) REFERENCES ${ohdsiSchema}.SEC_USER(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_USER_ROLE ADD CONSTRAINT FK_USER_ROLE_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES ${ohdsiSchema}.SEC_ROLE(ID);
 
 -- add SEC_ROLE_PERMISSION table constraints
 ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT PK_SEC_ROLE_PERMISSION PRIMARY KEY (ID);
-ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES SEC_ROLE(ID);
-ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_PERMISSION FOREIGN KEY (PERMISSION_ID) REFERENCES SEC_PERMISSION(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_ROLE FOREIGN KEY (ROLE_ID) REFERENCES ${ohdsiSchema}.SEC_ROLE(ID);
+ALTER TABLE ${ohdsiSchema}.SEC_ROLE_PERMISSION ADD CONSTRAINT FK_ROLE_PERMISSION_TO_PERMISSION FOREIGN KEY (PERMISSION_ID) REFERENCES ${ohdsiSchema}.SEC_PERMISSION(ID);